fix: ensure media group timeout is set to a minimum of 1 second during setup

client/bot/handlers/media.go

@@ -1,22 +1,14 @@
 package handlers
 
 import (
-	"fmt"
-	"sync"
-	"time"
-
 	"github.com/celestix/gotgproto/dispatcher"
 	"github.com/celestix/gotgproto/ext"
 	"github.com/charmbracelet/log"
-	"github.com/gotd/td/tg"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/dirutil"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/mediautil"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/shortcut"
-	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
 	"github.com/krau/SaveAny-Bot/database"
-	"github.com/krau/SaveAny-Bot/pkg/tcbdata"
-	"github.com/krau/SaveAny-Bot/pkg/tfile"
 	"github.com/krau/SaveAny-Bot/storage"
 )
 
@@ -76,96 +68,3 @@ func handleSilentSaveMedia(ctx *ext.Context, update *ext.Update) error {
 	}
 	return shortcut.CreateAndAddTGFileTaskWithEdit(ctx, userID, stor, dirutil.PathFromContext(ctx), file, msg.ID)
 }
-
-type MediaGroupHandler struct {
-	groups  map[int64][]tfile.TGFileMessage
-	timers  map[int64]*time.Timer
-	mu      sync.Mutex
-	timeout time.Duration
-}
-
-var mediaGroupHandler = &MediaGroupHandler{
-	groups:  make(map[int64][]tfile.TGFileMessage),
-	timers:  make(map[int64]*time.Timer),
-	timeout: 1 * time.Second,
-}
-
-func handleGroupMediaMessage(ctx *ext.Context, update *ext.Update, message *tg.Message, groupID int64) error {
-	logger := log.FromContext(ctx)
-	media := message.Media
-	supported := mediautil.IsSupported(media)
-	if !supported {
-		return dispatcher.EndGroups
-	}
-	file, err := tfile.FromMediaMessage(media, ctx.Raw, message, tfile.WithNameIfEmpty(
-		tgutil.GenFileNameFromMessage(*message),
-	))
-	if err != nil {
-		logger.Errorf("Failed to get file from media: %s", err)
-		return dispatcher.EndGroups
-	}
-	mediaGroupHandler.mu.Lock()
-	defer mediaGroupHandler.mu.Unlock()
-	if mediaGroupHandler.groups[groupID] == nil {
-		mediaGroupHandler.groups[groupID] = make([]tfile.TGFileMessage, 0)
-	}
-	mediaGroupHandler.groups[groupID] = append(mediaGroupHandler.groups[groupID], file)
-
-	if timer, exists := mediaGroupHandler.timers[groupID]; exists {
-		timer.Stop()
-	}
-	mediaGroupHandler.timers[groupID] = time.AfterFunc(mediaGroupHandler.timeout, func() {
-		processMediaGroup(ctx, update, groupID)
-	})
-	return dispatcher.EndGroups
-}
-
-func processMediaGroup(ctx *ext.Context, update *ext.Update, groupID int64) {
-	logger := log.FromContext(ctx)
-	mediaGroupHandler.mu.Lock()
-	items := mediaGroupHandler.groups[groupID]
-	delete(mediaGroupHandler.groups, groupID)
-	delete(mediaGroupHandler.timers, groupID)
-	mediaGroupHandler.mu.Unlock()
-	if len(items) == 0 {
-		logger.Warn("No media items to process for group", "groupID", groupID)
-		return
-	}
-	logger.Debugf("Processing media group %d with %d items", groupID, len(items))
-
-	userId := update.GetUserChat().GetID()
-	msg, err := ctx.Reply(update, ext.ReplyTextString("正在保存文件..."), nil)
-	if err != nil {
-		logger.Errorf("Failed to reply: %s", err)
-		return
-	}
-	stor := storage.FromContext(ctx)
-	if stor != nil {
-		// In silent mode
-		if len(items) == 1 {
-			shortcut.CreateAndAddTGFileTaskWithEdit(ctx, userId, stor, "", items[0], msg.ID)
-			return
-		}
-		shortcut.CreateAndAddBatchTGFileTaskWithEdit(ctx, userId, stor, "", items, msg.ID)
-		return
-	}
-
-	stors := storage.GetUserStorages(ctx, userId)
-	markup, err := msgelem.BuildAddSelectStorageKeyboard(stors, tcbdata.Add{
-		Files:   items,
-		AsBatch: len(items) > 1,
-	})
-	if err != nil {
-		logger.Errorf("构建存储选择键盘失败: %s", err)
-		ctx.EditMessage(userId, &tg.MessagesEditMessageRequest{
-			ID:      msg.ID,
-			Message: "构建存储选择键盘失败: " + err.Error(),
-		})
-		return
-	}
-	ctx.EditMessage(userId, &tg.MessagesEditMessageRequest{
-		ID:          msg.ID,
-		Message:     fmt.Sprintf("共 %d 个文件, 请选择存储位置", len(items)),
-		ReplyMarkup: markup,
-	})
-}

