diff options
| author | Mario <mario@mariovavti.com> | 2020-09-30 10:10:49 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2020-09-30 10:10:49 +0000 |
| commit | b878b6902817c7f442281cef30d346bd2a60659f (patch) | |
| tree | f91fca9fcabcdbd55c8a3e6895d3101292c03a0a /Zotlabs/Lib/Activity.php | |
| parent | 48440e368c07855285da35ea9d0875196919a70d (diff) | |
| download | volse-hubzilla-b878b6902817c7f442281cef30d346bd2a60659f.tar.gz volse-hubzilla-b878b6902817c7f442281cef30d346bd2a60659f.tar.bz2 volse-hubzilla-b878b6902817c7f442281cef30d346bd2a60659f.zip | |
5.0RC testing: fix issue in relation with deletes
Diffstat (limited to 'Zotlabs/Lib/Activity.php')
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 7de2ca7ec..7ad6c91ae 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -652,13 +652,28 @@ class Activity { else return []; - $ret['object'] = str_replace('/item/','/activity/',$i['mid']); + if ($i['obj']) { + if (! is_array($i['obj'])) { + $i['obj'] = json_decode($i['obj'],true); + } + $obj = self::encode_object($i['obj']); + if ($obj) + $ret['object'] = $obj; + else + return []; + } + else { + $obj = self::encode_item($i,$activitypub); + if ($obj) + $ret['object'] = $obj; + else + return []; + } + $ret['to'] = [ ACTIVITY_PUBLIC_INBOX ]; return $ret; - } - $ret['type'] = self::activity_mapper($i['verb']); if($ret['type'] === 'emojiReaction') { |