Archives
/
telebot
mirror of https://github.com/tucnak/telebot
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

telebot: rename ChosenInlineResult to the InlineResult

Browse Source
pull/425/head
Demian 3 years ago
parent 19e28229ea
commit fb7de291df
6 changed files with 54 additions and 53 deletions
Show Stats Download Patch File Download Diff File

58
bot.go
Unescape Escape View File

@ -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"`
ChosenInlineResult *ChosenInlineResult `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 *ChatMemberUpdated `json:"my_chat_member,omitempty"`
ChatMember *ChatMemberUpdated `json:"chat_member,omitempty"`
}
// Command represents a bot command.
@ -236,15 +236,15 @@ func (b *Bot) NewMarkup() *ReplyMarkup {
// field by the passed update.
func (b *Bot) NewContext(upd Update) Context {
return &nativeContext{
b: b,
message: upd.Message,
callback: upd.Callback,
query: upd.Query,
chosenInlineResult: upd.ChosenInlineResult,
shippingQuery: upd.ShippingQuery,
preCheckoutQuery: upd.PreCheckoutQuery,
poll: upd.Poll,
pollAnswer: upd.PollAnswer,
b: b,
message: upd.Message,
callback: upd.Callback,
query: upd.Query,
inlineResult: upd.InlineResult,
shippingQuery: upd.ShippingQuery,
preCheckoutQuery: upd.PreCheckoutQuery,
poll: upd.Poll,
pollAnswer: upd.PollAnswer,
}
}
@ -367,6 +367,11 @@ func (b *Bot) ProcessUpdate(upd Update) {
return
}
if m.VoiceChatScheduled != nil {
b.handle(OnVoiceChatScheduled, c)
return
}
if m.ProximityAlert != nil {
b.handle(OnProximityAlert, c)
return
@ -376,11 +381,6 @@ func (b *Bot) ProcessUpdate(upd Update) {
b.handle(OnAutoDeleteTimer, c)
return
}
if m.VoiceChatSchedule != nil {
b.handle(OnVoiceChatScheduled, c)
return
}
}
if upd.EditedMessage != nil {
@ -444,8 +444,8 @@ func (b *Bot) ProcessUpdate(upd Update) {
return
}
if upd.ChosenInlineResult != nil {
b.handle(OnChosenInlineResult, c)
if upd.InlineResult != nil {
b.handle(OnInlineResult, c)
return
}

6
bot_test.go
Unescape Escape View File

@ -276,8 +276,8 @@ func TestBotProcessUpdate(t *testing.T) {
assert.Equal(t, "query", c.Data())
return nil
})
b.Handle(OnChosenInlineResult, func(c Context) error {
assert.Equal(t, "result", c.ChosenInlineResult().ResultID)
b.Handle(OnInlineResult, func(c Context) error {
assert.Equal(t, "result", c.InlineResult().ResultID)
return nil
})
b.Handle(OnShipping, func(c Context) error {
@ -332,7 +332,7 @@ func TestBotProcessUpdate(t *testing.T) {
b.ProcessUpdate(Update{Callback: &Callback{Data: "callback"}})
b.ProcessUpdate(Update{Callback: &Callback{Data: "\funique|callback"}})
b.ProcessUpdate(Update{Query: &Query{Text: "query"}})
b.ProcessUpdate(Update{ChosenInlineResult: &ChosenInlineResult{ResultID: "result"}})
b.ProcessUpdate(Update{InlineResult: &InlineResult{ResultID: "result"}})
b.ProcessUpdate(Update{ShippingQuery: &ShippingQuery{ID: "shipping"}})
b.ProcessUpdate(Update{PreCheckoutQuery: &PreCheckoutQuery{ID: "checkout"}})
b.ProcessUpdate(Update{Poll: &Poll{ID: "poll"}})

32
context.go
Unescape Escape View File

@ -23,8 +23,8 @@ type Context interface {
// Query returns stored query if such presented.
Query() *Query
// ChosenInlineResult returns stored inline result if such presented.
ChosenInlineResult() *ChosenInlineResult
// InlineResult returns stored inline result if such presented.
InlineResult() *InlineResult
// ShippingQuery returns stored shipping query if such presented.
ShippingQuery() *ShippingQuery
@ -141,14 +141,14 @@ type Context interface {
type nativeContext struct {
b *Bot
message *Message
callback *Callback
query *Query
chosenInlineResult *ChosenInlineResult
shippingQuery *ShippingQuery
preCheckoutQuery *PreCheckoutQuery
poll *Poll
pollAnswer *PollAnswer
message *Message
callback *Callback
query *Query
inlineResult *InlineResult
shippingQuery *ShippingQuery
preCheckoutQuery *PreCheckoutQuery
poll *Poll
pollAnswer *PollAnswer
lock sync.RWMutex
store map[string]interface{}
@ -173,8 +173,8 @@ func (c *nativeContext) Query() *Query {
return c.query
}
func (c *nativeContext) ChosenInlineResult() *ChosenInlineResult {
return c.chosenInlineResult
func (c *nativeContext) InlineResult() *InlineResult {
return c.inlineResult
}
func (c *nativeContext) ShippingQuery() *ShippingQuery {
@ -205,8 +205,8 @@ func (c *nativeContext) Sender() *User {
return c.callback.Sender
case c.query != nil:
return c.query.Sender
case c.chosenInlineResult != nil:
return c.chosenInlineResult.Sender
case c.inlineResult != nil:
return c.inlineResult.Sender
case c.shippingQuery != nil:
return c.shippingQuery.Sender
case c.preCheckoutQuery != nil:
@ -256,8 +256,8 @@ func (c *nativeContext) Data() string {
return c.callback.Data
case c.query != nil:
return c.query.Text
case c.chosenInlineResult != nil:
return c.chosenInlineResult.Query
case c.inlineResult != nil:
return c.inlineResult.Query
case c.shippingQuery != nil:
return c.shippingQuery.Payload
case c.preCheckoutQuery != nil:

4
inline.go
Unescape Escape View File

@ -7,9 +7,9 @@ import (
"github.com/pkg/errors"
)
// ChosenInlineResult represents a result of an inline query that was chosen
// InlineResult represents a result of an inline query that was chosen
// by the user and sent to their chat partner.
type ChosenInlineResult struct {
type InlineResult struct {
Sender *User `json:"from"`
Location *Location `json:"location,omitempty"`
ResultID string `json:"result_id"`

5
message.go
Unescape Escape View File

@ -221,8 +221,6 @@ type Message struct {
// Inline keyboard attached to the message.
ReplyMarkup InlineKeyboardMarkup `json:"reply_markup"`
VoiceChatSchedule *VoiceChatScheduled `json:"voice_chat_scheduled,omitempty"`
// For a service message, a voice chat started in the chat.
VoiceChatStarted *VoiceChatStarted `json:"voice_chat_started,omitempty"`
@ -232,6 +230,9 @@ type Message struct {
// For a service message, some users were invited in the voice chat.
VoiceChatParticipants *VoiceChatParticipants `json:"voice_chat_participants_invited,omitempty"`
// For a service message, a voice chat schedule in the chat.
VoiceChatScheduled *VoiceChatScheduled `json:"voice_chat_scheduled,omitempty"`
// For a service message, represents the content of a service message,
// sent whenever a user in the chat triggers a proximity alert set by another user.
ProximityAlert *ProximityAlert `json:"proximity_alert_triggered,omitempty"`

2
telebot.go
Unescape Escape View File

@ -90,7 +90,7 @@ const (
OnQuery = "\aquery"
// Will fire on chosen inline results.
OnChosenInlineResult = "\achosen_inline_result"
OnInlineResult = "\achosen_inline_result"
// Will fire on a shipping query.
OnShipping = "\ashipping_query"

Write Preview
Loading…
Cancel
Save