Check for last-activity value before feeding it to strtotime in Module\NoScrape

[friendica.git] / src / Protocol / Diaspora.php

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 3c60f4041ba98ae374dbcce1f5021bf6c5064e7b..fe5b27d334f313d0b1817ac1bafb46e09b925113 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -826,9 +826,15 @@ class Diaspora
         */
        public static function isSupportedByContactUrl(string $url, ?bool $update = null): bool
        {
-               $contact = Contact::getByURL($url, $update);
+               $contact = Contact::getByURL($url, $update, ['uri-id', 'network']);
 
-               return DI::dsprContact()->existsByUriId($contact['uri-id'] ?? 0);
+               $supported = DI::dsprContact()->existsByUriId($contact['uri-id'] ?? 0);
+
+               if (!$supported && is_null($update) && ($contact['network'] == Protocol::DFRN)) {
+                       $supported = self::isSupportedByContactUrl($url, true);
+               }
+
+               return $supported;
        }
 
        /**
@@ -4064,7 +4070,7 @@ class Diaspora
                        return false;
                }
 
-               if (!self::isSupportedByContactUrl($parent_post['author-link'], false)) {
+               if (!self::isSupportedByContactUrl($parent_post['author-link'])) {
                        Logger::info('Parent author is no Diaspora contact.', ['parent-id' => $parent_id]);
                        return false;
                }