feat: add global proxy config

client/bot/bot.go

@@ -9,14 +9,12 @@ import (
 	"github.com/celestix/gotgproto/ext"
 	"github.com/celestix/gotgproto/sessionMaker"
 	"github.com/charmbracelet/log"
-	"github.com/gotd/td/telegram/dcs"
 	"github.com/gotd/td/tg"
 	"github.com/krau/SaveAny-Bot/client/bot/handlers"
 	"github.com/krau/SaveAny-Bot/client/middleware"
-	"github.com/krau/SaveAny-Bot/common/utils/netutil"
+	"github.com/krau/SaveAny-Bot/common/utils/tgutil"
 	"github.com/krau/SaveAny-Bot/config"
 	"github.com/ncruces/go-sqlite3/gormlite"
-	"golang.org/x/net/proxy"
 )
 
 func Init(ctx context.Context) <-chan struct{} {
@@ -26,22 +24,15 @@ func Init(ctx context.Context) <-chan struct{} {
 		err    error
 	})
 	shouldRestart := make(chan struct{})
+
 	go func() {
-		var resolver dcs.Resolver
-		if config.C().Telegram.Proxy.Enable && config.C().Telegram.Proxy.URL != "" {
-			dialer, err := netutil.NewProxyDialer(config.C().Telegram.Proxy.URL)
-			if err != nil {
-				resultChan <- struct {
-					client *gotgproto.Client
-					err    error
-				}{nil, err}
-				return
-			}
-			resolver = dcs.Plain(dcs.PlainOptions{
-				Dial: dialer.(proxy.ContextDialer).DialContext,
-			})
-		} else {
-			resolver = dcs.DefaultResolver()
+		resolver, err := tgutil.NewConfigProxyResolver()
+		if err != nil {
+			resultChan <- struct {
+				client *gotgproto.Client
+				err    error
+			}{nil, err}
+			return
 		}
 		client, err := gotgproto.NewClient(
 			config.C().Telegram.AppID,

client/bot/handlers/link.go

@@ -44,13 +44,7 @@ func handleMessageLink(ctx *ext.Context, update *ext.Update) error {
 }
 
 func handleSilentSaveLink(ctx *ext.Context, update *ext.Update) error {
-	logger := log.FromContext(ctx)
 	stor := storage.FromContext(ctx)
-	if stor == nil {
-		logger.Warn("Context storage is nil")
-		ctx.Reply(update, ext.ReplyTextString("未找到存储"), nil)
-		return dispatcher.EndGroups
-	}
 	replied, files, _, err := shortcut.GetFilesFromUpdateLinkMessageWithReplyEdit(ctx, update)
 	if err != nil {
 		return err

client/bot/handlers/media.go

@@ -45,11 +45,6 @@ func handleMediaMessage(ctx *ext.Context, update *ext.Update) error {
 func handleSilentSaveMedia(ctx *ext.Context, update *ext.Update) error {
 	logger := log.FromContext(ctx)
 	stor := storage.FromContext(ctx)
-	if stor == nil {
-		logger.Warn("Context storage is nil")
-		ctx.Reply(update, ext.ReplyTextString("未找到存储"), nil)
-		return dispatcher.EndGroups
-	}
 	message := update.EffectiveMessage.Message
 	groupID, isGroup := message.GetGroupedID()
 	if isGroup && groupID != 0 {

client/bot/handlers/parse.go

@@ -77,11 +77,6 @@ func handleTextMessage(ctx *ext.Context, u *ext.Update) error {
 func handleSilentSaveText(ctx *ext.Context, u *ext.Update) error {
 	logger := log.FromContext(ctx)
 	stor := storage.FromContext(ctx)
-	if stor == nil {
-		logger.Warn("Context storage is nil")
-		ctx.Reply(u, ext.ReplyTextString("未找到存储"), nil)
-		return dispatcher.EndGroups
-	}
 	text := u.EffectiveMessage.Text
 	if text == "" {
 		return dispatcher.EndGroups

client/bot/handlers/save.go

@@ -76,13 +76,7 @@ func handleSilentSaveReplied(ctx *ext.Context, update *ext.Update) error {
 	if len(args) >= 3 {
 		return handleBatchSave(ctx, update, args[1:])
 	}
-	logger := log.FromContext(ctx)
 	stor := storage.FromContext(ctx)
-	if stor == nil {
-		logger.Warn("Context storage is nil")
-		ctx.Reply(update, ext.ReplyTextString("未找到存储"), nil)
-		return dispatcher.EndGroups
-	}
 	replyTo := update.EffectiveMessage.ReplyToMessage
 	if replyTo == nil || replyTo.Message == nil {
 		ctx.Reply(update, ext.ReplyTextString(i18n.T(i18nk.BotMsgSaveHelpText)), nil)

client/bot/handlers/telegraph.go

@@ -61,13 +61,7 @@ func handleTelegraphUrlMessage(ctx *ext.Context, update *ext.Update) error {
 }
 
 func handleSilentSaveTelegraph(ctx *ext.Context, update *ext.Update) error {
-	logger := log.FromContext(ctx)
 	stor := storage.FromContext(ctx)
-	if stor == nil {
-		logger.Warn("Context storage is nil")
-		ctx.Reply(update, ext.ReplyTextString("未找到存储"), nil)
-		return dispatcher.EndGroups
-	}
 	msg, result, err := shortcut.GetTphPicsFromMessageWithReply(ctx, update)
 	if err != nil {
 		return err