Skip to content

Bugfix: Fix empty Aliases Being Created for Studios #6273

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

Merged
merged 6 commits into from
Nov 14, 2025
Merged

Bugfix: Fix empty Aliases Being Created for Studios #6273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
22776b6
Fix empty aliases being created for studios
Gykes Nov 13, 2025
92b1875
backend changes
Gykes Nov 13, 2025
c0205d0
Struct to string
Gykes Nov 13, 2025
07514fa
Reject empty alias strings
WithoutPants Nov 13, 2025
4c81524
Remove invalid ValidateAliases call from UpdatePartial
WithoutPants Nov 13, 2025
b86d88f
Lint fix
WithoutPants Nov 14, 2025
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
6 changes: 1 addition & 5 deletions pkg/sqlite/studio.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ func (qb *StudioStore) Create(ctx context.Context, newObject *models.Studio) err
}

if newObject.Aliases.Loaded() {
if err := studio.EnsureAliasesUnique(ctx, id, newObject.Aliases.List(), qb); err != nil {
if err := studio.ValidateAliases(ctx, id, newObject.Aliases.List(), qb); err != nil {
return err
}

Expand Down Expand Up @@ -232,10 +232,6 @@ func (qb *StudioStore) UpdatePartial(ctx context.Context, input models.StudioPar
}

if input.Aliases != nil {
if err := studio.EnsureAliasesUnique(ctx, input.ID, input.Aliases.Values, qb); err != nil {
return nil, err
}

if err := studiosAliasesTableMgr.modifyJoins(ctx, input.ID, input.Aliases.Values, input.Aliases.Mode); err != nil {
return nil, err
}
Expand Down
12 changes: 8 additions & 4 deletions pkg/studio/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

var (
ErrNameMissing = errors.New("studio name must not be blank")
ErrEmptyAlias = errors.New("studio alias must not be an empty string")
ErrStudioOwnAncestor = errors.New("studio cannot be an ancestor of itself")
)

Expand Down Expand Up @@ -61,9 +62,12 @@ func EnsureStudioNameUnique(ctx context.Context, id int, name string, qb models.
return nil
}

func EnsureAliasesUnique(ctx context.Context, id int, aliases []string, qb models.StudioQueryer) error {
func ValidateAliases(ctx context.Context, id int, aliases []string, qb models.StudioQueryer) error {
for _, a := range aliases {
if err := EnsureStudioNameUnique(ctx, id, a, qb); err != nil {
if err := validateName(ctx, id, a, qb); err != nil {
if errors.Is(err, ErrNameMissing) {
return ErrEmptyAlias
}
return err
}
}
Expand All @@ -77,7 +81,7 @@ func ValidateCreate(ctx context.Context, studio models.Studio, qb models.StudioQ
}

if studio.Aliases.Loaded() && len(studio.Aliases.List()) > 0 {
if err := EnsureAliasesUnique(ctx, 0, studio.Aliases.List(), qb); err != nil {
if err := ValidateAliases(ctx, 0, studio.Aliases.List(), qb); err != nil {
return err
}
}
Expand Down Expand Up @@ -131,7 +135,7 @@ func ValidateModify(ctx context.Context, s models.StudioPartial, qb ValidateModi
}

effectiveAliases := s.Aliases.Apply(existing.Aliases.List())
if err := EnsureAliasesUnique(ctx, s.ID, effectiveAliases, qb); err != nil {
if err := ValidateAliases(ctx, s.ID, effectiveAliases, qb); err != nil {
return err
}
}
Expand Down
10 changes: 8 additions & 2 deletions ui/v2.5/src/components/Tagger/scenes/StudioModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,10 @@ const StudioModal: React.FC<IStudioModalProps> = ({
image: studio.image,
parent_id: studio.parent?.stored_id,
details: studio.details,
aliases: studio.aliases?.split(",").map((a) => a.trim()),
aliases: studio.aliases
?.split(",")
.map((a) => a.trim())
.filter((a) => a),
tag_ids: studio.tags?.map((t) => t.stored_id).filter((id) => id) as
| string[]
| undefined,
Expand Down Expand Up @@ -270,7 +273,10 @@ const StudioModal: React.FC<IStudioModalProps> = ({
urls: studio.parent?.urls,
image: studio.parent?.image,
details: studio.parent?.details,
aliases: studio.parent?.aliases?.split(",").map((a) => a.trim()),
aliases: studio.parent?.aliases
?.split(",")
.map((a) => a.trim())
.filter((a) => a),
tag_ids: studio.parent?.tags
?.map((t) => t.stored_id)
.filter((id) => id) as string[] | undefined,
Expand Down