Redirecting aliased actors and tags.

This commit is contained in:
2026-07-07 01:05:18 +02:00
parent a94c24581f
commit 1f5bbb6ce5
7 changed files with 21 additions and 7 deletions

View File

@@ -254,10 +254,12 @@ export async function fetchActorsById(actorIds, options = {}, reqUser) {
knex.raw('row_to_json(sfw_media) as sfw_avatar'),
// knex.raw('json_agg(aliases) filter (where aliases.id is not null) as aliases'),
knex.raw('json_agg(row_to_json(aliases)::jsonb || jsonb_build_object(\'entity\', row_to_json(alias_entities))) filter (where aliases.id is not null) as aliases'),
knex.raw('row_to_json(aliased) as alias'),
knex.raw('row_to_json(media_biometrics) as biometrics'),
)
.leftJoin('actors_meta', 'actors_meta.actor_id', 'actors.id')
.leftJoin('actors as aliases', 'aliases.alias_for', 'actors.id')
.leftJoin('actors as aliased', 'aliased.id', 'actors.alias_for')
.leftJoin('entities as alias_entities', 'alias_entities.id', 'aliases.entity_id')
.leftJoin('countries as birth_countries', 'birth_countries.alpha2', 'actors.birth_country_alpha2')
.leftJoin('countries as residence_countries', 'residence_countries.alpha2', 'actors.residence_country_alpha2')
@@ -265,7 +267,7 @@ export async function fetchActorsById(actorIds, options = {}, reqUser) {
.leftJoin('media as sfw_media', 'sfw_media.id', 'avatars.sfw_media_id')
.leftJoin('media_biometrics', 'media_biometrics.media_id', 'actors.avatar_media_id')
.leftJoin('entities', 'entities.id', 'actors.entity_id')
.groupBy('actors.id', 'avatars.id', 'sfw_media.id', 'media_biometrics.id', 'entities.id', 'actors_meta.stashed', 'birth_countries.alpha2', 'residence_countries.alpha2');
.groupBy('actors.id', 'aliased.id', 'avatars.id', 'sfw_media.id', 'media_biometrics.id', 'entities.id', 'actors_meta.stashed', 'birth_countries.alpha2', 'residence_countries.alpha2');
}
}),
knex('actors_profiles')