From 57645386b2cd0adb1e8aa7a69d638853b32b6f08 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 20 Jan 2021 20:42:59 +0000 Subject: looks like we get arrays or json strings here for some reason --- Zotlabs/Daemon/Onepoll.php | 1 + Zotlabs/Lib/Activity.php | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'Zotlabs') diff --git a/Zotlabs/Daemon/Onepoll.php b/Zotlabs/Daemon/Onepoll.php index 568745608..388a78c81 100644 --- a/Zotlabs/Daemon/Onepoll.php +++ b/Zotlabs/Daemon/Onepoll.php @@ -138,6 +138,7 @@ class Onepoll { logger('fetching outbox'); $obj = new ASCollection($url, $importer, 0, $max); $messages = $obj->get(); + hz_syslog(print_r($messages,true)); if ($messages) { foreach ($messages as $message) { if (is_string($message)) { diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 0f9160bf7..aa121d98b 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -299,7 +299,13 @@ class Activity { if ($items) { $x = []; foreach ($items as $i) { - $t = ((get_iconfig($i['id'], 'activitypub', 'rawmsg')) ? get_iconfig($i['id'], 'activitypub', 'rawmsg') : self::encode_activity($i)); + $m = get_iconfig($i['id'], 'activitypub', 'rawmsg'); + if (is_string($m)) { + $t = json_decode($m, true); + } + else { + $t = $m; + } if ($t) { $x[] = $t; } -- cgit v1.2.3