Fixed actor avatar duplicates. Added new Jules Jordan logo.
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 41 KiB After Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 41 KiB |
Before Width: | Height: | Size: 57 KiB After Width: | Height: | Size: 57 KiB |
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 39 KiB |
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 63 KiB |
Before Width: | Height: | Size: 102 KiB After Width: | Height: | Size: 102 KiB |
|
@ -301,7 +301,7 @@ async function mergeProfiles(profiles, actor) {
|
||||||
piercings: prevProfile.piercings || profile.piercings,
|
piercings: prevProfile.piercings || profile.piercings,
|
||||||
tattoos: prevProfile.tattoos || profile.tattoos,
|
tattoos: prevProfile.tattoos || profile.tattoos,
|
||||||
social: prevProfile.social.concat(profile.social || []),
|
social: prevProfile.social.concat(profile.social || []),
|
||||||
avatars: prevProfile.avatars.concat([profile.avatar] || []),
|
avatars: prevProfile.avatars.concat(profile.avatar ? [profile.avatar] : []), // don't flatten fallbacks
|
||||||
};
|
};
|
||||||
}, {
|
}, {
|
||||||
social: [],
|
social: [],
|
||||||
|
|
|
@ -212,7 +212,7 @@ async function storePhotos(photos, {
|
||||||
.first();
|
.first();
|
||||||
|
|
||||||
if (primaryPhoto) {
|
if (primaryPhoto) {
|
||||||
const remainingAssociations = photoAssociations.filter(association => association.media_id === primaryPhoto.media_id);
|
const remainingAssociations = photoAssociations.filter(association => association.media_id !== primaryPhoto.media_id);
|
||||||
|
|
||||||
await upsert(`${domain}s_${role}s`, remainingAssociations, [`${domain}_id`, 'media_id']);
|
await upsert(`${domain}s_${role}s`, remainingAssociations, [`${domain}_id`, 'media_id']);
|
||||||
return;
|
return;
|
||||||
|
|