Replace reference to post plink by author base URL

[friendica.git] / src / Model / APContact.php

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 20457b46e838c407bb78dd3c52b0bb4cc954b074..c49017b595b120d3730e3d885417a7d4fedc4e27 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -29,7 +29,6 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Item;
-use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPException;
 use Friendica\Network\Probe;
 use Friendica\Protocol\ActivityNamespace;
@@ -120,6 +119,11 @@ class APContact
                        return [];
                }
 
+               if (!Network::isValidHttpUrl($url) && !filter_var($url, FILTER_VALIDATE_EMAIL)) {
+                       Logger::info('Invalid URL', ['url' => $url]);
+                       return [];
+               }
+
                $fetched_contact = [];
 
                if (empty($update)) {
@@ -259,6 +263,11 @@ class APContact
                $apcontact['photo'] = JsonLD::fetchElement($compacted, 'as:icon', '@id');
                if (is_array($apcontact['photo']) || !empty($compacted['as:icon']['as:url']['@id'])) {
                        $apcontact['photo'] = JsonLD::fetchElement($compacted['as:icon'], 'as:url', '@id');
+               } elseif (empty($apcontact['photo'])) {
+                       $photo = JsonLD::fetchElementArray($compacted, 'as:icon', 'as:url');
+                       if (!empty($photo[0]['@id'])) {
+                               $apcontact['photo'] = $photo[0]['@id'];
+                       }
                }
 
                $apcontact['header'] = JsonLD::fetchElement($compacted, 'as:image', '@id');
@@ -575,6 +584,14 @@ class APContact
         */
        public static function isRelay(array $apcontact): bool
        {
+               if (in_array($apcontact['type'], ['Person', 'Organization'])) {
+                       return false;
+               }
+
+               if (($apcontact['type'] == 'Service') && empty($apcontact['outbox']) && empty($apcontact['sharedinbox']) && empty($apcontact['following']) && empty($apcontact['followers']) && empty($apcontact['statuses_count'])) {
+                       return true;
+               }
+
                if (empty($apcontact['nick']) || $apcontact['nick'] != 'relay') {
                        return false;
                }