From: Michael <heluecht@pirati.ca>
Date: Mon, 13 Jun 2022 10:27:46 +0000 (+0000)
Subject: Using separate avatars for different peertube account types
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d9fb081db94b8abdd339178ec56e83439e9fd007;p=friendica.git

Using separate avatars for different peertube account types
---

diff --git a/images/default/peertube-account.png b/images/default/peertube-account.png
new file mode 100644
index 0000000000..0bedaa0c87
Binary files /dev/null and b/images/default/peertube-account.png differ
diff --git a/images/default/peertube-channel.png b/images/default/peertube-channel.png
new file mode 100644
index 0000000000..e24741815e
Binary files /dev/null and b/images/default/peertube-channel.png differ
diff --git a/images/default/peertube.png b/images/default/peertube.png
deleted file mode 100644
index e24741815e..0000000000
Binary files a/images/default/peertube.png and /dev/null differ
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 3ebc0e6986..6ee4582bcf 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1818,15 +1818,18 @@ class Contact
 
 		if (!DI::config()->get('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;