From 18b7b3f125b88143d4edefec22a0df67869788d9 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Fri, 16 Jun 2023 12:16:22 +0000
Subject: deprecate ActivityStreams::fetch() and provide the possibility to
 fetch local items directly

---
 Zotlabs/Lib/ActivityStreams.php | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

(limited to 'Zotlabs/Lib/ActivityStreams.php')

diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php
index f07f99ac3..1f10ac027 100644
--- a/Zotlabs/Lib/ActivityStreams.php
+++ b/Zotlabs/Lib/ActivityStreams.php
@@ -14,6 +14,7 @@ class ActivityStreams {
 	public $meta = null;
 	public $valid = false;
 	public $deleted = false;
+	public $portable_id = null;
 	public $id = '';
 	public $parent_id = '';
 	public $type = '';
@@ -35,12 +36,13 @@ class ActivityStreams {
 	 *
 	 * @param string $string
 	 */
-	function __construct($string) {
+	function __construct($string, $portable_id = null) {
 
 		if(!$string)
 			return;
 
 		$this->raw = $string;
+		$this->portable_id = $portable_id;
 
 		if (is_array($string)) {
 			$this->data = $string;
@@ -123,13 +125,14 @@ class ActivityStreams {
 
 			$this->parent_id = $this->get_property_obj('inReplyTo');
 
-			if ((!$this->parent_id) && is_array($this->obj) && isset($this->obj['inReplyTo'])) {
+			if (!$this->parent_id && is_array($this->obj) && isset($this->obj['inReplyTo'])) {
 				$this->parent_id = $this->obj['inReplyTo'];
 			}
 
-			if ((!$this->parent_id) && is_array($this->obj) && isset($this->obj['id'])) {
+			if (!$this->parent_id && is_array($this->obj) && isset($this->obj['id'])) {
 				$this->parent_id = $this->obj['id'];
 			}
+
 		}
 	}
 
@@ -302,12 +305,22 @@ class ActivityStreams {
 	 * @return NULL|mixed
 	 */
 
-	function fetch_property($url) {
-		return self::fetch($url);
-	}
-
-	static function fetch($url, $channel = null) {
-		return Activity::fetch($url, $channel);
+	function fetch_property($url, $channel = null) {
+		if (str_starts_with($url, z_root() . '/item/')) {
+			$x = Activity::fetch_local($url, $this->portable_id ?? '');
+			logger('local: ' . print_r($x,true));
+		}
+		if (!$x) {
+			$x = Activity::fetch($url, $channel);
+			if ($x === null && strpos($url, '/channel/')) {
+				// look for other nomadic channels which might be alive
+				$zf = Zotfinger::exec($url, $channel);
+
+				$url = $zf['signature']['signer'];
+				$x = Activity::fetch($url, $channel);
+			}
+		}
+		return $x;
 	}
 
 	static function is_an_actor($s) {
-- 
cgit v1.2.3


From 84487edc05a28f016872058ca3175fdf41efbcb6 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Fri, 16 Jun 2023 12:27:08 +0000
Subject: undefined variable and return null in fetch_local if we did not find
 anything (we also return null in fetch)

---
 Zotlabs/Lib/ActivityStreams.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Zotlabs/Lib/ActivityStreams.php')

diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php
index 1f10ac027..8b8c95ad8 100644
--- a/Zotlabs/Lib/ActivityStreams.php
+++ b/Zotlabs/Lib/ActivityStreams.php
@@ -306,10 +306,13 @@ class ActivityStreams {
 	 */
 
 	function fetch_property($url, $channel = null) {
+		$x = null;
+
 		if (str_starts_with($url, z_root() . '/item/')) {
 			$x = Activity::fetch_local($url, $this->portable_id ?? '');
 			logger('local: ' . print_r($x,true));
 		}
+
 		if (!$x) {
 			$x = Activity::fetch($url, $channel);
 			if ($x === null && strpos($url, '/channel/')) {
@@ -320,6 +323,7 @@ class ActivityStreams {
 				$x = Activity::fetch($url, $channel);
 			}
 		}
+
 		return $x;
 	}
 
-- 
cgit v1.2.3