fix: trim space in telegraph dir path , close #119

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/config.go

@@ -119,7 +119,9 @@ func handleConfigFnameTmpl(ctx *ext.Context, update *ext.Update) error {
 - {{.msgtags}}: 消息中的标签, 将以下划线分隔输出
 - {{.msggen}}: 根据消息生成的文件名
 - {{.msgdate}}: 消息日期, 格式 YYYY-MM-DD_HH-MM-SS
-- {{.origname}}: 媒体的原始文件名 (如果有)`
+- {{.origname}}: 媒体的原始文件名 (如果有)
+- {{.chatid}}: 消息的聊天ID
+`
 		if user.FilenameTemplate != "" {
 			text += fmt.Sprintf("\n\n当前模板: %s", user.FilenameTemplate)
 		}

client/bot/handlers/register.go

@@ -1,29 +1,40 @@
 package handlers
 
 import (
-	"path"
 	"regexp"
-	"strings"
 
 	"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/charmbracelet/log"
 	sabotfilters "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/filters"
 	"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/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/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 +43,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))
@@ -58,83 +60,3 @@ func Register(disp dispatcher.Dispatcher) {
 		go listenMediaMessageEvent(userclient.GetMediaMessageCh())
 	}
 }
-
-func listenMediaMessageEvent(ch chan userclient.MediaMessageEvent) {
-	logger := log.FromContext(userclient.GetCtx())
-	for event := range ch {
-		logger.Debug("Received media message event", "chat_id", event.ChatID, "file_name", event.File.Name())
-		ctx := event.Ctx
-		file := event.File
-		chats, err := database.GetWatchChatsByChatID(ctx, event.ChatID)
-		if err != nil {
-			logger.Errorf("Failed to get watch chats for chat ID %d: %v", event.ChatID, err)
-			continue
-		}
-		msgText := event.File.Message().GetMessage()
-		for _, chat := range chats {
-			if chat.Filter != "" {
-				filter := strings.Split(chat.Filter, ":")
-				if len(filter) != 2 {
-					logger.Warnf("Invalid filter format in chat %d, skipping", chat.ChatID)
-					continue
-				}
-				filterType := filter[0]
-				filterData := filter[1]
-				switch filterType {
-				case "msgre": // [TODO] enums for filter types
-					if ok, err := regexp.MatchString(filterData, msgText); err != nil {
-						continue
-					} else if !ok {
-						continue
-					}
-				default:
-					logger.Warnf("Unsupported filter type %s in chat %d, skipping", filterType, chat.ChatID)
-					continue
-				}
-			}
-			user, err := database.GetUserByID(ctx, chat.UserID)
-			if err != nil {
-				logger.Errorf("Failed to get user by ID %d: %v", chat.UserID, err)
-				continue
-			}
-			if user.DefaultStorage == "" {
-				logger.Warnf("User %d has no default storage set, skipping media message handling", chat.UserID)
-				continue
-			}
-			stor, err := storage.GetStorageByUserIDAndName(ctx, user.ChatID, user.DefaultStorage)
-			if err != nil {
-				logger.Errorf("Failed to get storage by user ID %d and name %s: %v", user.ChatID, user.DefaultStorage, err)
-				continue
-			}
-			var dirPath string
-			if user.ApplyRule && user.Rules != nil {
-				matched, matchedStorageName, matchedDirPath := ruleutil.ApplyRule(ctx, user.Rules, ruleutil.NewInput(file))
-				if !matched {
-					goto startCreateTask
-				}
-				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)
-						continue
-					}
-				}
-			}
-		startCreateTask:
-			storagePath := stor.JoinStoragePath(path.Join(dirPath, file.Name()))
-			injectCtx := tgutil.ExtWithContext(ctx.Context, ctx)
-			taskid := xid.New().String()
-			task, err := tfile.NewTGFileTask(taskid, injectCtx, file, stor, storagePath, nil)
-			if err != nil {
-				logger.Errorf("create task failed: %s", err)
-				continue
-			}
-			if err := core.AddTask(injectCtx, task); err != nil {
-				logger.Errorf("add task failed: %s", err)
-				continue
-			}
-			logger.Infof("Added media message task for user %d in chat %d: %s", chat.UserID, event.ChatID, file.Name())
-		}
-	}
-}

