aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-01-20 20:42:59 +0000
committerMario <mario@mariovavti.com>2021-01-20 20:42:59 +0000
commit57645386b2cd0adb1e8aa7a69d638853b32b6f08 (patch)
treebe07bd4fa54f30f057b3939c8b45100ba595b2df /Zotlabs
parentb242347fa1d41695edcdc378a2403b1621303da2 (diff)
downloadvolse-hubzilla-57645386b2cd0adb1e8aa7a69d638853b32b6f08.tar.gz
volse-hubzilla-57645386b2cd0adb1e8aa7a69d638853b32b6f08.tar.bz2
volse-hubzilla-57645386b2cd0adb1e8aa7a69d638853b32b6f08.zip
looks like we get arrays or json strings here for some reason
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Daemon/Onepoll.php1
-rw-r--r--Zotlabs/Lib/Activity.php8
2 files changed, 8 insertions, 1 deletions
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;
}