OpenSource/teloxide
OpenSource/teloxide
1
0
Fork 0
mirror of https://github.com/teloxide/teloxide.git synced 2024-12-22 14:35:36 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add BusinessConnection variant to UpdateKind enum

Browse source
This commit is contained in:
Akshett Rai Jindal 2024-08-21 01:42:17 +05:30
parent e8afdc58fc
commit 2fe5daccff
4 changed files with 37 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
crates/teloxide-core/src/types/allowed_update.rs
View file

@ -7,6 +7,7 @@ pub enum AllowedUpdate {
EditedMessage, EditedMessage,
ChannelPost, ChannelPost,
EditedChannelPost, EditedChannelPost,
BusinessConnection,
MessageReaction, MessageReaction,
MessageReactionCount, MessageReactionCount,
InlineQuery, InlineQuery,

52
crates/teloxide-core/src/types/update.rs
View file

@ -3,9 +3,9 @@ use serde::{de::MapAccess, Deserialize, Serialize, Serializer};
use serde_json::Value; use serde_json::Value;
use crate::types::{ use crate::types::{
CallbackQuery, Chat, ChatBoostRemoved, ChatBoostUpdated, ChatJoinRequest, ChatMemberUpdated, BusinessConnection, CallbackQuery, Chat, ChatBoostRemoved, ChatBoostUpdated, ChatJoinRequest,
ChosenInlineResult, InlineQuery, Message, MessageReactionCountUpdated, MessageReactionUpdated, ChatMemberUpdated, ChosenInlineResult, InlineQuery, Message, MessageReactionCountUpdated,
Poll, PollAnswer, PreCheckoutQuery, ShippingQuery, User, MessageReactionUpdated, Poll, PollAnswer, PreCheckoutQuery, ShippingQuery, User,
}; };
/// This [object] represents an incoming update. /// This [object] represents an incoming update.
@ -60,6 +60,10 @@ pub enum UpdateKind {
/// New version of a channel post that is known to the bot and was edited. /// New version of a channel post that is known to the bot and was edited.
EditedChannelPost(Message), EditedChannelPost(Message),
/// The bot was connected to or disconnected from a business account, or a
/// user edited an existing connection with the bot
BusinessConnection(BusinessConnection),
/// A reaction to a message was changed by a user. The bot must be an /// A reaction to a message was changed by a user. The bot must be an
/// administrator in the chat and must explicitly specify /// administrator in the chat and must explicitly specify
/// [`AllowedUpdate::MessageReaction`] in the list of `allowed_updates` /// [`AllowedUpdate::MessageReaction`] in the list of `allowed_updates`
@ -160,6 +164,8 @@ impl Update {
m.from.as_ref()? m.from.as_ref()?
} }
BusinessConnection(conn) => &conn.user,
CallbackQuery(query) => &query.from, CallbackQuery(query) => &query.from,
ChosenInlineResult(chosen) => &chosen.from, ChosenInlineResult(chosen) => &chosen.from,
MessageReaction(reaction) => return reaction.user(), MessageReaction(reaction) => return reaction.user(),
@ -262,7 +268,9 @@ impl Update {
i6(empty()) i6(empty())
} }
UpdateKind::MessageReactionCount(_) | UpdateKind::Error(_) => i6(empty()), UpdateKind::MessageReactionCount(_)
| UpdateKind::BusinessConnection(_)
| UpdateKind::Error(_) => i6(empty()),
} }
} }
@ -283,6 +291,7 @@ impl Update {
RemovedChatBoost(b) => &b.chat, RemovedChatBoost(b) => &b.chat,
InlineQuery(_) InlineQuery(_)
| BusinessConnection(_)
| ChosenInlineResult(_) | ChosenInlineResult(_)
| ShippingQuery(_) | ShippingQuery(_)
| PreCheckoutQuery(_) | PreCheckoutQuery(_)
@ -350,6 +359,10 @@ impl<'de> Deserialize<'de> for UpdateKind {
"edited_channel_post" => { "edited_channel_post" => {
map.next_value::<Message>().ok().map(UpdateKind::EditedChannelPost) map.next_value::<Message>().ok().map(UpdateKind::EditedChannelPost)
} }
"business_connection" => map
.next_value::<BusinessConnection>()
.ok()
.map(UpdateKind::BusinessConnection),
"message_reaction" => map "message_reaction" => map
.next_value::<MessageReactionUpdated>() .next_value::<MessageReactionUpdated>()
.ok() .ok()
@ -423,37 +436,40 @@ impl Serialize for UpdateKind {
UpdateKind::EditedChannelPost(v) => { UpdateKind::EditedChannelPost(v) => {
s.serialize_newtype_variant(name, 3, "edited_channel_post", v) s.serialize_newtype_variant(name, 3, "edited_channel_post", v)
} }
UpdateKind::BusinessConnection(b) => {
s.serialize_newtype_variant(name, 4, "business_connection", b)
}
UpdateKind::MessageReaction(v) => { UpdateKind::MessageReaction(v) => {
s.serialize_newtype_variant(name, 4, "message_reaction", v) s.serialize_newtype_variant(name, 5, "message_reaction", v)
} }
UpdateKind::MessageReactionCount(v) => { UpdateKind::MessageReactionCount(v) => {
s.serialize_newtype_variant(name, 5, "message_reaction_count", v) s.serialize_newtype_variant(name, 6, "message_reaction_count", v)
} }
UpdateKind::InlineQuery(v) => s.serialize_newtype_variant(name, 6, "inline_query", v), UpdateKind::InlineQuery(v) => s.serialize_newtype_variant(name, 7, "inline_query", v),
UpdateKind::ChosenInlineResult(v) => { UpdateKind::ChosenInlineResult(v) => {
s.serialize_newtype_variant(name, 7, "chosen_inline_result", v) s.serialize_newtype_variant(name, 8, "chosen_inline_result", v)
} }
UpdateKind::CallbackQuery(v) => { UpdateKind::CallbackQuery(v) => {
s.serialize_newtype_variant(name, 8, "callback_query", v) s.serialize_newtype_variant(name, 9, "callback_query", v)
} }
UpdateKind::ShippingQuery(v) => { UpdateKind::ShippingQuery(v) => {
s.serialize_newtype_variant(name, 9, "shipping_query", v) s.serialize_newtype_variant(name, 10, "shipping_query", v)
} }
UpdateKind::PreCheckoutQuery(v) => { UpdateKind::PreCheckoutQuery(v) => {
s.serialize_newtype_variant(name, 10, "pre_checkout_query", v) s.serialize_newtype_variant(name, 11, "pre_checkout_query", v)
} }
UpdateKind::Poll(v) => s.serialize_newtype_variant(name, 11, "poll", v), UpdateKind::Poll(v) => s.serialize_newtype_variant(name, 12, "poll", v),
UpdateKind::PollAnswer(v) => s.serialize_newtype_variant(name, 12, "poll_answer", v), UpdateKind::PollAnswer(v) => s.serialize_newtype_variant(name, 13, "poll_answer", v),
UpdateKind::MyChatMember(v) => { UpdateKind::MyChatMember(v) => {
s.serialize_newtype_variant(name, 13, "my_chat_member", v) s.serialize_newtype_variant(name, 14, "my_chat_member", v)
} }
UpdateKind::ChatMember(v) => s.serialize_newtype_variant(name, 14, "chat_member", v), UpdateKind::ChatMember(v) => s.serialize_newtype_variant(name, 15, "chat_member", v),
UpdateKind::ChatJoinRequest(v) => { UpdateKind::ChatJoinRequest(v) => {
s.serialize_newtype_variant(name, 15, "chat_join_request", v) s.serialize_newtype_variant(name, 16, "chat_join_request", v)
} }
UpdateKind::ChatBoost(v) => s.serialize_newtype_variant(name, 16, "chat_boost", v), UpdateKind::ChatBoost(v) => s.serialize_newtype_variant(name, 17, "chat_boost", v),
UpdateKind::RemovedChatBoost(v) => { UpdateKind::RemovedChatBoost(v) => {
s.serialize_newtype_variant(name, 17, "removed_chat_boost", v) s.serialize_newtype_variant(name, 18, "removed_chat_boost", v)
} }
UpdateKind::Error(v) => v.serialize(s), UpdateKind::Error(v) => v.serialize(s),
} }

1
crates/teloxide/src/dispatching/filter_ext.rs
View file

@ -155,6 +155,7 @@ define_update_ext! {
(filter_edited_message, UpdateKind::EditedMessage, EditedMessage), (filter_edited_message, UpdateKind::EditedMessage, EditedMessage),
(filter_channel_post, UpdateKind::ChannelPost, ChannelPost), (filter_channel_post, UpdateKind::ChannelPost, ChannelPost),
(filter_edited_channel_post, UpdateKind::EditedChannelPost, EditedChannelPost), (filter_edited_channel_post, UpdateKind::EditedChannelPost, EditedChannelPost),
(filter_business_connection, UpdateKind::BusinessConnection, BusinessConnection),
(filter_message_reaction_updated, UpdateKind::MessageReaction, MessageReaction), (filter_message_reaction_updated, UpdateKind::MessageReaction, MessageReaction),
(filter_message_reaction_count_updated, UpdateKind::MessageReactionCount, MessageReactionCount), (filter_message_reaction_count_updated, UpdateKind::MessageReactionCount, MessageReactionCount),
(filter_inline_query, UpdateKind::InlineQuery, InlineQuery), (filter_inline_query, UpdateKind::InlineQuery, InlineQuery),

1
crates/teloxide/src/dispatching/handler_description.rs
View file

@ -65,6 +65,7 @@ impl EventKind for Kind {
EditedMessage, EditedMessage,
ChannelPost, ChannelPost,
EditedChannelPost, EditedChannelPost,
BusinessConnection,
MessageReaction, MessageReaction,
MessageReactionCount, MessageReactionCount,
InlineQuery, InlineQuery,