Fetch Diaspora posts by url

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

diff --git a/src/Model/Item.php b/src/Model/Item.php
index ddfc5e0b35566a9fa4119dee016d473d46776923..81c60b30b038387f2711a32bc9551c70bcb61ce1 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -20,6 +20,7 @@ use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\DateTimeFormat;
@@ -29,7 +30,6 @@ use Friendica\Util\Security;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 use Friendica\Worker\Delivery;
-use Friendica\Protocol\ActivityPub;
 use Text_LanguageDetect;
 
 class Item extends BaseObject
@@ -3628,11 +3628,12 @@ class Item extends BaseObject
                        return $item_id;
                }
 
-               ActivityPub\Processor::fetchMissingActivity($uri);
-
-               /// @todo add Diaspora as well
+               if (ActivityPub\Processor::fetchMissingActivity($uri)) {
+                       $item_id = self::searchByLink($uri, $uid);
+               } else {
+                       $item_id = Diaspora::fetchByURL($uri);
+               }
 
-               $item_id = self::searchByLink($uri, $uid);
                if (!empty($item_id)) {
                        return $item_id;
                }