Merge branch 'teloxide:master' into master

This commit is contained in:
sogetsu 2024-07-16 11:10:28 +08:00 committed by GitHub
commit a80a1215b2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 455 additions and 92 deletions

View file

@ -46,6 +46,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- `filter_web_app_data` - `filter_web_app_data`
- Implement `PostgresStorage`, a persistent dialogue storage based on [PostgreSQL](https://www.postgresql.org/)([PR 996](https://github.com/teloxide/teloxide/pull/996)). - Implement `PostgresStorage`, a persistent dialogue storage based on [PostgreSQL](https://www.postgresql.org/)([PR 996](https://github.com/teloxide/teloxide/pull/996)).
- Implement `GetChatId` for `teloxide_core::types::{Chat, ChatJoinRequest, ChatMemberUpdated}`. - Implement `GetChatId` for `teloxide_core::types::{Chat, ChatJoinRequest, ChatMemberUpdated}`.
- Add `MessageExt::filter_story` method for the corresponding `MediaKind::Story` variant ([PR 1087](https://github.com/teloxide/teloxide/pull/1087))
### Fixed ### Fixed
@ -64,6 +65,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Sqlx version was bumped from `0.6` to `0.7.3`([PR 995](https://github.com/teloxide/teloxide/pull/995)) - Sqlx version was bumped from `0.6` to `0.7.3`([PR 995](https://github.com/teloxide/teloxide/pull/995))
- Feature `sqlite-storage` was renamed to `sqlite-storage-nativetls`([PR 995](https://github.com/teloxide/teloxide/pull/995)) - Feature `sqlite-storage` was renamed to `sqlite-storage-nativetls`([PR 995](https://github.com/teloxide/teloxide/pull/995))
- MSRV (Minimal Supported Rust Version) was bumped from `1.68.0` to `1.70.0` ([PR 996][https://github.com/teloxide/teloxide/pull/996]) - MSRV (Minimal Supported Rust Version) was bumped from `1.68.0` to `1.70.0` ([PR 996][https://github.com/teloxide/teloxide/pull/996])
- `axum` was bumped to `0.7`, along with related libraries used for webhooks ([PR 1093][https://github.com/teloxide/teloxide/pull/1093])
### Removed ### Removed

191
Cargo.lock generated
View file

@ -122,18 +122,19 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
[[package]] [[package]]
name = "axum" name = "axum"
version = "0.6.20" version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"axum-core", "axum-core",
"bitflags 1.3.2",
"bytes", "bytes",
"futures-util", "futures-util",
"http", "http 1.1.0",
"http-body", "http-body 1.0.1",
"hyper", "http-body-util",
"hyper 1.4.1",
"hyper-util",
"itoa", "itoa",
"matchit", "matchit",
"memchr", "memchr",
@ -145,28 +146,33 @@ dependencies = [
"serde_json", "serde_json",
"serde_path_to_error", "serde_path_to_error",
"serde_urlencoded", "serde_urlencoded",
"sync_wrapper", "sync_wrapper 1.0.1",
"tokio", "tokio",
"tower", "tower",
"tower-layer", "tower-layer",
"tower-service", "tower-service",
"tracing",
] ]
[[package]] [[package]]
name = "axum-core" name = "axum-core"
version = "0.3.4" version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"bytes", "bytes",
"futures-util", "futures-util",
"http", "http 1.1.0",
"http-body", "http-body 1.0.1",
"http-body-util",
"mime", "mime",
"pin-project-lite",
"rustversion", "rustversion",
"sync_wrapper 0.1.2",
"tower-layer", "tower-layer",
"tower-service", "tower-service",
"tracing",
] ]
[[package]] [[package]]
@ -240,15 +246,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]] [[package]]
name = "bytes" name = "bytes"
version = "1.6.0" version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.0.105" version = "1.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5208975e568d83b6b05cc0a063c8e7e9acc2b43bee6da15616a5b73e109d7437" checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052"
[[package]] [[package]]
name = "cfg-if" name = "cfg-if"
@ -531,12 +537,6 @@ version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
[[package]]
name = "finl_unicode"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6"
[[package]] [[package]]
name = "flume" name = "flume"
version = "0.11.0" version = "0.11.0"
@ -716,7 +716,7 @@ dependencies = [
"futures-core", "futures-core",
"futures-sink", "futures-sink",
"futures-util", "futures-util",
"http", "http 0.2.12",
"indexmap 2.2.5", "indexmap 2.2.5",
"slab", "slab",
"tokio", "tokio",
@ -823,6 +823,17 @@ dependencies = [
"itoa", "itoa",
] ]
[[package]]
name = "http"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
dependencies = [
"bytes",
"fnv",
"itoa",
]
[[package]] [[package]]
name = "http-body" name = "http-body"
version = "0.4.6" version = "0.4.6"
@ -830,15 +841,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
dependencies = [ dependencies = [
"bytes", "bytes",
"http", "http 0.2.12",
"pin-project-lite", "pin-project-lite",
] ]
[[package]] [[package]]
name = "http-range-header" name = "http-body"
version = "0.3.1" version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
dependencies = [
"bytes",
"http 1.1.0",
]
[[package]]
name = "http-body-util"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
dependencies = [
"bytes",
"futures-util",
"http 1.1.0",
"http-body 1.0.1",
"pin-project-lite",
]
[[package]] [[package]]
name = "httparse" name = "httparse"
@ -869,28 +897,47 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]] [[package]]
name = "hyper" name = "hyper"
version = "0.14.29" version = "0.14.30"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures-channel", "futures-channel",
"futures-core", "futures-core",
"futures-util", "futures-util",
"h2", "h2",
"http", "http 0.2.12",
"http-body", "http-body 0.4.6",
"httparse", "httparse",
"httpdate", "httpdate",
"itoa", "itoa",
"pin-project-lite", "pin-project-lite",
"socket2 0.5.6", "socket2 0.4.10",
"tokio", "tokio",
"tower-service", "tower-service",
"tracing", "tracing",
"want", "want",
] ]
[[package]]
name = "hyper"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
dependencies = [
"bytes",
"futures-channel",
"futures-util",
"http 1.1.0",
"http-body 1.0.1",
"httparse",
"httpdate",
"itoa",
"pin-project-lite",
"smallvec",
"tokio",
]
[[package]] [[package]]
name = "hyper-rustls" name = "hyper-rustls"
version = "0.24.2" version = "0.24.2"
@ -898,8 +945,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
dependencies = [ dependencies = [
"futures-util", "futures-util",
"http", "http 0.2.12",
"hyper", "hyper 0.14.30",
"rustls", "rustls",
"tokio", "tokio",
"tokio-rustls", "tokio-rustls",
@ -912,12 +959,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
dependencies = [ dependencies = [
"bytes", "bytes",
"hyper", "hyper 0.14.30",
"native-tls", "native-tls",
"tokio", "tokio",
"tokio-native-tls", "tokio-native-tls",
] ]
[[package]]
name = "hyper-util"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956"
dependencies = [
"bytes",
"futures-util",
"http 1.1.0",
"http-body 1.0.1",
"hyper 1.4.1",
"pin-project-lite",
"tokio",
]
[[package]] [[package]]
name = "iana-time-zone" name = "iana-time-zone"
version = "0.1.60" version = "0.1.60"
@ -1518,9 +1580,9 @@ dependencies = [
"futures-core", "futures-core",
"futures-util", "futures-util",
"h2", "h2",
"http", "http 0.2.12",
"http-body", "http-body 0.4.6",
"hyper", "hyper 0.14.30",
"hyper-rustls", "hyper-rustls",
"hyper-tls", "hyper-tls",
"ipnet", "ipnet",
@ -1533,11 +1595,12 @@ dependencies = [
"percent-encoding", "percent-encoding",
"pin-project-lite", "pin-project-lite",
"rustls", "rustls",
"rustls-native-certs",
"rustls-pemfile", "rustls-pemfile",
"serde", "serde",
"serde_json", "serde_json",
"serde_urlencoded", "serde_urlencoded",
"sync_wrapper", "sync_wrapper 0.1.2",
"system-configuration", "system-configuration",
"tokio", "tokio",
"tokio-native-tls", "tokio-native-tls",
@ -1619,6 +1682,18 @@ dependencies = [
"sct", "sct",
] ]
[[package]]
name = "rustls-native-certs"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
dependencies = [
"openssl-probe",
"rustls-pemfile",
"schannel",
"security-framework",
]
[[package]] [[package]]
name = "rustls-pemfile" name = "rustls-pemfile"
version = "1.0.4" version = "1.0.4"
@ -1690,9 +1765,9 @@ dependencies = [
[[package]] [[package]]
name = "security-framework-sys" name = "security-framework-sys"
version = "2.11.0" version = "2.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
dependencies = [ dependencies = [
"core-foundation-sys", "core-foundation-sys",
"libc", "libc",
@ -2064,6 +2139,12 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
[[package]]
name = "sync_wrapper"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
[[package]] [[package]]
name = "system-configuration" name = "system-configuration"
version = "0.5.1" version = "0.5.1"
@ -2202,18 +2283,18 @@ dependencies = [
[[package]] [[package]]
name = "thiserror" name = "thiserror"
version = "1.0.61" version = "1.0.62"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb"
dependencies = [ dependencies = [
"thiserror-impl", "thiserror-impl",
] ]
[[package]] [[package]]
name = "thiserror-impl" name = "thiserror-impl"
version = "1.0.61" version = "1.0.62"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2222,9 +2303,9 @@ dependencies = [
[[package]] [[package]]
name = "tinyvec" name = "tinyvec"
version = "1.7.0" version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce6b6a2fb3a985e99cebfaefa9faa3024743da73304ca1c683a36429613d3d22" checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
dependencies = [ dependencies = [
"tinyvec_macros", "tinyvec_macros",
] ]
@ -2326,17 +2407,15 @@ dependencies = [
[[package]] [[package]]
name = "tower-http" name = "tower-http"
version = "0.3.5" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 2.4.2",
"bytes", "bytes",
"futures-core", "http 1.1.0",
"futures-util", "http-body 1.0.1",
"http", "http-body-util",
"http-body",
"http-range-header",
"pin-project-lite", "pin-project-lite",
"tower-layer", "tower-layer",
"tower-service", "tower-service",
@ -2473,9 +2552,9 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
[[package]] [[package]]
name = "uuid" name = "uuid"
version = "1.9.1" version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
dependencies = [ dependencies = [
"getrandom", "getrandom",
] ]

View file

@ -13,7 +13,7 @@
<img src="https://img.shields.io/crates/v/teloxide.svg"> <img src="https://img.shields.io/crates/v/teloxide.svg">
</a> </a>
<a href="https://core.telegram.org/bots/api"> <a href="https://core.telegram.org/bots/api">
<img src="https://img.shields.io/badge/API%20coverage-Up%20to%206.6%20(inclusively)-green.svg"> <img src="https://img.shields.io/badge/API%20coverage-Up%20to%206.8%20(inclusively)-green.svg">
</a> </a>
<a href="https://t.me/teloxide"> <a href="https://t.me/teloxide">
<img src="https://img.shields.io/badge/support-t.me%2Fteloxide-blueviolet"> <img src="https://img.shields.io/badge/support-t.me%2Fteloxide-blueviolet">

View file

@ -85,7 +85,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- `set_my_name` - `set_my_name`
- `get_my_name` - `get_my_name`
- Add the ability to specify custom emoji entities using `HTML` and `MarkdownV2` formatting options for bots that purchased additional usernames on [Fragment](https://fragment.com/) - Add the ability to specify custom emoji entities using `HTML` and `MarkdownV2` formatting options for bots that purchased additional usernames on [Fragment](https://fragment.com/)
- Support for TBA 6.8 ([#1087](pr1087))
- Add the `MediaKind::Story`
- Add new fields
- `PollAnswer::voter` to support anonymous poll answers in chats
- `emoji_status_expiration_date` to `Chat` as part of the future `ChatFullInfo` type TBA type
- Add the `unpin_all_general_forum_topic_messages` method
[pr851]: https://github.com/teloxide/teloxide/pull/851 [pr851]: https://github.com/teloxide/teloxide/pull/851
[pr887]: https://github.com/teloxide/teloxide/pull/887 [pr887]: https://github.com/teloxide/teloxide/pull/887
@ -93,6 +98,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[pr982]: https://github.com/teloxide/teloxide/pull/982 [pr982]: https://github.com/teloxide/teloxide/pull/982
[pr1040]: https://github.com/teloxide/teloxide/pull/1040 [pr1040]: https://github.com/teloxide/teloxide/pull/1040
[pr1086]: https://github.com/teloxide/teloxide/pull/1086 [pr1086]: https://github.com/teloxide/teloxide/pull/1086
[pr1087]: https://github.com/teloxide/teloxide/pull/1087
### Fixed ### Fixed

View file

@ -22,6 +22,7 @@ categories = ["api-bindings", "asynchronous"]
default = ["native-tls"] default = ["native-tls"]
rustls = ["reqwest/rustls-tls"] rustls = ["reqwest/rustls-tls"]
rustls-native-roots = ["reqwest/rustls-tls-native-roots"]
native-tls = ["reqwest/native-tls"] native-tls = ["reqwest/native-tls"]
# Features which require nightly compiler. # Features which require nightly compiler.
@ -72,7 +73,7 @@ once_cell = "1.5.0"
takecell = "0.1" takecell = "0.1"
take_mut = "0.2" take_mut = "0.2"
rc-box = "1.1.1" rc-box = "1.1.1"
chrono = { version = "0.4.30", default-features = false } chrono = { version = "0.4.32", default-features = false }
either = "1.6.1" either = "1.6.1"
bitflags = { version = "1.2" } bitflags = { version = "1.2" }

View file

@ -12,7 +12,7 @@
<img src="https://img.shields.io/badge/license-MIT-blue.svg"> <img src="https://img.shields.io/badge/license-MIT-blue.svg">
</a> </a>
<a href="https://core.telegram.org/bots/api"> <a href="https://core.telegram.org/bots/api">
<img src="https://img.shields.io/badge/API%20coverage-Up%20to%206.6%20(inclusively)-green.svg"> <img src="https://img.shields.io/badge/API%20coverage-Up%20to%206.8%20(inclusively)-green.svg">
</a> </a>
<a href="https://crates.io/crates/teloxide_core"> <a href="https://crates.io/crates/teloxide_core">
<img src="https://img.shields.io/crates/v/teloxide_core.svg"> <img src="https://img.shields.io/crates/v/teloxide_core.svg">

View file

@ -39,7 +39,7 @@
//! [github]: https://github.com/WaffleLapkin/tg-methods-schema //! [github]: https://github.com/WaffleLapkin/tg-methods-schema
Schema( Schema(
api_version: ApiVersion(ver: "6.7", date: "April 21, 2023"), api_version: ApiVersion(ver: "6.8", date: "August 18, 2023"),
methods: [ methods: [
Method( Method(
names: ("getUpdates", "GetUpdates", "get_updates"), names: ("getUpdates", "GetUpdates", "get_updates"),
@ -2801,6 +2801,20 @@ Schema(
), ),
], ],
), ),
Method(
names: ("unpinAllGeneralForumTopicMessages", "UnpinAllGeneralForumTopicMessages", "unpin_all_general_forum_topic_messages"),
return_ty: True,
doc: Doc(md: "Use this method to clear the list of pinned messages in a General forum topic. The bot must be an administrator in the chat for this to work and must have the _can\\_pin\\_messages_ administrator right in the supergroup. Returns True on success."),
tg_doc: "https://core.telegram.org/bots/api#unpinallgeneralforumtopicmessages",
tg_category: "Available methods",
params: [
Param(
name: "chat_id",
ty: RawTy("Recipient"),
descr: Doc(md: "Unique identifier for the target chat or username of the target supergroup (in the format @supergroupusername)")
),
],
),
Method( Method(
names: ("answerCallbackQuery", "AnswerCallbackQuery", "answer_callback_query"), names: ("answerCallbackQuery", "AnswerCallbackQuery", "answer_callback_query"),
return_ty: True, return_ty: True,

View file

@ -156,6 +156,7 @@ where
reopen_general_forum_topic, reopen_general_forum_topic,
hide_general_forum_topic, hide_general_forum_topic,
unhide_general_forum_topic, unhide_general_forum_topic,
unpin_all_general_forum_topic_messages,
answer_callback_query, answer_callback_query,
set_my_commands, set_my_commands,
get_my_commands, get_my_commands,

View file

@ -251,6 +251,7 @@ where
reopen_general_forum_topic, reopen_general_forum_topic,
hide_general_forum_topic, hide_general_forum_topic,
unhide_general_forum_topic, unhide_general_forum_topic,
unpin_all_general_forum_topic_messages,
answer_callback_query, answer_callback_query,
set_my_commands, set_my_commands,
get_my_commands, get_my_commands,
@ -699,6 +700,11 @@ trait ErasableRequester<'a> {
chat_id: Recipient, chat_id: Recipient,
) -> ErasedRequest<'a, UnhideGeneralForumTopic, Self::Err>; ) -> ErasedRequest<'a, UnhideGeneralForumTopic, Self::Err>;
fn unpin_all_general_forum_topic_messages(
&self,
chat_id: Recipient,
) -> ErasedRequest<'a, UnpinAllGeneralForumTopicMessages, Self::Err>;
fn answer_callback_query( fn answer_callback_query(
&self, &self,
callback_query_id: String, callback_query_id: String,
@ -1500,6 +1506,13 @@ where
Requester::unhide_general_forum_topic(self, chat_id).erase() Requester::unhide_general_forum_topic(self, chat_id).erase()
} }
fn unpin_all_general_forum_topic_messages(
&self,
chat_id: Recipient,
) -> ErasedRequest<'a, UnpinAllGeneralForumTopicMessages, Self::Err> {
Requester::unpin_all_general_forum_topic_messages(self, chat_id).erase()
}
fn answer_callback_query( fn answer_callback_query(
&self, &self,
callback_query_id: String, callback_query_id: String,

View file

@ -231,12 +231,13 @@ where
close_forum_topic, close_forum_topic,
reopen_forum_topic, reopen_forum_topic,
delete_forum_topic, delete_forum_topic,
unpin_all_forum_topic_messages,
edit_general_forum_topic, edit_general_forum_topic,
close_general_forum_topic, close_general_forum_topic,
reopen_general_forum_topic, reopen_general_forum_topic,
hide_general_forum_topic, hide_general_forum_topic,
unhide_general_forum_topic, unhide_general_forum_topic,
unpin_all_forum_topic_messages, unpin_all_general_forum_topic_messages,
answer_callback_query, answer_callback_query,
set_my_commands, set_my_commands,
get_my_commands, get_my_commands,

View file

@ -139,6 +139,7 @@ where
reopen_general_forum_topic, reopen_general_forum_topic,
hide_general_forum_topic, hide_general_forum_topic,
unhide_general_forum_topic, unhide_general_forum_topic,
unpin_all_general_forum_topic_messages,
answer_callback_query, answer_callback_query,
set_my_commands, set_my_commands,
get_my_commands, get_my_commands,

View file

@ -185,6 +185,7 @@ where
reopen_general_forum_topic, reopen_general_forum_topic,
hide_general_forum_topic, hide_general_forum_topic,
unhide_general_forum_topic, unhide_general_forum_topic,
unpin_all_general_forum_topic_messages,
answer_callback_query, answer_callback_query,
set_my_commands, set_my_commands,
get_my_commands, get_my_commands,

View file

@ -802,6 +802,22 @@ impl Requester for Bot {
) )
} }
type UnpinAllGeneralForumTopicMessages =
JsonRequest<payloads::UnpinAllGeneralForumTopicMessages>;
fn unpin_all_general_forum_topic_messages<C>(
&self,
chat_id: C,
) -> Self::UnpinAllGeneralForumTopicMessages
where
C: Into<Recipient>,
{
Self::UnpinAllGeneralForumTopicMessages::new(
self.clone(),
payloads::UnpinAllGeneralForumTopicMessages::new(chat_id),
)
}
type AnswerCallbackQuery = JsonRequest<payloads::AnswerCallbackQuery>; type AnswerCallbackQuery = JsonRequest<payloads::AnswerCallbackQuery>;
fn answer_callback_query<C>(&self, callback_query_id: C) -> Self::AnswerCallbackQuery fn answer_callback_query<C>(&self, callback_query_id: C) -> Self::AnswerCallbackQuery

View file

@ -1009,6 +1009,14 @@ macro_rules! requester_forward {
$body!(unhide_general_forum_topic this (chat_id: C)) $body!(unhide_general_forum_topic this (chat_id: C))
} }
}; };
(@method unpin_all_general_forum_topic_messages $body:ident $ty:ident) => {
type UnpinAllGeneralForumTopicMessages = $ty![UnpinAllGeneralForumTopicMessages];
fn unpin_all_general_forum_topic_messages<C>(&self, chat_id: C) -> Self::UnpinAllGeneralForumTopicMessages where C: Into<Recipient> {
let this = self;
$body!(unpin_all_general_forum_topic_messages this (chat_id: C))
}
};
(@method answer_callback_query $body:ident $ty:ident) => { (@method answer_callback_query $body:ident $ty:ident) => {
type AnswerCallbackQuery = $ty![AnswerCallbackQuery]; type AnswerCallbackQuery = $ty![AnswerCallbackQuery];

View file

@ -135,6 +135,7 @@ mod unban_chat_sender_chat;
mod unhide_general_forum_topic; mod unhide_general_forum_topic;
mod unpin_all_chat_messages; mod unpin_all_chat_messages;
mod unpin_all_forum_topic_messages; mod unpin_all_forum_topic_messages;
mod unpin_all_general_forum_topic_messages;
mod unpin_chat_message; mod unpin_chat_message;
mod upload_sticker_file; mod upload_sticker_file;
@ -276,6 +277,9 @@ pub use unpin_all_chat_messages::{UnpinAllChatMessages, UnpinAllChatMessagesSett
pub use unpin_all_forum_topic_messages::{ pub use unpin_all_forum_topic_messages::{
UnpinAllForumTopicMessages, UnpinAllForumTopicMessagesSetters, UnpinAllForumTopicMessages, UnpinAllForumTopicMessagesSetters,
}; };
pub use unpin_all_general_forum_topic_messages::{
UnpinAllGeneralForumTopicMessages, UnpinAllGeneralForumTopicMessagesSetters,
};
pub use unpin_chat_message::{UnpinChatMessage, UnpinChatMessageSetters}; pub use unpin_chat_message::{UnpinChatMessage, UnpinChatMessageSetters};
pub use upload_sticker_file::{UploadStickerFile, UploadStickerFileSetters}; pub use upload_sticker_file::{UploadStickerFile, UploadStickerFileSetters};
// END BLOCK payload_modules // END BLOCK payload_modules

View file

@ -47,6 +47,6 @@ pub use crate::payloads::{
StopMessageLiveLocationInlineSetters as _, StopMessageLiveLocationSetters as _, StopMessageLiveLocationInlineSetters as _, StopMessageLiveLocationSetters as _,
StopPollSetters as _, UnbanChatMemberSetters as _, UnbanChatSenderChatSetters as _, StopPollSetters as _, UnbanChatMemberSetters as _, UnbanChatSenderChatSetters as _,
UnhideGeneralForumTopicSetters as _, UnpinAllChatMessagesSetters as _, UnhideGeneralForumTopicSetters as _, UnpinAllChatMessagesSetters as _,
UnpinAllForumTopicMessagesSetters as _, UnpinChatMessageSetters as _, UnpinAllForumTopicMessagesSetters as _, UnpinAllGeneralForumTopicMessagesSetters as _,
UploadStickerFileSetters as _, UnpinChatMessageSetters as _, UploadStickerFileSetters as _,
}; };

View file

@ -0,0 +1,16 @@
//! Generated by `codegen_payloads`, do not edit by hand.
use serde::Serialize;
use crate::types::{Recipient, True};
impl_payload! {
/// Use this method to clear the list of pinned messages in a General forum topic. The bot must be an administrator in the chat for this to work and must have the _can\_pin\_messages_ administrator right in the supergroup. Returns True on success.
#[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
pub UnpinAllGeneralForumTopicMessages (UnpinAllGeneralForumTopicMessagesSetters) => True {
required {
/// Unique identifier for the target chat or username of the target supergroup (in the format @supergroupusername)
pub chat_id: Recipient [into],
}
}
}

View file

@ -758,6 +758,19 @@ pub trait Requester {
where where
C: Into<Recipient>; C: Into<Recipient>;
type UnpinAllGeneralForumTopicMessages: Request<
Payload = UnpinAllGeneralForumTopicMessages,
Err = Self::Err,
>;
/// For Telegram documentation see [`UnpinAllGeneralForumTopicMessages`].
fn unpin_all_general_forum_topic_messages<C>(
&self,
chat_id: C,
) -> Self::UnpinAllGeneralForumTopicMessages
where
C: Into<Recipient>;
type AnswerCallbackQuery: Request<Payload = AnswerCallbackQuery, Err = Self::Err>; type AnswerCallbackQuery: Request<Payload = AnswerCallbackQuery, Err = Self::Err>;
/// For Telegram documentation see [`AnswerCallbackQuery`]. /// For Telegram documentation see [`AnswerCallbackQuery`].
@ -1297,6 +1310,7 @@ macro_rules! forward_all {
reopen_general_forum_topic, reopen_general_forum_topic,
hide_general_forum_topic, hide_general_forum_topic,
unhide_general_forum_topic, unhide_general_forum_topic,
unpin_all_general_forum_topic_messages,
answer_callback_query, answer_callback_query,
set_my_commands, set_my_commands,
get_my_commands, get_my_commands,

View file

@ -13,6 +13,7 @@ pub use callback_query::*;
pub use chat::*; pub use chat::*;
pub use chat_action::*; pub use chat_action::*;
pub use chat_administrator_rights::*; pub use chat_administrator_rights::*;
pub use chat_full_info::*;
pub use chat_invite_link::*; pub use chat_invite_link::*;
pub use chat_join_request::*; pub use chat_join_request::*;
pub use chat_location::*; pub use chat_location::*;
@ -105,6 +106,7 @@ pub use shipping_option::*;
pub use shipping_query::*; pub use shipping_query::*;
pub use sticker::*; pub use sticker::*;
pub use sticker_set::*; pub use sticker_set::*;
pub use story::*;
pub use successful_payment::*; pub use successful_payment::*;
pub use switch_inline_query_chosen_chat::*; pub use switch_inline_query_chosen_chat::*;
pub use target_message::*; pub use target_message::*;
@ -141,6 +143,7 @@ mod callback_query;
mod chat; mod chat;
mod chat_action; mod chat_action;
mod chat_administrator_rights; mod chat_administrator_rights;
mod chat_full_info;
mod chat_invite_link; mod chat_invite_link;
mod chat_join_request; mod chat_join_request;
mod chat_location; mod chat_location;
@ -206,6 +209,7 @@ mod shipping_option;
mod shipping_query; mod shipping_query;
mod sticker; mod sticker;
mod sticker_set; mod sticker_set;
mod story;
mod successful_payment; mod successful_payment;
mod switch_inline_query_chosen_chat; mod switch_inline_query_chosen_chat;
mod target_message; mod target_message;

View file

@ -1,7 +1,7 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use crate::types::{ use crate::types::{
ChatId, ChatLocation, ChatPermissions, ChatPhoto, Message, Seconds, True, User, ChatFullInfo, ChatId, ChatLocation, ChatPermissions, ChatPhoto, Message, Seconds, True, User,
}; };
/// This object represents a chat. /// This object represents a chat.
@ -47,6 +47,9 @@ pub struct Chat {
/// [`GetChat`]: crate::payloads::GetChat /// [`GetChat`]: crate::payloads::GetChat
#[serde(default, skip_serializing_if = "std::ops::Not::not")] #[serde(default, skip_serializing_if = "std::ops::Not::not")]
pub has_aggressive_anti_spam_enabled: bool, pub has_aggressive_anti_spam_enabled: bool,
#[serde(flatten)]
pub chat_full_info: ChatFullInfo,
} }
#[serde_with_macros::skip_serializing_none] #[serde_with_macros::skip_serializing_none]
@ -615,6 +618,7 @@ mod tests {
message_auto_delete_time: None, message_auto_delete_time: None,
has_hidden_members: false, has_hidden_members: false,
has_aggressive_anti_spam_enabled: false, has_aggressive_anti_spam_enabled: false,
chat_full_info: ChatFullInfo { emoji_status_expiration_date: None },
}; };
let actual = from_str(r#"{"id":-1,"type":"channel","username":"channel_name"}"#).unwrap(); let actual = from_str(r#"{"id":-1,"type":"channel","username":"channel_name"}"#).unwrap();
assert_eq!(expected, actual); assert_eq!(expected, actual);
@ -639,6 +643,7 @@ mod tests {
message_auto_delete_time: None, message_auto_delete_time: None,
has_hidden_members: false, has_hidden_members: false,
has_aggressive_anti_spam_enabled: false, has_aggressive_anti_spam_enabled: false,
chat_full_info: ChatFullInfo { emoji_status_expiration_date: None }
}, },
from_str(r#"{"id":0,"type":"private","username":"username","first_name":"Anon"}"#) from_str(r#"{"id":0,"type":"private","username":"username","first_name":"Anon"}"#)
.unwrap() .unwrap()
@ -663,6 +668,7 @@ mod tests {
message_auto_delete_time: None, message_auto_delete_time: None,
has_hidden_members: false, has_hidden_members: false,
has_aggressive_anti_spam_enabled: false, has_aggressive_anti_spam_enabled: false,
chat_full_info: ChatFullInfo { emoji_status_expiration_date: None },
}; };
let json = to_string(&chat).unwrap(); let json = to_string(&chat).unwrap();

View file

@ -0,0 +1,35 @@
use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize};
// TODO: in the TBA7.3 the Chat will be splitted into Chat and ChatInfo
// Currently it's just a container for the some fields of the Chat struct
#[serde_with_macros::skip_serializing_none]
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub struct ChatFullInfo {
/// Expiration date of the emoji status of the chat or the other party in a
/// private chat, in Unix time, if any
#[serde(default, with = "crate::types::serde_opt_date_from_unix_timestamp")]
pub emoji_status_expiration_date: Option<DateTime<Utc>>,
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_chat_full_info_de() {
assert_eq!(
serde_json::from_str::<ChatFullInfo>("{}").unwrap(),
ChatFullInfo { emoji_status_expiration_date: None }
);
assert_eq!(
serde_json::from_str::<ChatFullInfo>(
r#"{
"emoji_status_expiration_date": 1720708004
}"#
)
.unwrap(),
ChatFullInfo { emoji_status_expiration_date: DateTime::from_timestamp(1720708004, 0) }
);
}
}

View file

@ -9,9 +9,9 @@ use crate::types::{
ForumTopicClosed, ForumTopicCreated, ForumTopicEdited, ForumTopicReopened, Game, ForumTopicClosed, ForumTopicCreated, ForumTopicEdited, ForumTopicReopened, Game,
GeneralForumTopicHidden, GeneralForumTopicUnhidden, InlineKeyboardMarkup, Invoice, Location, GeneralForumTopicHidden, GeneralForumTopicUnhidden, InlineKeyboardMarkup, Invoice, Location,
MessageAutoDeleteTimerChanged, MessageEntity, MessageEntityRef, MessageId, PassportData, MessageAutoDeleteTimerChanged, MessageEntity, MessageEntityRef, MessageId, PassportData,
PhotoSize, Poll, ProximityAlertTriggered, Sticker, SuccessfulPayment, ThreadId, True, User, PhotoSize, Poll, ProximityAlertTriggered, Sticker, Story, SuccessfulPayment, ThreadId, True,
UserShared, Venue, Video, VideoChatEnded, VideoChatParticipantsInvited, VideoChatScheduled, User, UserShared, Venue, Video, VideoChatEnded, VideoChatParticipantsInvited,
VideoChatStarted, VideoNote, Voice, WebAppData, WriteAccessAllowed, VideoChatScheduled, VideoChatStarted, VideoNote, Voice, WebAppData, WriteAccessAllowed,
}; };
/// This object represents a message. /// This object represents a message.
@ -366,6 +366,7 @@ pub enum MediaKind {
Photo(MediaPhoto), Photo(MediaPhoto),
Poll(MediaPoll), Poll(MediaPoll),
Sticker(MediaSticker), Sticker(MediaSticker),
Story(MediaStory),
Text(MediaText), Text(MediaText),
Video(MediaVideo), Video(MediaVideo),
VideoNote(MediaVideoNote), VideoNote(MediaVideoNote),
@ -494,6 +495,13 @@ pub struct MediaSticker {
pub sticker: Sticker, pub sticker: Sticker,
} }
#[serde_with_macros::skip_serializing_none]
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub struct MediaStory {
/// Message is a forwarded story
pub story: Story,
}
#[serde_with_macros::skip_serializing_none] #[serde_with_macros::skip_serializing_none]
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub struct MediaText { pub struct MediaText {
@ -668,14 +676,14 @@ mod getters {
use crate::types::{ use crate::types::{
self, message::MessageKind::*, Chat, ChatId, ChatMigration, Forward, ForwardedFrom, self, message::MessageKind::*, Chat, ChatId, ChatMigration, Forward, ForwardedFrom,
MediaAnimation, MediaAudio, MediaContact, MediaDocument, MediaGame, MediaKind, MediaAnimation, MediaAudio, MediaContact, MediaDocument, MediaGame, MediaKind,
MediaLocation, MediaPhoto, MediaPoll, MediaSticker, MediaText, MediaVenue, MediaVideo, MediaLocation, MediaPhoto, MediaPoll, MediaSticker, MediaStory, MediaText, MediaVenue,
MediaVideoNote, MediaVoice, Message, MessageChannelChatCreated, MessageChatShared, MediaVideo, MediaVideoNote, MediaVoice, Message, MessageChannelChatCreated,
MessageCommon, MessageConnectedWebsite, MessageDeleteChatPhoto, MessageDice, MessageEntity, MessageChatShared, MessageCommon, MessageConnectedWebsite, MessageDeleteChatPhoto,
MessageGroupChatCreated, MessageId, MessageInvoice, MessageLeftChatMember, MessageDice, MessageEntity, MessageGroupChatCreated, MessageId, MessageInvoice,
MessageNewChatMembers, MessageNewChatPhoto, MessageNewChatTitle, MessagePassportData, MessageLeftChatMember, MessageNewChatMembers, MessageNewChatPhoto, MessageNewChatTitle,
MessagePinned, MessageProximityAlertTriggered, MessageSuccessfulPayment, MessagePassportData, MessagePinned, MessageProximityAlertTriggered,
MessageSupergroupChatCreated, MessageUserShared, MessageVideoChatParticipantsInvited, MessageSuccessfulPayment, MessageSupergroupChatCreated, MessageUserShared,
PhotoSize, User, MessageVideoChatParticipantsInvited, PhotoSize, User,
}; };
use super::{ use super::{
@ -899,6 +907,7 @@ mod getters {
| MediaKind::Location(_) | MediaKind::Location(_)
| MediaKind::Poll(_) | MediaKind::Poll(_)
| MediaKind::Sticker(_) | MediaKind::Sticker(_)
| MediaKind::Story(_)
| MediaKind::Text(_) | MediaKind::Text(_)
| MediaKind::VideoNote(_) | MediaKind::VideoNote(_)
| MediaKind::Voice(_) | MediaKind::Voice(_)
@ -973,6 +982,17 @@ mod getters {
} }
} }
#[must_use]
pub fn story(&self) -> Option<&types::Story> {
match &self.kind {
Common(MessageCommon {
media_kind: MediaKind::Story(MediaStory { story, .. }),
..
}) => Some(story),
_ => None,
}
}
#[must_use] #[must_use]
pub fn video(&self) -> Option<&types::Video> { pub fn video(&self) -> Option<&types::Video> {
match &self.kind { match &self.kind {
@ -1763,7 +1783,8 @@ mod tests {
has_aggressive_anti_spam_enabled: false, has_aggressive_anti_spam_enabled: false,
pinned_message: None, pinned_message: None,
message_auto_delete_time: None, message_auto_delete_time: None,
has_hidden_members: false has_hidden_members: false,
chat_full_info: ChatFullInfo { emoji_status_expiration_date: None }
}, },
kind: MessageKind::ChatShared(MessageChatShared { kind: MessageKind::ChatShared(MessageChatShared {
chat_shared: ChatShared { request_id: 348349, chat_id: ChatId(384939) } chat_shared: ChatShared { request_id: 348349, chat_id: ChatId(384939) }
@ -1996,6 +2017,7 @@ mod tests {
pinned_message: None, pinned_message: None,
has_hidden_members: false, has_hidden_members: false,
has_aggressive_anti_spam_enabled: false, has_aggressive_anti_spam_enabled: false,
chat_full_info: ChatFullInfo { emoji_status_expiration_date: None },
}; };
assert!(message.from().unwrap().is_anonymous()); assert!(message.from().unwrap().is_anonymous());

View file

@ -1,17 +1,117 @@
use crate::types::User; use serde::{Deserialize, Deserializer, Serialize};
use serde::{Deserialize, Serialize};
use crate::types::{Chat, User};
#[serde_with_macros::skip_serializing_none] #[serde_with_macros::skip_serializing_none]
#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)] #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub struct PollAnswer { pub struct PollAnswer {
/// Unique poll identifier. /// Unique poll identifier.
pub poll_id: String, pub poll_id: String,
/// The user, who changed the answer to the poll. /// If the voter is anonymous, stores the chat that changed the answer to
pub user: User, /// the poll.
///
/// If the voter isn't anonymous, stores the user that changed
/// the answer to the poll
#[serde(deserialize_with = "deserialize_voter", flatten)]
pub voter: Voter,
/// 0-based identifiers of answer options, chosen by the user. /// 0-based identifiers of answer options, chosen by the user.
/// ///
/// May be empty if the user retracted their vote. /// May be empty if the user retracted their vote.
pub option_ids: Vec<u8>, pub option_ids: Vec<u8>,
} }
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
#[serde(untagged)]
pub enum Voter {
Chat(Chat),
User(User),
}
impl Voter {
#[must_use]
pub fn chat(&self) -> Option<&Chat> {
match self {
Self::Chat(chat) => Some(chat),
_ => None,
}
}
#[must_use]
pub fn user(&self) -> Option<&User> {
match self {
Self::User(user) => Some(user),
_ => None,
}
}
}
/// These fields `chat` and `user` from the original [`PollAnswer`] should be
/// exclusive, but in cases when the `voter_chat` is presented the `user` isn't
/// `None`, but rather actual value for backward compatibility, the field `user`
/// in such objects will contain the user 136817688 (@Channel_Bot).
#[derive(Deserialize)]
struct VoterDe {
/// The chat that changed the answer to the poll, if the voter is anonymous
pub voter_chat: Option<Chat>,
/// The user that changed the answer to the poll, if the voter isn't
/// anonymous
pub user: Option<User>,
}
fn deserialize_voter<'d, D: Deserializer<'d>>(d: D) -> Result<Voter, D::Error> {
let VoterDe { voter_chat, user } = VoterDe::deserialize(d)?;
Ok(voter_chat.map(Voter::Chat).or(user.map(Voter::User)).unwrap())
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_poll_answer_with_user_de() {
let json = r#"{
"poll_id":"POLL_ID",
"user": {"id":42,"is_bot":false,"first_name":"blah"},
"option_ids": []
}"#;
let poll_answer: PollAnswer = serde_json::from_str(json).unwrap();
assert!(matches!(poll_answer.voter, Voter::User(_)));
}
#[test]
fn test_poll_answer_with_voter_chat_de() {
let json = r#"{
"poll_id":"POLL_ID",
"voter_chat": {
"id": -1001160242915,
"title": "a",
"type": "group"
},
"option_ids": []
}"#;
let poll_answer: PollAnswer = serde_json::from_str(json).unwrap();
assert!(matches!(poll_answer.voter, Voter::Chat(_)));
}
#[test]
fn test_poll_answer_with_both_user_and_voter_chat_de() {
let json = r#"{
"poll_id":"POLL_ID",
"voter_chat": {
"id": -1001160242915,
"title": "a",
"type": "group"
},
"user": {"id":136817688,"is_bot":true,"first_name":"Channel_Bot"},
"option_ids": []
}"#;
let poll_answer: PollAnswer = serde_json::from_str(json).unwrap();
assert!(matches!(poll_answer.voter, Voter::Chat(_)));
}
}

View file

@ -0,0 +1,5 @@
use serde::{Deserialize, Serialize};
/// TBA 6.8: currently it holds no information
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub struct Story {}

View file

@ -136,7 +136,7 @@ impl Update {
InlineQuery(query) => &query.from, InlineQuery(query) => &query.from,
ShippingQuery(query) => &query.from, ShippingQuery(query) => &query.from,
PreCheckoutQuery(query) => &query.from, PreCheckoutQuery(query) => &query.from,
PollAnswer(answer) => &answer.user, PollAnswer(answer) => return answer.voter.user(),
MyChatMember(m) | ChatMember(m) => &m.from, MyChatMember(m) | ChatMember(m) => &m.from,
ChatJoinRequest(r) => &r.from, ChatJoinRequest(r) => &r.from,
@ -198,7 +198,12 @@ impl Update {
UpdateKind::PreCheckoutQuery(query) => i1(once(&query.from)), UpdateKind::PreCheckoutQuery(query) => i1(once(&query.from)),
UpdateKind::Poll(poll) => i3(poll.mentioned_users()), UpdateKind::Poll(poll) => i3(poll.mentioned_users()),
UpdateKind::PollAnswer(answer) => i1(once(&answer.user)), UpdateKind::PollAnswer(answer) => {
if let Some(user) = answer.voter.user() {
return i1(once(user));
}
i6(empty())
}
UpdateKind::MyChatMember(member) | UpdateKind::ChatMember(member) => { UpdateKind::MyChatMember(member) | UpdateKind::ChatMember(member) => {
i4(member.mentioned_users()) i4(member.mentioned_users())
@ -380,8 +385,8 @@ fn empty_error() -> UpdateKind {
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use crate::types::{ use crate::types::{
Chat, ChatId, ChatKind, ChatPrivate, MediaKind, MediaText, Message, MessageCommon, Chat, ChatFullInfo, ChatId, ChatKind, ChatPrivate, MediaKind, MediaText, Message,
MessageId, MessageKind, Update, UpdateId, UpdateKind, User, UserId, MessageCommon, MessageId, MessageKind, Update, UpdateId, UpdateKind, User, UserId,
}; };
use chrono::DateTime; use chrono::DateTime;
@ -437,6 +442,7 @@ mod test {
message_auto_delete_time: None, message_auto_delete_time: None,
has_hidden_members: false, has_hidden_members: false,
has_aggressive_anti_spam_enabled: false, has_aggressive_anti_spam_enabled: false,
chat_full_info: ChatFullInfo { emoji_status_expiration_date: None },
}, },
kind: MessageKind::Common(MessageCommon { kind: MessageKind::Common(MessageCommon {
from: Some(User { from: Some(User {

View file

@ -42,6 +42,7 @@ ctrlc_handler = ["tokio/signal"]
native-tls = ["teloxide-core/native-tls"] native-tls = ["teloxide-core/native-tls"]
rustls = ["teloxide-core/rustls"] rustls = ["teloxide-core/rustls"]
rustls-native-roots = ["teloxide-core/rustls-native-roots"]
throttle = ["teloxide-core/throttle"] throttle = ["teloxide-core/throttle"]
cache-me = [ cache-me = [
"teloxide-core/cache_me", "teloxide-core/cache_me",
@ -111,9 +112,9 @@ sqlx = { version = "0.7.3", optional = true, default-features = false, features
redis = { version = "0.24", features = ["tokio-comp"], optional = true } redis = { version = "0.24", features = ["tokio-comp"], optional = true }
serde_cbor = { version = "0.11", optional = true } serde_cbor = { version = "0.11", optional = true }
bincode = { version = "1.3", optional = true } bincode = { version = "1.3", optional = true }
axum = { version = "0.6.0", optional = true } axum = { version = "0.7.0", optional = true }
tower = { version = "0.4.12", optional = true } tower = { version = "0.4.13", optional = true }
tower-http = { version = "0.3.4", features = ["trace"], optional = true } tower-http = { version = "0.5.2", features = ["trace"], optional = true }
rand = { version = "0.8.5", optional = true } rand = { version = "0.8.5", optional = true }
# HACK: ahash 0.8.7 bumped MSRV to 1.72, to keep MVSR 1.68 we need to depend on an older version. # HACK: ahash 0.8.7 bumped MSRV to 1.72, to keep MVSR 1.68 we need to depend on an older version.

View file

@ -83,6 +83,7 @@ define_message_ext! {
(filter_photo, Message::photo), (filter_photo, Message::photo),
(filter_poll, Message::poll), (filter_poll, Message::poll),
(filter_sticker, Message::sticker), (filter_sticker, Message::sticker),
(filter_story, Message::story),
(filter_text, Message::text), (filter_text, Message::text),
(filter_video, Message::video), (filter_video, Message::video),
(filter_video_note, Message::video_note), (filter_video_note, Message::video_note),

View file

@ -52,8 +52,14 @@ where
let stop_token = update_listener.stop_token(); let stop_token = update_listener.stop_token();
tokio::spawn(async move { tokio::spawn(async move {
axum::Server::bind(&address) let tcp_listener = tokio::net::TcpListener::bind(address)
.serve(app.into_make_service()) .await
.map_err(|err| {
stop_token.stop();
err
})
.expect("Couldn't bind to the address");
axum::serve(tcp_listener, app)
.with_graceful_shutdown(stop_flag) .with_graceful_shutdown(stop_flag)
.await .await
.map_err(|err| { .map_err(|err| {
@ -90,7 +96,7 @@ where
/// [`delete_webhook`]: crate::payloads::DeleteWebhook /// [`delete_webhook`]: crate::payloads::DeleteWebhook
/// [`stop`]: crate::stop::StopToken::stop /// [`stop`]: crate::stop::StopToken::stop
/// [`options.address`]: Options::address /// [`options.address`]: Options::address
/// [`with_graceful_shutdown`]: axum::Server::with_graceful_shutdown /// [`with_graceful_shutdown`]: axum::serve::Serve::with_graceful_shutdown
/// ///
/// ## Returns /// ## Returns
/// ///