diff options
| author | Mario Vavti <mario@mariovavti.com> | 2023-10-04 20:11:05 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2023-10-04 20:11:05 +0200 |
| commit | d1421d720c3f8ae9a7c409423fcbea4ff8132676 (patch) | |
| tree | 1fae34fc10a31df39582a46b58367d9c77113a23 /Zotlabs | |
| parent | 56e54ac820b32f4b5f7d3f554191079003ac78a5 (diff) | |
| download | volse-hubzilla-d1421d720c3f8ae9a7c409423fcbea4ff8132676.tar.gz volse-hubzilla-d1421d720c3f8ae9a7c409423fcbea4ff8132676.tar.bz2 volse-hubzilla-d1421d720c3f8ae9a7c409423fcbea4ff8132676.zip | |
parse the event object in first place and use the body bbcode as backup
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 190777b5f..227739fea 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -2344,7 +2344,7 @@ class Activity { $s['expires'] = datetime_convert('UTC', 'UTC', $act->obj['expires']); } - if ($act->type === 'Invite' && $act->objprop('type') === 'Event') { + if (in_array($act->type, ['Invite', 'Create']) && $act->objprop('type') === 'Event') { $s['mid'] = $s['parent_mid'] = $act->id; } @@ -2899,6 +2899,10 @@ class Activity { set_iconfig($s, 'activitypub', 'recips', $act->raw_recips); } + if ($act->objprop('type') === 'Event' && $act->objprop('timezone')) { + set_iconfig($s, 'event', 'timezone', $act->objprop('timezone'), true); + } + $hookinfo = [ 'act' => $act, 's' => $s @@ -3257,7 +3261,12 @@ class Activity { } } - if (is_array($x) && $x['item_id']) { + if ($x['success']) { + + if (check_item_source($channel['channel_id'], $x['item']) && in_array($x['item']['obj_type'], ['Event', ACTIVITY_OBJ_EVENT])) { + event_addtocal($x['item_id'], $channel['channel_id']); + } + if ($is_child_node) { if ($item['owner_xchan'] === $channel['channel_hash']) { // We are the owner of this conversation, so send all received comments back downstream |