diff --git a/pages/scene/+Page.vue b/pages/scene/+Page.vue index 69bfa85..0451be2 100644 --- a/pages/scene/+Page.vue +++ b/pages/scene/+Page.vue @@ -140,20 +140,27 @@ - + +
({ + actor, + tags: scene.tags.filter((tag) => tag.actorId === actor.id), + })), + { + tags: scene.tags.filter((tag) => tag.actorId === null), + actor: null, + }, +].filter((actorTags) => actorTags.tags.length > 0); + const showSummaryDialog = ref(false); const qualities = { @@ -640,6 +658,11 @@ function copySummary() { margin-bottom: 1rem; } +.tags-actor { + margin-right: .5rem; + font-weight: bold; +} + .actors { display: flex; flex-grow: 1; diff --git a/src/scenes.js b/src/scenes.js index 86b8c5d..8711555 100644 --- a/src/scenes.js +++ b/src/scenes.js @@ -82,6 +82,7 @@ function curateScene(rawScene, assets, reqUser, context) { slug: tag.slug, name: censor(tag.name, context.restriction), priority: tag.priority, + actorId: tag.actor_id, })), chapters: assets.chapters.map((chapter) => ({ id: chapter.id, @@ -218,7 +219,7 @@ export async function fetchScenesById(sceneIds, { reqUser, ...context } = {}) { .whereIn('release_id', sceneIds) .leftJoin('actors as directors', 'directors.id', 'releases_directors.director_id'), tags: knex('releases_tags') - .select('tags.id', 'slug', 'name', 'priority', 'release_id') + .select('tags.id', 'slug', 'name', 'priority', 'release_id', 'actor_id') .leftJoin('tags', 'tags.id', 'releases_tags.tag_id') .whereNotNull('tags.id') .whereIn('release_id', sceneIds) diff --git a/static b/static index 305454e..a91edb8 160000 --- a/static +++ b/static @@ -1 +1 @@ -Subproject commit 305454e97a44e43fc1c147ec16c166a56c72146a +Subproject commit a91edb84a1903cdcda8b3e0212fd5bc4f987057a