DebaucheryLibrarian
/
traxxx-web
1
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Using actors avatars table for secondary profile photos.

This commit is contained in:
DebaucheryLibrarian 2024-10-26 01:03:30 +02:00
parent 6b5aa9505e
commit a6af10ee20
5 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/actors/bio.vue
View File

@ -333,12 +333,14 @@
v-if="description.entity.type === 'network' || !description.entity.parent || description.entity.isIndependent"
:src="`/logos/${description.entity.slug}/thumbs/network.png`"
class="description-logo"
loading="lazy"
>
<img
v-else
:src="`/logos/${description.entity.parent.slug}/thumbs/${description.entity.slug}.png`"
class="description-logo"
loading="lazy"
>
</a>
</p>

3
components/edit/avatar.vue
View File

@ -79,7 +79,8 @@ defineProps({
padding: .25rem;
.icon {
fill: var(--highlight);
fill: var(--highlight-strong-20);
filter: drop-shadow(0 0 1px var(--shadow));
}
}

11
pages/actors/@actorId/+Page.vue
View File

@ -37,10 +37,10 @@
<div
class="photos nobar"
:class="{ 'has-avatar': actor.avatar, 'has-photos': actor.avatar ? photos.length > 1 : photos.length > 0 }"
:class="{ 'has-avatar': actor.avatar, 'has-photos': actor.avatar ? actor.photos.length > 1 : actor.photos.length > 0 }"
>
<div
v-for="photo in photos"
v-for="photo in actor.photos"
:key="`photo-${photo.id}`"
class="photo-container"
:class="{ avatar: photo.isAvatar }"
@ -92,13 +92,6 @@ const { pageProps, routeParams } = pageContext;
const { actor } = pageProps;
const domain = routeParams.domain;
const photos = Object.values(Object.fromEntries(actor.profiles
.filter((profile) => !!profile.avatar)
.map((profile) => [profile.avatar.id, {
...profile.avatar,
isAvatar: profile.avatar.id === actor.avatar.id,
}])));
</script>
<style scoped>

9
pages/actors/@actorId/edit/+Page.vue
View File

@ -748,14 +748,12 @@ const bustSizes = {
bustSizes.uk = bustSizes.us;
bustSizes.jp = bustSizes.eu;
const avatars = Object.values(Object.fromEntries(actor.value.profiles.filter((profile) => !!profile.avatar).map((profile) => [profile.avatar.id, profile.avatar])));
const fields = computed(() => [
...(avatars.length > 0 ? [{
...(actor.value.photos.length > 0 ? [{
key: 'avatar',
type: 'avatar',
value: actor.value.avatar?.id,
options: avatars,
options: actor.value.photos,
}] : []),
...(user.role === 'admin'
? [{
@ -1010,6 +1008,7 @@ async function submit() {
align-items: center;
padding: .25rem 1rem;
margin-bottom: .25rem;
overflow: hidden;
&.inline {
display: inline-flex;
@ -1049,6 +1048,7 @@ async function submit() {
display: flex;
align-items: center;
flex-grow: 1;
overflow: hidden;
.input {
flex-grow: 1;
@ -1140,6 +1140,7 @@ async function submit() {
}
.avatars {
width: 100%;
display: flex;
gap: .25rem;
padding-bottom: .5rem;

34
src/actors.js
View File

@ -110,8 +110,15 @@ export function curateActor(actor, context = {}) {
description: profile.description,
descriptionHash: profile.description_hash,
entity: curateEntity({ ...profile.entity, parent: profile.parent_entity }),
avatar: curateMedia(profile.avatar),
// avatars: profile.avatars.map((avatar) => curateMedia(avatar)),
})),
photos: context.photos
?.map((photo) => ({
...curateMedia(photo),
isAvatar: photo.id === actor.avatar?.id,
profileIds: photo.profile_ids,
}))
.toSorted((photoA, photoB) => photoB.isAvatar - photoA.isAvatar),
createdAt: actor.created_at,
updatedAt: actor.updated_at,
scenes: actor.scenes,
@ -149,7 +156,7 @@ export function sortActorsByGender(actors, context = {}) {
}
export async function fetchActorsById(actorIds, options = {}, reqUser) {
const [actors, profiles, stashes] = await Promise.all([
const [actors, profiles, photos, stashes] = await Promise.all([
knex('actors')
.select(
'actors.*',
@ -171,13 +178,29 @@ export async function fetchActorsById(actorIds, options = {}, reqUser) {
}
}),
knex('actors_profiles')
.select('actors_profiles.*', knex.raw('row_to_json(entities) as entity'), knex.raw('row_to_json(parents) as parent_entity'), knex.raw('row_to_json(media) as avatar'))
.select(
'actors_profiles.*',
knex.raw('row_to_json(entities) as entity'),
knex.raw('row_to_json(parents) as parent_entity'),
// knex.raw('coalesce(json_agg(media) filter (where media.id is not null), \'[]\') as avatars'),
)
.leftJoin('actors', 'actors.id', 'actors_profiles.actor_id')
.leftJoin('entities', 'entities.id', 'actors_profiles.entity_id')
.leftJoin('entities as parents', 'parents.id', 'entities.parent_id')
.leftJoin('media', 'media.id', 'actors_profiles.avatar_media_id')
.leftJoin('actors_avatars', 'actors_avatars.profile_id', 'actors_profiles.id')
// .leftJoin('media', 'media.id', 'actors_avatars.media_id')
.whereIn('actors_profiles.actor_id', actorIds)
.groupBy('actors_profiles.id', 'entities.id', 'parents.id'),
knex('actors_avatars')
.select(
'media.*',
'actors_avatars.actor_id',
knex.raw('json_agg(actors_avatars.profile_id) as profile_ids'),
)
.whereIn('actor_id', actorIds)
.groupBy('actors_profiles.id', 'entities.id', 'parents.id', 'media.id'),
.leftJoin('media', 'media.id', 'actors_avatars.media_id')
.groupBy('media.id', 'actors_avatars.actor_id', 'actors_avatars.created_at')
.orderBy('actors_avatars.created_at', 'desc'),
reqUser
? knex('stashes_actors')
.leftJoin('stashes', 'stashes.id', 'stashes_actors.stash_id')
@ -204,6 +227,7 @@ export async function fetchActorsById(actorIds, options = {}, reqUser) {
return curateActor(actor, {
stashes: stashes.filter((stash) => stash.actor_id === actor.id),
profiles: profiles.filter((profile) => profile.actor_id === actor.id),
photos: photos.filter((photo) => photo.actor_id === actor.id),
append: options.append,
});
}).filter(Boolean);