Fixed actor avatar duplicates. Added new Jules Jordan logo.

This commit is contained in:
2020-01-22 23:17:39 +01:00
parent 6d503a4c09
commit b92b9f3e18
11 changed files with 2 additions and 2 deletions

View File

@@ -301,7 +301,7 @@ async function mergeProfiles(profiles, actor) {
piercings: prevProfile.piercings || profile.piercings,
tattoos: prevProfile.tattoos || profile.tattoos,
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: [],

View File

@@ -212,7 +212,7 @@ async function storePhotos(photos, {
.first();
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']);
return;