Merge pull request #11936 from annando/youtube-shorts

[friendica.git] / src / Module / PermissionTooltip.php

diff --git a/src/Module/PermissionTooltip.php b/src/Module/PermissionTooltip.php
index a58465b40ecc2fdd0684eb964920d8958a2c684d..ec449aa15fa2f77d9afeb3859683f615bddfd921 100644 (file)
--- a/src/Module/PermissionTooltip.php
+++ b/src/Module/PermissionTooltip.php
@@ -22,6 +22,7 @@
 namespace Friendica\Module;
 
 use Friendica\Core\Hook;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\APContact;
@@ -83,15 +84,15 @@ class PermissionTooltip extends \Friendica\BaseModule
                                        case Item::PUBLIC:
                                                $receivers = DI::l10n()->t('Public');
                                                break;
-                                       
+
                                        case Item::UNLISTED:
                                                $receivers = DI::l10n()->t('Unlisted');
                                                break;
-                                       
+
                                        case Item::PRIVATE:
                                                $receivers = DI::l10n()->t('Limited/Private');
                                                break;
-                               }                               
+                               }
                        }
                } else {
                        $receivers = '';
@@ -164,17 +165,16 @@ class PermissionTooltip extends \Friendica\BaseModule
                } else {
                        echo $o . $receivers;
                }
-
-               exit();
+               System::exit();
        }
 
        /**
         * Fetch a list of receivers
         *
         * @param int $uriId
-        * @return string 
+        * @return string
         */
-       private function fetchReceivers(int $uriId):string
+       private function fetchReceivers(int $uriId): string
        {
                $own_url = '';
                $uid = local_user();
@@ -192,19 +192,24 @@ class PermissionTooltip extends \Friendica\BaseModule
                                continue;
                        }
 
-                       if ($receiver['url'] == ActivityPub::PUBLIC_COLLECTION) {
-                               $receivers[$receiver['type']][] = DI::l10n()->t('Public');
-                       } else {
-                               $apcontact = DBA::selectFirst('apcontact', ['name'], ['followers' => $receiver['url']]);
-                               if (!empty($apcontact['name'])) {
-                                       $receivers[$receiver['type']][] = DI::l10n()->t('Followers (%s)', $apcontact['name']);
-                               } elseif ($apcontact = APContact::getByURL($receiver['url'], false)) {
-                                       $receivers[$receiver['type']][] = $apcontact['name'];
-                               } elseif ($receiver['tag-type'] == Tag::COLLECTION) {
+                       switch (Tag::getTargetType($receiver['url'], false)) {
+                               case Tag::PUBLIC_COLLECTION:
+                                       $receivers[$receiver['type']][] = DI::l10n()->t('Public');
+                                       break;
+                               case Tag::GENERAL_COLLECTION:
                                        $receivers[$receiver['type']][] = DI::l10n()->t('Collection (%s)', $receiver['name']);
-                               } else {
+                                       break;
+                               case Tag::FOLLOWER_COLLECTION:
+                                       $apcontact = DBA::selectFirst('apcontact', ['name'], ['followers' => $receiver['url']]);
+                                       $receivers[$receiver['type']][] = DI::l10n()->t('Followers (%s)', $apcontact['name'] ?? $receiver['name']);
+                                       break;
+                               case Tag::ACCOUNT:
+                                       $apcontact = APContact::getByURL($receiver['url'], false);
+                                       $receivers[$receiver['type']][] = $apcontact['name'] ?? $receiver['name'];
+                                       break;
+                               default:
                                        $receivers[$receiver['type']][] = $receiver['name'];
-                               }
+                                       break;
                        }
                }