From f5686561f965393941b5acf8f08f6490912cb36d Mon Sep 17 00:00:00 2001 From: nite Date: Mon, 28 Jul 2025 12:12:15 +0000 Subject: [PATCH] modify base64 decode func in BuildSub uses std encoder --- common/sub.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/sub.go b/common/sub.go index c2192fe..b479798 100644 --- a/common/sub.go +++ b/common/sub.go @@ -135,16 +135,16 @@ func BuildSub(clashType model.ClashType, query model.ConvertConfig, template str for i := range query.Subs { data, err := LoadSubscription(query.Subs[i], query.Refresh, query.UserAgent, cacheExpire, retryTimes) - subName := "" - if strings.Contains(query.Subs[i], "#") { - subName = query.Subs[i][strings.LastIndex(query.Subs[i], "#")+1:] - } if err != nil { logger.Logger.Debug( "load subscription failed", zap.String("url", query.Subs[i]), zap.Error(err), ) return nil, NewSubscriptionLoadError(query.Subs[i], err) } + subName := "" + if strings.Contains(query.Subs[i], "#") { + subName = query.Subs[i][strings.LastIndex(query.Subs[i], "#")+1:] + } err = yaml.Unmarshal(data, &sub) var newProxies []P.Proxy @@ -161,7 +161,7 @@ func BuildSub(clashType model.ClashType, query model.ConvertConfig, template str } newProxies = p } else { - base64, err := utils.DecodeBase64(string(data), true) + base64, err := utils.DecodeBase64(string(data), false) if err != nil { logger.Logger.Debug( "parse subscription failed", zap.String("url", query.Subs[i]),