From d9fb081db94b8abdd339178ec56e83439e9fd007 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 13 Jun 2022 10:27:46 +0000 Subject: [PATCH] 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;