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 dc062fe5b506afd222a92f7b4f8c75f70d413a0b..c49017b595b120d3730e3d885417a7d4fedc4e27 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -119,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)) {
@@ -579,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;
                }