Skip to content

Commit baa1e2a

Browse files
committed
fix: handle botmsg.AnswerCallbackQuery in responder
1 parent 14d3cd2 commit baa1e2a

File tree

3 files changed

+16
-24
lines changed

3 files changed

+16
-24
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ go 1.24.3
1010

1111
require (
1212
github.com/bots-go-framework/bots-api-telegram v0.13.2
13-
github.com/bots-go-framework/bots-fw v0.67.0
13+
github.com/bots-go-framework/bots-fw v0.68.0
1414
github.com/bots-go-framework/bots-fw-store v0.10.0
1515
github.com/bots-go-framework/bots-fw-telegram-models v0.3.26
1616
github.com/bots-go-framework/bots-go-core v0.2.1

go.sum

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,13 @@
11
github.com/alexsergivan/transliterator v1.0.1 h1:vON2ilWCHjq+S5Y4obhLGhHK4Y1VIhsHEtQlij5d9pI=
22
github.com/alexsergivan/transliterator v1.0.1/go.mod h1:0IrumukulURJ4PD0z6UcdJKP2job1DYDhnHAP5y+5pE=
3-
github.com/bots-go-framework/bots-api-telegram v0.13.0 h1:rhBDHZPLboTKQRPJD/ofE1JHnhEvb3ZaFwSDLCZPGOk=
4-
github.com/bots-go-framework/bots-api-telegram v0.13.0/go.mod h1:5RnWs0Gq8Tw5aaqxbr0cGf5aoJaiGVzU4VikmvP5vko=
5-
github.com/bots-go-framework/bots-api-telegram v0.13.1 h1:Y6xtj2fUK6Q9FhS/qr/1i45MfpGF4i7ywHmhfgQco2g=
6-
github.com/bots-go-framework/bots-api-telegram v0.13.1/go.mod h1:36XpsbU/BvYBH3EJQg6fM96SVfS/2MNC3ce/1p1MjTA=
73
github.com/bots-go-framework/bots-api-telegram v0.13.2 h1:s8BbyeLY2+U8tz7JqNb+c/4QE0JC1d01LywjNX9hkWg=
84
github.com/bots-go-framework/bots-api-telegram v0.13.2/go.mod h1:/HcUOCL75qOKP2l2mk+o0FSfp86r6Zto5L/voN8rvPo=
9-
github.com/bots-go-framework/bots-fw v0.63.1 h1:gyEALY9dfLZ4WDbXKFGTcPqz4dUVimc7RITyZYEWTM0=
10-
github.com/bots-go-framework/bots-fw v0.63.1/go.mod h1:+2Mrx7DtoEovvNHuraEquoMm4OGM+yP0QAjXUnvd1gc=
11-
github.com/bots-go-framework/bots-fw v0.65.0 h1:Lxy5maKDKXhwv3xWXyiCuPT9rB7Iwr5lQsCdlGEdQTA=
12-
github.com/bots-go-framework/bots-fw v0.65.0/go.mod h1:uK72vjZrip3I6RwLoyKan5jPNtN5BS7L+EmIfbax2tI=
13-
github.com/bots-go-framework/bots-fw v0.65.3 h1:MWV/w4CV3bKgSqYQw3rUO7Bd+UkumWKE/Vqkp2OBAZQ=
14-
github.com/bots-go-framework/bots-fw v0.65.3/go.mod h1:uORY6Zmd35O2WF5UDoR+jgfOpwEz675cIIKz37uXoQk=
15-
github.com/bots-go-framework/bots-fw v0.66.0 h1:W+EJIUlTnNeiUr2x7PJ6nK3w8GE1kDHgmYoJXUlaLNY=
16-
github.com/bots-go-framework/bots-fw v0.66.0/go.mod h1:I2/V1cWQEhBLeNC60SPWOmGoNfp9sa9sgxk9QXM81Cw=
17-
github.com/bots-go-framework/bots-fw v0.67.0 h1:rW7mFgtisnXY9M0dUhMokEbz3pDZFBfx2qmWfVKoHx8=
18-
github.com/bots-go-framework/bots-fw v0.67.0/go.mod h1:lGsoeShOymf7Pe6FCQmDuPjuGQ4+6ouHbUF3mRZ/u2I=
5+
github.com/bots-go-framework/bots-fw v0.68.0 h1:p6EhXptWcRZInfZ0Dzey3e27PjdKI6+f5P77gs31JAM=
6+
github.com/bots-go-framework/bots-fw v0.68.0/go.mod h1:lGsoeShOymf7Pe6FCQmDuPjuGQ4+6ouHbUF3mRZ/u2I=
197
github.com/bots-go-framework/bots-fw-store v0.10.0 h1:e6bD274mjrHVp+X05/7uqqT3s5xZOqV9divKTaM2W+w=
208
github.com/bots-go-framework/bots-fw-store v0.10.0/go.mod h1:7oU4B8j5HuJZM8AftosbyQD+AqckXsDv8eU1auGPzn8=
21-
github.com/bots-go-framework/bots-fw-telegram-models v0.3.25 h1:AH7TlCNJ19e4FhKy+4QpgnKv4Qulj2apbtl9BmSazYI=
22-
github.com/bots-go-framework/bots-fw-telegram-models v0.3.25/go.mod h1:sTiSMobMrMsGbP+XWiA2kgJoyrGPdceF5VHpyi7CLME=
239
github.com/bots-go-framework/bots-fw-telegram-models v0.3.26 h1:J6mdMcrouCB0yjzDMFhVJxnB2epnnltC+iyTtISL27c=
2410
github.com/bots-go-framework/bots-fw-telegram-models v0.3.26/go.mod h1:Y4t7fKdZ2q+3pxhKKE7VEi7DXU2gn/CI2mQQp7zANcA=
25-
github.com/bots-go-framework/bots-go-core v0.0.3 h1:z3A7DLUgxbHWxvTCGnkHP9WHpTT9xxROEypoqAfvYIQ=
26-
github.com/bots-go-framework/bots-go-core v0.0.3/go.mod h1:XCn9z4TI8sbgwyus+VDzw7iMY2QCPWEAvl23GMDjeEU=
27-
github.com/bots-go-framework/bots-go-core v0.1.0 h1:mZZ0QC/CfvsLufYjkJR+nYeXkbNEJ5IXwAn2noxpzTE=
28-
github.com/bots-go-framework/bots-go-core v0.1.0/go.mod h1:XCn9z4TI8sbgwyus+VDzw7iMY2QCPWEAvl23GMDjeEU=
2911
github.com/bots-go-framework/bots-go-core v0.2.1 h1:LN2575Fv+441LSQWae+R8nZzt1JbGRdVK1SP2Yt4Skk=
3012
github.com/bots-go-framework/bots-go-core v0.2.1/go.mod h1:XCn9z4TI8sbgwyus+VDzw7iMY2QCPWEAvl23GMDjeEU=
3113
github.com/dal-go/dalgo v0.24.0 h1:lwf2S7+zBhp5z1HQXSKpsLd5ZXkby0aDm3jcEQA2VQI=
@@ -49,8 +31,6 @@ github.com/strongo/random v0.0.1 h1:OZHJBb/3uEa7OX8L2Dv2pLnSeewRmXMyTACoeto6O8I=
4931
github.com/strongo/random v0.0.1/go.mod h1:/pSI+SjBNLBkjljNtVdYr6ERddA+LqSa87o0/s+9iuU=
5032
github.com/strongo/slice v0.3.1 h1:VWkyYBgcVJn6Hs7wYhL9Vxwgb7V3zQAUFTBV9wo5lc4=
5133
github.com/strongo/slice v0.3.1/go.mod h1:B5ODKCkl0rp2oiG0UBqkN1cCOrSCU2cUuhqCM1sC8r4=
52-
github.com/strongo/strongoapp v0.31.6 h1:uCGYnMkiBV8oknxnze1h6nHYMSlgCLl9jdAe9WXr04E=
53-
github.com/strongo/strongoapp v0.31.6/go.mod h1:EMbRAE2Cas2zYuewfwd/uqxqk7wN2O4lmzIt23Khusk=
5434
github.com/strongo/strongoapp v0.31.7 h1:DMwULVT+a2c+0HXdoPZmnk5qxavyMXMcN4QsI6nY28k=
5535
github.com/strongo/strongoapp v0.31.7/go.mod h1:/iFsoothcfFT8SpkGB/UFZoIz4K9QYmWpjiCvXO6aOw=
5636
github.com/strongo/validation v0.0.7 h1:gs6YkwPsYtVsepQaQOB+ZF+T0Gu5+nk4ZMND8F85e+U=

telegram/webhook_responder.go

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,19 @@ func (r tgWebhookResponder) SendMessage(ctx context.Context, m botmsg.MessageFro
113113
case botmsg.BotMessageTypeInlineResults:
114114
sendable = tgbotapi.InlineConfig(m.BotMessage.(InlineBotMessage))
115115
case botmsg.TypeCallbackAnswer:
116-
callbackAnswer := tgbotapi.AnswerCallbackQueryConfig(m.BotMessage.(CallbackAnswer))
116+
var callbackAnswer tgbotapi.AnswerCallbackQueryConfig
117+
switch botMsg := botMessage.(type) {
118+
case CallbackAnswer:
119+
callbackAnswer = tgbotapi.AnswerCallbackQueryConfig(botMsg)
120+
case botmsg.AnswerCallbackQuery:
121+
callbackAnswer = tgbotapi.AnswerCallbackQueryConfig{
122+
CallbackQueryID: botMsg.CallbackQueryID,
123+
Text: botMsg.Text,
124+
ShowAlert: botMsg.ShowAlert,
125+
URL: botMsg.URL,
126+
CacheTime: botMsg.CacheTime,
127+
}
128+
}
117129
if callbackAnswer.CallbackQueryID == "" && tgUpdate.CallbackQuery != nil {
118130
callbackAnswer.CallbackQueryID = tgUpdate.CallbackQuery.ID
119131
}

0 commit comments

Comments
 (0)