diff options
| author | Mario <mario@mariovavti.com> | 2021-03-13 22:13:17 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-03-13 23:22:08 +0100 |
| commit | b9e1c38773d761a85132e6656995431b3e5980dd (patch) | |
| tree | 4df9ccef6cd01c1ff8e53d92d079ef243dcc80a7 /Zotlabs/Lib | |
| parent | 1582b8bc9620a661823c608c0c7023a70554214b (diff) | |
| download | volse-hubzilla-b9e1c38773d761a85132e6656995431b3e5980dd.tar.gz volse-hubzilla-b9e1c38773d761a85132e6656995431b3e5980dd.tar.bz2 volse-hubzilla-b9e1c38773d761a85132e6656995431b3e5980dd.zip | |
fix mod subthread for zot6
(cherry picked from commit 22d769ecae17c9d5d36232c543b48b0a155ca502)
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index c800f331d..9370c2aa5 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -1125,7 +1125,7 @@ class Activity { static function encode_item_object($item, $elm = 'obj') { $ret = []; - + if ($item[$elm]) { if (! is_array($item[$elm])) { $item[$elm] = json_decode($item[$elm],true); @@ -1167,6 +1167,7 @@ class Activity { 'http://activitystrea.ms/schema/1.0/tag' => 'Add', 'http://activitystrea.ms/schema/1.0/follow' => 'Follow', 'http://activitystrea.ms/schema/1.0/unfollow' => 'Unfollow', + 'http://activitystrea.ms/schema/1.0/stop-following' => 'Unfollow', 'http://purl.org/zot/activity/attendyes' => 'Accept', 'http://purl.org/zot/activity/attendno' => 'Reject', 'http://purl.org/zot/activity/attendmaybe' => 'TentativeAccept', @@ -1214,6 +1215,7 @@ class Activity { 'http://activitystrea.ms/schema/1.0/tag' => 'Add', 'http://activitystrea.ms/schema/1.0/follow' => 'Follow', 'http://activitystrea.ms/schema/1.0/unfollow' => 'Unfollow', + 'http://activitystrea.ms/schema/1.0/stop-following' => 'Unfollow', 'http://purl.org/zot/activity/attendyes' => 'Accept', 'http://purl.org/zot/activity/attendno' => 'Reject', 'http://purl.org/zot/activity/attendmaybe' => 'TentativeAccept', @@ -2294,11 +2296,11 @@ class Activity { } if (array_key_exists('type', $act->obj)) { - + if ($act->obj['type'] === 'Note' && $s['attach']) { $s['body'] .= self::bb_attach($s['attach'], $s['body']); } - + if ($act->obj['type'] === 'Question' && in_array($act->type, ['Create', 'Update'])) { if (array_key_exists('endTime', $act->obj)) { $s['comments_closed'] = datetime_convert('UTC', 'UTC', $act->obj['endTime']); |