diff --git a/server/pkg/api/admin.go b/server/pkg/api/admin.go index 124d21078f..7ae784ab41 100644 --- a/server/pkg/api/admin.go +++ b/server/pkg/api/admin.go @@ -3,13 +3,14 @@ package api import ( "errors" "fmt" - "github.com/ente-io/museum/pkg/controller/emergency" - "github.com/ente-io/museum/pkg/controller/remotestore" - "github.com/ente-io/museum/pkg/repo/authenticator" "net/http" "strconv" "strings" + "github.com/ente-io/museum/pkg/controller/emergency" + "github.com/ente-io/museum/pkg/controller/remotestore" + "github.com/ente-io/museum/pkg/repo/authenticator" + "github.com/ente-io/museum/pkg/controller/family" bonusEntity "github.com/ente-io/museum/ente/storagebonus" @@ -377,7 +378,7 @@ func (h *AdminHandler) UpdateFeatureFlag(c *gin.Context) { return } go h.DiscordController.NotifyAdminAction( - fmt.Sprintf("Admin (%d) updating flag:%s to val:%s for %d", auth.GetUserID(c.Request.Header), request.Key, request.Value, request.UserID)) + fmt.Sprintf("Admin (%d) updating flag:%s to val:%v for %d", auth.GetUserID(c.Request.Header), request.Key, request.Value, request.UserID)) logger := logrus.WithFields(logrus.Fields{ "user_id": request.UserID, diff --git a/server/pkg/middleware/collection_link.go b/server/pkg/middleware/collection_link.go index 4bdb2de285..a0e59df2ca 100644 --- a/server/pkg/middleware/collection_link.go +++ b/server/pkg/middleware/collection_link.go @@ -5,13 +5,14 @@ import ( "context" "crypto/sha256" "fmt" - "github.com/ente-io/museum/pkg/repo/remotestore" - "github.com/gin-contrib/requestid" - "github.com/spf13/viper" "net/http" "net/url" "strings" + "github.com/ente-io/museum/pkg/repo/remotestore" + "github.com/gin-contrib/requestid" + "github.com/spf13/viper" + public2 "github.com/ente-io/museum/pkg/controller/public" "github.com/ente-io/museum/pkg/repo/public" @@ -222,7 +223,6 @@ func (m *CollectionLinkMiddleware) validateOrigin(c *gin.Context, ownerID int64) logger.Warnf("custom domain check failed for owner %d, origin %s, domain %s", ownerID, origin, *domain) m.DiscordController.NotifyPotentialAbuse(alertMessage) } - return } func computeHashKeyForList(list []string, delim string) string {