fix: implement filename strategy in userbot listen mode

client/bot/bot.go

@@ -19,7 +19,7 @@ import (
 	"golang.org/x/net/proxy"
 )
 
-func Init(ctx context.Context) (<-chan struct{}) {
+func Init(ctx context.Context) <-chan struct{} {
 	log.FromContext(ctx).Info("初始化 Bot...")
 	resultChan := make(chan struct {
 		client *gotgproto.Client
@@ -75,18 +75,9 @@ func Init(ctx context.Context) (<-chan struct{}) {
 		client.API().BotsSetBotCommands(ctx, &tg.BotsSetBotCommandsRequest{
 			Scope: &tg.BotCommandScopeDefault{},
 		})
-		commands := []tg.BotCommand{
-			{Command: "start", Description: "开始使用"},
-			{Command: "help", Description: "显示帮助"},
-			{Command: "silent", Description: "开启/关闭静默模式"},
-			{Command: "storage", Description: "设置默认存储端"},
-			{Command: "save", Description: "保存文件"},
-			{Command: "dir", Description: "管理存储文件夹"},
-			{Command: "rule", Description: "管理规则"},
-		}
-		if config.C().Telegram.Userbot.Enable {
-			commands = append(commands, tg.BotCommand{Command: "watch", Description: "监听聊天"})
-			commands = append(commands, tg.BotCommand{Command: "unwatch", Description: "取消监听聊天"})
+		commands := make([]tg.BotCommand, 0, len(handlers.CommandHandlers))
+		for _, info := range handlers.CommandHandlers {
+			commands = append(commands, tg.BotCommand{Command: info.Cmd, Description: info.Desc})
 		}
 		_, err = client.API().BotsSetBotCommands(ctx, &tg.BotsSetBotCommandsRequest{
 			Scope:    &tg.BotCommandScopeDefault{},

client/bot/handlers/register.go

@@ -1,9 +1,12 @@
 package handlers
 
 import (
+	"fmt"
 	"path"
 	"regexp"
 	"strings"
+	"text/template"
+	"time"
 
 	"github.com/celestix/gotgproto/dispatcher"
 	"github.com/celestix/gotgproto/dispatcher/handlers"
@@ -11,19 +14,43 @@ import (
 	"github.com/celestix/gotgproto/ext"
 	"github.com/charmbracelet/log"
 	sabotfilters "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/filters"
+	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/mediautil"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/re"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/ruleutil"
 	userclient "github.com/krau/SaveAny-Bot/client/user"
+	"github.com/krau/SaveAny-Bot/common/utils/strutil"
 	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
 	"github.com/krau/SaveAny-Bot/config"
 	"github.com/krau/SaveAny-Bot/core"
 	"github.com/krau/SaveAny-Bot/core/tasks/tfile"
 	"github.com/krau/SaveAny-Bot/database"
+	"github.com/krau/SaveAny-Bot/pkg/enums/fnamest"
 	"github.com/krau/SaveAny-Bot/pkg/tcbdata"
 	"github.com/krau/SaveAny-Bot/storage"
 	"github.com/rs/xid"
 )
 
+type DescCommandHandler struct {
+	Cmd     string
+	Desc    string
+	handler func(ctx *ext.Context, u *ext.Update) error
+}
+
+var CommandHandlers = []DescCommandHandler{
+	{"start", "开始使用", handleHelpCmd},
+	{"silent", "切换静默模式", handleSilentCmd},
+	{"storage", "设置默认存储端", handleStorageCmd},
+	{"dir", "管理存储文件夹", handleDirCmd},
+	{"rule", "管理自动存储规则", handleRuleCmd},
+	{"watch", "监听聊天(UserBot)", handleWatchCmd},
+	{"unwatch", "取消监听聊天(UserBot)", handleUnwatchCmd},
+	{"save", "保存文件", handleSilentMode(handleSaveCmd, handleSilentSaveReplied)},
+	{"config", "修改配置", handleConfigCmd},
+	{"fnametmpl", "设置文件命名模板", handleConfigFnameTmpl},
+	{"update", "检查更新", handleUpdateCmd},
+	{"help", "显示帮助", handleHelpCmd},
+}
+
 func Register(disp dispatcher.Dispatcher) {
 	disp.AddHandler(handlers.NewMessage(filters.Message.ChatType(filters.ChatTypeChannel), func(ctx *ext.Context, u *ext.Update) error {
 		return dispatcher.EndGroups
@@ -32,18 +59,9 @@ func Register(disp dispatcher.Dispatcher) {
 		return dispatcher.EndGroups
 	}))
 	disp.AddHandler(handlers.NewMessage(filters.Message.All, checkPermission))
-	disp.AddHandler(handlers.NewCommand("start", handleHelpCmd))
-	disp.AddHandler(handlers.NewCommand("help", handleHelpCmd))
-	disp.AddHandler(handlers.NewCommand("silent", handleSilentCmd))
-	disp.AddHandler(handlers.NewCommand("storage", handleStorageCmd))
-	disp.AddHandler(handlers.NewCommand("dir", handleDirCmd))
-	disp.AddHandler(handlers.NewCommand("rule", handleRuleCmd))
-	disp.AddHandler(handlers.NewCommand("watch", handleWatchCmd))
-	disp.AddHandler(handlers.NewCommand("unwatch", handleUnwatchCmd))
-	disp.AddHandler(handlers.NewCommand("save", handleSilentMode(handleSaveCmd, handleSilentSaveReplied)))
-	disp.AddHandler(handlers.NewCommand("config", handleConfigCmd))
-	disp.AddHandler(handlers.NewCommand("fnametmpl", handleConfigFnameTmpl))
-	disp.AddHandler(handlers.NewCommand("update", handleUpdateCmd))
+	for _, info := range CommandHandlers {
+		disp.AddHandler(handlers.NewCommand(info.Cmd, info.handler))
+	}
 	disp.AddHandler(handlers.NewCallbackQuery(filters.CallbackQuery.Prefix("update"), handleUpdateCallback))
 	disp.AddHandler(handlers.NewCallbackQuery(filters.CallbackQuery.Prefix(tcbdata.TypeAdd), handleAddCallback))
 	disp.AddHandler(handlers.NewCallbackQuery(filters.CallbackQuery.Prefix(tcbdata.TypeSetDefault), handleSetDefaultCallback))
@@ -106,6 +124,58 @@ func listenMediaMessageEvent(ch chan userclient.MediaMessageEvent) {
 				logger.Errorf("Failed to get storage by user ID %d and name %s: %v", user.ChatID, user.DefaultStorage, err)
 				continue
 			}
+			switch user.FilenameStrategy {
+			case fnamest.Message.String():
+				file.SetName(tgutil.GenFileNameFromMessage(*file.Message()))
+			case fnamest.Template.String():
+				if user.FilenameTemplate == "" {
+					logger.Warnf("Empty filename template for user %d, using default filename", user.ChatID)
+					break
+				}
+				// [TODO] refactor this
+				message := file.Message()
+				tmpl, err := template.New("filename").Parse(user.FilenameTemplate)
+				if err != nil {
+					logger.Errorf("Failed to parse filename template for user %d: %s", user.ChatID, err)
+					break
+				}
+				data := mediautil.FilenameTemplateData{
+					MsgID: func() string {
+						id := message.GetID()
+						if id == 0 {
+							return ""
+						}
+						return fmt.Sprintf("%d", id)
+					}(),
+					MsgTags: func() string {
+						tags := strutil.ExtractTagsFromText(message.GetMessage())
+						if len(tags) == 0 {
+							return ""
+						}
+						return strings.Join(tags, "_")
+					}(),
+					MsgGen: tgutil.GenFileNameFromMessage(*message),
+					OrigName: func() string {
+						f, _ := tgutil.GetMediaFileName(message.Media)
+						return f
+					}(),
+					MsgDate: func() string {
+						date := message.GetDate()
+						if date == 0 {
+							return ""
+						}
+						t := time.Unix(int64(date), 0)
+						return t.Format("2006-01-02_15-04-05")
+					}(),
+				}.ToMap()
+				var sb strings.Builder
+				err = tmpl.Execute(&sb, data)
+				if err != nil {
+					log.FromContext(ctx).Errorf("failed to execute filename template: %s", err)
+					break
+				}
+				file.SetName(sb.String())
+			}
 			var dirPath string
 			if user.ApplyRule && user.Rules != nil {
 				matched, matchedStorageName, matchedDirPath := ruleutil.ApplyRule(ctx, user.Rules, ruleutil.NewInput(file))

common/utils/netutil/proxy.go

@@ -43,11 +43,10 @@ func NewProxyHTTPClient(proxyUrl string) (*http.Client, error) {
 			},
 		}, nil
 	case "socks5":
-		dialer, err := proxy.SOCKS5("tcp", u.Host, nil, proxy.Direct)
+		dialer, err := proxy.FromURL(u, proxy.Direct)
 		if err != nil {
 			return nil, err
 		}
-
 		return &http.Client{
 			Transport: &http.Transport{
 				DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {

pkg/tfile/tgfile.go

@@ -14,6 +14,7 @@ type TGFile interface {
 	Dler() downloader.Client // witch client to use for downloading
 	Size() int64
 	Name() string
+	SetName(name string)
 }
 
 type TGFileMessage interface {
@@ -29,6 +30,10 @@ type tgFile struct {
 	dler     downloader.Client
 }
 
+func (f *tgFile) SetName(name string) {
+	f.name = name
+}
+
 func (f *tgFile) Location() tg.InputFileLocationClass {
 	return f.location
 }