diff --git a/session/storage_js.go b/session/storage_js.go index 6990ee5077..5c290902d1 100644 --- a/session/storage_js.go +++ b/session/storage_js.go @@ -35,7 +35,7 @@ func getStorage() (js.Value, bool) { // ErrLocalStorageIsNotAvailable is returned if localStorage is not available and Storage can't use it. var ErrLocalStorageIsNotAvailable = xerrors.New("localStorage is not available") -func catch(err *error) { // nolint:gocritic +func catch(err *error) { // nolint:gocritic if r := recover(); r != nil { rErr, ok := r.(error) if !ok { diff --git a/telegram/message/inline/article.go b/telegram/message/inline/article.go index d49ed6ac50..354c1baf6a 100644 --- a/telegram/message/inline/article.go +++ b/telegram/message/inline/article.go @@ -16,8 +16,15 @@ func (b *ArticleResultBuilder) apply(r *resultPageBuilder) error { return err } - var t tg.InputBotInlineResult - t.FillFrom(b.result) + t := tg.InputBotInlineResult{ + ID: b.result.ID, + Type: b.result.Type, + Title: b.result.Title, + Description: b.result.Description, + URL: b.result.URL, + Thumb: b.result.Thumb, + Content: b.result.Content, + } if t.ID == "" { t.ID, err = r.generateID() if err != nil { diff --git a/telegram/message/inline/article_test.go b/telegram/message/inline/article_test.go index 8cf8895f78..eab0108267 100644 --- a/telegram/message/inline/article_test.go +++ b/telegram/message/inline/article_test.go @@ -27,7 +27,7 @@ func TestArticle(t *testing.T) { } }).ThenTrue() _, err := builder.Set(ctx, - Article(ArticleType, MessageText("article")).Title(ArticleType). + Article(ArticleType, MessageText("article")). Description(ArticleType).URL(ArticleType), Article(ArticleType, MediaAuto("article")).ID("10").Title(ArticleType). Description(ArticleType).URL(ArticleType), diff --git a/telegram/message/inline/document.go b/telegram/message/inline/document.go index 55c3364631..4757cbb2d1 100644 --- a/telegram/message/inline/document.go +++ b/telegram/message/inline/document.go @@ -14,8 +14,13 @@ func (b *DocumentResultBuilder) apply(r *resultPageBuilder) error { return err } - var t tg.InputBotInlineResultDocument - t.FillFrom(b.result) + t := tg.InputBotInlineResultDocument{ + ID: b.result.ID, + Type: b.result.Type, + Title: b.result.Title, + Description: b.result.Description, + Document: b.result.Document, + } if t.ID == "" { t.ID, err = r.generateID() if err != nil { diff --git a/telegram/message/inline/game.go b/telegram/message/inline/game.go index 3f7b995c55..fc3bdbea53 100644 --- a/telegram/message/inline/game.go +++ b/telegram/message/inline/game.go @@ -16,8 +16,10 @@ func (b *GameResultBuilder) apply(r *resultPageBuilder) error { return err } - var t tg.InputBotInlineResultGame - t.FillFrom(b.result) + t := tg.InputBotInlineResultGame{ + ID: b.result.ID, + ShortName: b.result.ShortName, + } if t.ID == "" { t.ID, err = r.generateID() if err != nil { diff --git a/telegram/message/inline/inline.go b/telegram/message/inline/inline.go index a1d300c385..fb6be7d8be 100644 --- a/telegram/message/inline/inline.go +++ b/telegram/message/inline/inline.go @@ -107,6 +107,7 @@ func (r *ResultBuilder) Set(ctx context.Context, opt ResultOption, opts ...Resul CacheTime: r.cacheTime, NextOffset: r.nextOffset, SwitchPm: r.switchPm, + Gallery: r.gallery, }) if err != nil { return false, xerrors.Errorf("set inline results: %w", err) diff --git a/telegram/message/inline/photo.go b/telegram/message/inline/photo.go index 734d26e585..64ef9427c7 100644 --- a/telegram/message/inline/photo.go +++ b/telegram/message/inline/photo.go @@ -16,8 +16,11 @@ func (b *PhotoResultBuilder) apply(r *resultPageBuilder) error { return err } - var t tg.InputBotInlineResultPhoto - t.FillFrom(b.result) + t := tg.InputBotInlineResultPhoto{ + ID: b.result.ID, + Type: b.result.Type, + Photo: b.result.Photo, + } if t.ID == "" { t.ID, err = r.generateID() if err != nil {