Convert group aliases to list

.github/CODEOWNERS

@@ -1,5 +1,3 @@
 /ui/v2.5/src/docs/en/Manual/ @DogmaDragon
 /docs/ @DogmaDragon
 README.md @DogmaDragon
-/docker/ @feederbox826
-/.github/workflows/ @feederbox826

.mockery.yml

@@ -1,4 +1,27 @@
-dir: ./pkg/models
-name: ".*ReaderWriter"
-outpkg: mocks
-output: ./pkg/models/mocks
+with-expecter: false
+packages:
+  github.com/stashapp/stash/pkg/models:
+    config:
+      dir: ./pkg/models/mocks
+      filename: "{{.InterfaceName}}.go"
+      outpkg: mocks
+    interfaces:
+      FileReaderWriter:
+      FolderReaderWriter:
+      GalleryReaderWriter:
+      GalleryChapterReaderWriter:
+      ImageReaderWriter:
+      GroupReaderWriter:
+      PerformerReaderWriter:
+      SceneReaderWriter:
+      SceneMarkerReaderWriter:
+      StudioReaderWriter:
+      TagReaderWriter:
+      SavedFilterReaderWriter:
+  github.com/stashapp/stash/internal/manager:
+    config:
+      dir: ./internal/manager/mocks
+      filename: "{{.InterfaceName}}.go"
+      outpkg: mocks
+    interfaces:
+      GroupService:

go.mod

