bot: tidy the chat member type

pull/447/head
Demian 3 years ago
parent 570c656d0c
commit 20ec6fc7fc

@ -20,8 +20,8 @@ type ChatInviteLink struct {
// If the link is revoked.
IsRevoked bool `json:"is_revoked"`
// (Optional) Point in time when the link will expire, use
// ChatInviteLink.ExpireDate() to get time.Time
// (Optional) Point in time when the link will expire,
// use ExpireDate() to get time.Time
ExpireUnixtime int64 `json:"expire_date,omitempty"`
// (Optional) Maximum number of users that can be members of
@ -34,15 +34,15 @@ func (c *ChatInviteLink) ExpireDate() time.Time {
return time.Unix(c.ExpireUnixtime, 0)
}
// ChatMemberUpdated object represents changes in the status of a chat member.
type ChatMemberUpdated struct {
// ChatMemberUpdate object represents changes in the status of a chat member.
type ChatMemberUpdate struct {
// Chat where the user belongs to.
Chat *Chat `json:"chat"`
// From which user the action was triggered.
From *User `json:"from"`
// Sender which user the action was triggered.
Sender *User `json:"from"`
// Unixtime, use ChatMemberUpdated.Time() to get time.Time
// Unixtime, use Date() to get time.Time
Unixtime int64 `json:"date"`
// Previous information about the chat member.
@ -57,7 +57,7 @@ type ChatMemberUpdated struct {
}
// Time returns the moment of the change in local time.
func (c *ChatMemberUpdated) Time() time.Time {
func (c *ChatMemberUpdate) Time() time.Time {
return time.Unix(c.Unixtime, 0)
}

@ -121,19 +121,19 @@ type Settings struct {
type Update struct {
ID int `json:"update_id"`
Message *Message `json:"message,omitempty"`
EditedMessage *Message `json:"edited_message,omitempty"`
ChannelPost *Message `json:"channel_post,omitempty"`
EditedChannelPost *Message `json:"edited_channel_post,omitempty"`
Callback *Callback `json:"callback_query,omitempty"`
Query *Query `json:"inline_query,omitempty"`
InlineResult *InlineResult `json:"chosen_inline_result,omitempty"`
ShippingQuery *ShippingQuery `json:"shipping_query,omitempty"`
PreCheckoutQuery *PreCheckoutQuery `json:"pre_checkout_query,omitempty"`
Poll *Poll `json:"poll,omitempty"`
PollAnswer *PollAnswer `json:"poll_answer,omitempty"`
MyChatMember *ChatMemberUpdated `json:"my_chat_member,omitempty"`
ChatMember *ChatMemberUpdated `json:"chat_member,omitempty"`
Message *Message `json:"message,omitempty"`
EditedMessage *Message `json:"edited_message,omitempty"`
ChannelPost *Message `json:"channel_post,omitempty"`
EditedChannelPost *Message `json:"edited_channel_post,omitempty"`
Callback *Callback `json:"callback_query,omitempty"`
Query *Query `json:"inline_query,omitempty"`
InlineResult *InlineResult `json:"chosen_inline_result,omitempty"`
ShippingQuery *ShippingQuery `json:"shipping_query,omitempty"`
PreCheckoutQuery *PreCheckoutQuery `json:"pre_checkout_query,omitempty"`
Poll *Poll `json:"poll,omitempty"`
PollAnswer *PollAnswer `json:"poll_answer,omitempty"`
MyChatMember *ChatMemberUpdate `json:"my_chat_member,omitempty"`
ChatMember *ChatMemberUpdate `json:"chat_member,omitempty"`
}
// Command represents a bot command.

@ -44,7 +44,7 @@ type Context interface {
PollAnswer() *PollAnswer
// ChatMember returns chat member changes.
ChatMember() *ChatMemberUpdated
ChatMember() *ChatMemberUpdate
// Migration returns both migration from and to chat IDs.
Migration() (int64, int64)
@ -158,8 +158,8 @@ type nativeContext struct {
preCheckoutQuery *PreCheckoutQuery
poll *Poll
pollAnswer *PollAnswer
myChatMember *ChatMemberUpdated
chatMember *ChatMemberUpdated
myChatMember *ChatMemberUpdate
chatMember *ChatMemberUpdate
lock sync.RWMutex
store map[string]interface{}
@ -204,7 +204,7 @@ func (c *nativeContext) PreCheckoutQuery() *PreCheckoutQuery {
return c.preCheckoutQuery
}
func (c *nativeContext) ChatMember() *ChatMemberUpdated {
func (c *nativeContext) ChatMember() *ChatMemberUpdate {
switch {
case c.chatMember != nil:
return c.chatMember

Loading…
Cancel
Save