X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FContactSelector.php;h=6c7e09945f9f594ae81b0905a94dceeba7876b42;hb=65b86fe0d556829c09e8c8f5c707b868ad37dfe1;hp=c834f8c514c4ccfcec0e63161a3596ca2178ca68;hpb=d09b3f5bdeae444f785f6283e55dbf2f61caadac;p=friendica.git diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php index c834f8c514..6c7e09945f 100644 --- a/src/Content/ContactSelector.php +++ b/src/Content/ContactSelector.php @@ -1,6 +1,6 @@ $server_url]); + + self::$serverdata[$server_url] = $gserver; + return $gserver; + } + /** * @param string $profile Profile URL * @return string Server URL @@ -68,6 +86,10 @@ class ContactSelector */ private static function getServerURLForProfile($profile) { + if (!empty(self::$server_url[$profile])) { + return self::$server_url[$profile]; + } + $server_url = ''; // Fetch the server url from the contact table @@ -76,14 +98,6 @@ class ContactSelector $server_url = Strings::normaliseLink($contact['baseurl']); } - if (empty($server_url)) { - // Fetch the server url from the gcontact table - $gcontact = DBA::selectFirst('gcontact', ['server_url'], ['nurl' => Strings::normaliseLink($profile)]); - if (!empty($gcontact) && !empty($gcontact['server_url'])) { - $server_url = Strings::normaliseLink($gcontact['server_url']); - } - } - if (empty($server_url)) { // Create the server url out of the profile url $parts = parse_url($profile); @@ -91,6 +105,8 @@ class ContactSelector $server_url = Strings::normaliseLink(Network::unparseURL($parts)); } + self::$server_url[$profile] = $server_url; + return $server_url; } @@ -101,7 +117,7 @@ class ContactSelector * @return string * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function networkToName($network, $profile = '', $protocol = '') + public static function networkToName($network, $profile = '', $protocol = '', $gsid = 0) { $nets = [ Protocol::DFRN => DI::l10n()->t('DFRN'), @@ -131,24 +147,26 @@ class ContactSelector $networkname = str_replace($search, $replace, $network); if ((in_array($network, Protocol::FEDERATED)) && ($profile != "")) { - $server_url = self::getServerURLForProfile($profile); - - // Now query the GServer for the platform name - $gserver = DBA::selectFirst('gserver', ['platform', 'network'], ['nurl' => $server_url]); + if (!empty($gsid) && !empty(self::$serverdata[$gsid])) { + $gserver = self::$serverdata[$gsid]; + } elseif (!empty($gsid)) { + $gserver = DBA::selectFirst('gserver', ['platform', 'network'], ['id' => $gsid]); + self::$serverdata[$gsid] = $gserver; + } else { + $gserver = self::getServerForProfile($profile); + } - if (DBA::isResult($gserver)) { - if (!empty($gserver['platform'])) { - $platform = $gserver['platform']; - } elseif (!empty($gserver['network']) && ($gserver['network'] != Protocol::ACTIVITYPUB)) { - $platform = self::networkToName($gserver['network']); - } + if (!empty($gserver['platform'])) { + $platform = $gserver['platform']; + } elseif (!empty($gserver['network']) && ($gserver['network'] != Protocol::ACTIVITYPUB)) { + $platform = self::networkToName($gserver['network']); + } - if (!empty($platform)) { - $networkname = $platform; + if (!empty($platform)) { + $networkname = $platform; - if ($network == Protocol::ACTIVITYPUB) { - $networkname .= ' (AP)'; - } + if ($network == Protocol::ACTIVITYPUB) { + $networkname .= ' (AP)'; } } } @@ -166,7 +184,7 @@ class ContactSelector * @return string * @throws \Exception */ - public static function networkToIcon($network, $profile = "") + public static function networkToIcon($network, $profile = "", $gsid = 0) { $nets = [ Protocol::DFRN => 'friendica', @@ -200,12 +218,15 @@ class ContactSelector $network_icon = str_replace($search, $replace, $network); if ((in_array($network, Protocol::FEDERATED)) && ($profile != "")) { - $server_url = self::getServerURLForProfile($profile); - - // Now query the GServer for the platform name - $gserver = DBA::selectFirst('gserver', ['platform'], ['nurl' => $server_url]); - - if (DBA::isResult($gserver) && !empty($gserver['platform'])) { + if (!empty($gsid) && !empty(self::$serverdata[$gsid])) { + $gserver = self::$serverdata[$gsid]; + } elseif (!empty($gsid)) { + $gserver = DBA::selectFirst('gserver', ['platform', 'network'], ['id' => $gsid]); + self::$serverdata[$gsid] = $gserver; + } else { + $gserver = self::getServerForProfile($profile); + } + if (!empty($gserver['platform'])) { $network_icon = $platform_icons[strtolower($gserver['platform'])] ?? $network_icon; } }