From f0853536d910e121113a925057b273369349d07a Mon Sep 17 00:00:00 2001
From: krau <71133316+krau@users.noreply.github.com>
Date: Thu, 6 Nov 2025 16:59:51 +0800
Subject: [PATCH] fix: use same ctx to get grouped message

---
 client/bot/handlers/utils/shortcut/message.go | 9 +--------
 common/utils/tgutil/message.go                | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/client/bot/handlers/utils/shortcut/message.go b/client/bot/handlers/utils/shortcut/message.go
index 2921707..b9c8621 100644
--- a/client/bot/handlers/utils/shortcut/message.go
+++ b/client/bot/handlers/utils/shortcut/message.go
@@ -99,13 +99,6 @@ func GetFilesFromUpdateLinkMessageWithReplyEdit(ctx *ext.Context, update *ext.Up
 			logger.Debugf("message %d has no media", msg.GetID())
 			return
 		}
-		// var opt tfile.TGFileOption
-		// switch user.FilenameStrategy {
-		// case fnamest.Message.String():
-		// 	opt = tfile.WithName(tgutil.GenFileNameFromMessage(*msg))
-		// default:
-		// 	opt = tfile.WithNameIfEmpty(tgutil.GenFileNameFromMessage(*msg))
-		// }
 		opts := mediautil.TfileOptions(ctx, user, msg)
 		file, err := tfile.FromMediaMessage(media, client, msg, opts...)
 		if err != nil {
@@ -138,7 +131,7 @@ func GetFilesFromUpdateLinkMessageWithReplyEdit(ctx *ext.Context, update *ext.Up
 		}
 		groupID, isGroup := msg.GetGroupedID()
 		if isGroup && groupID != 0 && !linkUrl.Query().Has("single") {
-			gmsgs, err := tgutil.GetGroupedMessages(ctx, chatId, msg)
+			gmsgs, err := tgutil.GetGroupedMessages(tctx, chatId, msg)
 			if err != nil {
 				logger.Errorf("failed to get grouped messages: %s", err)
 			} else {
diff --git a/common/utils/tgutil/message.go b/common/utils/tgutil/message.go
index 099fff4..b4f0840 100644
--- a/common/utils/tgutil/message.go
+++ b/common/utils/tgutil/message.go
@@ -293,7 +293,7 @@ func GetGroupedMessages(ctx *ext.Context, chatID int64, msg *tg.Message) ([]*tg.
 	}
 	msgs, err := GetMessagesRange(ctx, chatID, minID, maxID)
 	if err != nil {
-		return nil, fmt.Errorf("failed to get grouped messages: %w", err)
+		return nil, err
 	}
 	groupedMessages := make([]*tg.Message, 0, len(msgs))
 	for _, m := range msgs {