feat: add dir command at init and show dirs in dir command help

* Add files via upload

* Add files via upload

* Add OpenWrt auto-start and shortcut script instructions, Optimize file link reference method.

* add more detailed instructions.

* Add files via upload

README.md

@@ -1,5 +1,6 @@
 <div align="center">
 
+
 # <img src="docs/logo.jpg" width="45" align="center"> Save Any Bot
 
 **简体中文** | [English](README_EN.md) 
@@ -14,6 +15,7 @@ Demo Video:
 
 <div align="center">
 
+
 [SaveAny-Bot 演示视频 ｜ The Demo of SaveAny-Bot.webm](https://github.com/user-attachments/assets/a0de2453-a4d1-4a12-81fb-9d84856dce09)
 
 </div>
@@ -24,7 +26,7 @@ Demo Video:
 
 在 [Release](https://github.com/krau/SaveAny-Bot/releases) 页面下载对应平台的二进制文件.
 
-在解压后目录新建 `config.toml` 文件, 参考 [config.toml.example](https://github.com/krau/SaveAny-Bot/blob/main/config.example.toml) 编辑配置文件.
+在解压后目录新建 `config.toml` 文件, 参考 [config.example.toml](./config.example.toml) 编辑配置文件.
 
 运行:
 
@@ -58,11 +60,30 @@ WantedBy=multi-user.target
 systemctl enable --now saveany-bot
 ```
 
+#### 为OpenWrt及衍生系统添加开机自启动服务
+
+创建文件 ` /etc/init.d/saveanybot` ，参考[saveanybot](./docs/saveanybot)自行修改.
+
+`chmod +x /etc/init.d/saveanybot`
+
+完成后，将文件复制到 `/etc/rc.d`并重命名为`S99saveanybot`.
+
+`chmod +x /etc/rc.d/S99saveanybot`
+
+#### 为OpenWrt及衍生系统添加快捷指令
+
+创建文件` /usr/bin/sabot` ，参考[sabot](./docs/sabot)自行配置修改，注意此处文件编码仅支持 ANSI 936 .
+
+`chmod +x /usr/bin/sabot`
+
+之后，终端输入`sabot start|stop|restart|status|enable|disable`即可.
+
+
 ### 使用 Docker 部署
 
 #### Docker Compose
 
-下载 [docker-compose.yml](https://github.com/krau/SaveAny-Bot/blob/main/docker-compose.yml) 文件, 在同目录下新建 `config.toml` 文件, 参考 [config.toml.example](https://github.com/krau/SaveAny-Bot/blob/main/config.example.toml) 编辑配置文件.
+下载 [docker-compose.yml](./docker-compose.yml) 文件, 在同目录下新建 `config.toml` 文件, 参考 [config.example.toml](./config.example.toml) 编辑配置文件.
 
 启动:
 

bootstrap/init.go

@@ -1,26 +0,0 @@
-package bootstrap
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/krau/SaveAny-Bot/bot"
-	"github.com/krau/SaveAny-Bot/common"
-	"github.com/krau/SaveAny-Bot/config"
-	"github.com/krau/SaveAny-Bot/dao"
-	"github.com/krau/SaveAny-Bot/logger"
-	"github.com/krau/SaveAny-Bot/storage"
-)
-
-func InitAll() {
-	if err := config.Init(); err != nil {
-		fmt.Println("加载配置文件失败: ", err)
-		os.Exit(1)
-	}
-	logger.InitLogger()
-	logger.L.Info("正在启动 SaveAny-Bot...")
-	storage.LoadStorages()
-	common.Init()
-	dao.Init()
-	bot.Init()
-}

bot/bot.go

@@ -76,6 +76,7 @@ func Init() {
 				{Command: "silent", Description: "开启/关闭静默模式"},
 				{Command: "storage", Description: "设置默认存储端"},
 				{Command: "save", Description: "保存所回复的文件"},
+				{Command: "dir", Description: "管理存储文件夹"},
 			},
 		})
 		resultChan <- struct {

bot/handle_add_task.go

@@ -0,0 +1,189 @@
+package bot
+
+import (
+	"errors"
+	"fmt"
+	"path"
+	"strconv"
+	"strings"
+
+	"github.com/celestix/gotgproto/dispatcher"
+	"github.com/celestix/gotgproto/ext"
+	"github.com/duke-git/lancet/v2/slice"
+	"github.com/gotd/td/telegram/message/entity"
+	"github.com/gotd/td/telegram/message/styling"
+	"github.com/gotd/td/tg"
+	"github.com/krau/SaveAny-Bot/config"
+	"github.com/krau/SaveAny-Bot/dao"
+	"github.com/krau/SaveAny-Bot/logger"
+	"github.com/krau/SaveAny-Bot/queue"
+	"github.com/krau/SaveAny-Bot/types"
+	"gorm.io/gorm"
+)
+
+func AddToQueue(ctx *ext.Context, update *ext.Update) error {
+	// TODO: 回调数据用户独立鉴权 (处理 bot 在群聊中的情况)
+	if !slice.Contain(config.Cfg.GetUsersID(), update.CallbackQuery.UserID) {
+		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
+			QueryID:   update.CallbackQuery.QueryID,
+			Alert:     true,
+			Message:   "你没有权限",
+			CacheTime: 5,
+		})
+		return dispatcher.EndGroups
+	}
+	args := strings.Split(string(update.CallbackQuery.Data), " ")
+	addToDir := args[0] == "add_to_dir"
+	cbDataId, _ := strconv.Atoi(args[1])
+	cbData, err := dao.GetCallbackData(uint(cbDataId))
+	if err != nil {
+		logger.L.Errorf("获取回调数据失败: %s", err)
+		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
+			QueryID:   update.CallbackQuery.QueryID,
+			Alert:     true,
+			Message:   "获取回调数据失败",
+			CacheTime: 5,
+		})
+		return dispatcher.EndGroups
+	}
+
+	data := strings.Split(cbData, " ")
+	fileChatID, _ := strconv.Atoi(data[0])
+	fileMessageID, _ := strconv.Atoi(data[1])
+	storageName := data[2]
+	dirIdInt, _ := strconv.Atoi(data[3])
+	dirId := uint(dirIdInt)
+
+	user, err := dao.GetUserByChatID(update.CallbackQuery.UserID)
+	if err != nil {
+		logger.L.Errorf("获取用户失败: %s", err)
+		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
+			QueryID:   update.CallbackQuery.QueryID,
+			Alert:     true,
+			Message:   "获取用户失败",
+			CacheTime: 5,
+		})
+		return dispatcher.EndGroups
+	}
+
+	if !addToDir {
+		dirs, err := dao.GetDirsByUserIDAndStorageName(user.ID, storageName)
+		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+			logger.L.Errorf("获取路径失败: %s", err)
+			ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
+				QueryID:   update.CallbackQuery.QueryID,
+				Alert:     true,
+				Message:   "获取路径失败",
+				CacheTime: 5,
+			})
+			return dispatcher.EndGroups
+		}
+		if len(dirs) != 0 {
+			markup, err := getSelectDirMarkup(fileChatID, fileMessageID, storageName, dirs)
+			if err != nil {
+				logger.L.Errorf("获取路径失败: %s", err)
+				ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
+					QueryID:   update.CallbackQuery.QueryID,
+					Alert:     true,
+					Message:   "获取路径失败",
+					CacheTime: 5,
+				})
+				return dispatcher.EndGroups
+			}
+			_, err = ctx.EditMessage(update.EffectiveChat().GetID(), &tg.MessagesEditMessageRequest{
+				ID:          update.CallbackQuery.GetMsgID(),
+				Message:     "请选择要保存到的路径",
+				ReplyMarkup: markup,
+			})
+			if err != nil {
+				logger.L.Errorf("编辑消息失败: %s", err)
+			}
+			return dispatcher.EndGroups
+		}
+	}
+
+	logger.L.Tracef("Got add to queue: chatID: %d, messageID: %d, storage: %s", fileChatID, fileMessageID, storageName)
+	record, err := dao.GetReceivedFileByChatAndMessageID(int64(fileChatID), fileMessageID)
+	if err != nil {
+		logger.L.Errorf("获取记录失败: %s", err)
+		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
+			QueryID:   update.CallbackQuery.QueryID,
+			Alert:     true,
+			Message:   "查询记录失败",
+			CacheTime: 5,
+		})
+		return dispatcher.EndGroups
+	}
+	if update.CallbackQuery.MsgID != record.ReplyMessageID {
+		record.ReplyMessageID = update.CallbackQuery.MsgID
+		if err := dao.SaveReceivedFile(record); err != nil {
+			logger.L.Errorf("更新接收的文件失败: %s", err)
+		}
+	}
+
+	var dir *dao.Dir
+	if addToDir && dirId != 0 {
+		dir, err = dao.GetDirByID(dirId)
+		if err != nil {
+			logger.L.Errorf("获取路径失败: %s", err)
+			ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
+				QueryID:   update.CallbackQuery.QueryID,
+				Alert:     true,
+				Message:   "获取路径失败",
+				CacheTime: 5,
+			})
+			return dispatcher.EndGroups
+		}
+	}
+
+	file, err := FileFromMessage(ctx, record.ChatID, record.MessageID, record.FileName)
+	if err != nil {
+		logger.L.Errorf("获取消息中的文件失败: %s", err)
+		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
+			QueryID:   update.CallbackQuery.QueryID,
+			Alert:     true,
+			Message:   fmt.Sprintf("获取消息中的文件失败: %s", err),
+			CacheTime: 5,
+		})
+		return dispatcher.EndGroups
+	}
+
+	task := types.Task{
+		Ctx:            ctx,
+		Status:         types.Pending,
+		File:           file,
+		StorageName:    storageName,
+		StoragePath:    path.Join(),
+		FileChatID:     record.ChatID,
+		ReplyMessageID: record.ReplyMessageID,
+		FileMessageID:  record.MessageID,
+		ReplyChatID:    record.ReplyChatID,
+		UserID:         update.GetUserChat().GetID(),
+	}
+	if dir != nil {
+		task.StoragePath = path.Join(dir.Path, file.FileName)
+	}
+
+	queue.AddTask(task)
+
+	entityBuilder := entity.Builder{}
+	var entities []tg.MessageEntityClass
+	text := fmt.Sprintf("已添加到任务队列\n文件名: %s\n当前排队任务数: %d", record.FileName, queue.Len())
+	if err := styling.Perform(&entityBuilder,
+		styling.Plain("已添加到任务队列\n文件名: "),
+		styling.Code(record.FileName),
+		styling.Plain("\n当前排队任务数: "),
+		styling.Bold(strconv.Itoa(queue.Len())),
+	); err != nil {
+		logger.L.Errorf("Failed to build entity: %s", err)
+	} else {
+		text, entities = entityBuilder.Complete()
+	}
+
+	ctx.EditMessage(update.EffectiveChat().GetID(), &tg.MessagesEditMessageRequest{
+		Message:  text,
+		Entities: entities,
+		ID:       record.ReplyMessageID,
+	})
+	return dispatcher.EndGroups
+}

bot/handle_dir.go

@@ -0,0 +1,88 @@
+package bot
+
+import (
+	"strings"
+
+	"github.com/celestix/gotgproto/dispatcher"
+	"github.com/celestix/gotgproto/ext"
+	"github.com/gotd/td/telegram/message/styling"
+	"github.com/krau/SaveAny-Bot/dao"
+	"github.com/krau/SaveAny-Bot/logger"
+	"github.com/krau/SaveAny-Bot/storage"
+)
+
+func dirCmd(ctx *ext.Context, update *ext.Update) error {
+	args := strings.Split(strings.TrimPrefix(update.EffectiveMessage.Text, "/dir "), " ")
+	if len(args) < 3 {
+		dirs, err := dao.GetUserDirsByChatID(update.GetUserChat().GetID())
+		if err != nil {
+			logger.L.Errorf("获取用户路径失败: %s", err)
+			ctx.Reply(update, ext.ReplyTextString("获取用户路径失败"), nil)
+			return dispatcher.EndGroups
+		}
+		ctx.Reply(update, ext.ReplyTextStyledTextArray(
+			[]styling.StyledTextOption{
+				styling.Bold("使用方法: /dir <操作> <存储名> <路径>"),
+				styling.Plain("\n\n可用操作:\n"),
+				styling.Code("add"),
+				styling.Plain(" - 添加路径\n"),
+				styling.Code("del"),
+				styling.Plain(" - 删除路径\n"),
+				styling.Plain("\n示例:\n"),
+				styling.Code("/dir add local1 path/to/dir"),
+				styling.Plain("\n\n当前已添加的路径:\n"),
+				styling.Blockquote(func() string {
+					var sb strings.Builder
+					for _, dir := range dirs {
+						sb.WriteString(dir.StorageName)
+						sb.WriteString(" - ")
+						sb.WriteString(dir.Path)
+						sb.WriteString("\n")
+					}
+					return sb.String()
+				}(), true),
+			},
+		), nil)
+		return dispatcher.EndGroups
+	}
+	user, err := dao.GetUserByChatID(update.GetUserChat().GetID())
+	if err != nil {
+		logger.L.Errorf("获取用户失败: %s", err)
+		ctx.Reply(update, ext.ReplyTextString("获取用户失败"), nil)
+		return dispatcher.EndGroups
+	}
+	switch args[0] {
+	case "add":
+		return addDir(ctx, update, user, args[1], args[2])
+	case "del":
+		return delDir(ctx, update, user, args[1], args[2])
+	default:
+		ctx.Reply(update, ext.ReplyTextString("未知操作"), nil)
+		return dispatcher.EndGroups
+	}
+}
+
+func addDir(ctx *ext.Context, update *ext.Update, user *dao.User, storageName, path string) error {
+	if _, err := storage.GetStorageByUserIDAndName(user.ChatID, storageName); err != nil {
+		ctx.Reply(update, ext.ReplyTextString(err.Error()), nil)
+		return dispatcher.EndGroups
+	}
+
+	if err := dao.CreateDirForUser(user.ID, storageName, path); err != nil {
+		logger.L.Errorf("创建路径失败: %s", err)
+		ctx.Reply(update, ext.ReplyTextString("创建路径失败"), nil)
+		return dispatcher.EndGroups
+	}
+	ctx.Reply(update, ext.ReplyTextString("路径添加成功"), nil)
+	return dispatcher.EndGroups
+}
+
+func delDir(ctx *ext.Context, update *ext.Update, user *dao.User, storageName, path string) error {
+	if err := dao.DeleteDirForUser(user.ID, storageName, path); err != nil {
+		logger.L.Errorf("删除路径失败: %s", err)
+		ctx.Reply(update, ext.ReplyTextString("删除路径失败"), nil)
+		return dispatcher.EndGroups
+	}
+	ctx.Reply(update, ext.ReplyTextString("路径删除成功"), nil)
+	return dispatcher.EndGroups
+}

bot/handle_file.go

@@ -0,0 +1,85 @@
+package bot
+
+import (
+	"fmt"
+
+	"github.com/celestix/gotgproto/dispatcher"
+	"github.com/celestix/gotgproto/ext"
+	"github.com/gotd/td/tg"
+	"github.com/krau/SaveAny-Bot/dao"
+	"github.com/krau/SaveAny-Bot/logger"
+	"github.com/krau/SaveAny-Bot/storage"
+	"github.com/krau/SaveAny-Bot/types"
+)
+
+func handleFileMessage(ctx *ext.Context, update *ext.Update) error {
+	logger.L.Trace("Got media: ", update.EffectiveMessage.Media.TypeName())
+	supported, err := supportedMediaFilter(update.EffectiveMessage.Message)
+	if err != nil {
+		return err
+	}
+	if !supported {
+		return dispatcher.EndGroups
+	}
+
+	user, err := dao.GetUserByChatID(update.GetUserChat().GetID())
+	if err != nil {
+		logger.L.Errorf("获取用户失败: %s", err)
+		ctx.Reply(update, ext.ReplyTextString("获取用户失败"), nil)
+		return dispatcher.EndGroups
+	}
+	storages := storage.GetUserStorages(user.ChatID)
+	if len(storages) == 0 {
+		ctx.Reply(update, ext.ReplyTextString("无可用的存储"), nil)
+		return dispatcher.EndGroups
+	}
+
+	msg, err := ctx.Reply(update, ext.ReplyTextString("正在获取文件信息..."), nil)
+	if err != nil {
+		logger.L.Errorf("回复失败: %s", err)
+		return dispatcher.EndGroups
+	}
+	media := update.EffectiveMessage.Media
+	file, err := FileFromMedia(media, "")
+	if err != nil {
+		logger.L.Errorf("获取文件失败: %s", err)
+		ctx.Reply(update, ext.ReplyTextString(fmt.Sprintf("获取文件失败: %s", err)), nil)
+		return dispatcher.EndGroups
+	}
+	if file.FileName == "" {
+		file.FileName = fmt.Sprintf("%d_%d_%s", update.EffectiveChat().GetID(), update.EffectiveMessage.ID, file.Hash())
+	}
+
+	if err := dao.SaveReceivedFile(&dao.ReceivedFile{
+		Processing:     false,
+		FileName:       file.FileName,
+		ChatID:         update.EffectiveChat().GetID(),
+		MessageID:      update.EffectiveMessage.ID,
+		ReplyMessageID: msg.ID,
+		ReplyChatID:    update.GetUserChat().GetID(),
+	}); err != nil {
+		logger.L.Errorf("添加接收的文件失败: %s", err)
+		if _, err := ctx.EditMessage(update.EffectiveChat().GetID(), &tg.MessagesEditMessageRequest{
+			Message: fmt.Sprintf("添加接收的文件失败: %s", err),
+			ID:      msg.ID,
+		}); err != nil {
+			logger.L.Errorf("编辑消息失败: %s", err)
+		}
+		return dispatcher.EndGroups
+	}
+
+	if !user.Silent || user.DefaultStorage == "" {
+		return ProvideSelectMessage(ctx, update, file, update.EffectiveChat().GetID(), update.EffectiveMessage.ID, msg.ID)
+	}
+	return HandleSilentAddTask(ctx, update, user, &types.Task{
+		Ctx:            ctx,
+		Status:         types.Pending,
+		File:           file,
+		StorageName:    user.DefaultStorage,
+		FileChatID:     update.EffectiveChat().GetID(),
+		ReplyMessageID: msg.ID,
+		ReplyChatID:    update.GetUserChat().GetID(),
+		FileMessageID:  update.EffectiveMessage.ID,
+		UserID:         user.ChatID,
+	})
+}

bot/handle_link.go

@@ -78,7 +78,7 @@ func handleLinkMessage(ctx *ext.Context, update *ext.Update) error {
 		file.FileName = fmt.Sprintf("%d_%d_%s", linkChat.GetID(), messageID, file.Hash())
 	}
 
-	receivedFile := &types.ReceivedFile{
+	receivedFile := &dao.ReceivedFile{
 		Processing:     false,
 		FileName:       file.FileName,
 		ChatID:         linkChat.GetID(),

bot/handle_save.go

@@ -0,0 +1,116 @@
+package bot
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/celestix/gotgproto/dispatcher"
+	"github.com/celestix/gotgproto/ext"
+	"github.com/gotd/td/tg"
+	"github.com/krau/SaveAny-Bot/dao"
+	"github.com/krau/SaveAny-Bot/logger"
+	"github.com/krau/SaveAny-Bot/storage"
+	"github.com/krau/SaveAny-Bot/types"
+)
+
+func saveCmd(ctx *ext.Context, update *ext.Update) error {
+	res, ok := update.EffectiveMessage.GetReplyTo()
+	if !ok || res == nil {
+		ctx.Reply(update, ext.ReplyTextString("请回复要保存的文件"), nil)
+		return dispatcher.EndGroups
+	}
+	replyHeader, ok := res.(*tg.MessageReplyHeader)
+	if !ok {
+		ctx.Reply(update, ext.ReplyTextString("请回复要保存的文件"), nil)
+		return dispatcher.EndGroups
+	}
+	replyToMsgID, ok := replyHeader.GetReplyToMsgID()
+	if !ok {
+		ctx.Reply(update, ext.ReplyTextString("请回复要保存的文件"), nil)
+		return dispatcher.EndGroups
+	}
+
+	user, err := dao.GetUserByChatID(update.GetUserChat().GetID())
+	if err != nil {
+		logger.L.Errorf("获取用户失败: %s", err)
+		ctx.Reply(update, ext.ReplyTextString("获取用户失败"), nil)
+		return dispatcher.EndGroups
+	}
+
+	storages := storage.GetUserStorages(user.ChatID)
+
+	if len(storages) == 0 {
+		ctx.Reply(update, ext.ReplyTextString("无可用的存储"), nil)
+		return dispatcher.EndGroups
+	}
+
+	msg, err := GetTGMessage(ctx, update.EffectiveChat().GetID(), replyToMsgID)
+	if err != nil {
+		logger.L.Errorf("获取消息失败: %s", err)
+		ctx.Reply(update, ext.ReplyTextString("无法获取消息"), nil)
+		return dispatcher.EndGroups
+	}
+
+	supported, _ := supportedMediaFilter(msg)
+	if !supported {
+		ctx.Reply(update, ext.ReplyTextString("不支持的消息类型或消息中没有文件"), nil)
+		return dispatcher.EndGroups
+	}
+
+	replied, err := ctx.Reply(update, ext.ReplyTextString("正在获取文件信息..."), nil)
+	if err != nil {
+		logger.L.Errorf("回复失败: %s", err)
+		return dispatcher.EndGroups
+	}
+
+	cmdText := update.EffectiveMessage.Text
+	customFileName := strings.TrimSpace(strings.TrimPrefix(cmdText, "/save"))
+
+	file, err := FileFromMessage(ctx, update.EffectiveChat().GetID(), msg.ID, customFileName)
+	if err != nil {
+		logger.L.Errorf("获取文件失败: %s", err)
+		ctx.EditMessage(update.EffectiveChat().GetID(), &tg.MessagesEditMessageRequest{
+			Message: fmt.Sprintf("获取文件失败: %s", err),
+			ID:      replied.ID,
+		})
+		return dispatcher.EndGroups
+	}
+
+	// TODO: better file name
+	if file.FileName == "" {
+		file.FileName = fmt.Sprintf("%d_%d_%s", update.EffectiveChat().GetID(), replyToMsgID, file.Hash())
+	}
+	receivedFile := &dao.ReceivedFile{
+		Processing:     false,
+		FileName:       file.FileName,
+		ChatID:         update.EffectiveChat().GetID(),
+		MessageID:      replyToMsgID,
+		ReplyMessageID: replied.ID,
+		ReplyChatID:    update.GetUserChat().GetID(),
+	}
+
+	if err := dao.SaveReceivedFile(receivedFile); err != nil {
+		logger.L.Errorf("保存接收的文件失败: %s", err)
+		if _, err := ctx.EditMessage(update.EffectiveChat().GetID(), &tg.MessagesEditMessageRequest{
+			Message: fmt.Sprintf("保存接收的文件失败: %s", err),
+			ID:      replied.ID,
+		}); err != nil {
+			logger.L.Errorf("编辑消息失败: %s", err)
+		}
+		return dispatcher.EndGroups
+	}
+	if !user.Silent || user.DefaultStorage == "" {
+		return ProvideSelectMessage(ctx, update, file, update.EffectiveChat().GetID(), msg.ID, replied.ID)
+	}
+	return HandleSilentAddTask(ctx, update, user, &types.Task{
+		Ctx:            ctx,
+		Status:         types.Pending,
+		File:           file,
+		StorageName:    user.DefaultStorage,
+		FileChatID:     update.EffectiveChat().GetID(),
+		ReplyMessageID: replied.ID,
+		ReplyChatID:    update.GetUserChat().GetID(),
+		FileMessageID:  msg.ID,
+		UserID:         user.ChatID,
+	})
+}

bot/handle_silent.go

@@ -0,0 +1,30 @@
+package bot
+
+import (
+	"fmt"
+
+	"github.com/celestix/gotgproto/dispatcher"
+	"github.com/celestix/gotgproto/ext"
+	"github.com/krau/SaveAny-Bot/dao"
+	"github.com/krau/SaveAny-Bot/logger"
+)
+
+func silent(ctx *ext.Context, update *ext.Update) error {
+	user, err := dao.GetUserByChatID(update.GetUserChat().GetID())
+	if err != nil {
+		logger.L.Errorf("获取用户失败: %s", err)
+		return dispatcher.EndGroups
+	}
+	if !user.Silent && user.DefaultStorage == "" {
+		ctx.Reply(update, ext.ReplyTextString("请先使用 /storage 设置默认存储位置"), nil)
+		return dispatcher.EndGroups
+	}
+	user.Silent = !user.Silent
+	if err := dao.UpdateUser(user); err != nil {
+		logger.L.Errorf("更新用户失败: %s", err)
+		ctx.Reply(update, ext.ReplyTextString("更新用户失败"), nil)
+		return dispatcher.EndGroups
+	}
+	ctx.Reply(update, ext.ReplyTextString(fmt.Sprintf("已%s静默模式", map[bool]string{true: "开启", false: "关闭"}[user.Silent])), nil)
+	return dispatcher.EndGroups
+}

bot/handle_start.go

@@ -0,0 +1,37 @@
+package bot
+
+import (
+	"github.com/celestix/gotgproto/dispatcher"
+	"github.com/celestix/gotgproto/ext"
+	"github.com/krau/SaveAny-Bot/dao"
+	"github.com/krau/SaveAny-Bot/logger"
+)
+
+func start(ctx *ext.Context, update *ext.Update) error {
+	if err := dao.CreateUser(update.GetUserChat().GetID()); err != nil {
+		logger.L.Errorf("创建用户失败: %s", err)
+		return dispatcher.EndGroups
+	}
+	return help(ctx, update)
+}
+
+const helpText string = `
+Save Any Bot - 转存你的 Telegram 文件
+命令:
+/start - 开始使用
+/help - 显示帮助
+/silent - 开关静默模式
+/storage - 设置默认存储位置
+/save [自定义文件名] - 保存文件
+
+静默模式: 开启后 Bot 直接保存到收到的文件到默认位置, 不再询问
+
+默认存储位置: 在静默模式下保存到的位置
+
+向 Bot 发送(转发)文件, 或发送一个公开频道的消息链接以保存文件
+`
+
+func help(ctx *ext.Context, update *ext.Update) error {
+	ctx.Reply(update, ext.ReplyTextString(helpText), nil)
+	return dispatcher.EndGroups
+}

bot/handle_storage.go

@@ -0,0 +1,99 @@
+package bot
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+
+	"github.com/celestix/gotgproto/dispatcher"
+	"github.com/celestix/gotgproto/ext"
+	"github.com/gotd/td/tg"
+	"github.com/krau/SaveAny-Bot/dao"
+	"github.com/krau/SaveAny-Bot/logger"
+	"github.com/krau/SaveAny-Bot/storage"
+)
+
+func storageCmd(ctx *ext.Context, update *ext.Update) error {
+	userChatID := update.GetUserChat().GetID()
+	storages := storage.GetUserStorages(userChatID)
+	if len(storages) == 0 {
+		ctx.Reply(update, ext.ReplyTextString("无可用的存储"), nil)
+		return dispatcher.EndGroups
+	}
+	markup, err := getSetDefaultStorageMarkup(userChatID, storages)
+	if err != nil {
+		logger.L.Errorf("Failed to get markup: %s", err)
+		ctx.Reply(update, ext.ReplyTextString("获取存储位置失败"), nil)
+		return dispatcher.EndGroups
+	}
+	ctx.Reply(update, ext.ReplyTextString("请选择要设为默认的存储位置"), &ext.ReplyOpts{
+		Markup: markup,
+	})
+	return dispatcher.EndGroups
+}
+
+func setDefaultStorage(ctx *ext.Context, update *ext.Update) error {
+	args := strings.Split(string(update.CallbackQuery.Data), " ")
+	userID, _ := strconv.Atoi(args[1])
+	if userID != int(update.CallbackQuery.GetUserID()) {
+		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
+			QueryID:   update.CallbackQuery.QueryID,
+			Alert:     true,
+			Message:   "你没有权限",
+			CacheTime: 5,
+		})
+		return dispatcher.EndGroups
+	}
+	cbDataId, _ := strconv.Atoi(args[2])
+	storageName, err := dao.GetCallbackData(uint(cbDataId))
+	if err != nil {
+		logger.L.Errorf("获取回调数据失败: %s", err)
+		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
+			QueryID:   update.CallbackQuery.QueryID,
+			Alert:     true,
+			Message:   "获取回调数据失败",
+			CacheTime: 5,
+		})
+		return dispatcher.EndGroups
+	}
+
+	selectedStorage, err := storage.GetStorageByName(storageName)
+
+	if err != nil {
+		logger.L.Errorf("获取指定存储失败: %s", err)
+		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
+			QueryID:   update.CallbackQuery.QueryID,
+			Alert:     true,
+			Message:   "获取指定存储失败",
+			CacheTime: 5,
+		})
+		return dispatcher.EndGroups
+	}
+	user, err := dao.GetUserByChatID(int64(userID))
+	if err != nil {
+		logger.L.Errorf("Failed to get user: %s", err)
+		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
+			QueryID:   update.CallbackQuery.QueryID,
+			Alert:     true,
+			Message:   "获取用户失败",
+			CacheTime: 5,
+		})
+		return dispatcher.EndGroups
+	}
+	user.DefaultStorage = storageName
+	if err := dao.UpdateUser(user); err != nil {
+		logger.L.Errorf("Failed to update user: %s", err)
+		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
+			QueryID:   update.CallbackQuery.QueryID,
+			Alert:     true,
+			Message:   "更新用户失败",
+			CacheTime: 5,
+		})
+		return dispatcher.EndGroups
+	}
+	ctx.EditMessage(update.EffectiveChat().GetID(), &tg.MessagesEditMessageRequest{
+		Message: fmt.Sprintf("已将 %s (%s) 设为默认存储位置", selectedStorage.Name(), selectedStorage.Type()),
+		ID:      update.CallbackQuery.GetMsgID(),
+	})
+	return dispatcher.EndGroups
+}

bot/handlers.go

@@ -1,25 +1,10 @@
 package bot
 
 import (
-	"fmt"
-	"strconv"
-	"strings"
-
-	"github.com/duke-git/lancet/v2/slice"
-	"github.com/gotd/td/telegram/message/entity"
-	"github.com/gotd/td/telegram/message/styling"
-	"github.com/gotd/td/tg"
-
 	"github.com/celestix/gotgproto/dispatcher"
 	"github.com/celestix/gotgproto/dispatcher/handlers"
 	"github.com/celestix/gotgproto/dispatcher/handlers/filters"
-	"github.com/celestix/gotgproto/ext"
-	"github.com/krau/SaveAny-Bot/config"
-	"github.com/krau/SaveAny-Bot/dao"
 	"github.com/krau/SaveAny-Bot/logger"
-	"github.com/krau/SaveAny-Bot/queue"
-	"github.com/krau/SaveAny-Bot/storage"
-	"github.com/krau/SaveAny-Bot/types"
 )
 
 func RegisterHandlers(dispatcher dispatcher.Dispatcher) {
@@ -29,6 +14,7 @@ func RegisterHandlers(dispatcher dispatcher.Dispatcher) {
 	dispatcher.AddHandler(handlers.NewCommand("silent", silent))
 	dispatcher.AddHandler(handlers.NewCommand("storage", storageCmd))
 	dispatcher.AddHandler(handlers.NewCommand("save", saveCmd))
+	dispatcher.AddHandler(handlers.NewCommand("dir", dirCmd))
 	linkRegexFilter, err := filters.Message.Regex(linkRegexString)
 	if err != nil {
 		logger.L.Panicf("创建正则表达式过滤器失败: %s", err)
@@ -38,404 +24,3 @@ func RegisterHandlers(dispatcher dispatcher.Dispatcher) {
 	dispatcher.AddHandler(handlers.NewCallbackQuery(filters.CallbackQuery.Prefix("set_default"), setDefaultStorage))
 	dispatcher.AddHandler(handlers.NewMessage(filters.Message.Media, handleFileMessage))
 }
-
-const noPermissionText string = `
-您不在白名单中, 无法使用此 Bot.
-您可以部署自己的实例: https://github.com/krau/SaveAny-Bot
-`
-
-func checkPermission(ctx *ext.Context, update *ext.Update) error {
-	userID := update.GetUserChat().GetID()
-	if !slice.Contain(config.Cfg.GetUsersID(), userID) {
-		ctx.Reply(update, ext.ReplyTextString(noPermissionText), nil)
-		return dispatcher.EndGroups
-	}
-	return dispatcher.ContinueGroups
-}
-
-func start(ctx *ext.Context, update *ext.Update) error {
-	if err := dao.CreateUser(update.GetUserChat().GetID()); err != nil {
-		logger.L.Errorf("创建用户失败: %s", err)
-		return dispatcher.EndGroups
-	}
-	return help(ctx, update)
-}
-
-const helpText string = `
-Save Any Bot - 转存你的 Telegram 文件
-命令:
-/start - 开始使用
-/help - 显示帮助
-/silent - 开关静默模式
-/storage - 设置默认存储位置
-/save [自定义文件名] - 保存文件
-
-静默模式: 开启后 Bot 直接保存到收到的文件到默认位置, 不再询问
-
-默认存储位置: 在静默模式下保存到的位置
-
-向 Bot 发送(转发)文件, 或发送一个公开频道的消息链接以保存文件
-`
-
-func help(ctx *ext.Context, update *ext.Update) error {
-	ctx.Reply(update, ext.ReplyTextString(helpText), nil)
-	return dispatcher.EndGroups
-}
-
-func silent(ctx *ext.Context, update *ext.Update) error {
-	user, err := dao.GetUserByChatID(update.GetUserChat().GetID())
-	if err != nil {
-		logger.L.Errorf("获取用户失败: %s", err)
-		return dispatcher.EndGroups
-	}
-	if !user.Silent && user.DefaultStorage == "" {
-		ctx.Reply(update, ext.ReplyTextString("请先使用 /storage 设置默认存储位置"), nil)
-		return dispatcher.EndGroups
-	}
-	user.Silent = !user.Silent
-	if err := dao.UpdateUser(user); err != nil {
-		logger.L.Errorf("更新用户失败: %s", err)
-		ctx.Reply(update, ext.ReplyTextString("更新用户失败"), nil)
-		return dispatcher.EndGroups
-	}
-	ctx.Reply(update, ext.ReplyTextString(fmt.Sprintf("已%s静默模式", map[bool]string{true: "开启", false: "关闭"}[user.Silent])), nil)
-	return dispatcher.EndGroups
-}
-
-func saveCmd(ctx *ext.Context, update *ext.Update) error {
-	res, ok := update.EffectiveMessage.GetReplyTo()
-	if !ok || res == nil {
-		ctx.Reply(update, ext.ReplyTextString("请回复要保存的文件"), nil)
-		return dispatcher.EndGroups
-	}
-	replyHeader, ok := res.(*tg.MessageReplyHeader)
-	if !ok {
-		ctx.Reply(update, ext.ReplyTextString("请回复要保存的文件"), nil)
-		return dispatcher.EndGroups
-	}
-	replyToMsgID, ok := replyHeader.GetReplyToMsgID()
-	if !ok {
-		ctx.Reply(update, ext.ReplyTextString("请回复要保存的文件"), nil)
-		return dispatcher.EndGroups
-	}
-
-	user, err := dao.GetUserByChatID(update.GetUserChat().GetID())
-	if err != nil {
-		logger.L.Errorf("获取用户失败: %s", err)
-		ctx.Reply(update, ext.ReplyTextString("获取用户失败"), nil)
-		return dispatcher.EndGroups
-	}
-
-	storages := storage.GetUserStorages(user.ChatID)
-
-	if len(storages) == 0 {
-		ctx.Reply(update, ext.ReplyTextString("无可用的存储"), nil)
-		return dispatcher.EndGroups
-	}
-
-	msg, err := GetTGMessage(ctx, update.EffectiveChat().GetID(), replyToMsgID)
-	if err != nil {
-		logger.L.Errorf("获取消息失败: %s", err)
-		ctx.Reply(update, ext.ReplyTextString("无法获取消息"), nil)
-		return dispatcher.EndGroups
-	}
-
-	supported, _ := supportedMediaFilter(msg)
-	if !supported {
-		ctx.Reply(update, ext.ReplyTextString("不支持的消息类型或消息中没有文件"), nil)
-		return dispatcher.EndGroups
-	}
-
-	replied, err := ctx.Reply(update, ext.ReplyTextString("正在获取文件信息..."), nil)
-	if err != nil {
-		logger.L.Errorf("回复失败: %s", err)
-		return dispatcher.EndGroups
-	}
-
-	cmdText := update.EffectiveMessage.Text
-	customFileName := strings.TrimSpace(strings.TrimPrefix(cmdText, "/save"))
-
-	file, err := FileFromMessage(ctx, update.EffectiveChat().GetID(), msg.ID, customFileName)
-	if err != nil {
-		logger.L.Errorf("获取文件失败: %s", err)
-		ctx.EditMessage(update.EffectiveChat().GetID(), &tg.MessagesEditMessageRequest{
-			Message: fmt.Sprintf("获取文件失败: %s", err),
-			ID:      replied.ID,
-		})
-		return dispatcher.EndGroups
-	}
-
-	// TODO: better file name
-	if file.FileName == "" {
-		file.FileName = fmt.Sprintf("%d_%d_%s", update.EffectiveChat().GetID(), replyToMsgID, file.Hash())
-	}
-	receivedFile := &types.ReceivedFile{
-		Processing:     false,
-		FileName:       file.FileName,
-		ChatID:         update.EffectiveChat().GetID(),
-		MessageID:      replyToMsgID,
-		ReplyMessageID: replied.ID,
-		ReplyChatID:    update.GetUserChat().GetID(),
-	}
-
-	if err := dao.SaveReceivedFile(receivedFile); err != nil {
-		logger.L.Errorf("保存接收的文件失败: %s", err)
-		if _, err := ctx.EditMessage(update.EffectiveChat().GetID(), &tg.MessagesEditMessageRequest{
-			Message: fmt.Sprintf("保存接收的文件失败: %s", err),
-			ID:      replied.ID,
-		}); err != nil {
-			logger.L.Errorf("编辑消息失败: %s", err)
-		}
-		return dispatcher.EndGroups
-	}
-	if !user.Silent || user.DefaultStorage == "" {
-		return ProvideSelectMessage(ctx, update, file, update.EffectiveChat().GetID(), msg.ID, replied.ID)
-	}
-	return HandleSilentAddTask(ctx, update, user, &types.Task{
-		Ctx:            ctx,
-		Status:         types.Pending,
-		File:           file,
-		StorageName:    user.DefaultStorage,
-		FileChatID:     update.EffectiveChat().GetID(),
-		ReplyMessageID: replied.ID,
-		ReplyChatID:    update.GetUserChat().GetID(),
-		FileMessageID:  msg.ID,
-		UserID:         user.ChatID,
-	})
-}
-
-func storageCmd(ctx *ext.Context, update *ext.Update) error {
-	user, err := dao.GetUserByChatID(update.GetUserChat().GetID())
-	if err != nil {
-		logger.L.Errorf("获取用户失败: %s", err)
-		ctx.Reply(update, ext.ReplyTextString("获取用户失败"), nil)
-		return dispatcher.EndGroups
-	}
-	storages := storage.GetUserStorages(user.ChatID)
-	if len(storages) == 0 {
-		ctx.Reply(update, ext.ReplyTextString("无可用的存储"), nil)
-		return dispatcher.EndGroups
-	}
-
-	ctx.Reply(update, ext.ReplyTextString("请选择要设为默认的存储位置"), &ext.ReplyOpts{
-		Markup: getSetDefaultStorageMarkup(user.ChatID, storages),
-	})
-
-	return dispatcher.EndGroups
-}
-
-func setDefaultStorage(ctx *ext.Context, update *ext.Update) error {
-	args := strings.Split(string(update.CallbackQuery.Data), " ")
-	userID, _ := strconv.Atoi(args[1])
-	storageNameHash := args[2]
-	if userID != int(update.CallbackQuery.GetUserID()) {
-		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
-			QueryID:   update.CallbackQuery.QueryID,
-			Alert:     true,
-			Message:   "你没有权限",
-			CacheTime: 5,
-		})
-		return dispatcher.EndGroups
-	}
-	storageName := storageHashName[storageNameHash]
-	selectedStorage, err := storage.GetStorageByName(storageName)
-
-	if err != nil {
-		logger.L.Errorf("获取指定存储失败: %s", err)
-		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
-			QueryID:   update.CallbackQuery.QueryID,
-			Alert:     true,
-			Message:   "获取指定存储失败",
-			CacheTime: 5,
-		})
-		return dispatcher.EndGroups
-	}
-	user, err := dao.GetUserByChatID(int64(userID))
-	if err != nil {
-		logger.L.Errorf("Failed to get user: %s", err)
-		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
-			QueryID:   update.CallbackQuery.QueryID,
-			Alert:     true,
-			Message:   "获取用户失败",
-			CacheTime: 5,
-		})
-		return dispatcher.EndGroups
-	}
-	user.DefaultStorage = storageName
-	if err := dao.UpdateUser(user); err != nil {
-		logger.L.Errorf("Failed to update user: %s", err)
-		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
-			QueryID:   update.CallbackQuery.QueryID,
-			Alert:     true,
-			Message:   "更新用户失败",
-			CacheTime: 5,
-		})
-		return dispatcher.EndGroups
-	}
-	ctx.EditMessage(update.EffectiveChat().GetID(), &tg.MessagesEditMessageRequest{
-		Message: fmt.Sprintf("已将 %s (%s) 设为默认存储位置", selectedStorage.Name(), selectedStorage.Type()),
-		ID:      update.CallbackQuery.GetMsgID(),
-	})
-	return dispatcher.EndGroups
-}
-
-func handleFileMessage(ctx *ext.Context, update *ext.Update) error {
-	logger.L.Trace("Got media: ", update.EffectiveMessage.Media.TypeName())
-	supported, err := supportedMediaFilter(update.EffectiveMessage.Message)
-	if err != nil {
-		return err
-	}
-	if !supported {
-		return dispatcher.EndGroups
-	}
-
-	user, err := dao.GetUserByChatID(update.GetUserChat().GetID())
-	if err != nil {
-		logger.L.Errorf("获取用户失败: %s", err)
-		ctx.Reply(update, ext.ReplyTextString("获取用户失败"), nil)
-		return dispatcher.EndGroups
-	}
-	storages := storage.GetUserStorages(user.ChatID)
-	if len(storages) == 0 {
-		ctx.Reply(update, ext.ReplyTextString("无可用的存储"), nil)
-		return dispatcher.EndGroups
-	}
-
-	msg, err := ctx.Reply(update, ext.ReplyTextString("正在获取文件信息..."), nil)
-	if err != nil {
-		logger.L.Errorf("回复失败: %s", err)
-		return dispatcher.EndGroups
-	}
-	media := update.EffectiveMessage.Media
-	file, err := FileFromMedia(media, "")
-	if err != nil {
-		logger.L.Errorf("获取文件失败: %s", err)
-		ctx.Reply(update, ext.ReplyTextString(fmt.Sprintf("获取文件失败: %s", err)), nil)
-		return dispatcher.EndGroups
-	}
-	if file.FileName == "" {
-		file.FileName = fmt.Sprintf("%d_%d_%s", update.EffectiveChat().GetID(), update.EffectiveMessage.ID, file.Hash())
-	}
-
-	if err := dao.SaveReceivedFile(&types.ReceivedFile{
-		Processing:     false,
-		FileName:       file.FileName,
-		ChatID:         update.EffectiveChat().GetID(),
-		MessageID:      update.EffectiveMessage.ID,
-		ReplyMessageID: msg.ID,
-		ReplyChatID:    update.GetUserChat().GetID(),
-	}); err != nil {
-		logger.L.Errorf("添加接收的文件失败: %s", err)
-		if _, err := ctx.EditMessage(update.EffectiveChat().GetID(), &tg.MessagesEditMessageRequest{
-			Message: fmt.Sprintf("添加接收的文件失败: %s", err),
-			ID:      msg.ID,
-		}); err != nil {
-			logger.L.Errorf("编辑消息失败: %s", err)
-		}
-		return dispatcher.EndGroups
-	}
-
-	if !user.Silent || user.DefaultStorage == "" {
-		return ProvideSelectMessage(ctx, update, file, update.EffectiveChat().GetID(), update.EffectiveMessage.ID, msg.ID)
-	}
-	return HandleSilentAddTask(ctx, update, user, &types.Task{
-		Ctx:            ctx,
-		Status:         types.Pending,
-		File:           file,
-		StorageName:    user.DefaultStorage,
-		FileChatID:     update.EffectiveChat().GetID(),
-		ReplyMessageID: msg.ID,
-		ReplyChatID:    update.GetUserChat().GetID(),
-		FileMessageID:  update.EffectiveMessage.ID,
-		UserID:         user.ChatID,
-	})
-}
-
-func AddToQueue(ctx *ext.Context, update *ext.Update) error {
-	if !slice.Contain(config.Cfg.GetUsersID(), update.CallbackQuery.UserID) {
-		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
-			QueryID:   update.CallbackQuery.QueryID,
-			Alert:     true,
-			Message:   "你没有权限",
-			CacheTime: 5,
-		})
-		return dispatcher.EndGroups
-	}
-	args := strings.Split(string(update.CallbackQuery.Data), " ")
-	fileChatID, _ := strconv.Atoi(args[1])
-	fileMessageID, _ := strconv.Atoi(args[2])
-	storageNameHash := args[3]
-	storageName := storageHashName[storageNameHash]
-	if storageName == "" {
-		logger.L.Errorf("未知存储位置哈希: %d", storageNameHash)
-		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
-			QueryID:   update.CallbackQuery.QueryID,
-			Alert:     true,
-			Message:   "未知存储位置",
-			CacheTime: 5,
-		})
-		return dispatcher.EndGroups
-	}
-	logger.L.Tracef("Got add to queue: chatID: %d, messageID: %d, storage: %s", fileChatID, fileMessageID, storageName)
-	record, err := dao.GetReceivedFileByChatAndMessageID(int64(fileChatID), fileMessageID)
-	if err != nil {
-		logger.L.Errorf("获取记录失败: %s", err)
-		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
-			QueryID:   update.CallbackQuery.QueryID,
-			Alert:     true,
-			Message:   "查询记录失败",
-			CacheTime: 5,
-		})
-		return dispatcher.EndGroups
-	}
-	if update.CallbackQuery.MsgID != record.ReplyMessageID {
-		record.ReplyMessageID = update.CallbackQuery.MsgID
-		if err := dao.SaveReceivedFile(record); err != nil {
-			logger.L.Errorf("更新接收的文件失败: %s", err)
-		}
-	}
-	file, err := FileFromMessage(ctx, record.ChatID, record.MessageID, record.FileName)
-	if err != nil {
-		logger.L.Errorf("获取消息中的文件失败: %s", err)
-		ctx.AnswerCallback(&tg.MessagesSetBotCallbackAnswerRequest{
-			QueryID:   update.CallbackQuery.QueryID,
-			Alert:     true,
-			Message:   fmt.Sprintf("获取消息中的文件失败: %s", err),
-			CacheTime: 5,
-		})
-		return dispatcher.EndGroups
-	}
-
-	queue.AddTask(types.Task{
-		Ctx:            ctx,
-		Status:         types.Pending,
-		File:           file,
-		StorageName:    storageName,
-		FileChatID:     record.ChatID,
-		ReplyMessageID: record.ReplyMessageID,
-		FileMessageID:  record.MessageID,
-		ReplyChatID:    record.ReplyChatID,
-		UserID:         update.GetUserChat().GetID(),
-	})
-
-	entityBuilder := entity.Builder{}
-	var entities []tg.MessageEntityClass
-	text := fmt.Sprintf("已添加到任务队列\n文件名: %s\n当前排队任务数: %d", record.FileName, queue.Len())
-	if err := styling.Perform(&entityBuilder,
-		styling.Plain("已添加到任务队列\n文件名: "),
-		styling.Code(record.FileName),
-		styling.Plain("\n当前排队任务数: "),
-		styling.Bold(strconv.Itoa(queue.Len())),
-	); err != nil {
-		logger.L.Errorf("Failed to build entity: %s", err)
-	} else {
-		text, entities = entityBuilder.Complete()
-	}
-
-	ctx.EditMessage(update.EffectiveChat().GetID(), &tg.MessagesEditMessageRequest{
-		Message:  text,
-		Entities: entities,
-		ID:       record.ReplyMessageID,
-	})
-	return dispatcher.EndGroups
-}

bot/middlewares.go

@@ -3,9 +3,13 @@ package bot
 import (
 	"time"
 
+	"github.com/celestix/gotgproto/dispatcher"
+	"github.com/celestix/gotgproto/ext"
+	"github.com/duke-git/lancet/v2/slice"
 	"github.com/gotd/contrib/middleware/floodwait"
 	"github.com/gotd/contrib/middleware/ratelimit"
 	"github.com/gotd/td/telegram"
+	"github.com/krau/SaveAny-Bot/config"
 	"golang.org/x/time/rate"
 )
 
@@ -17,3 +21,17 @@ func FloodWaitMiddleware() []telegram.Middleware {
 		ratelimiter,
 	}
 }
+
+const noPermissionText string = `
+您不在白名单中, 无法使用此 Bot.
+您可以部署自己的实例: https://github.com/krau/SaveAny-Bot
+`
+
+func checkPermission(ctx *ext.Context, update *ext.Update) error {
+	userID := update.GetUserChat().GetID()
+	if !slice.Contain(config.Cfg.GetUsersID(), userID) {
+		ctx.Reply(update, ext.ReplyTextString(noPermissionText), nil)
+		return dispatcher.EndGroups
+	}
+	return dispatcher.ContinueGroups
+}

bot/utils.go

@@ -24,6 +24,7 @@ var (
 	ErrEmptyPhotoSize  = errors.New("photo size is empty")
 	ErrEmptyPhotoSizes = errors.New("photo size slice is empty")
 	ErrNoStorages      = errors.New("no available storage")
+	ErrEmptyMessage    = errors.New("message is empty")
 )
 
 func supportedMediaFilter(m *tg.Message) (bool, error) {
@@ -40,9 +41,6 @@ func supportedMediaFilter(m *tg.Message) (bool, error) {
 	}
 }
 
-// for callback data
-var storageHashName = map[string]string{}
-
 func getSelectStorageMarkup(userChatID int64, fileChatID, fileMessageID int) (*tg.ReplyInlineMarkup, error) {
 	user, err := dao.GetUserByChatID(userChatID)
 	if err != nil {
@@ -55,11 +53,14 @@ func getSelectStorageMarkup(userChatID int64, fileChatID, fileMessageID int) (*t
 
 	buttons := make([]tg.KeyboardButtonClass, 0)
 	for _, storage := range storages {
-		nameHash := common.HashString(storage.Name())
-		storageHashName[nameHash] = storage.Name()
+		cbData := fmt.Sprintf("%d %d %s 0", fileChatID, fileMessageID, storage.Name()) // 0 for empty dir id
+		cbDataId, err := dao.CreateCallbackData(cbData)
+		if err != nil {
+			return nil, fmt.Errorf("failed to create callback data: %w", err)
+		}
 		buttons = append(buttons, &tg.KeyboardButtonCallback{
 			Text: storage.Name(),
-			Data: []byte(fmt.Sprintf("add %d %d %s", fileChatID, fileMessageID, nameHash)),
+			Data: []byte(fmt.Sprintf("add %d", cbDataId)),
 		})
 	}
 	markup := &tg.ReplyInlineMarkup{}
@@ -71,14 +72,19 @@ func getSelectStorageMarkup(userChatID int64, fileChatID, fileMessageID int) (*t
 	return markup, nil
 }
 
-func getSetDefaultStorageMarkup(userChatID int64, storages []storage.Storage) *tg.ReplyInlineMarkup {
+func getSelectDirMarkup(fileChatID, fileMessageID int, storageName string, dirs []dao.Dir) (*tg.ReplyInlineMarkup, error) {
 	buttons := make([]tg.KeyboardButtonClass, 0)
-	for _, storage := range storages {
-		nameHash := common.HashString(storage.Name())
-		storageHashName[nameHash] = storage.Name()
+	for _, dir := range dirs {
+		if dir.ID == 0 || dir.StorageName != storageName {
+			return nil, fmt.Errorf("unexpected dir: %v", dir)
+		}
+		cbDataId, err := dao.CreateCallbackData(fmt.Sprintf("%d %d %s %d", fileChatID, fileMessageID, storageName, dir.ID))
+		if err != nil {
+			return nil, fmt.Errorf("failed to create callback data: %w", err)
+		}
 		buttons = append(buttons, &tg.KeyboardButtonCallback{
-			Text: storage.Name(),
-			Data: []byte(fmt.Sprintf("set_default %d %s", userChatID, nameHash)),
+			Text: dir.Path,
+			Data: []byte(fmt.Sprintf("add_to_dir %d", cbDataId)),
 		})
 	}
 	markup := &tg.ReplyInlineMarkup{}
@@ -87,8 +93,28 @@ func getSetDefaultStorageMarkup(userChatID int64, storages []storage.Storage) *t
 		row.Buttons = buttons[i:min(i+3, len(buttons))]
 		markup.Rows = append(markup.Rows, row)
 	}
-	return markup
+	return markup, nil
+}
 
+func getSetDefaultStorageMarkup(userChatID int64, storages []storage.Storage) (*tg.ReplyInlineMarkup, error) {
+	buttons := make([]tg.KeyboardButtonClass, 0)
+	for _, storage := range storages {
+		cbDataId, err := dao.CreateCallbackData(storage.Name())
+		if err != nil {
+			return nil, fmt.Errorf("failed to create callback data: %w", err)
+		}
+		buttons = append(buttons, &tg.KeyboardButtonCallback{
+			Text: storage.Name(),
+			Data: []byte(fmt.Sprintf("set_default %d %d", userChatID, cbDataId)),
+		})
+	}
+	markup := &tg.ReplyInlineMarkup{}
+	for i := 0; i < len(buttons); i += 3 {
+		row := tg.KeyboardButtonRow{}
+		row.Buttons = buttons[i:min(i+3, len(buttons))]
+		markup.Rows = append(markup.Rows, row)
+	}
+	return markup, nil
 }
 
 func FileFromMedia(media tg.MessageMediaClass, customFileName string) (*types.File, error) {
@@ -179,7 +205,7 @@ func GetTGMessage(ctx *ext.Context, chatId int64, messageID int) (*tg.Message, e
 		return nil, err
 	}
 	if len(messages) == 0 {
-		return nil, errors.New("no messages found")
+		return nil, ErrEmptyMessage
 	}
 	msg := messages[0]
 	tgMessage, ok := msg.(*tg.Message)
@@ -230,7 +256,7 @@ func ProvideSelectMessage(ctx *ext.Context, update *ext.Update, file *types.File
 	return dispatcher.EndGroups
 }
 
-func HandleSilentAddTask(ctx *ext.Context, update *ext.Update, user *types.User, task *types.Task) error {
+func HandleSilentAddTask(ctx *ext.Context, update *ext.Update, user *dao.User, task *types.Task) error {
 	if user.DefaultStorage == "" {
 		ctx.EditMessage(update.EffectiveChat().GetID(), &tg.MessagesEditMessageRequest{
 			Message: "请先使用 /storage 设置默认存储位置",

cmd/run.go

@@ -1,20 +1,24 @@
 package cmd
 
 import (
+	"fmt"
 	"os"
 	"os/signal"
 	"path/filepath"
 	"syscall"
 
-	"github.com/krau/SaveAny-Bot/bootstrap"
+	"github.com/krau/SaveAny-Bot/bot"
+	"github.com/krau/SaveAny-Bot/common"
 	"github.com/krau/SaveAny-Bot/config"
 	"github.com/krau/SaveAny-Bot/core"
+	"github.com/krau/SaveAny-Bot/dao"
 	"github.com/krau/SaveAny-Bot/logger"
+	"github.com/krau/SaveAny-Bot/storage"
 	"github.com/spf13/cobra"
 )
 
 func Run(_ *cobra.Command, _ []string) {
-	bootstrap.InitAll()
+	InitAll()
 	core.Run()
 
 	quit := make(chan os.Signal, 1)
@@ -49,3 +53,16 @@ func Run(_ *cobra.Command, _ []string) {
 		}
 	}
 }
+
+func InitAll() {
+	if err := config.Init(); err != nil {
+		fmt.Println("加载配置文件失败: ", err)
+		os.Exit(1)
+	}
+	logger.InitLogger()
+	logger.L.Info("正在启动 SaveAny-Bot...")
+	dao.Init()
+	storage.LoadStorages()
+	common.Init()
+	bot.Init()
+}

config.example.toml

@@ -1,8 +1,11 @@
+#创建文件时，若需要保留中文注释，请务必确保本文件编码为 UTF-8 ，否则会无法读取。
 workers = 4 # 同时下载文件数
 retry = 3   # 下载失败重试次数
+threads = 4 # 单个任务下载最大线程数
 
 [telegram]
 # Bot Token
+# 更换 Bot Token 后请删除数据库文件和 session.db
 token = ""
 # Telegram API 配置, 若不配置也可运行, 将使用默认的 API ID 和 API HASH
 # 推荐使用自己的 API ID 和 API HASH (https://my.telegram.org)
@@ -23,6 +26,7 @@ name = "本机1"
 type = "local"
 # 启用存储
 enable = true
+# 文件保存根路径
 base_path = "./downloads"
 
 [[storages]]
@@ -34,12 +38,12 @@ base_path = "./downloads/2"
 [[storages]]
 name = "MyAlist"
 type = "alist"
-enable = false
+enable = false  #记得启用
 base_path = '/'
 url = 'https://alist.com'
 username = 'admin'
 password = 'password'
-token_exp = 86400
+token_exp = 86400  # 86400--1天   604800--7天   1296000--15天   2592000--30天   15552000--180天
 # alist 可直接使用 token 登录, 此时 username, password, token_exp 将被忽略
 # 请自行在 alist 侧配置合理的 token 过期时间
 # token = ""
@@ -48,8 +52,8 @@ token_exp = 86400
 [[storages]]
 name = "MyWebdav"
 type = "webdav"
-base_path = '/path/telegram'
 enable = false
+base_path = '/path/telegram'
 url = 'https://example.com/dav'
 username = 'username'
 password = 'password'
@@ -57,20 +61,24 @@ password = 'password'
 
 # 用户列表
 [[users]]
-# user id
-id = 123456
-# 存储名称过滤列表
-storages = ["本机1"]
-# 开启黑名单模式, 过滤列表中的存储将无法使用, 默认为白名单模式
-blacklist = false
+# telegram user id
+id = 114514
+# 开启黑名单，开启后下方留空以使用所有存储，反之则为白名单，白名单请在下方输入允许的存储名
+blacklist = true
+# 将列表留空并开启黑名单模式以允许使用所有存储，此处示例为黑名单模式，用户114514 可使用所有存储
+storages = []
+
 
 [[users]]
-id = 114514
-# 将列表留空并开启黑名单模式以允许使用所有存储
-storages = []
-blacklist = true
+id = 123456
+blacklist = false  #开启白名单模式，此时，用户123456 仅可使用下方列表中的存储
+# 此时该用户只能使用名为 本机1 的存储
+storages = ["本机1"]
 
 
+
+# 其他配置
+
 # [log]
 # # 日志等级
 # level = "DEBUG"
@@ -82,4 +90,4 @@ blacklist = true
 # cache_ttl = 30
 
 # [db]
-# path = "data/data.db" # 数据库文件路径
+# path = "data/data.db" # 数据库文件路径

core/utils.go

@@ -158,7 +158,6 @@ func fixTaskFileExt(task *types.Task, localFilePath string) {
 	}
 }
 
-// TODO: configurable
 func getTaskThreads(fileSize int64) int {
 	threads := 1
 	if fileSize > 1024*1024*100 {

dao/callback_data.go

@@ -0,0 +1,19 @@
+package dao
+
+func CreateCallbackData(data string) (uint, error) {
+	callbackData := CallbackData{
+		Data: data,
+	}
+	err := db.Create(&callbackData).Error
+	return callbackData.ID, err
+}
+
+func GetCallbackData(id uint) (string, error) {
+	var callbackData CallbackData
+	err := db.First(&callbackData, id).Error
+	return callbackData.Data, err
+}
+
+func DeleteCallbackData(id uint) error {
+	return db.Unscoped().Where("id = ?", id).Delete(&CallbackData{}).Error
+}

dao/db.go

@@ -9,7 +9,6 @@ import (
 	"github.com/glebarez/sqlite"
 	"github.com/krau/SaveAny-Bot/config"
 	"github.com/krau/SaveAny-Bot/logger"
-	"github.com/krau/SaveAny-Bot/types"
 	"gorm.io/gorm"
 	glogger "gorm.io/gorm/logger"
 )
@@ -37,7 +36,7 @@ func Init() {
 		os.Exit(1)
 	}
 	logger.L.Debug("Database connected")
-	if err := db.AutoMigrate(&types.ReceivedFile{}, &types.User{}); err != nil {
+	if err := db.AutoMigrate(&ReceivedFile{}, &User{}, &Dir{}, &CallbackData{}); err != nil {
 		logger.L.Fatal("迁移数据库失败, 如果您从旧版本升级, 建议手动删除数据库文件后重试: ", err)
 	}
 
@@ -52,7 +51,7 @@ func syncUsers() error {
 		return fmt.Errorf("failed to get users: %w", err)
 	}
 
-	dbUserMap := make(map[int64]types.User)
+	dbUserMap := make(map[int64]User)
 	for _, u := range dbUsers {
 		dbUserMap[u.ChatID] = u
 	}

dao/dir.go

@@ -0,0 +1,43 @@
+package dao
+
+func CreateDirForUser(userID uint, storageName, path string) error {
+	dir := Dir{
+		UserID:      userID,
+		StorageName: storageName,
+		Path:        path,
+	}
+	return db.Create(&dir).Error
+}
+
+func GetDirByID(id uint) (*Dir, error) {
+	dir := &Dir{}
+	err := db.First(dir, id).Error
+	if err != nil {
+		return nil, err
+	}
+	return dir, err
+}
+
+func GetUserDirs(userID uint) ([]Dir, error) {
+	var dirs []Dir
+	err := db.Where("user_id = ?", userID).Find(&dirs).Error
+	return dirs, err
+}
+
+func GetUserDirsByChatID(chatID int64) ([]Dir, error) {
+	user, err := GetUserByChatID(chatID)
+	if err != nil {
+		return nil, err
+	}
+	return GetUserDirs(user.ID)
+}
+
+func GetDirsByUserIDAndStorageName(userID uint, storageName string) ([]Dir, error) {
+	var dirs []Dir
+	err := db.Where("user_id = ? AND storage_name = ?", userID, storageName).Find(&dirs).Error
+	return dirs, err
+}
+
+func DeleteDirForUser(userID uint, storageName, path string) error {
+	return db.Unscoped().Where("user_id = ? AND storage_name = ? AND path = ?", userID, storageName, path).Delete(&Dir{}).Error
+}

dao/file.go

@@ -1,8 +1,6 @@
 package dao
 
-import "github.com/krau/SaveAny-Bot/types"
-
-func SaveReceivedFile(receivedFile *types.ReceivedFile) error {
+func SaveReceivedFile(receivedFile *ReceivedFile) error {
 	record, err := GetReceivedFileByChatAndMessageID(receivedFile.ChatID, receivedFile.MessageID)
 	if err == nil {
 		receivedFile.ID = record.ID
@@ -10,8 +8,8 @@ func SaveReceivedFile(receivedFile *types.ReceivedFile) error {
 	return db.Save(receivedFile).Error
 }
 
-func GetReceivedFileByChatAndMessageID(chatID int64, messageID int) (*types.ReceivedFile, error) {
-	var receivedFile types.ReceivedFile
+func GetReceivedFileByChatAndMessageID(chatID int64, messageID int) (*ReceivedFile, error) {
+	var receivedFile ReceivedFile
 	err := db.Where("chat_id = ? AND message_id = ?", chatID, messageID).First(&receivedFile).Error
 	if err != nil {
 		return nil, err
@@ -19,6 +17,6 @@ func GetReceivedFileByChatAndMessageID(chatID int64, messageID int) (*types.Rece
 	return &receivedFile, nil
 }
 
-func DeleteReceivedFile(receivedFile *types.ReceivedFile) error {
+func DeleteReceivedFile(receivedFile *ReceivedFile) error {
 	return db.Unscoped().Delete(receivedFile).Error
 }

dao/model.go

@@ -1,4 +1,4 @@
-package types
+package dao
 
 import (
 	"gorm.io/gorm"
@@ -21,4 +21,17 @@ type User struct {
 	ChatID         int64 `gorm:"uniqueIndex;not null"`
 	Silent         bool
 	DefaultStorage string // Default storage name
+	Dirs           []Dir
+}
+
+type Dir struct {
+	gorm.Model
+	UserID      uint
+	StorageName string
+	Path        string
+}
+
+type CallbackData struct {
+	gorm.Model
+	Data string
 }

dao/user.go

@@ -1,32 +1,30 @@
 package dao
 
-import (
-	"github.com/krau/SaveAny-Bot/types"
-)
-
 func CreateUser(chatID int64) error {
 	if _, err := GetUserByChatID(chatID); err == nil {
 		return nil
 	}
-	return db.Create(&types.User{ChatID: chatID}).Error
+	return db.Create(&User{ChatID: chatID}).Error
 }
 
-func GetAllUsers() ([]types.User, error) {
-	var users []types.User
-	err := db.Find(&users).Error
+func GetAllUsers() ([]User, error) {
+	var users []User
+	err := db.Preload("Dirs").Find(&users).Error
 	return users, err
 }
 
-func GetUserByChatID(chatID int64) (*types.User, error) {
-	var user types.User
-	err := db.Where("chat_id = ?", chatID).First(&user).Error
+func GetUserByChatID(chatID int64) (*User, error) {
+	var user User
+	err := db.
+		Preload("Dirs").
+		Where("chat_id = ?", chatID).First(&user).Error
 	return &user, err
 }
 
-func UpdateUser(user *types.User) error {
+func UpdateUser(user *User) error {
 	return db.Save(user).Error
 }
 
-func DeleteUser(user *types.User) error {
-	return db.Unscoped().Delete(user).Error
+func DeleteUser(user *User) error {
+	return db.Unscoped().Select("Dirs").Delete(user).Error
 }

docs/sabot

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+case "$1" in
+    start)
+        /etc/init.d/saveanybot start
+        ;;
+    stop)
+        /etc/init.d/saveanybot stop
+        ;;
+    restart)
+        /etc/init.d/saveanybot restart
+        ;;
+    status)
+        /etc/init.d/saveanybot status
+        ;;
+    enable)
+        /etc/init.d/saveanybot enable
+        echo "Enable SaveAnyBot auto-start."
+        ;;
+    disable)
+        /etc/init.d/saveanybot disable
+        echo "Disable SaveAnyBot auto-start."
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|restart|status|enable|disable}"
+        exit 1
+        ;;
+esac

docs/saveanybot

@@ -0,0 +1,34 @@
+#!/bin/sh /etc/rc.common
+
+# This is the OpenWRT init.d script for SaveAnyBot
+
+START=99  # 设置启动顺序，数字越大越后启动
+STOP=10   # 设置停止顺序，数字越小越先停止
+
+# 脚本描述
+description="SaveAnyBot"
+
+# 设置工作目录和执行文件路径
+WORKING_DIR="/mnt/mmc1-1/SaveAnyBot"
+EXEC_PATH="$WORKING_DIR/saveany-bot"
+
+# 启动函数
+start() {
+    echo "Starting SaveAnyBot..."
+    # 切换到工作目录并执行程序
+    cd $WORKING_DIR
+    $EXEC_PATH &
+}
+
+# 停止函数
+stop() {
+    echo "Stopping SaveAnyBot..."
+    # 查找并杀死进程
+    killall saveany-bot
+}
+
+# 重启函数
+reload() {
+    stop
+    start
+}

storage/alist/alist.go

@@ -98,6 +98,7 @@ func (a *Alist) Name() string {
 }
 
 func (a *Alist) Save(ctx context.Context, filePath, storagePath string) error {
+	logger.L.Infof("Saving file %s to %s", filePath, storagePath)
 	file, err := os.Open(filePath)
 	if err != nil {
 		return fmt.Errorf("failed to open file: %w", err)

storage/local/local.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/duke-git/lancet/v2/fileutil"
 	"github.com/krau/SaveAny-Bot/config"
+	"github.com/krau/SaveAny-Bot/logger"
 	"github.com/krau/SaveAny-Bot/types"
 )
 
@@ -40,6 +41,7 @@ func (l *Local) Name() string {
 }
 
 func (l *Local) Save(ctx context.Context, filePath, storagePath string) error {
+	logger.L.Infof("Saving file %s to %s", filePath, storagePath)
 	absPath, err := filepath.Abs(storagePath)
 	if err != nil {
 		return err

storage/webdav/webdav.go

@@ -45,6 +45,7 @@ func (w *Webdav) Name() string {
 }
 
 func (w *Webdav) Save(ctx context.Context, filePath, storagePath string) error {
+	logger.L.Infof("Saving file %s to %s", filePath, storagePath)
 	if err := w.client.MkdirAll(path.Dir(storagePath), os.ModePerm); err != nil {
 		logger.L.Errorf("Failed to create directory %s: %v", path.Dir(storagePath), err)
 		return ErrFailedToCreateDirectory