client/bot/handlers/media_group.go

@@ -0,0 +1,126 @@
+package handlers
+
+import (
+	"fmt"
+	"sync"
+	"time"
+
+	"github.com/celestix/gotgproto/dispatcher"
+	"github.com/celestix/gotgproto/ext"
+	"github.com/charmbracelet/log"
+	"github.com/gotd/td/tg"
+	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/mediautil"
+	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem"
+	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/shortcut"
+	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
+	"github.com/krau/SaveAny-Bot/config"
+	"github.com/krau/SaveAny-Bot/pkg/tcbdata"
+	"github.com/krau/SaveAny-Bot/pkg/tfile"
+	"github.com/krau/SaveAny-Bot/storage"
+)
+
+type MediaGroupHandler struct {
+	groups    map[int64][]tfile.TGFileMessage
+	timers    map[int64]*time.Timer
+	mu        sync.Mutex
+	timeout   time.Duration
+	setupOnce sync.Once
+}
+
+func (m *MediaGroupHandler) SetupTimeout(timeoutSec int) {
+	m.setupOnce.Do(func() {
+		if timeoutSec < 1 {
+			timeoutSec = 1
+		}
+		m.timeout = time.Duration(timeoutSec) * time.Second
+	})
+}
+
+var (
+	mediaGroupHandler = &MediaGroupHandler{
+		groups: make(map[int64][]tfile.TGFileMessage),
+		timers: make(map[int64]*time.Timer),
+		mu:     sync.Mutex{},
+	}
+)
+
+func handleGroupMediaMessage(ctx *ext.Context, update *ext.Update, message *tg.Message, groupID int64) error {
+	mediaGroupHandler.SetupTimeout(max(config.C().Telegram.MediaGroupTimeout, 1))
+	logger := log.FromContext(ctx)
+	media := message.Media
+	supported := mediautil.IsSupported(media)
+	if !supported {
+		return dispatcher.EndGroups
+	}
+	file, err := tfile.FromMediaMessage(media, ctx.Raw, message, tfile.WithNameIfEmpty(
+		tgutil.GenFileNameFromMessage(*message),
+	))
+	if err != nil {
+		logger.Errorf("Failed to get file from media: %s", err)
+		return dispatcher.EndGroups
+	}
+	mediaGroupHandler.mu.Lock()
+	defer mediaGroupHandler.mu.Unlock()
+	if mediaGroupHandler.groups[groupID] == nil {
+		mediaGroupHandler.groups[groupID] = make([]tfile.TGFileMessage, 0)
+	}
+	mediaGroupHandler.groups[groupID] = append(mediaGroupHandler.groups[groupID], file)
+
+	if timer, exists := mediaGroupHandler.timers[groupID]; exists {
+		timer.Stop()
+	}
+	mediaGroupHandler.timers[groupID] = time.AfterFunc(mediaGroupHandler.timeout, func() {
+		processMediaGroup(ctx, update, groupID)
+	})
+	return dispatcher.EndGroups
+}
+
+func processMediaGroup(ctx *ext.Context, update *ext.Update, groupID int64) {
+	logger := log.FromContext(ctx)
+	mediaGroupHandler.mu.Lock()
+	items := mediaGroupHandler.groups[groupID]
+	delete(mediaGroupHandler.groups, groupID)
+	delete(mediaGroupHandler.timers, groupID)
+	mediaGroupHandler.mu.Unlock()
+	if len(items) == 0 {
+		logger.Warn("No media items to process for group", "groupID", groupID)
+		return
+	}
+	logger.Debugf("Processing media group %d with %d items", groupID, len(items))
+
+	userId := update.GetUserChat().GetID()
+	msg, err := ctx.Reply(update, ext.ReplyTextString("正在保存文件..."), nil)
+	if err != nil {
+		logger.Errorf("Failed to reply: %s", err)
+		return
+	}
+	stor := storage.FromContext(ctx)
+	if stor != nil {
+		// In silent mode
+		if len(items) == 1 {
+			shortcut.CreateAndAddTGFileTaskWithEdit(ctx, userId, stor, "", items[0], msg.ID)
+			return
+		}
+		shortcut.CreateAndAddBatchTGFileTaskWithEdit(ctx, userId, stor, "", items, msg.ID)
+		return
+	}
+
+	stors := storage.GetUserStorages(ctx, userId)
+	markup, err := msgelem.BuildAddSelectStorageKeyboard(stors, tcbdata.Add{
+		Files:   items,
+		AsBatch: len(items) > 1,
+	})
+	if err != nil {
+		logger.Errorf("构建存储选择键盘失败: %s", err)
+		ctx.EditMessage(userId, &tg.MessagesEditMessageRequest{
+			ID:      msg.ID,
+			Message: "构建存储选择键盘失败: " + err.Error(),
+		})
+		return
+	}
+	ctx.EditMessage(userId, &tg.MessagesEditMessageRequest{
+		ID:          msg.ID,
+		Message:     fmt.Sprintf("共 %d 个文件, 请选择存储位置", len(items)),
+		ReplyMarkup: markup,
+	})
+}

