fixes for bot lib v1.0.1 with bot API v7.0

go-telegram · Jan 19, 2024 · a01a911 · a01a911
1 parent 96bead6
commit a01a911
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 35 deletions.
diff --git a/datepicker/callback.go b/datepicker/callback.go
@@ -52,7 +52,7 @@ func (datePicker *DatePicker) callback(ctx context.Context, b *bot.Bot, update *
 		if datePicker.deleteOnSelect {
 			_, errDelete := b.DeleteMessage(ctx, &bot.DeleteMessageParams{
 				ChatID:    update.CallbackQuery.Message.Chat.ID,
-				MessageID: update.CallbackQuery.Message.ID,
+				MessageID: update.CallbackQuery.Message.MessageID,
 			})
 			if errDelete != nil {
 				datePicker.onError(fmt.Errorf("failed to delete message onSelect: %w", errDelete))
@@ -64,7 +64,7 @@ func (datePicker *DatePicker) callback(ctx context.Context, b *bot.Bot, update *
 		if datePicker.deleteOnCancel {
 			_, errDelete := b.DeleteMessage(ctx, &bot.DeleteMessageParams{
 				ChatID:    update.CallbackQuery.Message.Chat.ID,
-				MessageID: update.CallbackQuery.Message.ID,
+				MessageID: update.CallbackQuery.Message.MessageID,
 			})
 			if errDelete != nil {
 				datePicker.onError(fmt.Errorf("failed to delete message onCancel: %w", errDelete))
@@ -105,32 +105,32 @@ func (datePicker *DatePicker) callback(ctx context.Context, b *bot.Bot, update *
 	datePicker.callbackAnswer(ctx, b, update.CallbackQuery)
 }
 
-func (datePicker *DatePicker) showSelectMonth(ctx context.Context, b *bot.Bot, mes *models.Message) {
+func (datePicker *DatePicker) showSelectMonth(ctx context.Context, b *bot.Bot, mes models.InaccessibleMessage) {
 	_, err := b.EditMessageReplyMarkup(ctx, &bot.EditMessageReplyMarkupParams{
 		ChatID:      mes.Chat.ID,
-		MessageID:   mes.ID,
+		MessageID:   mes.MessageID,
 		ReplyMarkup: models.InlineKeyboardMarkup{InlineKeyboard: datePicker.buildMonthKeyboard()},
 	})
 	if err != nil {
 		datePicker.onError(fmt.Errorf("error edit message in showSelectMonth, %w", err))
 	}
 }
 
-func (datePicker *DatePicker) showSelectYear(ctx context.Context, b *bot.Bot, mes *models.Message, currentYear int) {
+func (datePicker *DatePicker) showSelectYear(ctx context.Context, b *bot.Bot, mes models.InaccessibleMessage, currentYear int) {
 	_, err := b.EditMessageReplyMarkup(ctx, &bot.EditMessageReplyMarkupParams{
 		ChatID:      mes.Chat.ID,
-		MessageID:   mes.ID,
+		MessageID:   mes.MessageID,
 		ReplyMarkup: models.InlineKeyboardMarkup{InlineKeyboard: datePicker.buildYearKeyboard(currentYear)},
 	})
 	if err != nil {
 		datePicker.onError(fmt.Errorf("error edit message in showSelectYear, %w", err))
 	}
 }
 
-func (datePicker *DatePicker) showMain(ctx context.Context, b *bot.Bot, mes *models.Message) {
+func (datePicker *DatePicker) showMain(ctx context.Context, b *bot.Bot, mes models.InaccessibleMessage) {
 	_, err := b.EditMessageReplyMarkup(ctx, &bot.EditMessageReplyMarkupParams{
 		ChatID:      mes.Chat.ID,
-		MessageID:   mes.ID,
+		MessageID:   mes.MessageID,
 		ReplyMarkup: models.InlineKeyboardMarkup{InlineKeyboard: datePicker.buildKeyboard()},
 	})
 	if err != nil {

diff --git a/datepicker/datepicker.go b/datepicker/datepicker.go
@@ -17,8 +17,8 @@ const (
 	DateModeInclude
 )
 
-type OnSelectHandler func(ctx context.Context, bot *bot.Bot, mes *models.Message, date time.Time)
-type OnCancelHandler func(ctx context.Context, bot *bot.Bot, mes *models.Message)
+type OnSelectHandler func(ctx context.Context, bot *bot.Bot, mes models.InaccessibleMessage, date time.Time)
+type OnCancelHandler func(ctx context.Context, bot *bot.Bot, mes models.InaccessibleMessage)
 type OnErrorHandler func(err error)
 
 type DatePicker struct {
@@ -80,4 +80,4 @@ func defaultOnError(err error) {
 	log.Printf("[TG-UI-DATEPICKER] [ERROR] %s", err)
 }
 
-func defaultOnCancel(_ context.Context, _ *bot.Bot, _ *models.Message) {}
+func defaultOnCancel(_ context.Context, _ *bot.Bot, _ models.InaccessibleMessage) {}
diff --git a/dialog/dialog.go b/dialog/dialog.go
@@ -81,7 +81,7 @@ func (d *Dialog) callback(ctx context.Context, b *bot.Bot, update *models.Update
 	if d.inline {
 		_, errEdit := b.EditMessageText(ctx, &bot.EditMessageTextParams{
 			ChatID:      update.CallbackQuery.Message.Chat.ID,
-			MessageID:   update.CallbackQuery.Message.ID,
+			MessageID:   update.CallbackQuery.Message.MessageID,
 			Text:        node.Text,
 			ParseMode:   models.ParseModeMarkdown,
 			ReplyMarkup: node.buildKB(d.prefix),

diff --git a/examples/datepicker_custom.go b/examples/datepicker_custom.go
@@ -41,14 +41,14 @@ func handlerDatepickerCustom(ctx context.Context, b *bot.Bot, update *models.Upd
 	})
 }
 
-func onDatepickerCustomCancel(ctx context.Context, b *bot.Bot, mes *models.Message) {
+func onDatepickerCustomCancel(ctx context.Context, b *bot.Bot, mes models.InaccessibleMessage) {
 	b.SendMessage(ctx, &bot.SendMessageParams{
 		ChatID: mes.Chat.ID,
 		Text:   "Canceled",
 	})
 }
 
-func onDatepickerCustomSelect(ctx context.Context, b *bot.Bot, mes *models.Message, date time.Time) {
+func onDatepickerCustomSelect(ctx context.Context, b *bot.Bot, mes models.InaccessibleMessage, date time.Time) {
 	b.SendMessage(ctx, &bot.SendMessageParams{
 		ChatID: mes.Chat.ID,
 		Text:   "You select " + date.Format("2006-01-02"),

diff --git a/examples/datepicker_simple.go b/examples/datepicker_simple.go
@@ -19,7 +19,7 @@ func handlerDatepickerSimple(ctx context.Context, b *bot.Bot, update *models.Upd
 	})
 }
 
-func onDatepickerSimpleSelect(ctx context.Context, b *bot.Bot, mes *models.Message, date time.Time) {
+func onDatepickerSimpleSelect(ctx context.Context, b *bot.Bot, mes models.InaccessibleMessage, date time.Time) {
 	b.SendMessage(ctx, &bot.SendMessageParams{
 		ChatID: mes.Chat.ID,
 		Text:   "You select " + date.Format("2006-01-02"),

diff --git a/examples/inline_keyboard.go b/examples/inline_keyboard.go
@@ -32,7 +32,7 @@ func handlerInlineKeyboard(ctx context.Context, b *bot.Bot, update *models.Updat
 	})
 }
 
-func onInlineKeyboardSelect(ctx context.Context, b *bot.Bot, mes *models.Message, data []byte) {
+func onInlineKeyboardSelect(ctx context.Context, b *bot.Bot, mes models.InaccessibleMessage, data []byte) {
 	b.SendMessage(ctx, &bot.SendMessageParams{
 		ChatID: mes.Chat.ID,
 		Text:   "You selected: " + string(data),

diff --git a/examples/main.go b/examples/main.go
@@ -46,9 +46,11 @@ func defaultHandler(ctx context.Context, b *bot.Bot, update *models.Update) {
 		return
 	}
 	b.SendMessage(ctx, &bot.SendMessageParams{
-		ChatID:                update.Message.Chat.ID,
-		Text:                  defaultMessage,
-		ParseMode:             models.ParseModeMarkdown,
-		DisableWebPagePreview: true,
+		ChatID:    update.Message.Chat.ID,
+		Text:      defaultMessage,
+		ParseMode: models.ParseModeMarkdown,
+		LinkPreviewOptions: &models.LinkPreviewOptions{
+			IsDisabled: bot.True(),
+		},
 	})
 }
diff --git a/examples/progress_custom.go b/examples/progress_custom.go
@@ -14,7 +14,7 @@ import (
 func handlerProgressCustom(ctx context.Context, b *bot.Bot, update *models.Update) {
 	cancelCtx, cancel := context.WithCancel(context.Background())
 
-	progressCancelFunc := func(ctx context.Context, b *bot.Bot, mes *models.Message) {
+	progressCancelFunc := func(ctx context.Context, b *bot.Bot, mes models.InaccessibleMessage) {
 		cancel()
 		b.SendMessage(ctx, &bot.SendMessageParams{
 			ChatID: mes.Chat.ID,

diff --git a/examples/slider.go b/examples/slider.go
@@ -43,14 +43,14 @@ func handlerSlider(ctx context.Context, b *bot.Bot, update *models.Update) {
 	sl.Show(ctx, b, update.Message.Chat.ID)
 }
 
-func sliderOnSelect(ctx context.Context, b *bot.Bot, message *models.Message, item int) {
+func sliderOnSelect(ctx context.Context, b *bot.Bot, message models.InaccessibleMessage, item int) {
 	b.SendMessage(ctx, &bot.SendMessageParams{
 		ChatID: message.Chat.ID,
 		Text:   "Select " + strconv.Itoa(item),
 	})
 }
 
-func sliderOnCancel(ctx context.Context, b *bot.Bot, message *models.Message) {
+func sliderOnCancel(ctx context.Context, b *bot.Bot, message models.InaccessibleMessage) {
 	b.SendMessage(ctx, &bot.SendMessageParams{
 		ChatID: message.Chat.ID,
 		Text:   "Cancel",

diff --git a/go.mod b/go.mod
@@ -2,4 +2,4 @@ module github.com/go-telegram/ui
 
 go 1.20
 
-require github.com/go-telegram/bot v0.8.0
+require github.com/go-telegram/bot v1.0.1
diff --git a/go.sum b/go.sum
@@ -2,3 +2,5 @@ github.com/go-telegram/bot v0.7.13 h1:8VUBXtYwdh0skrCx6oORSrT0M9ZZaKIKIX3hC3XBs1
 github.com/go-telegram/bot v0.7.13/go.mod h1:i2TRs7fXWIeaceF3z7KzsMt/he0TwkVC680mvdTFYeM=
 github.com/go-telegram/bot v0.8.0 h1:LQZwaU5eqfXzeUIqDBOLrk6/Lu26zqwnBs5BOKQl7fU=
 github.com/go-telegram/bot v0.8.0/go.mod h1:i2TRs7fXWIeaceF3z7KzsMt/he0TwkVC680mvdTFYeM=
+github.com/go-telegram/bot v1.0.1 h1:Rxg5H6WLN36n1YWzw61O/+krbNM12E+d+BowkrFEcWA=
+github.com/go-telegram/bot v1.0.1/go.mod h1:i2TRs7fXWIeaceF3z7KzsMt/he0TwkVC680mvdTFYeM=
diff --git a/keyboard/inline/callback.go b/keyboard/inline/callback.go
@@ -29,7 +29,7 @@ func (kb *Keyboard) callback(ctx context.Context, b *bot.Bot, update *models.Upd
 
 		_, errDelete := b.DeleteMessage(ctx, &bot.DeleteMessageParams{
 			ChatID:    update.CallbackQuery.Message.Chat.ID,
-			MessageID: update.CallbackQuery.Message.ID,
+			MessageID: update.CallbackQuery.Message.MessageID,
 		})
 		if errDelete != nil {
 			kb.onError(fmt.Errorf("error delete message in callback, %w", errDelete))

diff --git a/keyboard/inline/keyboard.go b/keyboard/inline/keyboard.go
@@ -9,7 +9,7 @@ import (
 	"github.com/go-telegram/bot/models"
 )
 
-type OnSelect func(ctx context.Context, bot *bot.Bot, mes *models.Message, data []byte)
+type OnSelect func(ctx context.Context, bot *bot.Bot, mes models.InaccessibleMessage, data []byte)
 type OnErrorHandler func(err error)
 
 type handlerData struct {

diff --git a/paginator/callback.go b/paginator/callback.go
@@ -47,7 +47,7 @@ func (p *Paginator) callback(ctx context.Context, b *bot.Bot, update *models.Upd
 
 		_, errDelete := b.DeleteMessage(ctx, &bot.DeleteMessageParams{
 			ChatID:    update.CallbackQuery.Message.Chat.ID,
-			MessageID: update.CallbackQuery.Message.ID,
+			MessageID: update.CallbackQuery.Message.MessageID,
 		})
 		if errDelete != nil {
 			p.onError(errDelete)
@@ -61,7 +61,7 @@ func (p *Paginator) callback(ctx context.Context, b *bot.Bot, update *models.Upd
 
 	_, errEdit := b.EditMessageText(ctx, &bot.EditMessageTextParams{
 		ChatID:          update.CallbackQuery.Message.Chat.ID,
-		MessageID:       update.CallbackQuery.Message.ID,
+		MessageID:       update.CallbackQuery.Message.MessageID,
 		InlineMessageID: update.CallbackQuery.InlineMessageID,
 		Text:            p.buildText(),
 		ParseMode:       models.ParseModeMarkdown,

diff --git a/progress/progress.go b/progress/progress.go
@@ -9,7 +9,7 @@ import (
 	"github.com/go-telegram/bot/models"
 )
 
-type OnCancelFunc func(ctx context.Context, b *bot.Bot, message *models.Message)
+type OnCancelFunc func(ctx context.Context, b *bot.Bot, message models.InaccessibleMessage)
 type RenderTextFunc func(value float64) string
 type OnErrorHandler func(err error)
 
@@ -101,7 +101,7 @@ func (p *Progress) onCancelCall(ctx context.Context, b *bot.Bot, update *models.
 	if p.deleteOnCancel {
 		_, err := b.DeleteMessage(ctx, &bot.DeleteMessageParams{
 			ChatID:    update.CallbackQuery.Message.Chat.ID,
-			MessageID: update.CallbackQuery.Message.ID,
+			MessageID: update.CallbackQuery.Message.MessageID,
 		})
 		if err != nil {
 			p.onError(err)

diff --git a/slider/callback.go b/slider/callback.go
@@ -42,7 +42,7 @@ func (s *Slider) callback(ctx context.Context, b *bot.Bot, update *models.Update
 
 			_, errDelete := b.DeleteMessage(ctx, &bot.DeleteMessageParams{
 				ChatID:    update.CallbackQuery.Message.Chat.ID,
-				MessageID: update.CallbackQuery.Message.ID,
+				MessageID: update.CallbackQuery.Message.MessageID,
 			})
 			if errDelete != nil {
 				s.onError(errDelete)
@@ -57,7 +57,7 @@ func (s *Slider) callback(ctx context.Context, b *bot.Bot, update *models.Update
 
 			_, errDelete := b.DeleteMessage(ctx, &bot.DeleteMessageParams{
 				ChatID:    update.CallbackQuery.Message.Chat.ID,
-				MessageID: update.CallbackQuery.Message.ID,
+				MessageID: update.CallbackQuery.Message.MessageID,
 			})
 			if errDelete != nil {
 				s.onError(errDelete)
@@ -72,7 +72,7 @@ func (s *Slider) callback(ctx context.Context, b *bot.Bot, update *models.Update
 
 	editParams := &bot.EditMessageMediaParams{
 		ChatID:    update.CallbackQuery.Message.Chat.ID,
-		MessageID: update.CallbackQuery.Message.ID,
+		MessageID: update.CallbackQuery.Message.MessageID,
 		Media: &models.InputMediaPhoto{
 			Media:     slide.Photo,
 			Caption:   slide.Text,

diff --git a/slider/slider.go b/slider/slider.go
@@ -9,8 +9,8 @@ import (
 	"github.com/go-telegram/bot/models"
 )
 
-type OnSelectFunc func(ctx context.Context, b *bot.Bot, message *models.Message, item int)
-type OnCancelFunc func(ctx context.Context, b *bot.Bot, message *models.Message)
+type OnSelectFunc func(ctx context.Context, b *bot.Bot, message models.InaccessibleMessage, item int)
+type OnCancelFunc func(ctx context.Context, b *bot.Bot, message models.InaccessibleMessage)
 type OnErrorFunc func(err error)
 
 type Slide struct {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ module github.com/go-telegram/ui

		go 1.20

		require github.com/go-telegram/bot v0.8.0
		require github.com/go-telegram/bot v1.0.1