From eff77d99c3b522d758c1ba960ac05968b5a74f25 Mon Sep 17 00:00:00 2001 From: Nikolai Oplachko Date: Sat, 19 Jul 2025 16:52:15 +0200 Subject: [PATCH] support teloxide 0.17.0 --- Cargo.lock | 12 ++++++------ README.md | 2 +- examples/Cargo.lock | 8 ++++---- examples/album_bot/Cargo.toml | 2 +- examples/calculator_bot/Cargo.toml | 2 +- examples/deep_linking_bot/Cargo.toml | 2 +- examples/file_download_bot/Cargo.toml | 2 +- examples/hello_world_bot/Cargo.toml | 2 +- examples/phrase_bot/Cargo.toml | 2 +- teloxide_tests/Cargo.toml | 2 +- teloxide_tests/src/dataset/chat_full_info.rs | 9 +++++++++ teloxide_tests/src/dataset/message_common.rs | 3 +++ teloxide_tests/src/dataset/mod.rs | 6 ++++++ 13 files changed, 36 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1ce8138..ac24f7b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -846,9 +846,9 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "dptree" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d12280a6070b0c46830fcb4011f77ac56e9e1ca224c039f1d61d2024fa1ee870" +checksum = "db96968fcf52fe063a98c75df1d1f2b1fba304e7ae29b72fdc81c1165b7e2fd0" dependencies = [ "colored", "futures", @@ -2967,9 +2967,9 @@ checksum = "20f34339676cdcab560c9a82300c4c2581f68b9369aedf0fae86f2ff9565ff3e" [[package]] name = "teloxide" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d407992f53f23d781dfef19bddfbf33ec63a9f24f2bfb2808cf7bd3890d4be29" +checksum = "84992abeed3ae42e8401b25d266d12bcba1def0abe59d22f6b9781167545f71e" dependencies = [ "aquamarine", "bytes", @@ -2994,9 +2994,9 @@ dependencies = [ [[package]] name = "teloxide-core" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7c27c35350ddf2965403b7ffe122ae8b8090c6882f520e31717e81cc839296" +checksum = "7f7a34ca8e971fa892e633858c07547fe138ef4a02e4a4eaa1d35e517d6e0bc4" dependencies = [ "bitflags", "bytes", diff --git a/README.md b/README.md index cdab086..4875cdf 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ - + diff --git a/examples/Cargo.lock b/examples/Cargo.lock index db1ce1c..eb5b9ca 100644 --- a/examples/Cargo.lock +++ b/examples/Cargo.lock @@ -3169,9 +3169,9 @@ checksum = "20f34339676cdcab560c9a82300c4c2581f68b9369aedf0fae86f2ff9565ff3e" [[package]] name = "teloxide" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d407992f53f23d781dfef19bddfbf33ec63a9f24f2bfb2808cf7bd3890d4be29" +checksum = "84992abeed3ae42e8401b25d266d12bcba1def0abe59d22f6b9781167545f71e" dependencies = [ "aquamarine", "bytes", @@ -3198,9 +3198,9 @@ dependencies = [ [[package]] name = "teloxide-core" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7c27c35350ddf2965403b7ffe122ae8b8090c6882f520e31717e81cc839296" +checksum = "7f7a34ca8e971fa892e633858c07547fe138ef4a02e4a4eaa1d35e517d6e0bc4" dependencies = [ "bitflags", "bytes", diff --git a/examples/album_bot/Cargo.toml b/examples/album_bot/Cargo.toml index 23549e1..f0b9f96 100644 --- a/examples/album_bot/Cargo.toml +++ b/examples/album_bot/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -teloxide = { version = "0.16.0", features = ["macros"] } +teloxide = { version = "0.17.0", features = ["macros"] } tokio = { version = "1.38", features = ["rt-multi-thread", "macros"] } dotenv = "0.15.0" log = "0.4" diff --git a/examples/calculator_bot/Cargo.toml b/examples/calculator_bot/Cargo.toml index 1ba3803..b84b167 100644 --- a/examples/calculator_bot/Cargo.toml +++ b/examples/calculator_bot/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -teloxide = { version = "0.16.0", features = ["macros", "redis-storage", "cbor-serializer"] } +teloxide = { version = "0.17.0", features = ["macros", "redis-storage", "cbor-serializer"] } tokio = { version = "1.38", features = ["rt-multi-thread", "macros"] } dotenv = "0.15.0" serde = { version = "1.0", features = ["derive"] } diff --git a/examples/deep_linking_bot/Cargo.toml b/examples/deep_linking_bot/Cargo.toml index 4fe312a..9663312 100644 --- a/examples/deep_linking_bot/Cargo.toml +++ b/examples/deep_linking_bot/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -teloxide = { version = "0.16.0", features = ["macros"] } +teloxide = { version = "0.17.0", features = ["macros"] } tokio = { version = "1.38", features = ["rt-multi-thread", "macros"] } dotenv = "0.15.0" serde = { version = "1.0", features = ["derive"] } diff --git a/examples/file_download_bot/Cargo.toml b/examples/file_download_bot/Cargo.toml index 837b9cb..d99f3ec 100644 --- a/examples/file_download_bot/Cargo.toml +++ b/examples/file_download_bot/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -teloxide = { version = "0.16.0", features = ["macros"] } +teloxide = { version = "0.17.0", features = ["macros"] } tokio = { version = "1.38", features = ["rt-multi-thread", "macros"] } dotenv = "0.15.0" diff --git a/examples/hello_world_bot/Cargo.toml b/examples/hello_world_bot/Cargo.toml index a87be13..7e7f401 100644 --- a/examples/hello_world_bot/Cargo.toml +++ b/examples/hello_world_bot/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -teloxide = { version = "0.16.0", features = ["macros"] } +teloxide = { version = "0.17.0", features = ["macros"] } tokio = { version = "1.38", features = ["rt-multi-thread", "macros"] } dotenv = "0.15.0" diff --git a/examples/phrase_bot/Cargo.toml b/examples/phrase_bot/Cargo.toml index 23dd52f..e8731a0 100644 --- a/examples/phrase_bot/Cargo.toml +++ b/examples/phrase_bot/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -teloxide = { version = "0.16.0", features = ["macros", "redis-storage", "cbor-serializer"] } +teloxide = { version = "0.17.0", features = ["macros", "redis-storage", "cbor-serializer"] } tokio = { version = "1.38", features = ["rt-multi-thread", "macros"] } dotenv = "0.15.0" serde = { version = "1.0", features = ["derive"] } diff --git a/teloxide_tests/Cargo.toml b/teloxide_tests/Cargo.toml index f59dd5d..6028515 100644 --- a/teloxide_tests/Cargo.toml +++ b/teloxide_tests/Cargo.toml @@ -20,7 +20,7 @@ log = "0.4" pretty_env_logger = "0.5" url = "2.5.1" reqwest = "0.12.5" -teloxide = { version = "0.16.0", features = ["macros", "sqlite-storage-nativetls"] } +teloxide = { version = "0.17.0", features = ["macros", "sqlite-storage-nativetls"] } tokio = { version = "1.38", features = ["rt-multi-thread", "macros"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/teloxide_tests/src/dataset/chat_full_info.rs b/teloxide_tests/src/dataset/chat_full_info.rs index 710e8ba..54f49e2 100644 --- a/teloxide_tests/src/dataset/chat_full_info.rs +++ b/teloxide_tests/src/dataset/chat_full_info.rs @@ -27,6 +27,7 @@ macro_rules! ChatFullInfo { pub emoji_status_expiration_date: Option>, pub has_visible_history: bool, pub max_reaction_count: u8, + pub accepted_gift_types: AcceptedGiftTypes, $($fpub $field : $type,)* } impl $name { @@ -35,6 +36,12 @@ macro_rules! ChatFullInfo { pub const AGGRESSIVE_ANTI_SPAM_ENABLED: bool = false; pub const HAS_VISIBLE_HISTORY: bool = true; pub const MAX_REACTION_COUNT: u8 = 100; + pub const ACCEPTED_GIFT_TYPES: AcceptedGiftTypes = AcceptedGiftTypes { + unlimited_gifts: false, + limited_gifts: false, + unique_gifts: false, + premium_subscription: false, + }; pub(crate) fn new_chat_full_info($($field:$type,)*) -> Self{ Self { // To not repeat this over and over again @@ -52,6 +59,7 @@ macro_rules! ChatFullInfo { emoji_status_expiration_date: None, has_visible_history: Self::HAS_VISIBLE_HISTORY, max_reaction_count: Self::MAX_REACTION_COUNT, + accepted_gift_types: Self::ACCEPTED_GIFT_TYPES, $($field,)* } } @@ -73,6 +81,7 @@ macro_rules! ChatFullInfo { has_visible_history: self.has_visible_history, max_reaction_count: self.max_reaction_count, kind: chat_full_info_kind, + accepted_gift_types: self.accepted_gift_types, } } } diff --git a/teloxide_tests/src/dataset/message_common.rs b/teloxide_tests/src/dataset/message_common.rs index 60b318e..95a0989 100644 --- a/teloxide_tests/src/dataset/message_common.rs +++ b/teloxide_tests/src/dataset/message_common.rs @@ -20,6 +20,7 @@ macro_rules! MessageCommon { // Rust was supposed to be used without inheritanc #[derive($($derive),*)] $pub struct $name { pub author_signature: Option, + pub paid_star_count: Option, pub effect_id: Option, pub forward_origin: Option, pub reply_to_message: Option>, @@ -52,6 +53,7 @@ macro_rules! MessageCommon { // Rust was supposed to be used without inheritanc None, None, None, + None, $name::IS_AUTOMATIC_FORWARD, $name::HAS_PROTECTED_CONTENT, $name::IS_FROM_OFFLINE, @@ -65,6 +67,7 @@ macro_rules! MessageCommon { // Rust was supposed to be used without inheritanc pub(crate) fn build_message_common(self, media_kind: MediaKind) -> Message { self.clone().build_message(MessageKind::Common(MessageCommon { author_signature: self.author_signature, + paid_star_count: self.paid_star_count, effect_id: self.effect_id, forward_origin: self.forward_origin, reply_to_message: self.reply_to_message, diff --git a/teloxide_tests/src/dataset/mod.rs b/teloxide_tests/src/dataset/mod.rs index 6346c8c..0108503 100644 --- a/teloxide_tests/src/dataset/mod.rs +++ b/teloxide_tests/src/dataset/mod.rs @@ -385,6 +385,8 @@ pub struct MockVideo { pub height: u32, pub duration: Seconds, pub thumbnail: Option, + pub cover: Option>, + pub start_timestamp: Option, pub file_name: Option, pub mime_type: Option, // FileMeta @@ -417,6 +419,8 @@ impl MockVideo { height: Self::HEIGHT, duration: Self::DURATION, thumbnail: None, + cover: None, + start_timestamp: None, file_name: None, mime_type: None, file_id: Self::FILE_ID.into(), @@ -440,6 +444,8 @@ impl MockVideo { height: self.height, duration: self.duration, thumbnail: self.thumbnail, + cover: self.cover, + start_timestamp: self.start_timestamp, file_name: self.file_name, mime_type: self.mime_type, file: FileMeta {