diff options
| author | Mario <mario@mariovavti.com> | 2023-06-23 12:35:41 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2023-06-23 12:35:41 +0000 |
| commit | 12b2137a044ff6fd48239e207e5ad9350ceaf5e5 (patch) | |
| tree | 40fbddc372fe7701a2953d9c7f2239baba0d25f5 /Zotlabs/Lib/Activity.php | |
| parent | cd26ead043f9cb92ca4d59e587480520cb51f117 (diff) | |
| download | volse-hubzilla-12b2137a044ff6fd48239e207e5ad9350ceaf5e5.tar.gz volse-hubzilla-12b2137a044ff6fd48239e207e5ad9350ceaf5e5.tar.bz2 volse-hubzilla-12b2137a044ff6fd48239e207e5ad9350ceaf5e5.zip | |
fix relaying and syncing in Activity::drop(), change wording for moderation request notices and redirect moderation request for reactions to mod moderate
Diffstat (limited to 'Zotlabs/Lib/Activity.php')
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 433024cf0..e2618625f 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -1591,10 +1591,17 @@ class Activity { } if (in_array($observer, [$r[0]['author_xchan'], $r[0]['owner_xchan']])) { - drop_item($r[0]['id'], false); + drop_item($r[0]['id'], false, (($r[0]['item_wall']) ? DROPITEM_PHASE1 : DROPITEM_NORMAL)); } elseif (in_array($act->actor['id'], [$r[0]['author_xchan'], $r[0]['owner_xchan']])) { - drop_item($r[0]['id'], false); + drop_item($r[0]['id'], false, (($r[0]['item_wall']) ? DROPITEM_PHASE1 : DROPITEM_NORMAL)); } + + sync_an_item($channel['channel_id'], $r[0]['id']); + + if ($r[0]['item_wall']) { + Master::Summon(['Notifier', 'drop', $r[0]['id']]); + } + } @@ -2970,7 +2977,6 @@ class Activity { }*/ if (!$allowed) { - if (get_pconfig($channel['channel_id'], 'system', 'moderate_unsolicited_comments')) { $item['item_blocked'] = intval(ITEM_MODERATED); $allowed = true; |