config/tg.go

@@ -1,12 +1,13 @@
 package config
 
 type telegramConfig struct {
-	Token    string        `toml:"token" mapstructure:"token"`
-	AppID    int           `toml:"app_id" mapstructure:"app_id" json:"app_id"`
-	AppHash  string        `toml:"app_hash" mapstructure:"app_hash" json:"app_hash"`
-	Proxy    tgProxyConfig `toml:"proxy" mapstructure:"proxy"`
-	RpcRetry int           `toml:"rpc_retry" mapstructure:"rpc_retry" json:"rpc_retry"`
-	Userbot  userbotConfig `toml:"userbot" mapstructure:"userbot" json:"userbot"`
+	Token             string        `toml:"token" mapstructure:"token"`
+	AppID             int           `toml:"app_id" mapstructure:"app_id" json:"app_id"`
+	AppHash           string        `toml:"app_hash" mapstructure:"app_hash" json:"app_hash"`
+	Proxy             tgProxyConfig `toml:"proxy" mapstructure:"proxy"`
+	RpcRetry          int           `toml:"rpc_retry" mapstructure:"rpc_retry" json:"rpc_retry"`
+	Userbot           userbotConfig `toml:"userbot" mapstructure:"userbot" json:"userbot"`
+	MediaGroupTimeout int           `toml:"media_group_timeout" mapstructure:"media_group_timeout" json:"media_group_timeout"`
 }
 
 type userbotConfig struct {

go.mod

@@ -19,7 +19,8 @@ require (
 	github.com/rs/xid v1.6.0
 	github.com/spf13/cobra v1.10.1
 	github.com/spf13/viper v1.21.0
-	golang.org/x/net v0.46.0
+	github.com/yapingcat/gomedia v0.0.0-20240906162731-17feea57090c
+	golang.org/x/net v0.47.0
 	golang.org/x/time v0.14.0
 )
 
@@ -97,7 +98,7 @@ require (
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/crypto v0.43.0 // indirect
+	golang.org/x/crypto v0.45.0 // indirect
 	golang.org/x/mod v0.29.0 // indirect
 	golang.org/x/oauth2 v0.32.0 // indirect
 	golang.org/x/tools v0.38.0 // indirect

go.sum

@@ -265,6 +265,8 @@ github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY=
 github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
+github.com/yapingcat/gomedia v0.0.0-20240906162731-17feea57090c h1:xA2TJS9Hu/ivzaZIrDcwvpJ3Fnpsk5fDOJ4iSnL6J0w=
+github.com/yapingcat/gomedia v0.0.0-20240906162731-17feea57090c/go.mod h1:WSZ59bidJOO40JSJmLqlkBJrjZCtjbKKkygEMfzY/kc=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
@@ -290,6 +292,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
 golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
+golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
+golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
 golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 h1:mgKeJMpvi0yx/sU5GsxQ7p6s2wtOnGAHZWCHUM4KGzY=
 golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546/go.mod h1:j/pmGrbnkbPtQfxEe5D0VQhZC6qKbfKifgD0oM7sR70=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -307,6 +311,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
 golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
+golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
+golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY=

parsers/parsers/parsers.go

@@ -30,7 +30,6 @@ var (
 )
 
 func Add(p ...parser.Parser) {
-	configOnce.Do(configParsers)
 	mu.Lock()
 	defer mu.Unlock()
 	parsers = append(parsers, p...)

storage/telegram/telegram.go

@@ -68,8 +68,8 @@ func (t *Telegram) Save(ctx context.Context, r io.Reader, storagePath string) er
 	if err := t.limiter.Wait(ctx); err != nil {
 		return fmt.Errorf("rate limit failed: %w", err)
 	}
-	rs, ok := r.(io.ReadSeeker)
-	if !ok || rs == nil {
+	rs, seekable := r.(io.ReadSeeker)
+	if !seekable || rs == nil {
 		return fmt.Errorf("reader must implement io.ReadSeeker")
 	}
 	tctx := tgutil.ExtFromContext(ctx)
@@ -147,6 +147,17 @@ func (t *Telegram) Save(ctx context.Context, r io.Reader, storagePath string) er
 	switch mtypeStr := mtype.String(); {
 	case strings.HasPrefix(mtypeStr, "video/"):
 		media = docb.Video().SupportsStreaming()
+		rs.Seek(0, io.SeekStart)
+		switch mtypeStr {
+		case "video/mp4":
+			info, err := getMP4Info(rs)
+			if err == nil {
+				media = docb.Video().
+					Duration(time.Duration(info.Duration)*time.Second).
+					Resolution(info.Width, info.Height).
+					SupportsStreaming()
+			}
+		}
 	case strings.HasPrefix(mtypeStr, "audio/"):
 		media = docb.Audio().Title(filename)
 	case strings.HasPrefix(mtypeStr, "image/") && !strings.HasSuffix(mtypeStr, "webp"):

storage/telegram/util.go

@@ -0,0 +1,36 @@
+package telegram
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/yapingcat/gomedia/go-mp4"
+)
+
+type MP4Info struct {
+	Duration int
+	Width    int
+	Height   int
+}
+
+func getMP4Info(r io.ReadSeeker) (*MP4Info, error) {
+	d := mp4.CreateMp4Demuxer(r)
+
+	tracks, err := d.ReadHead()
+	if err != nil {
+		return nil, err
+	}
+
+	for _, track := range tracks {
+		if track.Cid == mp4.MP4_CODEC_H264 {
+			info := d.GetMp4Info()
+			return &MP4Info{
+				Duration: int(info.Duration / info.Timescale),
+				Width:    int(track.Width),
+				Height:   int(track.Height),
+			}, nil
+		}
+	}
+
+	return nil, fmt.Errorf("no h264 track found")
+}