refactor: update configuration file structure and improve comments for clarity

.dockerignore

@@ -6,6 +6,6 @@
 downloads/
 data/
 cache/
-docs
+docs/
 config.example.toml
 docker-compose.*

.github/FUNDING.yml

@@ -1,5 +1,5 @@
 # These are supported funding model platforms
 
 custom: [
-  "https://afdian.com/a/acherkrau"
+  "https://afdian.com/a/unvapp"
 ]

.github/workflows/build-docker.yml

@@ -29,13 +29,7 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=sha
-            type=raw,value=latest
-            type=ref,event=branch
-            type=ref,event=tag
-          labels: |
-            org.opencontainers.image.title=${{ env.IMAGE_NAME }}
-            org.opencontainers.image.source=https://github.com/krau/SaveAny-Bot
-            org.opencontainers.image.url=https://github.com/krau/SaveAny-Bot
+            type=raw,value=latest,enable={{is_default_branch}}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -50,23 +44,20 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Extract version from Git Ref
-        id: extract_version
-        run: |
-          VERSION=$(echo "${{ github.ref }}" | sed 's/refs\/tags\/v//')
-          echo "VERSION=${VERSION}" >> $GITHUB_ENV
-
       - name: Build and push Docker image
+        id: build-and-push
         uses: docker/build-push-action@v6
         with:
           context: .
           platforms: linux/amd64,linux/arm64
-          cache-from: type=gha
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: |
+            type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+            type=gha
           cache-to: type=gha,mode=max
           build-args: |
             VERSION=${{ steps.meta.outputs.version }}
             GitCommit=${{ github.sha }}
-            BuildTime=${{ format(github.event.repository.updated_at, 'yyyy-MM-dd HH:mm:ss') }}
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+            BuildTime=${{ fromJson(toJSON(github.event.repository.pushed_at)) }}

Dockerfile

@@ -6,15 +6,18 @@ ARG BuildTime="Unknown"
 
 WORKDIR /app
 
-COPY . .
+COPY go.mod go.sum ./
+RUN --mount=type=cache,target=/go/pkg/mod \
+    go mod download
 
+COPY . .
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg \
     CGO_ENABLED=0 \ 
     go build -trimpath \ 
     -ldflags "-s -w \ 
     -X github.com/krau/SaveAny-Bot/common.Version=${VERSION} \
-    -X github.com/krau/SaveAny-Bot/common.GitCommit=${GiTCommit} \
+    -X github.com/krau/SaveAny-Bot/common.GitCommit=${GitCommit} \
     -X github.com/krau/SaveAny-Bot/common.BuildTime=${BuildTime}" \
     -o saveany-bot .
 

client/bot/handlers/media.go

@@ -1,18 +1,32 @@
 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/pkg/tcbdata"
