Skip to content

Commit 14d3cd2

Browse files
trakhimenoktrakhimenok
committed
feat(deps): latest bots-fw
1 parent bdb36db commit 14d3cd2

29 files changed

+178
-173
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.65.3
13+
github.com/bots-go-framework/bots-fw v0.67.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: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ github.com/bots-go-framework/bots-fw v0.65.0 h1:Lxy5maKDKXhwv3xWXyiCuPT9rB7Iwr5l
1212
github.com/bots-go-framework/bots-fw v0.65.0/go.mod h1:uK72vjZrip3I6RwLoyKan5jPNtN5BS7L+EmIfbax2tI=
1313
github.com/bots-go-framework/bots-fw v0.65.3 h1:MWV/w4CV3bKgSqYQw3rUO7Bd+UkumWKE/Vqkp2OBAZQ=
1414
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=
1519
github.com/bots-go-framework/bots-fw-store v0.10.0 h1:e6bD274mjrHVp+X05/7uqqT3s5xZOqV9divKTaM2W+w=
1620
github.com/bots-go-framework/bots-fw-store v0.10.0/go.mod h1:7oU4B8j5HuJZM8AftosbyQD+AqckXsDv8eU1auGPzn8=
1721
github.com/bots-go-framework/bots-fw-telegram-models v0.3.25 h1:AH7TlCNJ19e4FhKy+4QpgnKv4Qulj2apbtl9BmSazYI=

‎telegram/bot_messages.go

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,71 +2,71 @@ package telegram
22

33
import (
44
"github.com/bots-go-framework/bots-api-telegram/tgbotapi"
5-
"github.com/bots-go-framework/bots-fw/botsfw"
5+
"github.com/bots-go-framework/bots-fw/botmsg"
66
)
77

8-
var _ botsfw.BotMessage = (*InlineBotMessage)(nil)
8+
var _ botmsg.BotMessage = (*InlineBotMessage)(nil)
99

1010
// InlineBotMessage is a wrapper for Telegram bot message
1111
type InlineBotMessage tgbotapi.InlineConfig
1212

