feat(ui): migrate performer aliases to new object-based system and remove alias_list

notsafeforgit · notsafeforgit · commit 83c44e3fc8fa · 2026-03-18T00:37:17.000-07:00
diff --git a/pkg/models/performer.go b/pkg/models/performer.go
@@ -247,9 +247,9 @@ type PerformerCreateInput struct {
 	Tattoos        *string                `json:"tattoos"`
 	Piercings      *string                `json:"piercings"`
 	Aliases        []*PerformerAliasInput `json:"aliases"`
-	AliasList      []string               `json:"alias_list"`
-	Twitter        *string                `json:"twitter"`   // deprecated
-	Instagram      *string                `json:"instagram"` // deprecated
+	AliasList      []string               `json:"alias_list"` // deprecated
+	Twitter        *string                `json:"twitter"`    // deprecated
+	Instagram      *string                `json:"instagram"`  // deprecated
 	Favorite       *bool                  `json:"favorite"`
 	TagIds         []string               `json:"tag_ids"`
 	// This should be a URL or a base64 encoded data URL
@@ -288,9 +288,9 @@ type PerformerUpdateInput struct {
 	Tattoos        *string                      `json:"tattoos"`
 	Piercings      *string                      `json:"piercings"`
 	Aliases        *UpdatePerformerAliasesInput `json:"aliases"`
-	AliasList      []string                     `json:"alias_list"`
-	Twitter        *string                      `json:"twitter"`   // deprecated
-	Instagram      *string                      `json:"instagram"` // deprecated
+	AliasList      []string                     `json:"alias_list"` // deprecated
+	Twitter        *string                      `json:"twitter"`    // deprecated
+	Instagram      *string                      `json:"instagram"`  // deprecated
 	Favorite       *bool                        `json:"favorite"`
 	TagIds         []string                     `json:"tag_ids"`
 	// This should be a URL or a base64 encoded data URL
diff --git a/ui/v2.5/graphql/data/performer-slim.graphql b/ui/v2.5/graphql/data/performer-slim.graphql
@@ -20,7 +20,6 @@ fragment SlimPerformerData on Performer {
   career_end
   tattoos
   piercings
-  alias_list
   aliases {
     ...PerformerAliasData
   }
@@ -42,7 +41,6 @@ fragment SelectPerformerData on Performer {
   id
   name
   disambiguation
-  alias_list
   aliases {
     ...PerformerAliasData
   }
diff --git a/ui/v2.5/graphql/data/performer.graphql b/ui/v2.5/graphql/data/performer.graphql
@@ -22,7 +22,6 @@ fragment PerformerData on Performer {
   career_end
   tattoos
   piercings
-  alias_list
   aliases {
     ...PerformerAliasData
   }
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx
@@ -325,7 +325,6 @@ export const GalleryEditPanel: React.FC<IProps> = ({
             return {
               id: p.stored_id!,
               name: p.name ?? "",
-              alias_list: [],
               aliases: [],
             };
           })
diff --git a/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx b/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx
@@ -269,7 +269,6 @@ export const ImageEditPanel: React.FC<IProps> = ({
             return {
               id: p.stored_id!,
               name: p.name ?? "",
-              alias_list: [],
               aliases: [],
             };
           })
diff --git a/ui/v2.5/src/components/List/Filters/PerformersFilter.tsx b/ui/v2.5/src/components/List/Filters/PerformersFilter.tsx
@@ -59,13 +59,13 @@ function queryVariables(
 
 function sortResults(
   query: string,
-  performers?: Pick<PerformerDataFragment, "name" | "alias_list" | "id">[]
+  performers?: Pick<PerformerDataFragment, "name" | "aliases" | "id">[]
 ) {
   return sortByRelevance(
     query,
     performers ?? [],
     (p) => p.name,
-    (p) => p.alias_list ?? undefined
+    (p) => p.aliases.map((a) => a.alias)
   ).map((p) => {
     return {
       id: p.id,
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
@@ -452,7 +452,9 @@ const PerformerPage: React.FC<IProps> = PatchComponent(
                     <ExternalLinkButtons urls={performer.urls ?? undefined} />
                   </span>
                 </DetailTitle>
-                <AliasList aliases={performer.alias_list ?? undefined} />
+                <AliasList
+                  aliases={performer.aliases?.map((a) => a.alias) ?? undefined}
+                />
                 <div className="quality-group">
                   <RatingSystem
                     value={performer.rating100}
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
@@ -217,7 +217,7 @@ export const PerformerScrapeDialog: React.FC<IPerformerScrapeDialogProps> = (
   );
   const [aliases, setAliases] = useState<ScrapeResult<string>>(
     new ScrapeResult<string>(
-      props.performer.alias_list?.join(", "),
+      props.performer.aliases?.map((a) => a.alias).join(", "),
       props.scraped.aliases
     )
   );
diff --git a/ui/v2.5/src/components/Performers/PerformerListTable.tsx b/ui/v2.5/src/components/Performers/PerformerListTable.tsx
@@ -89,7 +89,9 @@ export const PerformerListTable: React.FC<IPerformerListTableProps> = (
   );
 
   const AliasesCell = (performer: GQL.PerformerDataFragment) => {
-    let aliases = performer.alias_list ? performer.alias_list.join(", ") : "";
+    let aliases = performer.aliases
+      ? performer.aliases.map((a) => a.alias).join(", ")
+      : "";
     return (
       <span className="ellips-data" title={aliases}>
         {aliases}
diff --git a/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx b/ui/v2.5/src/components/Performers/PerformerMergeDialog.tsx
@@ -69,7 +69,7 @@ const PerformerMergeDetails: React.FC<IPerformerMergeDetailsProps> = ({
     new ScrapeResult<string>(dest.disambiguation)
   );
   const [aliases, setAliases] = useState<ScrapeResult<string[]>>(
-    new ScrapeResult<string[]>(dest.alias_list)
+    new ScrapeResult<string[]>(dest.aliases.map((a) => a.alias))
   );
   const [birthdate, setBirthdate] = useState<ScrapeResult<string>>(
     new ScrapeResult<string>(dest.birthdate)
@@ -188,14 +188,18 @@ const PerformerMergeDetails: React.FC<IPerformerMergeDetailsProps> = ({
     // default alias list should be the existing aliases, plus the names of all sources,
     // plus all source aliases, deduplicated
     const allAliases = uniq(
-      (dest.alias_list ?? []).concat(
+      (dest.aliases.map((a) => a.alias) ?? []).concat(
         sources.map((s) => s.name),
-        sources.flatMap((s) => s.alias_list ?? [])
+        sources.flatMap((s) => s.aliases.map((a) => a.alias) ?? [])
       )
     );
 
     setAliases(
-      new ScrapeResult(dest.alias_list ?? [], allAliases, !!allAliases.length)
+      new ScrapeResult(
+        dest.aliases.map((a) => a.alias) ?? [],
+        allAliases,
+        !!allAliases.length
+      )
     );
     setBirthdate(
       new ScrapeResult(
@@ -648,10 +652,10 @@ const PerformerMergeDetails: React.FC<IPerformerMergeDetailsProps> = ({
         id: dest.id,
         name: name.getNewValue(),
         disambiguation: disambiguation.getNewValue(),
-        alias_list: aliases
+        aliases: aliases
           .getNewValue()
-          ?.map((s) => s.trim())
-          .filter((s) => s.length > 0),
+          ?.map((s) => ({ alias: s.trim(), ignore_auto_tag: true }))
+          .filter((a) => a.alias.length > 0),
         birthdate: birthdate.getNewValue(),
         death_date: deathDate.getNewValue(),
         ethnicity: ethnicity.getNewValue(),
diff --git a/ui/v2.5/src/components/Performers/PerformerSelect.tsx b/ui/v2.5/src/components/Performers/PerformerSelect.tsx
@@ -43,7 +43,6 @@ export type Performer = Pick<
   GQL.Performer,
   | "id"
   | "name"
-  | "alias_list"
   | "aliases"
   | "disambiguation"
   | "image_path"
@@ -64,7 +63,7 @@ function sortPerformersByRelevance(
     input,
     performers,
     (p) => p.name,
-    (p) => p.alias_list ?? undefined
+    (p) => p.aliases.map((a) => a.alias)
   );
 }
 
@@ -120,9 +119,9 @@ const _PerformerSelect: React.FC<
     const { inputValue } = optionProps.selectProps;
     let alias: string | undefined = "";
     if (!name.toLowerCase().includes(inputValue.toLowerCase())) {
-      alias = object.alias_list?.find((a) =>
-        a.toLowerCase().includes(inputValue.toLowerCase())
-      );
+      alias = object.aliases.find((a) =>
+        a.alias.toLowerCase().includes(inputValue.toLowerCase())
+      )?.alias;
     }
 
     const sceneAge = TextUtils.age(object.birthdate, props.ageFromDate);
@@ -263,7 +262,6 @@ const _PerformerSelect: React.FC<
     return {
       id,
       name,
-      alias_list: [],
       aliases: [],
     };
   };
@@ -277,8 +275,8 @@ const _PerformerSelect: React.FC<
       options.some((o) => {
         return (
           o.name.toLowerCase() === inputValue.toLowerCase() ||
-          o.alias_list?.some(
-            (a) => a.toLowerCase() === inputValue.toLowerCase()
+          o.aliases?.some(
+            (a) => a.alias.toLowerCase() === inputValue.toLowerCase()
           )
         );
       })
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
@@ -507,7 +507,6 @@ export const SceneEditPanel: React.FC<IProps> = ({
             return {
               id: p.stored_id!,
               name: p.name ?? "",
-              alias_list: [],
               aliases: [],
             };
           })
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx
@@ -252,12 +252,14 @@ export const ScrapedPerformersRow: React.FC<
     const value = resultValue ?? [];
 
     const selectValue = value.map((p) => {
-      const alias_list: string[] = [];
+      const aliases =
+        p.aliases
+          ?.split(",")
+          .map((a) => ({ alias: a.trim(), ignore_auto_tag: true })) ?? [];
       return {
         id: p.stored_id ?? "",
         name: p.name ?? "",
-        alias_list,
-        aliases: [],
+        aliases,
       };
     });
 
@@ -271,8 +273,8 @@ export const ScrapedPerformersRow: React.FC<
             // map the id back to stored_id
             onChangeFn(
               items.map((p) => {
-                const { aliases, ...rest } = p;
-                return { ...rest, stored_id: p.id };
+                const aliases = p.aliases.map((a) => a.alias).join(", ");
+                return { ...p, aliases, stored_id: p.id };
               })
             );
           }
@@ -329,11 +331,10 @@ export const ScrapedGroupsRow: React.FC<
     const value = resultValue ?? [];
 
     const selectValue = value.map((p) => {
-      const aliases: string = "";
       return {
         id: p.stored_id ?? "",
         name: p.name ?? "",
-        aliases,
+        aliases: p.aliases ?? "",
       };
     });
 
@@ -347,8 +348,7 @@ export const ScrapedGroupsRow: React.FC<
             // map the id back to stored_id
             onChangeFn(
               items.map((p) => {
-                const { aliases, ...rest } = p;
-                return { ...rest, stored_id: p.id };
+                return { ...p, stored_id: p.id };
               })
             );
           }
diff --git a/ui/v2.5/src/components/Tagger/PerformerModal.tsx b/ui/v2.5/src/components/Tagger/PerformerModal.tsx
@@ -228,8 +228,11 @@ const PerformerModal: React.FC<IPerformerModalProps> = ({
     } = {
       name: performer.name ?? "",
       disambiguation: performer.disambiguation ?? "",
-      alias_list:
-        performer.aliases?.split(",").map((a) => a.trim()) ?? undefined,
+      aliases:
+        performer.aliases
+          ?.split(",")
+          .map((a) => ({ alias: a.trim(), ignore_auto_tag: true })) ??
+        undefined,
       gender: stringToGender(performer.gender ?? undefined, true),
       birthdate: performer.birthdate,
       ethnicity: performer.ethnicity,
@@ -282,8 +285,8 @@ const PerformerModal: React.FC<IPerformerModalProps> = ({
         performerData[k] = undefined;
       }
       // #5565 - special case aliases as the names differ
-      if (k == "alias_list" && excluded.aliases) {
-        performerData.alias_list = undefined;
+      if (k == "aliases" && excluded.aliases) {
+        performerData.aliases = undefined;
       }
     });
 
diff --git a/ui/v2.5/src/components/Tagger/performers/StashSearchResult.tsx b/ui/v2.5/src/components/Tagger/performers/StashSearchResult.tsx
@@ -18,21 +18,6 @@ interface IStashSearchResultProps {
   excludedPerformerFields: string[];
 }
 
-// #4596 - remove any duplicate aliases or aliases that are the same as the performer's name
-function cleanAliases(currentName: string, aliases: string[]) {
-  const ret: string[] = [];
-  aliases.forEach((alias) => {
-    if (
-      alias.toLowerCase() !== currentName.toLowerCase() &&
-      !ret.find((r) => r.toLowerCase() === alias.toLowerCase())
-    ) {
-      ret.push(alias);
-    }
-  });
-
-  return ret;
-}
-
 const StashSearchResult: React.FC<IStashSearchResultProps> = ({
   performer,
   stashboxPerformers,
@@ -58,10 +43,6 @@ const StashSearchResult: React.FC<IStashSearchResultProps> = ({
       input.stash_ids = mergeStashIDs(performer.stash_ids, input.stash_ids);
     }
 
-    if (input.alias_list) {
-      input.alias_list = cleanAliases(performer.name, input.alias_list);
-    }
-
     const updateData: GQL.PerformerUpdateInput = {
       ...input,
       id: performer.id,
diff --git a/ui/v2.5/src/core/performers.ts b/ui/v2.5/src/core/performers.ts
@@ -108,7 +108,7 @@ export const scrapedPerformerToCreateInput = (
     career_end: toCreate.career_end,
     tattoos: toCreate.tattoos,
     piercings: toCreate.piercings,
-    alias_list: aliases,
+    aliases: aliases.map((a) => ({ alias: a, ignore_auto_tag: true })),
     urls: toCreate.urls,
     tag_ids: filterData((toCreate.tags ?? []).map((t) => t.stored_id)),
     image:

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ fragment PerformerData on Performer {`
`22`	`22`	`career_end`
`23`	`23`	`tattoos`
`24`	`24`	`piercings`
`25`		`- alias_list`
`26`	`25`	`aliases {`
`27`	`26`	`...PerformerAliasData`
`28`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ export const PerformerScrapeDialog: React.FC<IPerformerScrapeDialogProps> = (`
`217`	`217`	`);`
`218`	`218`	`const [aliases, setAliases] = useState<ScrapeResult<string>>(`
`219`	`219`	`new ScrapeResult<string>(`
`220`		`- props.performer.alias_list?.join(", "),`
	`220`	`+ props.performer.aliases?.map((a) => a.alias).join(", "),`
`221`	`221`	`props.scraped.aliases`
`222`	`222`	`)`
`223`	`223`	`);`