Skip to content

Commit ebc81d9

Browse files
committed
fix: getIsInGroup returns error
1 parent 01fd7b2 commit ebc81d9

File tree

3 files changed

+20
-15
lines changed

3 files changed

+20
-15
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ go 1.23.0
88

99
require (
1010
github.com/bots-go-framework/bots-api-telegram v0.4.6
11-
github.com/bots-go-framework/bots-fw v0.30.0
11+
github.com/bots-go-framework/bots-fw v0.31.1
1212
github.com/bots-go-framework/bots-fw-store v0.7.0
1313
github.com/bots-go-framework/bots-fw-telegram-models v0.3.0
1414
github.com/dal-go/dalgo v0.12.2

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ github.com/bots-go-framework/bots-fw v0.29.0 h1:Y/SV0Pex2oBtL2M2MWurdcTHbDEtdlCJ
1818
github.com/bots-go-framework/bots-fw v0.29.0/go.mod h1:AmDgG3Yqbz3eHlCqCFoVtpCXMu1xkjqRoFQA7z59Wnc=
1919
github.com/bots-go-framework/bots-fw v0.30.0 h1:T3OHgmzP1YR9KLsXDs2/ZqQo4sT38/ume+FRR6Pac+Y=
2020
github.com/bots-go-framework/bots-fw v0.30.0/go.mod h1:lJel6JvLj/6am7voTFjg8UQLjNWowqEqRajYfPJSrP8=
21+
github.com/bots-go-framework/bots-fw v0.31.1 h1:j6WSGtJmQ+qDq7t96J+tX1WZRUhTFripV0lM0J+PM/c=
22+
github.com/bots-go-framework/bots-fw v0.31.1/go.mod h1:lJel6JvLj/6am7voTFjg8UQLjNWowqEqRajYfPJSrP8=
2123
github.com/bots-go-framework/bots-fw-store v0.4.0 h1:5gQNsMNJ2rni3uGvXt7TeG+V7LFJ6lNIDkAC9g9J/us=
2224
github.com/bots-go-framework/bots-fw-store v0.4.0/go.mod h1:T2yX1QodQ9A1nep/aIAL/czt9adqMyIBVTGOAdNVPAI=
2325
github.com/bots-go-framework/bots-fw-store v0.5.0 h1:RY/EdRB3dq7fgzMDw9H8Qr0K6dKgX33Les26NOiBTDU=

webhook_context_tg.go

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

33
import (
44
"context"
5+
"errors"
56
"fmt"
67
"github.com/bots-go-framework/bots-api-telegram/tgbotapi"
78
"github.com/bots-go-framework/bots-fw-store/botsfwmodels"
@@ -124,43 +125,45 @@ func newTelegramWebhookContext(
124125
args botsfw.CreateWebhookContextArgs,
125126
input TgWebhookInput,
126127
recordsFieldsSetter botsfw.BotRecordsFieldsSetter,
127-
) (*tgWebhookContext, error) {
128-
twhc := &tgWebhookContext{
129-
tgInput: input,
130-
}
128+
) (twhc *tgWebhookContext, err error) {
129+
twhc = &tgWebhookContext{tgInput: input}
130+
131131
chat := twhc.tgInput.TgUpdate().Chat()
132132

133-
isInGroup := func() bool { // Checks if current chat is a group chat
133+
getIsInGroup := func() (isInGroup bool, err error) { // Checks if current chat is a group chat
134134
if chat != nil && chat.IsGroup() {
135-
return true
135+
return true, nil
136136
}
137137

138138
if callbackQuery := twhc.tgInput.TgUpdate().CallbackQuery; callbackQuery != nil && callbackQuery.ChatInstance != "" {
139139
c := args.BotContext.BotHost.Context(args.HttpRequest)
140140
var isGroupChat bool
141-
chatInstance, err := tgChatInstanceDal.GetTelegramChatInstanceByID(c, callbackQuery.ChatInstance)
142-
if err != nil {
141+
if tgChatInstanceDal == nil {
142+
err = errors.New("tgChatInstanceDal is nil")
143+
return
144+
}
145+
var chatInstance botsfwtgmodels.TgChatInstanceData
146+
if chatInstance, err = tgChatInstanceDal.GetTelegramChatInstanceByID(c, callbackQuery.ChatInstance); err != nil {
143147
if !dal.IsNotFound(err) {
144148
logus.Errorf(c, "failed to get tg chat instance: %v", err)
145149
}
146-
return isGroupChat
150+
return isGroupChat, err
147151
} else if chatInstance != nil {
148152
isGroupChat = chatInstance.GetTgChatID() < 0
149153
}
150-
return isGroupChat
154+
return isGroupChat, err
151155
}
152156

153-
return false
157+
return false, err
154158
}
155159

156-
whcb, err := botsfw.NewWebhookContextBase(
160+
twhc.WebhookContextBase, err = botsfw.NewWebhookContextBase(
157161
args,
158162
Platform,
159163
recordsFieldsSetter,
160-
isInGroup,
164+
getIsInGroup,
161165
twhc.getLocalAndChatIDByChatInstance,
162166
)
163-
twhc.WebhookContextBase = whcb
164167
return twhc, err
165168
}
166169

0 commit comments

Comments
 (0)