client/bot/handlers/utils/mediautil/media.go

@@ -31,6 +31,7 @@ type FilenameTemplateData struct {
 	MsgGen   string `json:"msggen,omitempty"`
 	MsgDate  string `json:"msgdate,omitempty"`
 	OrigName string `json:"origname,omitempty"`
+	ChatID   string `json:"chatid,omitempty"`
 }
 
 func (f FilenameTemplateData) ToMap() map[string]string {
@@ -40,6 +41,7 @@ func (f FilenameTemplateData) ToMap() map[string]string {
 		"msggen":   f.MsgGen,
 		"msgdate":  f.MsgDate,
 		"origname": f.OrigName,
+		"chatid":   f.ChatID,
 	}
 }
 
@@ -61,35 +63,7 @@ func TfileOptions(ctx context.Context, user *database.User, message *tg.Message)
 			fnameOpt = tfile.WithNameIfEmpty(tgutil.GenFileNameFromMessage(*message))
 			break
 		}
-		data := 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()
+		data := BuildFilenameTemplateData(message)
 		var sb strings.Builder
 		err = tmpl.Execute(&sb, data)
 		if err != nil {
@@ -104,3 +78,64 @@ func TfileOptions(ctx context.Context, user *database.User, message *tg.Message)
 	opts = append(opts, fnameOpt, tfile.WithMessage(message))
 	return opts
 }
+
+func BuildFilenameTemplateData(message *tg.Message) map[string]string {
+	data := 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")
+		}(),
+		ChatID: func() string {
+			// 如果消息是频道的(从消息链接中fetch的) 直接使用其chat id, 无论它是否是从其他来源转发的
+			if message.GetPost() {
+				peer := message.GetPeerID()
+				switch p := peer.(type) {
+				case *tg.PeerChannel:
+					return intToStringOmitZero(p.ChannelID)
+				default: // impossible case
+					return intToStringOmitZero(tgutil.ChatIdFromPeer(peer))
+				}
+			}
+			fwdHeader, ok := message.GetFwdFrom()
+			if !ok {
+				return intToStringOmitZero(tgutil.ChatIdFromPeer(message.GetPeerID()))
+			}
+			fwdFrom, ok := fwdHeader.GetFromID()
+			if !ok {
+				return intToStringOmitZero(tgutil.ChatIdFromPeer(message.GetPeerID()))
+			}
+			return intToStringOmitZero(tgutil.ChatIdFromPeer(fwdFrom))
+		}(),
+	}.ToMap()
+	return data
+}
+
+func intToStringOmitZero(i int64) string {
+	if i == 0 {
+		return ""
+	}
+	return fmt.Sprintf("%d", i)
+}

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

@@ -190,6 +190,7 @@ func GetTphPicsFromMessageWithReply(ctx *ext.Context, update *ext.Update) (*type
 		ctx.Reply(update, ext.ReplyTextString("解析 telegraph 路径失败: "+err.Error()), nil)
 		return nil, nil, dispatcher.EndGroups
 	}