+	"github.com/krau/SaveAny-Bot/pkg/tfile"
 	"github.com/krau/SaveAny-Bot/storage"
 )
 
 func handleMediaMessage(ctx *ext.Context, update *ext.Update) error {
 	logger := log.FromContext(ctx)
 	message := update.EffectiveMessage.Message
+	groupID, isGroup := message.GetGroupedID()
+	if isGroup && groupID != 0 {
+		return handleGroupMediaMessage(ctx, update, message, groupID)
+	}
 	logger.Debugf("Got media: %s", message.Media.TypeName())
+
 	msg, file, err := shortcut.GetFileFromMessageWithReply(ctx, update, message)
 	if err != nil {
 		return err
@@ -38,6 +52,10 @@ func handleSilentSaveMedia(ctx *ext.Context, update *ext.Update) error {
 		return dispatcher.EndGroups
 	}
 	message := update.EffectiveMessage.Message
+	groupID, isGroup := message.GetGroupedID()
+	if isGroup && groupID != 0 {
+		return handleGroupMediaMessage(ctx, update, message, groupID)
+	}
 	logger.Debugf("Got media: %s", message.Media.TypeName())
 	userID := update.GetUserChat().GetID()
 	msg, file, err := shortcut.GetFileFromMessageWithReply(ctx, update, message)
@@ -46,3 +64,96 @@ func handleSilentSaveMedia(ctx *ext.Context, update *ext.Update) error {
 	}
 	return shortcut.CreateAndAddTGFileTaskWithEdit(ctx, userID, stor, "", 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/utils/ruleutil/rule.go

@@ -3,6 +3,8 @@ package ruleutil
 import (
 	"context"
 
+	"github.com/duke-git/lancet/v2/convertor"
+
 	"github.com/charmbracelet/log"
 	"github.com/krau/SaveAny-Bot/database"
 	"github.com/krau/SaveAny-Bot/pkg/consts"
@@ -33,11 +35,22 @@ func (m matchedStorName) String() string {
 	return string(m)
 }
 
-func (m matchedStorName) IsValid() bool {
+// can we use this storage name directly?
+func (m matchedStorName) IsUsable() bool {
 	return m != "" && m != consts.RuleStorNameChosen
 }
 
-func ApplyRule(ctx context.Context, rules []database.Rule, inputs *ruleInput) (matchedStorageName matchedStorName, dirPath string) {
+type MatchedDirPath string
+
+func (m MatchedDirPath) String() string {
+	return string(m)
+}
+
+func (m MatchedDirPath) NeedNewForAlbum() bool {
+	return m != "" && m == consts.RuleDirPathNewForAlbum
+}
+
+func ApplyRule(ctx context.Context, rules []database.Rule, inputs *ruleInput) (matchedStorageName matchedStorName, dirPath MatchedDirPath) {
 	if inputs == nil || len(rules) == 0 {
 		return "", ""
 	}
@@ -56,7 +69,7 @@ func ApplyRule(ctx context.Context, rules []database.Rule, inputs *ruleInput) (m
 				continue
 			}
 			if ok {
-				dirPath = ru.StoragePath()
+				dirPath = MatchedDirPath(ru.StoragePath())
 				matchedStorageName = matchedStorName(ru.StorageName())
 			}
 		case ruleenum.MessageRegex.String():
@@ -71,7 +84,26 @@ func ApplyRule(ctx context.Context, rules []database.Rule, inputs *ruleInput) (m
 				continue
 			}
 			if ok {
-				dirPath = ru.StoragePath()
+				dirPath = MatchedDirPath(ru.StoragePath())
+				matchedStorageName = matchedStorName(ru.StorageName())
+			}
+		case ruleenum.IsAlbum.String():
+			matchAlbum, err := convertor.ToBool(ur.Data)
+			if err != nil {
+				matchAlbum = false
+			}
+			ru, err := rule.NewRuleMediaType(ur.StorageName, ur.DirPath, matchAlbum)
+			if err != nil {
+				logger.Errorf("Failed to create rule: %s", err)
+				continue
+			}
+			ok, err := ru.Match(inputs.File.Message().GroupedID != 0)
+			if err != nil {
+				logger.Errorf("Failed to match rule: %s", err)
+				continue
+			}
+			if ok {
+				dirPath = MatchedDirPath(ru.StoragePath())
 				matchedStorageName = matchedStorName(ru.StorageName())
 			}
 		}

client/bot/handlers/utils/shortcut/message.go

@@ -14,7 +14,7 @@ import (
 	"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/re"
-	"github.com/krau/SaveAny-Bot/client/user"
+	uc "github.com/krau/SaveAny-Bot/client/user"
 	"github.com/krau/SaveAny-Bot/common/cache"
 	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
 	"github.com/krau/SaveAny-Bot/common/utils/tphutil"
@@ -103,7 +103,7 @@ func GetFilesFromUpdateLinkMessageWithReplyEdit(ctx *ext.Context, update *ext.Up
 
 	tctx := ctx
 	if config.Cfg.Telegram.Userbot.Enable {
-		tctx = user.GetCtx()
+		tctx = uc.GetCtx()
 	}
 
 	for _, link := range msgLinks {

client/bot/handlers/utils/shortcut/tftask.go

@@ -3,6 +3,7 @@ package shortcut
 import (
 	"fmt"
 	"path"
+	"strings"
 
 	"github.com/celestix/gotgproto/dispatcher"
 	"github.com/celestix/gotgproto/ext"
@@ -34,8 +35,8 @@ func CreateAndAddTGFileTaskWithEdit(ctx *ext.Context, userID int64, stor storage
 	}
 	if user.ApplyRule && user.Rules != nil {
 		matchedStorageName, matchedDirPath := ruleutil.ApplyRule(ctx, user.Rules, ruleutil.NewInput(file))
-		dirPath = matchedDirPath
-		if matchedStorageName.IsValid() {
+		dirPath = matchedDirPath.String()
+		if matchedStorageName.IsUsable() {
 			stor, err = storage.GetStorageByUserIDAndName(ctx, user.ChatID, matchedStorageName.String())
 			if err != nil {
 				logger.Errorf("Failed to get storage by user ID and name: %s", err)
@@ -93,19 +94,28 @@ func CreateAndAddBatchTGFileTaskWithEdit(ctx *ext.Context, userID int64, stor st
 		})
 		return dispatcher.EndGroups
 	}
+
 	useRule := user.ApplyRule && user.Rules != nil
-	applyRule := func(file tfile.TGFileMessage) (string, string) {
+
+	applyRule := func(file tfile.TGFileMessage) (string, ruleutil.MatchedDirPath) {
 		if !useRule {
-			return stor.Name(), dirPath
+			return stor.Name(), ruleutil.MatchedDirPath(dirPath)
 		}
 		storName, dirP := ruleutil.ApplyRule(ctx, user.Rules, ruleutil.NewInput(file))
-		if !storName.IsValid() {
-			return stor.Name(), dirP
+
+		storname := storName.String()
+		if !storName.IsUsable() {
+			storname = stor.Name()
 		}
-		return storName.String(), dirP
+		return storname, dirP
 	}
 
 	elems := make([]batchtftask.TaskElement, 0, len(files))
+	type albumFile struct {
+		file    tfile.TGFileMessage
+		storage storage.Storage
+	}
+	albumFiles := make(map[int64][]albumFile, 0)
 	for _, file := range files {
 		storName, dirPath := applyRule(file)
 		fileStor := stor
@@ -120,18 +130,56 @@ func CreateAndAddBatchTGFileTaskWithEdit(ctx *ext.Context, userID int64, stor st
 				return dispatcher.EndGroups
 			}
 		}
-		storPath := fileStor.JoinStoragePath(path.Join(dirPath, file.Name()))
-		elem, err := batchtftask.NewTaskElement(fileStor, storPath, file)
-		if err != nil {
-			logger.Errorf("Failed to create task element: %s", err)
-			ctx.EditMessage(userID, &tg.MessagesEditMessageRequest{
-				ID:      trackMsgID,
-				Message: "任务创建失败: " + err.Error(),
+		if !dirPath.NeedNewForAlbum() {
+			storPath := fileStor.JoinStoragePath(path.Join(dirPath.String(), file.Name()))
+			elem, err := batchtftask.NewTaskElement(fileStor, storPath, file)
+			if err != nil {
+				logger.Errorf("Failed to create task element: %s", err)
+				ctx.EditMessage(userID, &tg.MessagesEditMessageRequest{
+					ID:      trackMsgID,
+					Message: "任务创建失败: " + err.Error(),
+				})
+				return dispatcher.EndGroups
+			}
+			elems = append(elems, *elem)
+		} else {
+			groupId, isGroup := file.Message().GetGroupedID()
+			if !isGroup || groupId == 0 {
+				logger.Warnf("File %s is not in a group, skipping album handling", file.Name())
+				continue
+			}
+			if _, ok := albumFiles[groupId]; !ok {
+				albumFiles[groupId] = make([]albumFile, 0)
+			}
+			albumFiles[groupId] = append(albumFiles[groupId], albumFile{
+				file:    file,
+				storage: fileStor,
 			})
-			return dispatcher.EndGroups
 		}
-		elems = append(elems, *elem)
 	}
+	for _, afiles := range albumFiles {
+		if len(afiles) <= 1 {
+			continue
+		}
+		// 对于需要新建目录的文件, 将第一个文件的文件名(去除扩展名)作为目录名
+		// 存储以第一个文件的存储为准
+		albumDir := strings.TrimSuffix(path.Base(afiles[0].file.Name()), path.Ext(afiles[0].file.Name()))
+		albumStor := afiles[0].storage
+		for _, af := range afiles {
+			afstorPath := af.storage.JoinStoragePath(path.Join(dirPath, albumDir, af.file.Name()))
+			elem, err := batchtftask.NewTaskElement(albumStor, afstorPath, af.file)
+			if err != nil {
+				logger.Errorf("Failed to create task element for album file: %s", err)
+				ctx.EditMessage(userID, &tg.MessagesEditMessageRequest{
+					ID:      trackMsgID,
+					Message: "任务创建失败: " + err.Error(),
+				})
+				return dispatcher.EndGroups
+			}
+			elems = append(elems, *elem)
+		}
+	}
+
 	injectCtx := tgutil.ExtWithContext(ctx.Context, ctx)
 	taskid := xid.New().String()
 	task := batchtftask.NewBatchTGFileTask(taskid, injectCtx, elems, batchtftask.NewProgressTracker(trackMsgID, userID), true)

client/middleware/default.go

@@ -9,13 +9,14 @@ import (
 	"github.com/gotd/td/telegram"
 	"github.com/krau/SaveAny-Bot/client/middleware/recovery"
 	"github.com/krau/SaveAny-Bot/client/middleware/retry"
+	"github.com/krau/SaveAny-Bot/config"
 )
 
 // https://github.com/iyear/tdl/blob/master/core/tclient/tclient.go
 func NewDefaultMiddlewares(ctx context.Context, timeout time.Duration) []telegram.Middleware {
 	return []telegram.Middleware{
 		recovery.New(ctx, newBackoff(timeout)),
-		retry.New(5),
+		retry.New(config.Cfg.Telegram.RpcRetry),
 		floodwait.NewSimpleWaiter(),
 	}
 }

client/middleware/retry/retry.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	"github.com/charmbracelet/log"
-	"github.com/go-faster/errors"
 	"github.com/gotd/td/bin"
 	"github.com/gotd/td/telegram"
 	"github.com/gotd/td/tg"
@@ -37,7 +36,8 @@ func (r retry) Handle(next tg.Invoker) telegram.InvokeFunc {
 					retries++
 					continue
 				}
-				return errors.Wrap(err, "retry middleware skip")
+				// retry middleware skip
+				return err
 			}
 
 			return nil

config.example.toml

@@ -1,69 +1,34 @@
-#创建文件时，若需要保留中文注释，请务必确保本文件编码为 UTF-8 ，否则会无法读取。
-workers = 4 # 同时下载文件数
-retry = 3   # 下载失败重试次数
-threads = 4 # 单个任务下载最大线程数
-stream = false # 使用stream模式, 详情请查看文档
+# 创建文件时，若需要保留中文注释，请务必确保本文件编码为 UTF-8 ，否则会无法读取。
+# 更详细的配置请在 https://sabot.unv.app/deployment/configuration 查看
+workers = 4    # 同时下载文件数
+retry = 3      # 下载失败重试次数
+threads = 4    # 单个任务下载使用的最大线程数
+stream = false # 使用流式传输模式, 建议仅在硬盘空间十分有限时使用.
 
 [telegram]
 # Bot Token
-# 更换 Bot Token 后请删除数据库文件和 session.db
+# 更换 Bot Token 后请删除会话数据库文件 (默认路径为 data/session.db )
 token = ""
 # Telegram API 配置, 若不配置也可运行, 将使用默认的 API ID 和 API HASH
 # 推荐使用自己的 API ID 和 API HASH (https://my.telegram.org)
 # app_id = 1025907
 # app_hash = "452b0359b988148995f22ff0f4229750"
-
-# 初始化超时时间, 单位: 秒
-timeout = 60
-# flood_retry = 5
-# rpc_retry = 5
-
 [telegram.proxy]
 # 启用代理连接 telegram, 只支持 socks5
 enable = false
 url = "socks5://127.0.0.1:7890"
 
-# 用户列表
-[[users]]
-# telegram user id
-id = 114514
-# 使用黑名单模式，开启后下方留空以使用所有存储，反之则为白名单，白名单请在下方输入允许的存储名
-blacklist = true
-# 将列表留空并开启黑名单模式以允许使用所有存储，此处示例为黑名单模式，用户 114514 可使用所有存储
-storages = []
-
-[[users]]
-id = 123456
-blacklist = false  # 使用白名单模式，此时，用户123456 仅可使用下方列表中的存储
-# 此时该用户只能使用名为 本机1 的存储
-storages = ["本机1"]
-
 # 存储列表
 [[storages]]
 # 标识名, 需要唯一
 name = "本机1"
-# 存储类型, 目前可用: local, alist, webdav, minio
+# 存储类型, 目前可用: local, alist, webdav, minio, telegram
 type = "local"
 # 启用存储
 enable = true
 # 文件保存根路径
 base_path = "./downloads"
 
-[[storages]]
-name = "MyAlist"
-type = "alist"
-enable = false  #记得启用
-base_path = '/'
-url = 'https://alist.com'
-username = 'admin'
-password = 'password'
-# alist token 刷新时间 
-# 86400--1天   604800--7天   1296000--15天   2592000--30天   15552000--180天
-token_exp = 86400  
-# alist 可直接使用 token 登录, 此时 username, password, token_exp 将被忽略
-# 请自行在 alist 侧配置合理的 token 过期时间
-# token = ""
-
 [[storages]]
 name = "MyWebdav"
 type = "webdav"
@@ -73,28 +38,17 @@ url = 'https://example.com/dav'
 username = 'username'
 password = 'password'
 
-[[storages]]
-name = "MyMinio"
-type = "minio"
-enable = true
-endpoint = 'play.min.io'
-use_ssl = true
-access_key_id = 'Q3AM3UQ867SPQQA43P2F'
-secret_access_key = 'zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG'
-bucket_name = 'saveanybot'
-base_path = '/path/telegram'
-
-[[storages]]
-name = "mychannel"
-type = "telegram"
-enable = true
-chat_id = 1820371480
-
-# [temp]
-# # 下载文件临时目录, 请不要在此目录下存放任何其他文件
-# base_path = "cache/"
-
-# [db]
-# path = "data/data.db" # 数据库文件路径
-# session = "data/session.db"
+# 用户列表
+[[users]]
+# telegram user id
+id = 114514
+# 存储过滤列表, 元素为存储标识名.
+# 将该列表留空并开启黑名单过滤模式以允许使用所有存储，此处示例为黑名单模式，用户 114514 可使用所有存储
+storages = []
+# 使用列表过滤黑名单模式，反之则为白名单，白名单请在列表中指定可用的存储.
+blacklist = true
 
+[[users]]
+id = 123456
+storages = ["本机1"]
+blacklist = false  # 使用白名单模式，此时，用户 123456 仅可使用标识名为 '本地1' 的存储

docs/content/zh/deployment/configuration/_index.md

@@ -51,9 +51,20 @@ Stream 模式对于磁盘空间有限的部署环境十分有用, 但也有一
 - `app_id`, `app_hash`: Telegram API ID & Hash, 在 [Telegram API](https://my.telegram.org/apps) 创建应用获取, 若不提供则使用默认值.
 - `flood_retry`: Flood 控制重试次数, 默认为 5.
 - `rpc_retry`: RPC 请求重试次数, 默认为 5.
-- `proxy`: 代理配置, 可选项.
+- `proxy`: 代理配置, 可选.
   - `enable`: 是否启用代理.
   - `url`: 代理地址, 只支持 `socks5://`
+- `userbot`: userbot 配置, 可选.
+  - `enable`: 启用 userbot 集成, 需要登录用户账号, 此时请务必使用自己的 api id & hash.
+  - `session`: userbot 会话文件路径, 默认为 `data/usersession.db`.
+
+{{< hint warning >}}
+启用 userbot 集成后, bot 可以下载私密频道和群组的文件, 但具有无法避免的账号被封禁的风险.
+<br />
+并且, 由于上游依赖问题, 该功能不稳定, 会出现获取文件失败的情况.
+<br />
+开启 userbot 集成后第一次启动 bot 时需要通过终端交互输入手机号, 2FA 和验证码, 如果你使用 docker 部署, 请进入容器内执行相关操作.
+{{< /hint >}}
 
 ```toml
 [telegram]
@@ -65,6 +76,9 @@ rpc_retry = 5
 [telegram.proxy]
 enable = false
 url = "socks5://127.0.0.1:7890"
+[telegram.userbot]
+enable = false
+session = "data/usersession.db"
 ```
 
 ### 存储端列表

docs/content/zh/usage/_index.md

@@ -26,7 +26,6 @@ Bot 接受两种消息: 文件和链接.
 
 在开启静默模式之前, 需要使用 `/storage` 命令设置默认保存位置.
 
-
 ## 存储规则
 
 允许你为 Bot 在上传文件到存储时设置一些重定向规则, 用于自动整理所保存的文件.
@@ -37,6 +36,7 @@ Bot 接受两种消息: 文件和链接.
 
 1. FILENAME-REGEX
 2. MESSAGE-REGEX
+3. IS-ALBUM
 
 添加规则的基本语法:
 
@@ -64,4 +64,18 @@ FILENAME-REGEX (?i)\.(mp4|mkv|ts|avi|flv)$ MyAlist /视频
 
 ### MESSAGE-REGEX
 
-同上, 但是是根据消息本身的文本内容正则匹配
+同上, 但是是根据消息本身的文本内容正则匹配
+
+### IS-ALBUM
+
+匹配相册消息 (media group), 规则内容只能为 `true` 或 `false`.
+
+规则中的路径若使用 "NEW-FOR-ALBUM" , 则表示为该组消息新建一个文件夹来存储它们. 见: https://github.com/krau/SaveAny-Bot/issues/87
+
+例如:
+
+```
+IS-ALBUM true MyWebdav NEW-FOR-ALBUM
+```
+
+这将会把以 media group 形式发送的消息保存到名为 MyWebdav 的存储下, 并为每个相册新建一个文件夹(由第一个文件生成)来存储它们.

pkg/consts/specific.go

@@ -1,5 +1,6 @@
 package consts
 
 const (
-	RuleStorNameChosen = "CHOSEN"
+	RuleStorNameChosen     = "CHOSEN"
+	RuleDirPathNewForAlbum = "NEW-FOR-ALBUM" // create a new directory for album files
 )

pkg/enums/rule/ruletype.go

@@ -5,6 +5,7 @@ type RuleType string
 const (
 	FileNameRegex RuleType = "FILENAME-REGEX"
 	MessageRegex  RuleType = "MESSAGE-REGEX"
+	IsAlbum       RuleType = "IS-ALBUM"
 )
 
 func (r RuleType) String() string {
@@ -12,5 +13,5 @@ func (r RuleType) String() string {
 }
 
 func Values() []RuleType {
-	return []RuleType{FileNameRegex, MessageRegex}
+	return []RuleType{FileNameRegex, MessageRegex, IsAlbum}
 }

pkg/rule/is_album.go

@@ -0,0 +1,38 @@
+package rule
+
+import (
+	ruleenum "github.com/krau/SaveAny-Bot/pkg/enums/rule"
+)
+
+var _ RuleClass[bool] = (*RuleMediaType)(nil)
+
+type RuleMediaType struct {
+	storInfo
+	matchAlbum bool
+}
+
+func (r RuleMediaType) Type() ruleenum.RuleType {
+	return ruleenum.IsAlbum
+}
+
+func (r RuleMediaType) Match(input bool) (bool, error) {
+	return r.matchAlbum == input, nil
+}
+
+func (r RuleMediaType) StorageName() string {
+	return r.storName
+}
+
+func (r RuleMediaType) StoragePath() string {
+	return r.storPath
+}
+
+func NewRuleMediaType(storName, storPath string, matchAlbum bool) (*RuleMediaType, error) {
+	return &RuleMediaType{
+		storInfo: storInfo{
+			storName: storName,
+			storPath: storPath,
+		},
+		matchAlbum: matchAlbum,
+	}, nil
+}

storage/minio/client.go

@@ -13,6 +13,7 @@ import (
 	storenum "github.com/krau/SaveAny-Bot/pkg/enums/storage"
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
+	"github.com/rs/xid"
 )
 
 type Minio struct {
@@ -61,7 +62,7 @@ func (m *Minio) Name() string {
 }
 
 func (m *Minio) JoinStoragePath(p string) string {
-	return path.Join(m.config.BasePath, p)
+	return strings.TrimPrefix(path.Join(m.config.BasePath, p), "/")
 }
 
 func (m *Minio) Save(ctx context.Context, r io.Reader, storagePath string) error {
@@ -72,6 +73,11 @@ func (m *Minio) Save(ctx context.Context, r io.Reader, storagePath string) error
 	candidate := storagePath
 	for i := 1; m.Exists(ctx, candidate); i++ {
 		candidate = fmt.Sprintf("%s_%d%s", base, i, ext)
+		if i > 1000 {
+			m.logger.Errorf("Too many attempts to find a unique filename for %s", storagePath)
+			candidate = fmt.Sprintf("%s_%s%s", base, xid.New().String(), ext)
+			break
+		}
 	}
 	size := int64(-1)
 	if length := ctx.Value(ctxkey.ContentLength); length != nil {

storage/telegram/telegram.go

@@ -5,8 +5,11 @@ import (
 	"fmt"
 	"io"
 	"path"
+	"strconv"
+	"strings"
 	"time"
 
+	"github.com/duke-git/lancet/v2/convertor"
 	"github.com/gabriel-vasile/mimetype"
 	"github.com/gotd/td/telegram/message"
 	"github.com/gotd/td/telegram/message/styling"
@@ -70,9 +73,17 @@ func (t *Telegram) Save(ctx context.Context, r io.Reader, storagePath string) er
 	if tctx == nil {
 		return fmt.Errorf("failed to get telegram context")
 	}
-	peer := tctx.PeerStorage.GetInputPeerById(t.config.ChatID)
+	chatID := t.config.ChatID
+	if after, ok0 := strings.CutPrefix(convertor.ToString(chatID), "-100"); ok0 {
+		cid, err := strconv.ParseInt(after, 10, 64)
+		if err != nil {
+			return fmt.Errorf("failed to parse chat ID: %w", err)
+		}
+		chatID = cid
+	}
+	peer := tctx.PeerStorage.GetInputPeerById(chatID)
 	if peer == nil {
-		return fmt.Errorf("failed to get input peer for chat ID %d", t.config.ChatID)
+		return fmt.Errorf("failed to get input peer for chat ID %d", chatID)
 	}
 	mtype, err := mimetype.DetectReader(rs)
 	if err != nil {

storage/webdav/client_test.go

@@ -78,6 +78,10 @@ func TestWriteFile(t *testing.T) {
 			remotePath: "hello.txt",
 			content:    "Hello webdav",
 		},
+		{
+			remotePath: "//nested/dir/test.txt",
+			content:    "Nested file",
+		},
 		{
 			remotePath: "nested/dir/test.txt",
 			content:    "Nested file",

storage/webdav/webdav.go

@@ -12,6 +12,7 @@ import (
 	"github.com/charmbracelet/log"
 	config "github.com/krau/SaveAny-Bot/config/storage"
 	storenum "github.com/krau/SaveAny-Bot/pkg/enums/storage"
+	"github.com/rs/xid"
 )
 
 type Webdav struct {
@@ -56,6 +57,11 @@ func (w *Webdav) Save(ctx context.Context, r io.Reader, storagePath string) erro
 	candidate := storagePath
 	for i := 1; w.Exists(ctx, candidate); i++ {
 		candidate = fmt.Sprintf("%s_%d%s", base, i, ext)
+		if i > 1000 {
+			w.logger.Errorf("Too many attempts to find a unique filename for %s", storagePath)
+			candidate = fmt.Sprintf("%s_%s%s", base, xid.New().String(), ext)
+			break
+		}
 	}
 
 	if err := w.client.MkDir(ctx, path.Dir(candidate)); err != nil {