Fix code standards

[friendica.git] / src / Content / Item.php

diff --git a/src/Content/Item.php b/src/Content/Item.php
index 86493385f26cf76d697798e10175efdb0090107e..163db89aa472c6b698cffb5ca92d244d9d7b4b4f 100644 (file)
--- a/src/Content/Item.php
+++ b/src/Content/Item.php
@@ -34,15 +34,16 @@ use Friendica\Core\Protocol;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Attach;
+use Friendica\Model\Circle;
 use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
 use Friendica\Model\FileTag;
-use Friendica\Model\Circle;
 use Friendica\Model\Item as ItemModel;
 use Friendica\Model\Photo;
-use Friendica\Model\Tag;
 use Friendica\Model\Post;
+use Friendica\Model\Tag;
 use Friendica\Model\User;
 use Friendica\Network\HTTPException;
 use Friendica\Object\EMail\ItemCCEMail;
@@ -50,11 +51,11 @@ use Friendica\Protocol\Activity;
 use Friendica\Util\ACLFormatter;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Emailer;
-use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
 use Friendica\Util\Profiler;
 use Friendica\Util\Proxy;
 use Friendica\Util\XML;
+use GuzzleHttp\Psr7\Uri;
 
 /**
  * A content helper class for displaying items
@@ -408,8 +409,9 @@ class Item
                        $collapse_link = $item['self'] ? '' : $contact_url . '/collapse?t=' . $formSecurityToken;
                }
 
-               if (!empty($item['author-gsid'])) {
-                       $ignoreserver_link = Network::isLocalLink($contact_url) ? '' : 'settings/server/' . $item['author-gsid'] . '/ignore';
+               $authorBaseUri = new Uri($item['author-baseurl'] ?? '');
+               if (!empty($item['author-gsid']) && $authorBaseUri->getHost() && !DI::baseUrl()->isLocalUrl($authorBaseUri)) {
+                       $ignoreserver_link = 'settings/server/' . $item['author-gsid'] . '/ignore';
                }
 
                if ($cid && !$item['self']) {
@@ -433,7 +435,7 @@ class Item
                                $this->l10n->t('Block') => $block_link,
                                $this->l10n->t('Ignore') => $ignore_link,
                                $this->l10n->t('Collapse') => $collapse_link,
-                               $this->l10n->t("Ignore %s's server", $item['author-name']) => $ignoreserver_link,
+                               $this->l10n->t("Ignore %s server", $authorBaseUri->getHost()) => $ignoreserver_link,
                        ];
 
                        if (!empty($item['language'])) {