@@ -55,15 +55,15 @@ require (
 	github.com/vearutop/statigz v1.4.0
 	github.com/vektah/dataloaden v0.3.0
 	github.com/vektah/gqlparser/v2 v2.5.27
-	github.com/vektra/mockery/v2 v2.10.0
+	github.com/vektra/mockery/v2 v2.21.6
 	github.com/xWTF/chardet v0.0.0-20230208095535-c780f2ac244e
 	github.com/zencoder/go-dash/v3 v3.0.2
-	golang.org/x/crypto v0.48.0
-	golang.org/x/image v0.38.0
-	golang.org/x/net v0.50.0
-	golang.org/x/sys v0.41.0
-	golang.org/x/term v0.40.0
-	golang.org/x/text v0.35.0
+	golang.org/x/crypto v0.52.0
+	golang.org/x/image v0.41.0
+	golang.org/x/net v0.55.0
+	golang.org/x/sys v0.45.0
+	golang.org/x/term v0.43.0
+	golang.org/x/text v0.37.0
 	golang.org/x/time v0.10.0
 	gopkg.in/guregu/null.v4 v4.0.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
@@ -76,6 +76,7 @@ require (
 	github.com/antchfx/xpath v1.3.6 // indirect
 	github.com/asticode/go-astikit v0.20.0 // indirect
 	github.com/asticode/go-astits v1.8.0 // indirect
+	github.com/chigopher/pathlib v0.12.0 // indirect
 	github.com/chromedp/sysutil v1.1.0 // indirect
 	github.com/coder/websocket v1.8.12 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
@@ -133,9 +134,9 @@ require (
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	go.yaml.in/yaml/v3 v3.0.3 // indirect
-	golang.org/x/mod v0.33.0 // indirect
+	golang.org/x/mod v0.35.0 // indirect
 	golang.org/x/sync v0.20.0 // indirect
-	golang.org/x/tools v0.42.0 // indirect
+	golang.org/x/tools v0.44.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

graphql/schema/schema.graphql

@@ -331,7 +331,7 @@ type Mutation {
   sceneResetPlayCount(id: ID!): Int!
 
   "Generates screenshot at specified time in seconds. Leave empty to generate default screenshot"
-  sceneGenerateScreenshot(id: ID!, at: Float): String!
+  sceneGenerateScreenshot(id: ID!, at: Float): ID!
 
   sceneMarkerCreate(input: SceneMarkerCreateInput!): SceneMarker
   sceneMarkerUpdate(input: SceneMarkerUpdateInput!): SceneMarker

graphql/schema/types/group.graphql

@@ -7,7 +7,7 @@ type GroupDescription {
 type Group {
   id: ID!
   name: String!
-  aliases: String
+  aliases: [String!]
   "Duration in seconds"
   duration: Int
   date: String
@@ -41,7 +41,8 @@ input GroupDescriptionInput {
 
 input GroupCreateInput {
   name: String!
-  aliases: String
+  "Duplicate aliases and those equal to name will be ignored (case-insensitive)"
+  aliases: [String!]
   "Duration in seconds"
   duration: Int
   date: String
@@ -67,7 +68,8 @@ input GroupCreateInput {
 input GroupUpdateInput {
   id: ID!
   name: String
-  aliases: String
+  "Duplicate aliases and those equal to name will be ignored (case-insensitive)"
+  aliases: [String!]
   duration: Int
   date: String
   # rating expressed as 1-100

graphql/schema/types/scraped-group.graphql

@@ -36,7 +36,7 @@ input ScrapedMovieInput {
 type ScrapedGroup {
   stored_id: ID
   name: String
-  aliases: String
+  aliases: [String!]
   duration: String
   date: String
   rating: String
@@ -54,7 +54,7 @@ type ScrapedGroup {
 
 input ScrapedGroupInput {
   name: String
-  aliases: String
+  aliases: [String!]
   duration: String
   date: String
   rating: String

graphql/schema/types/scraper.graphql

@@ -289,6 +289,7 @@ type StashBoxFingerprint {
   algorithm: String!
   hash: String!
   duration: Int!
+  submissions: Int!
 }
 
 """

graphql/stash-box/query.graphql

@@ -20,6 +20,13 @@ fragment StudioFragment on Studio {
   parent {
     name
     id
+    aliases
+    urls {
+      ...URLFragment
+    }
+    images {
+      ...ImageFragment
+    }
   }
   images {
     ...ImageFragment
@@ -97,6 +104,7 @@ fragment FingerprintFragment on Fingerprint {
   algorithm
   hash
   duration
+  submissions
 }
 
 fragment SceneFragment on Scene {

internal/api/authentication.go

@@ -76,9 +76,9 @@ func authenticateHandler() func(http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			c := config.GetInstance()
-			ctx := r.Context()
 
 			r = session.SetLocalRequest(r)
+			ctx := r.Context()
 
 			// Check for signed media requests
 			if username, ok := authenticateSignedRequest(r); ok {

internal/api/resolver_model_movie.go

@@ -228,3 +228,28 @@ func (r *groupResolver) CustomFields(ctx context.Context, obj *models.Group) (ma
 
 	return m, nil
 }
+
+func (r *groupResolver) Aliases(ctx context.Context, obj *models.Group) ([]string, error) {
+	if !obj.Aliases.Loaded() {
+		if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+			return obj.LoadAliases(ctx, r.repository.Group)
+		}); err != nil {
+			return nil, err
+		}
+	}
+
+	return obj.Aliases.List(), nil
+}
+
+// movieResolver.Aliases overrides groupResolver.Aliases to return a single string
+// for backward compatibility with the deprecated Movie type.
+func (r *movieResolver) Aliases(ctx context.Context, obj *models.Group) (*string, error) {
+	aliases, err := r.groupResolver.Aliases(ctx, obj)
+	if err != nil {
+		return nil, err
+	}
+	if len(aliases) == 0 {
+		return nil, nil
+	}
+	return &aliases[0], nil
+}

internal/api/resolver_mutation_group.go

@@ -27,7 +27,7 @@ func groupFromGroupCreateInput(ctx context.Context, input GroupCreateInput) (*mo
 	newGroup := newGroupInput.Group
 
 	newGroup.Name = strings.TrimSpace(input.Name)
-	newGroup.Aliases = translator.string(input.Aliases)
+	newGroup.Aliases = models.NewRelatedStrings(stringslice.UniqueExcludeFold(stringslice.TrimSpace(input.Aliases), newGroup.Name))
 	newGroup.Duration = input.Duration
 	newGroup.Rating = input.Rating100
 	newGroup.Director = translator.string(input.Director)
@@ -118,7 +118,9 @@ func groupPartialFromGroupUpdateInput(translator changesetTranslator, input Grou
 	updatedGroup := models.NewGroupPartial()
 
 	updatedGroup.Name = translator.optionalString(input.Name, "name")
-	updatedGroup.Aliases = translator.optionalString(input.Aliases, "aliases")
+
+	aliases := stringslice.TrimSpace(input.Aliases)
+	updatedGroup.Aliases = translator.updateStrings(aliases, "aliases")
 	updatedGroup.Duration = translator.optionalInt(input.Duration, "duration")
 	updatedGroup.Rating = translator.optionalInt(input.Rating100, "rating100")
 	updatedGroup.Director = translator.optionalString(input.Director, "director")
@@ -198,6 +200,32 @@ func (r *mutationResolver) GroupUpdate(ctx context.Context, input GroupUpdateInp
 	}
 
 	if err := r.withTxn(ctx, func(ctx context.Context) error {
+		qb := r.repository.Group
+
+		// make sure to deduplicate and exclude name from aliases
+		// in update flow
+		if updatedGroup.Aliases != nil {
+			g, err := qb.Find(ctx, groupID)
+			if err != nil {
+				return err
+			}
+			if g != nil {
+				if err := g.LoadAliases(ctx, qb); err != nil {
+					return err
+				}
+
+				effectiveAliases := updatedGroup.Aliases.Apply(g.Aliases.List())
+				name := g.Name
+				if updatedGroup.Name.Set {
+					name = updatedGroup.Name.Value
+				}
+
+				sanitized := stringslice.UniqueExcludeFold(effectiveAliases, name)
+				updatedGroup.Aliases.Values = sanitized
+				updatedGroup.Aliases.Mode = models.RelationshipUpdateModeSet
+			}
+		}
+
 		frontImage := group.ImageInput{
 			Image: frontimageData,
 			Set:   frontImageIncluded,