mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-04 21:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Replace gg.If with cmp.Or

Browse source
This commit is contained in:
Deluan 2024-06-05 22:48:00 -04:00
parent 11bef060a3
commit b4ef1b1e38
5 changed files with 6 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/server.go
View file

@ -1,6 +1,7 @@
package server
import (
"cmp"
"context"
"errors"
"fmt"
@ -23,7 +24,6 @@ import (
"github.com/navidrome/navidrome/model"
"github.com/navidrome/navidrome/server/events"
"github.com/navidrome/navidrome/ui"
. "github.com/navidrome/navidrome/utils/gg"
)
type Server struct {
@ -237,7 +237,7 @@ func AbsoluteURL(r *http.Request, u string, params url.Values) string {
if strings.HasPrefix(u, "/") {
buildUrl.Path = path.Join(conf.Server.BasePath, buildUrl.Path)
if conf.Server.BaseHost != "" {
buildUrl.Scheme = If(conf.Server.BaseScheme, "http")
buildUrl.Scheme = cmp.Or(conf.Server.BaseScheme, "http")
buildUrl.Host = conf.Server.BaseHost
} else {
buildUrl.Scheme = r.URL.Scheme