1313
// BotMessageType returns BotMessageTypeInlineResults
14-
func (InlineBotMessage) BotMessageType() botsfw.BotMessageType {
15-
return botsfw.BotMessageTypeInlineResults
14+
func (InlineBotMessage) BotMessageType() botmsg.Type {
15+
return botmsg.BotMessageTypeInlineResults
1616
}
1717

1818
func (m InlineBotMessage) BotEndpoint() string {
1919
return (tgbotapi.InlineConfig)(m).TelegramMethod()
2020
}
2121

22-
var _ botsfw.BotMessage = (*CallbackAnswer)(nil)
22+
var _ botmsg.BotMessage = (*CallbackAnswer)(nil)
2323

2424
// CallbackAnswer is a callback answer message
2525
type CallbackAnswer tgbotapi.AnswerCallbackQueryConfig
2626

2727
// BotMessageType returns BotMessageTypeCallbackAnswer
28-
func (CallbackAnswer) BotMessageType() botsfw.BotMessageType {
29-
return botsfw.BotMessageTypeCallbackAnswer
28+
func (CallbackAnswer) BotMessageType() botmsg.Type {
29+
return botmsg.TypeCallbackAnswer
3030
}
3131

3232
func (a CallbackAnswer) BotEndpoint() string {
3333
return (tgbotapi.AnswerCallbackQueryConfig)(a).TelegramMethod()
3434
}
3535

36-
var _ botsfw.BotMessage = (*LeaveChat)(nil)
36+
var _ botmsg.BotMessage = (*LeaveChat)(nil)
3737

3838
// LeaveChat is a leave chat message from bot
3939
type LeaveChat tgbotapi.LeaveChatConfig
4040

4141
// BotMessageType return BotMessageTypeLeaveChat
42-
func (LeaveChat) BotMessageType() botsfw.BotMessageType {
43-
return botsfw.BotMessageTypeLeaveChat
42+
func (LeaveChat) BotMessageType() botmsg.Type {
43+
return botmsg.TypeLeaveChat
4444
}
4545

4646
func (m LeaveChat) BotEndpoint() string {
4747
return (tgbotapi.LeaveChatConfig)(m).TelegramMethod()
4848
}
4949

50-
var _ botsfw.BotMessage = (*ExportChatInviteLink)(nil)
50+
var _ botmsg.BotMessage = (*ExportChatInviteLink)(nil)
5151

5252
// ExportChatInviteLink is a TG message
5353
type ExportChatInviteLink tgbotapi.ExportChatInviteLink
5454

5555
// BotMessageType returns BotMessageTypeExportChatInviteLink
56-
func (ExportChatInviteLink) BotMessageType() botsfw.BotMessageType {
57-
return botsfw.BotMessageTypeExportChatInviteLink
56+
func (ExportChatInviteLink) BotMessageType() botmsg.Type {
57+
return botmsg.TypeExportChatInviteLink
5858
}
5959

6060
func (m ExportChatInviteLink) BotEndpoint() string {
6161
return (tgbotapi.ExportChatInviteLink)(m).TelegramMethod()
6262
}
6363

64-
var _ botsfw.BotMessage = (*Invoice)(nil)
64+
var _ botmsg.BotMessage = (*Invoice)(nil)
6565

6666
type Invoice tgbotapi.InvoiceConfig
6767

68-
func (Invoice) BotMessageType() botsfw.BotMessageType {
69-
return botsfw.BotMessageTypeSendInvoice
68+
func (Invoice) BotMessageType() botmsg.Type {
69+
return botmsg.TypeSendInvoice
7070
}
7171

7272
func (m Invoice) BotEndpoint() string {
@@ -76,16 +76,16 @@ func (m Invoice) BotEndpoint() string {
7676

7777
type PreCheckoutQueryAnswer tgbotapi.AnswerPreCheckoutQueryConfig
7878

79-
func (PreCheckoutQueryAnswer) BotMessageType() botsfw.BotMessageType {
80-
return botsfw.BotMessageTypeAnswerPreCheckoutQuery
79+
func (PreCheckoutQueryAnswer) BotMessageType() botmsg.Type {
80+
return botmsg.TypeAnswerPreCheckoutQuery
8181
}
8282

83-
var _ botsfw.BotMessage = SetBotDescription{}
83+
var _ botmsg.BotMessage = SetBotDescription{}
8484

8585
type SetBotDescription tgbotapi.SetMyDescription
8686

87-
func (SetBotDescription) BotMessageType() botsfw.BotMessageType {
88-
return botsfw.BotMessageTypeSetDescription
87+
func (SetBotDescription) BotMessageType() botmsg.Type {
88+
return botmsg.TypeSetDescription
8989
}
9090

9191
func (m SetBotDescription) BotEndpoint() string {
@@ -94,8 +94,8 @@ func (m SetBotDescription) BotEndpoint() string {
9494

9595
type SetBotShortDescription tgbotapi.SetMyShortDescription
9696

97-
func (SetBotShortDescription) BotMessageType() botsfw.BotMessageType {
98-
return botsfw.BotMessageTypeSetShortDescription
97+
func (SetBotShortDescription) BotMessageType() botmsg.Type {
98+
return botmsg.TypeSetShortDescription
9999
}
100100

101101
func (m SetBotShortDescription) BotEndpoint() string {
@@ -104,8 +104,8 @@ func (m SetBotShortDescription) BotEndpoint() string {
104104

105105
type SetBotCommands tgbotapi.SetMyCommandsConfig
106106

107-
func (SetBotCommands) BotMessageType() botsfw.BotMessageType {
108-
return botsfw.BotMessageTypeSetCommands
107+
func (SetBotCommands) BotMessageType() botmsg.Type {
108+
return botmsg.TypeSetCommands
109109
}
110110

111111
func (m SetBotCommands) BotEndpoint() string {
@@ -114,8 +114,8 @@ func (m SetBotCommands) BotEndpoint() string {
114114

115115
type SendPhoto tgbotapi.PhotoConfig
116116

117-
func (SendPhoto) BotMessageType() botsfw.BotMessageType {
118-
return botsfw.BotMessageTypeSendPhoto
117+
func (SendPhoto) BotMessageType() botmsg.Type {
118+
return botmsg.TypeSendPhoto
119119
}
120120

121121
func (m SendPhoto) BotEndpoint() string {

‎telegram/bot_records_fields_setter.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
)
99

1010
func NewBotRecordsFieldsSetter(
11-
setAppUserFields func(appUser botsfwmodels.AppUserData, sender botinput.WebhookSender) error,
11+
setAppUserFields func(appUser botsfwmodels.AppUserData, sender botinput.Sender) error,
1212
) botsfw.BotRecordsFieldsSetter {
1313
if setAppUserFields == nil {
1414
panic("setAppUserFields is nil")
@@ -19,18 +19,18 @@ func NewBotRecordsFieldsSetter(
1919
}
2020

2121
type tgBotRecordsFieldsSetter struct {
22-
setAppUserFields func(appUser botsfwmodels.AppUserData, sender botinput.WebhookSender) error
22+
setAppUserFields func(appUser botsfwmodels.AppUserData, sender botinput.Sender) error
2323
}
2424

2525
func (b tgBotRecordsFieldsSetter) Platform() string {
2626
return string(PlatformID)
2727
}
2828

29-
func (b tgBotRecordsFieldsSetter) SetAppUserFields(appUser botsfwmodels.AppUserData, sender botinput.WebhookSender) error {
29+
func (b tgBotRecordsFieldsSetter) SetAppUserFields(appUser botsfwmodels.AppUserData, sender botinput.Sender) error {
3030
return b.setAppUserFields(appUser, sender)
3131
}
3232

33-
func (b tgBotRecordsFieldsSetter) SetBotUserFields(botUser botsfwmodels.PlatformUserData, sender botinput.WebhookSender, botID, botUserID, appUserID string) error {
33+
func (b tgBotRecordsFieldsSetter) SetBotUserFields(botUser botsfwmodels.PlatformUserData, sender botinput.Sender, botID, botUserID, appUserID string) error {
3434
//tgSender := sender.(tgWebhookUser)
3535
tgBotUser := botUser.(botsfwtgmodels.TgPlatformUser)
3636
tgBotUserBaseData := tgBotUser.TgPlatformUserBaseDbo()
@@ -41,7 +41,7 @@ func (b tgBotRecordsFieldsSetter) SetBotUserFields(botUser botsfwmodels.Platform
4141
return nil
4242
}
4343

44-
func (b tgBotRecordsFieldsSetter) SetBotChatFields(botChat botsfwmodels.BotChatData, chat botinput.WebhookChat, botID, botUserID, appUserID string, isAccessGranted bool) error {
44+
func (b tgBotRecordsFieldsSetter) SetBotChatFields(botChat botsfwmodels.BotChatData, chat botinput.Chat, botID, botUserID, appUserID string, isAccessGranted bool) error {
4545
_ = botID
4646
_ = chat
4747
tgBotChatData := botChat.(botsfwtgmodels.TgChatData)

‎telegram/message_uid.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ package telegram
22

33
import (
44
"fmt"
5-
"github.com/bots-go-framework/bots-fw/botsfw"
5+
"github.com/bots-go-framework/bots-fw/botmsg"
66
)
77

88
type callbackCurrent struct {
99
}
1010

1111
// CallbackCurrent is what?
12-
var CallbackCurrent botsfw.MessageUID = &callbackCurrent{}
12+
var CallbackCurrent botmsg.MessageUID = &callbackCurrent{}
1313

1414
func (callbackCurrent) UID() string {
1515
return "callbackCurrent"
@@ -20,7 +20,7 @@ type InlineMessageUID struct {
2020
InlineMessageID string
2121
}
2222

23-
var _ botsfw.MessageUID = (*InlineMessageUID)(nil)
23+
var _ botmsg.MessageUID = (*InlineMessageUID)(nil)
2424

2525
// NewInlineMessageUID creates new inline message UID
2626
func NewInlineMessageUID(inlineMessageID string) *InlineMessageUID {
@@ -43,7 +43,7 @@ type ChatMessageUID struct {
4343
MessageID int
4444
}
4545

46-
var _ botsfw.MessageUID = (*ChatMessageUID)(nil)
46+
var _ botmsg.MessageUID = (*ChatMessageUID)(nil)
4747

4848
// UID return unique ID of the message
4949
func (m ChatMessageUID) UID() string {

‎telegram/tg_webhook_handler.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"github.com/bots-go-framework/bots-api-telegram/tgbotapi"
99
"github.com/bots-go-framework/bots-fw-store/botsfwmodels"
1010
"github.com/bots-go-framework/bots-fw/botinput"
11+
"github.com/bots-go-framework/bots-fw/botmsg"
1112
"github.com/bots-go-framework/bots-fw/botsfw"
1213
"github.com/strongo/logus"
1314
"io"
@@ -29,7 +30,7 @@ type tgWebhookHandler struct {
2930
func NewTelegramWebhookHandler(
3031
botContextProvider botsfw.BotContextProvider,
3132
translatorProvider botsfw.TranslatorProvider,
32-
setAppUserFields func(botsfwmodels.AppUserData, botinput.WebhookSender) error, // TODO: Move to botsfwdal.AppUserDal ?
33+
setAppUserFields func(botsfwmodels.AppUserData, botinput.Sender) error, // TODO: Move to botsfwdal.AppUserDal ?
3334
) botsfw.WebhookHandler {
3435
if botContextProvider == nil {
3536
panic("botContextProvider == nil")
@@ -52,9 +53,9 @@ func NewTelegramWebhookHandler(
5253
}
5354
}
5455

55-
func (h tgWebhookHandler) HandleUnmatched(whc botsfw.WebhookContext) (m botsfw.MessageFromBot) {
56+
func (h tgWebhookHandler) HandleUnmatched(whc botsfw.WebhookContext) (m botmsg.MessageFromBot) {
5657
switch whc.Input().InputType() {
57-
case botinput.WebhookInputCallbackQuery:
58+
case botinput.TypeCallbackQuery:
5859
m.BotMessage = CallbackAnswer(tgbotapi.AnswerCallbackQueryConfig{
5960
Text: "⚠️ Error: Not matched to any command",
6061
ShowAlert: true,
@@ -158,7 +159,7 @@ Parametes:
158159
}
159160
}
160161

161-
func (h tgWebhookHandler) GetBotContextAndInputs(ctx context.Context, r *http.Request) (botContext *botsfw.BotContext, entriesWithInputs []botsfw.EntryInputs, err error) {
162+
func (h tgWebhookHandler) GetBotContextAndInputs(ctx context.Context, r *http.Request) (botContext *botsfw.BotContext, entriesWithInputs []botinput.EntryInputs, err error) {
162163
logus.Debugf(ctx, "tgWebhookHandler.GetBotContextAndInputs(): %s", r.URL.RequestURI())
163164
botID := r.URL.Query().Get("id")
164165
if botContext, err = h.botContextProvider.GetBotContext(ctx, PlatformID, botID); err != nil {
@@ -203,17 +204,17 @@ func (h tgWebhookHandler) GetBotContextAndInputs(ctx context.Context, r *http.Re
203204
return
204205
}
205206

206-
var input botinput.WebhookInput
207+
var input botinput.InputMessage
207208
if input, err = NewTelegramWebhookInput(update, logRequestBody); err != nil {
208209
logRequestBody()
209210
return
210211
}
211212
logRequestBody()
212213

213-
entriesWithInputs = []botsfw.EntryInputs{
214+
entriesWithInputs = []botinput.EntryInputs{
214215
{
215216
Entry: tgWebhookEntry{update: update},
216-
Inputs: []botinput.WebhookInput{input},
217+
Inputs: []botinput.InputMessage{input},
217218
},
218219
}
219220

‎telegram/tg_webhook_handler_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestTelegramWebhookHandler_Handle(t *testing.T) {
3535
var translatorProvider botsfw.TranslatorProvider = func(c context.Context) i18n.Translator {
3636
return nil
3737
}
38-
setAppUserFields := func(botsfwmodels.AppUserData, botinput.WebhookSender) error {
38+
setAppUserFields := func(botsfwmodels.AppUserData, botinput.Sender) error {
3939
return nil
4040
}
4141
handler := NewTelegramWebhookHandler(botContextProvider, translatorProvider, setAppUserFields)
@@ -89,10 +89,10 @@ func TestTelegramWebhookHandler_Handle(t *testing.T) {
8989
if len(entriesWithInputs[0].Inputs) != 1 {
9090
t.Errorf("len(entriesWithInputs[0].Inputs) = %v, want 1", len(entriesWithInputs[0].Inputs))
9191
}
92-
if inputType := entriesWithInputs[0].Inputs[0].InputType(); inputType != botinput.WebhookInputSuccessfulPayment {
93-
t.Errorf("entriesWithInputs[0].Inputs[0].InputType() = %v, want %v", inputType, botinput.WebhookInputSuccessfulPayment)
92+
if inputType := entriesWithInputs[0].Inputs[0].InputType(); inputType != botinput.TypeSuccessfulPayment {
93+
t.Errorf("entriesWithInputs[0].Inputs[0].InputType() = %v, want %v", inputType, botinput.TypeSuccessfulPayment)
9494
}
95-
successfulPayment := entriesWithInputs[0].Inputs[0].(botinput.WebhookSuccessfulPayment)
95+
successfulPayment := entriesWithInputs[0].Inputs[0].(botinput.SuccessfulPayment)
9696

9797
if currency := successfulPayment.GetCurrency(); currency != "XTR" {
9898
t.Errorf("successfulPayment.GetCurrency() = %v, want XTR", currency)

‎telegram/webhook_callback_query.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
)
66

77
type WebhookCallbackQuery interface {
8-
botinput.WebhookCallbackQuery
8+
botinput.CallbackQuery
99
GetInlineMessageID() string // Telegram only?
1010
GetChatInstanceID() string // Telegram only?
1111
}

‎telegram/webhook_callbackquery.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
)
88

99
var (
10-
_ TgWebhookInput = (*TgWebhookCallbackQuery)(nil)
11-
_ botinput.WebhookInput = (*TgWebhookCallbackQuery)(nil)
12-
_ botinput.WebhookCallbackQuery = (*TgWebhookCallbackQuery)(nil)
13-
_ WebhookCallbackQuery = (*TgWebhookCallbackQuery)(nil)
10+
_ TgWebhookInput = (*TgWebhookCallbackQuery)(nil)
11+
_ botinput.InputMessage = (*TgWebhookCallbackQuery)(nil)
12+
_ botinput.CallbackQuery = (*TgWebhookCallbackQuery)(nil)
13+
_ WebhookCallbackQuery = (*TgWebhookCallbackQuery)(nil)
1414
)
1515

1616
// TgWebhookCallbackQuery is wrapper on callback query
@@ -44,7 +44,7 @@ func (whi TgWebhookCallbackQuery) Sequence() int {
4444
}
4545

4646
// GetMessage returns message
47-
func (whi TgWebhookCallbackQuery) GetMessage() botinput.WebhookMessage {
47+
func (whi TgWebhookCallbackQuery) GetMessage() botinput.Message {
4848
return newTelegramWebhookMessage(whi.tgWebhookInput, whi.update.CallbackQuery.Message)
4949
}
5050

@@ -54,7 +54,7 @@ func (whi TgWebhookCallbackQuery) TelegramCallbackMessage() *tgbotapi.Message {
5454
}
5555

5656
// GetFrom returns sender
57-
func (whi TgWebhookCallbackQuery) GetFrom() botinput.WebhookSender {
57+
func (whi TgWebhookCallbackQuery) GetFrom() botinput.Sender {
5858
return tgWebhookUser{tgUser: whi.update.CallbackQuery.From}
5959
}
6060

@@ -77,7 +77,7 @@ func (whi TgWebhookCallbackQuery) BotChatID() (string, error) {
7777
}
7878

7979
// EditMessageOnCallbackQuery creates edit message
80-
func EditMessageOnCallbackQuery(whcbq botinput.WebhookCallbackQuery, parseMode, text string) *tgbotapi.EditMessageTextConfig {
80+
func EditMessageOnCallbackQuery(whcbq botinput.CallbackQuery, parseMode, text string) *tgbotapi.EditMessageTextConfig {
8181
twhcbq := whcbq.(TgWebhookCallbackQuery)
8282
callbackQuery := twhcbq.update.CallbackQuery
8383

‎telegram/webhook_chat.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ type TgWebhookChat struct {
1111
chat *tgbotapi.Chat
1212
}
1313

14-
var _ botinput.WebhookChat = (*TgWebhookChat)(nil)
14+
var _ botinput.Chat = (*TgWebhookChat)(nil)
1515

1616
// GetID returns telegram chat ID
1717
func (wh TgWebhookChat) GetID() string {

0 commit comments

Comments
 (0)