From e0a0c57c44b0e083f614d90d0e7a0638553e73f1 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 13 Jun 2022 05:18:54 +0000 Subject: [PATCH 1/6] 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 59b14ad0f..172540dd1 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 134cade65..86c737aa4 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; From a5b5f9316dcd555ecdbe08a93f4b78809391bf58 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 13 Jun 2022 05:46:37 +0000 Subject: [PATCH 2/6] Updated database.sql and messages.po --- database.sql | 2 +- view/lang/C/messages.po | 88 ++++++++++++++++++++--------------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/database.sql b/database.sql index 38cc39154..009a20fa0 100644 --- a/database.sql +++ b/database.sql @@ -1,5 +1,5 @@ -- ------------------------------------------ --- Friendica 2022.06 (Giant Rhubarb) +-- Friendica 2022.09-dev (Giant Rhubarb) -- DB_UPDATE_VERSION 1469 -- ------------------------------------------ diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index b8d98f947..333a0aaa6 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2022.06\n" +"Project-Id-Version: 2022.09-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-06 07:33+0000\n" +"POT-Creation-Date: 2022-06-13 05:45+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -37,7 +37,7 @@ msgstr "" msgid "User not found." msgstr "" -#: mod/cal.php:122 mod/display.php:247 src/Module/Profile/Profile.php:94 +#: mod/cal.php:122 mod/display.php:262 src/Module/Profile/Profile.php:94 #: src/Module/Profile/Profile.php:109 src/Module/Profile/Status.php:110 #: src/Module/Update/Profile.php:56 msgid "Access to this profile has been restricted." @@ -104,17 +104,17 @@ msgstr "" msgid "calendar" msgstr "" -#: mod/display.php:142 mod/photos.php:802 +#: mod/display.php:143 mod/photos.php:802 #: src/Module/Conversation/Community.php:175 src/Module/Directory.php:49 #: src/Module/Search/Index.php:50 msgid "Public access denied." msgstr "" -#: mod/display.php:198 mod/display.php:272 +#: mod/display.php:213 mod/display.php:287 msgid "The requested item doesn't exist or has been deleted." msgstr "" -#: mod/display.php:352 +#: mod/display.php:367 msgid "The feed for this item is unavailable." msgstr "" @@ -230,7 +230,7 @@ msgstr "" #: mod/editpost.php:107 mod/message.php:200 mod/message.php:358 #: mod/photos.php:1489 mod/wallmessage.php:142 src/Content/Conversation.php:368 -#: src/Content/Conversation.php:712 src/Module/Item/Compose.php:177 +#: src/Content/Conversation.php:713 src/Module/Item/Compose.php:177 #: src/Object/Post.php:528 msgid "Please wait" msgstr "" @@ -1077,11 +1077,11 @@ msgstr "" msgid "Comment" msgstr "" -#: mod/photos.php:1424 src/Content/Conversation.php:628 src/Object/Post.php:247 +#: mod/photos.php:1424 src/Content/Conversation.php:629 src/Object/Post.php:247 msgid "Select" msgstr "" -#: mod/photos.php:1425 mod/settings.php:350 src/Content/Conversation.php:629 +#: mod/photos.php:1425 mod/settings.php:350 src/Content/Conversation.php:630 #: src/Module/Admin/Users/Active.php:139 src/Module/Admin/Users/Blocked.php:140 #: src/Module/Admin/Users/Index.php:153 msgid "Delete" @@ -1942,7 +1942,7 @@ msgid "%s attends maybe." msgstr "" #: src/Content/Conversation.php:222 src/Content/Conversation.php:260 -#: src/Content/Conversation.php:872 +#: src/Content/Conversation.php:873 #, php-format msgid "%s reshared this." msgstr "" @@ -2061,92 +2061,92 @@ msgstr "" msgid "Scheduled at" msgstr "" -#: src/Content/Conversation.php:656 src/Object/Post.php:235 +#: src/Content/Conversation.php:657 src/Object/Post.php:235 msgid "Pinned item" msgstr "" -#: src/Content/Conversation.php:672 src/Object/Post.php:476 +#: src/Content/Conversation.php:673 src/Object/Post.php:476 #: src/Object/Post.php:477 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: src/Content/Conversation.php:685 src/Object/Post.php:464 +#: src/Content/Conversation.php:686 src/Object/Post.php:464 msgid "Categories:" msgstr "" -#: src/Content/Conversation.php:686 src/Object/Post.php:465 +#: src/Content/Conversation.php:687 src/Object/Post.php:465 msgid "Filed under:" msgstr "" -#: src/Content/Conversation.php:694 src/Object/Post.php:490 +#: src/Content/Conversation.php:695 src/Object/Post.php:490 #, php-format msgid "%s from %s" msgstr "" -#: src/Content/Conversation.php:710 +#: src/Content/Conversation.php:711 msgid "View in context" msgstr "" -#: src/Content/Conversation.php:775 +#: src/Content/Conversation.php:776 msgid "remove" msgstr "" -#: src/Content/Conversation.php:779 +#: src/Content/Conversation.php:780 msgid "Delete Selected Items" msgstr "" -#: src/Content/Conversation.php:844 src/Content/Conversation.php:847 -#: src/Content/Conversation.php:850 src/Content/Conversation.php:853 +#: src/Content/Conversation.php:845 src/Content/Conversation.php:848 +#: src/Content/Conversation.php:851 src/Content/Conversation.php:854 #, php-format msgid "You had been addressed (%s)." msgstr "" -#: src/Content/Conversation.php:856 +#: src/Content/Conversation.php:857 #, php-format msgid "You are following %s." msgstr "" -#: src/Content/Conversation.php:859 +#: src/Content/Conversation.php:860 msgid "Tagged" msgstr "" -#: src/Content/Conversation.php:874 +#: src/Content/Conversation.php:875 msgid "Reshared" msgstr "" -#: src/Content/Conversation.php:874 +#: src/Content/Conversation.php:875 #, php-format msgid "Reshared by %s <%s>" msgstr "" -#: src/Content/Conversation.php:877 +#: src/Content/Conversation.php:878 #, php-format msgid "%s is participating in this thread." msgstr "" -#: src/Content/Conversation.php:880 +#: src/Content/Conversation.php:881 msgid "Stored" msgstr "" -#: src/Content/Conversation.php:883 +#: src/Content/Conversation.php:884 msgid "Global" msgstr "" -#: src/Content/Conversation.php:886 +#: src/Content/Conversation.php:887 msgid "Relayed" msgstr "" -#: src/Content/Conversation.php:886 +#: src/Content/Conversation.php:887 #, php-format msgid "Relayed by %s <%s>" msgstr "" -#: src/Content/Conversation.php:889 +#: src/Content/Conversation.php:890 msgid "Fetched" msgstr "" -#: src/Content/Conversation.php:889 +#: src/Content/Conversation.php:890 #, php-format msgid "Fetched because of %s <%s>" msgstr "" @@ -3625,63 +3625,63 @@ msgstr "" msgid "Forum" msgstr "" -#: src/Model/Contact.php:2517 +#: src/Model/Contact.php:2550 msgid "Disallowed profile URL." msgstr "" -#: src/Model/Contact.php:2522 src/Module/Friendica.php:81 +#: src/Model/Contact.php:2555 src/Module/Friendica.php:81 msgid "Blocked domain" msgstr "" -#: src/Model/Contact.php:2527 +#: src/Model/Contact.php:2560 msgid "Connect URL missing." msgstr "" -#: src/Model/Contact.php:2536 +#: src/Model/Contact.php:2569 msgid "" "The contact could not be added. Please check the relevant network " "credentials in your Settings -> Social Networks page." msgstr "" -#: src/Model/Contact.php:2578 +#: src/Model/Contact.php:2611 msgid "The profile address specified does not provide adequate information." msgstr "" -#: src/Model/Contact.php:2580 +#: src/Model/Contact.php:2613 msgid "No compatible communication protocols or feeds were discovered." msgstr "" -#: src/Model/Contact.php:2583 +#: src/Model/Contact.php:2616 msgid "An author or name was not found." msgstr "" -#: src/Model/Contact.php:2586 +#: src/Model/Contact.php:2619 msgid "No browser URL could be matched to this address." msgstr "" -#: src/Model/Contact.php:2589 +#: src/Model/Contact.php:2622 msgid "" "Unable to match @-style Identity Address with a known protocol or email " "contact." msgstr "" -#: src/Model/Contact.php:2590 +#: src/Model/Contact.php:2623 msgid "Use mailto: in front of address to force email check." msgstr "" -#: src/Model/Contact.php:2596 +#: src/Model/Contact.php:2629 msgid "" "The profile address specified belongs to a network which has been disabled " "on this site." msgstr "" -#: src/Model/Contact.php:2601 +#: src/Model/Contact.php:2634 msgid "" "Limited profile. This person will be unable to receive direct/personal " "notifications from you." msgstr "" -#: src/Model/Contact.php:2660 +#: src/Model/Contact.php:2693 msgid "Unable to retrieve contact information." msgstr "" From c1a64b77c06e8ceaf6549ea5e4cf193d5d765397 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 13 Jun 2022 10:03:34 +0000 Subject: [PATCH 3/6] Improved license text --- src/Model/Contact.php | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 172540dd1..3ebc0e698 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -1831,22 +1831,38 @@ class Contact switch ($platform) { case 'mastodon': - // @see https://github.com/mastodon/mastodon/tree/main/public/avatars/original/missing.png + /** + * Picture credits + * @license GNU Affero General Public License v3.0 + * @link 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 + /** + * Picture credits + * @license GNU Affero General Public License v3.0 + * @link 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/ + /** + * Picture credits + * @license GNU Affero General Public License v3.0 + * @link 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 + /** + * Picture credits + * @license GNU Affero General Public License v3.0 + * @link https://github.com/Chocobozzz/PeerTube/blob/develop/client/src/assets/images/default-avatar-video-channel.png + */ $default = '/images/default/peertube.png'; break; } From a47f1efec3ce8c175338dcfea5e233fc7c4ac743 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 13 Jun 2022 10:18:17 +0000 Subject: [PATCH 4/6] use correct image for Pleroma --- images/default/pleroma.png | Bin 82086 -> 1036 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/images/default/pleroma.png b/images/default/pleroma.png index 886eaee54d378c99109cfa4573a541a13630f6b9..df4e2d23364c8923ffb5ac1f17d108cc36a54c45 100644 GIT binary patch literal 1036 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 From d9fb081db94b8abdd339178ec56e83439e9fd007 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 13 Jun 2022 10:27:46 +0000 Subject: [PATCH 5/6] Using separate avatars for different peertube account types --- images/default/peertube-account.png | Bin 0 -> 4944 bytes .../{peertube.png => peertube-channel.png} | Bin src/Model/Contact.php | 16 ++++++++++++---- 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 images/default/peertube-account.png rename images/default/{peertube.png => peertube-channel.png} (100%) diff --git a/images/default/peertube-account.png b/images/default/peertube-account.png new file mode 100644 index 0000000000000000000000000000000000000000..0bedaa0c87bf2071ee4170077c28c1be66931854 GIT binary patch literal 4944 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'system', 'remote_avatar_lookup')) { $platform = ''; + $type = Contact::TYPE_PERSON; if (!empty($contact['id'])) { - $account = DBA::selectFirst('account-user-view', ['platform'], ['id' => $contact['id']]); + $account = DBA::selectFirst('account-user-view', ['platform', 'contact-type'], ['id' => $contact['id']]); $platform = $account['platform'] ?? ''; + $type = $account['contact-type'] ?? Contact::TYPE_PERSON; } if (empty($platform) && !empty($contact['uri-id'])) { - $account = DBA::selectFirst('account-user-view', ['platform'], ['uri-id' => $contact['uri-id']]); + $account = DBA::selectFirst('account-user-view', ['platform', 'contact-type'], ['uri-id' => $contact['uri-id']]); $platform = $account['platform'] ?? ''; + $type = $account['contact-type'] ?? Contact::TYPE_PERSON; } switch ($platform) { @@ -1861,9 +1864,14 @@ class Contact /** * Picture credits * @license GNU Affero General Public License v3.0 - * @link https://github.com/Chocobozzz/PeerTube/blob/develop/client/src/assets/images/default-avatar-video-channel.png */ - $default = '/images/default/peertube.png'; + if ($type == Contact::TYPE_COMMUNITY) { + // @link https://github.com/Chocobozzz/PeerTube/blob/develop/client/src/assets/images/default-avatar-video-channel.png + $default = '/images/default/peertube-channel.png'; + } else { + // @link https://github.com/Chocobozzz/PeerTube/blob/develop/client/src/assets/images/default-avatar-account.png + $default = '/images/default/peertube-account.png'; + } break; } return DI::baseUrl() . $default; From 70b9a8114db958ccdbfafad5ebc2329c7900c981 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 13 Jun 2022 10:30:21 +0000 Subject: [PATCH 6/6] Improve license comment --- src/Model/Contact.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 6ee4582bc..fedf6c839 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -1861,15 +1861,19 @@ class Contact break; case 'peertube': - /** - * Picture credits - * @license GNU Affero General Public License v3.0 - */ if ($type == Contact::TYPE_COMMUNITY) { - // @link https://github.com/Chocobozzz/PeerTube/blob/develop/client/src/assets/images/default-avatar-video-channel.png + /** + * Picture credits + * @license GNU Affero General Public License v3.0 + * @link https://github.com/Chocobozzz/PeerTube/blob/develop/client/src/assets/images/default-avatar-video-channel.png + */ $default = '/images/default/peertube-channel.png'; } else { - // @link https://github.com/Chocobozzz/PeerTube/blob/develop/client/src/assets/images/default-avatar-account.png + /** + * Picture credits + * @license GNU Affero General Public License v3.0 + * @link https://github.com/Chocobozzz/PeerTube/blob/develop/client/src/assets/images/default-avatar-account.png + */ $default = '/images/default/peertube-account.png'; } break;