Skip to content

将 flag / type 请求参数用于判断客户端类型并优先于 User-Agent #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
QwQlinkie wants to merge 1 commit into
base: master
Choose a base branch
from
Open

将 flag / type 请求参数用于判断客户端类型并优先于 User-Agent #112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions internal/logic/subscribe/subscribeLogic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,13 @@ func (l *SubscribeLogic) Handler(req *types.SubscribeRequest) (resp *types.Subsc
return nil, err
}

userAgent := strings.ToLower(l.ctx.Request.UserAgent())
// Priority: flag/type query parameter > User-Agent header
clientIdentifier := strings.ToLower(l.ctx.Request.UserAgent())
if req.Flag != "" {
clientIdentifier = strings.ToLower(req.Flag)
} else if req.Type != "" {
clientIdentifier = strings.ToLower(req.Type)
}

var targetApp, defaultApp *client.SubscribeApplication

Expand All @@ -56,19 +62,19 @@ func (l *SubscribeLogic) Handler(req *types.SubscribeRequest) (resp *types.Subsc
defaultApp = item
}

if strings.Contains(userAgent, u) {
if strings.Contains(clientIdentifier, u) {
// Special handling for Stash
if strings.Contains(userAgent, "stash") && !strings.Contains(u, "stash") {
if strings.Contains(clientIdentifier, "stash") && !strings.Contains(u, "stash") {
continue
}
targetApp = item
break
}
}
if targetApp == nil {
l.Debugf("[SubscribeLogic] No matching client found", logger.Field("userAgent", userAgent))
l.Debugf("[SubscribeLogic] No matching client found", logger.Field("clientIdentifier", clientIdentifier))
if defaultApp == nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "No matching client found for user agent: %s", userAgent)
return nil, errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "No matching client found for: %s", clientIdentifier)
}
targetApp = defaultApp
}
Expand Down