+	tphdir = strings.TrimSpace(tphdir)
 	msg, err := ctx.Reply(update, ext.ReplyTextString("正在获取 telegraph 页面..."), nil)
 	if err != nil {
 		logger.Errorf("Failed to reply to update: %s", err)

client/bot/handlers/watch.go

@@ -1,16 +1,26 @@
 package handlers
 
 import (
+	"path"
 	"regexp"
 	"strings"
+	"text/template"
 
 	"github.com/celestix/gotgproto/dispatcher"
 	"github.com/celestix/gotgproto/ext"
 	"github.com/charmbracelet/log"
+	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/mediautil"
+	"github.com/krau/SaveAny-Bot/client/bot/handlers/utils/ruleutil"
+	userclient "github.com/krau/SaveAny-Bot/client/user"
 	"github.com/krau/SaveAny-Bot/common/i18n"
 	"github.com/krau/SaveAny-Bot/common/i18n/i18nk"
 	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
+	"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/storage"
+	"github.com/rs/xid"
 )
 
 func handleWatchCmd(ctx *ext.Context, update *ext.Update) error {
@@ -109,3 +119,106 @@ func handleUnwatchCmd(ctx *ext.Context, update *ext.Update) error {
 	ctx.Reply(update, ext.ReplyTextString("已取消监听聊天: "+chatArg), nil)
 	return dispatcher.EndGroups
 }
+
+func listenMediaMessageEvent(ch chan userclient.MediaMessageEvent) {
+	logger := log.FromContext(userclient.GetCtx())
+	for event := range ch {
+		logger.Debug("Received media message event", "chat_id", event.ChatID, "file_name", event.File.Name())
+		ctx := event.Ctx
+		file := event.File
+		chats, err := database.GetWatchChatsByChatID(ctx, event.ChatID)
+		if err != nil {
+			logger.Errorf("Failed to get watch chats for chat ID %d: %v", event.ChatID, err)
+			continue
+		}
+		msgText := event.File.Message().GetMessage()
+		for _, chat := range chats {
+			if chat.Filter != "" {
+				filter := strings.Split(chat.Filter, ":")
+				if len(filter) != 2 {
+					logger.Warnf("Invalid filter format in chat %d, skipping", chat.ChatID)
+					continue
+				}
+				filterType := filter[0]
+				filterData := filter[1]
+				switch filterType {
+				case "msgre": // [TODO] enums for filter types
+					if ok, err := regexp.MatchString(filterData, msgText); err != nil {
+						continue
+					} else if !ok {
+						continue
+					}
+				default:
+					logger.Warnf("Unsupported filter type %s in chat %d, skipping", filterType, chat.ChatID)
+					continue
+				}
+			}
+			user, err := database.GetUserByID(ctx, chat.UserID)
+			if err != nil {
+				logger.Errorf("Failed to get user by ID %d: %v", chat.UserID, err)
+				continue
+			}
+			if user.DefaultStorage == "" {
+				logger.Warnf("User %d has no default storage set, skipping media message handling", chat.UserID)
+				continue
+			}
+			stor, err := storage.GetStorageByUserIDAndName(ctx, user.ChatID, user.DefaultStorage)
+			if err != nil {
+				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
+				}
+				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.BuildFilenameTemplateData(message)
+				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))
+				if !matched {
+					goto startCreateTask
+				}
+				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)
+						continue
+					}
+				}
+			}
+		startCreateTask:
+			storagePath := stor.JoinStoragePath(path.Join(dirPath, file.Name()))
+			injectCtx := tgutil.ExtWithContext(ctx.Context, ctx)
+			taskid := xid.New().String()
+			task, err := tfile.NewTGFileTask(taskid, injectCtx, file, stor, storagePath, nil)
+			if err != nil {
+				logger.Errorf("create task failed: %s", err)
+				continue
+			}
+			if err := core.AddTask(injectCtx, task); err != nil {
+				logger.Errorf("add task failed: %s", err)
+				continue
+			}
+			logger.Infof("Added media message task for user %d in chat %d: %s", chat.UserID, event.ChatID, file.Name())
+		}
+	}
+}

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) {

common/utils/tgutil/peer.go

@@ -0,0 +1,16 @@
+package tgutil
+
+import "github.com/gotd/td/tg"
+
+func ChatIdFromPeer(peer tg.PeerClass) int64 {
+	switch peer := peer.(type) {
+	case *tg.PeerChannel:
+		return peer.ChannelID
+	case *tg.PeerUser:
+		return peer.UserID
+	case *tg.PeerChat:
+		return peer.ChatID
+	default:
+		return 0
+	}
+}

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
 }