diff --git a/public/img/logos/julesjordan/favicon.png b/public/img/logos/julesjordan/favicon.png index d1e40e2f..8e952692 100644 Binary files a/public/img/logos/julesjordan/favicon.png and b/public/img/logos/julesjordan/favicon.png differ diff --git a/public/img/logos/julesjordan/julesjordan.png b/public/img/logos/julesjordan/julesjordan.png index 0478c57c..1c526b4f 100644 Binary files a/public/img/logos/julesjordan/julesjordan.png and b/public/img/logos/julesjordan/julesjordan.png differ diff --git a/public/img/logos/julesjordan/manuelferrara.png b/public/img/logos/julesjordan/manuelferrara.png index 89a9f0f7..309ffe59 100644 Binary files a/public/img/logos/julesjordan/manuelferrara.png and b/public/img/logos/julesjordan/manuelferrara.png differ diff --git a/public/img/logos/julesjordan/misc/jules-jordan_old.png b/public/img/logos/julesjordan/misc/jules-jordan_old.png new file mode 100644 index 00000000..0478c57c Binary files /dev/null and b/public/img/logos/julesjordan/misc/jules-jordan_old.png differ diff --git a/public/img/logos/julesjordan/misc/julesjordan_original.png b/public/img/logos/julesjordan/misc/jules-jordan_original.png similarity index 100% rename from public/img/logos/julesjordan/misc/julesjordan_original.png rename to public/img/logos/julesjordan/misc/jules-jordan_original.png diff --git a/public/img/logos/julesjordan/network.png b/public/img/logos/julesjordan/network.png index 3bbddcc9..c711b26e 100644 Binary files a/public/img/logos/julesjordan/network.png and b/public/img/logos/julesjordan/network.png differ diff --git a/public/img/logos/julesjordan/spermswallowers.png b/public/img/logos/julesjordan/spermswallowers.png index a1fad227..aaea6b93 100644 Binary files a/public/img/logos/julesjordan/spermswallowers.png and b/public/img/logos/julesjordan/spermswallowers.png differ diff --git a/public/img/logos/julesjordan/theassfactory.png b/public/img/logos/julesjordan/theassfactory.png index 95535d29..4897848c 100644 Binary files a/public/img/logos/julesjordan/theassfactory.png and b/public/img/logos/julesjordan/theassfactory.png differ diff --git a/public/img/logos/julesjordan/theassfactory_full.png b/public/img/logos/julesjordan/theassfactory_full.png index 933fc3ec..0b3fe393 100644 Binary files a/public/img/logos/julesjordan/theassfactory_full.png and b/public/img/logos/julesjordan/theassfactory_full.png differ diff --git a/src/actors.js b/src/actors.js index 65caae81..65918f01 100644 --- a/src/actors.js +++ b/src/actors.js @@ -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: [], diff --git a/src/media.js b/src/media.js index d2b8c0d8..97e8ca67 100644 --- a/src/media.js +++ b/src/media.js @@ -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;