From e0a0c57c44b0e083f614d90d0e7a0638553e73f1 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 13 Jun 2022 05:18:54 +0000 Subject: [PATCH] Use platform specific default avatar pictures --- images/default/diaspora.png | Bin 0 -> 1736 bytes images/default/mastodon.png | Bin 0 -> 3292 bytes images/default/peertube.png | Bin 0 -> 4024 bytes images/default/pleroma.png | 738 ++++++++++++++++++++++++++++++++++++ src/Model/Contact.php | 33 ++ src/Module/Photo.php | 2 +- 6 files changed, 772 insertions(+), 1 deletion(-) create mode 100644 images/default/diaspora.png create mode 100644 images/default/mastodon.png create mode 100644 images/default/peertube.png create mode 100644 images/default/pleroma.png diff --git a/images/default/diaspora.png b/images/default/diaspora.png new file mode 100644 index 0000000000000000000000000000000000000000..53d10ffc0371cdf94146121da55755662219df9f GIT binary patch literal 1736 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 T1m@pU{u3x2G_pqP0p|YzWF96{ literal 0 HcmV?d00001 diff --git a/images/default/peertube.png b/images/default/peertube.png new file mode 100644 index 0000000000000000000000000000000000000000..e24741815e594a8bbcb9ff63de0ae4f808942cd3 GIT binary patch literal 4024 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 s5 + + + +priv/static/images/avi.png · develop · Pleroma / pleroma · GitLab + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Skip to content +
+
+
+

+GitLab +

+
+ + + +
+
+
+ +
+ +
+
+
+ +
+ + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+ + +
+ +
+
+
+
+
+
+ +
+
+
Switch branch/tag
+
+
+
+
+
+
+
+
+ +
+
Find file +HistoryPermalink
+
+ +
+
+ +
+ + +
+
+
+ +
+
+ + + +
+ + + +
+
+ + +
+
+
+
+
+
+
+ + + + + + + + + diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 59b14ad0fe..172540dd1f 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -1817,6 +1817,39 @@ class Contact } if (!DI::config()->get('system', 'remote_avatar_lookup')) { + $platform = ''; + + if (!empty($contact['id'])) { + $account = DBA::selectFirst('account-user-view', ['platform'], ['id' => $contact['id']]); + $platform = $account['platform'] ?? ''; + } + + if (empty($platform) && !empty($contact['uri-id'])) { + $account = DBA::selectFirst('account-user-view', ['platform'], ['uri-id' => $contact['uri-id']]); + $platform = $account['platform'] ?? ''; + } + + switch ($platform) { + case 'mastodon': + // @see https://github.com/mastodon/mastodon/tree/main/public/avatars/original/missing.png + $default = '/images/default/mastodon.png'; + break; + + case 'pleroma': + // @see https://git.pleroma.social/pleroma/pleroma/-/blob/develop/priv/static/images/avi.png + $default = '/images/default/pleroma.png'; + break; + + case 'diaspora': + // @see https://github.com/diaspora/diaspora/ + $default = '/images/default/diaspora.png'; + break; + + case 'peertube': + // @see https://github.com/Chocobozzz/PeerTube/blob/develop/client/src/assets/images/default-avatar-video-channel.png + $default = '/images/default/peertube.png'; + break; + } return DI::baseUrl() . $default; } diff --git a/src/Module/Photo.php b/src/Module/Photo.php index 134cade650..86c737aa4e 100644 --- a/src/Module/Photo.php +++ b/src/Module/Photo.php @@ -270,7 +270,7 @@ class Photo extends BaseModule return MPhoto::createPhotoForExternalResource($link['url'], (int)local_user(), $link['mimetype']); case "contact": - $fields = ['uid', 'url', 'nurl', 'avatar', 'photo', 'xmpp', 'addr', 'network', 'failed', 'updated']; + $fields = ['uid', 'uri-id', 'url', 'nurl', 'avatar', 'photo', 'xmpp', 'addr', 'network', 'failed', 'updated']; $contact = Contact::getById($id, $fields); if (empty($contact)) { return false;