diff options
| author | Mario <mario@mariovavti.com> | 2023-03-30 12:08:43 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2023-03-30 12:08:43 +0000 |
| commit | ba71c53bc6565849ec5ad7af759173e92a498858 (patch) | |
| tree | 351a89c4370ac5c264f7afc6aeffe917a8c18a86 | |
| parent | b3cfeb573a47058f7c2a119829875a5286a078ad (diff) | |
| download | volse-hubzilla-ba71c53bc6565849ec5ad7af759173e92a498858.tar.gz volse-hubzilla-ba71c53bc6565849ec5ad7af759173e92a498858.tar.bz2 volse-hubzilla-ba71c53bc6565849ec5ad7af759173e92a498858.zip | |
ignore deliveries by our own channel which do not origin from the local hub. instead rely on the sync delivery.
| -rw-r--r-- | Zotlabs/Daemon/Notifier.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Lib/Libzot.php | 2 | ||||
| -rw-r--r-- | include/items.php | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index d5fe7ee6d..4f0538965 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -334,6 +334,7 @@ class Notifier { $m = get_iconfig($target_item, 'activitypub', 'signed_data'); // Re-use existing signature unless the activity type changed to a Tombstone, which won't verify. if ($m && (!intval($target_item['item_deleted']))) { + hz_syslog('notifier existing'); self::$encoded_item = json_decode($m, true); } else { diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index 406a26910..709c9dc94 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -1585,7 +1585,7 @@ class Libzot { * access checks. */ - if ($sender === $channel['channel_hash'] && $arr['author_xchan'] === $channel['channel_hash'] && $arr['mid'] === $arr['parent_mid']) { + if ($sender === $channel['channel_hash'] && $arr['author_xchan'] === $channel['channel_hash'] && !str_starts_with($arr['mid'], z_root())) { $DR->update('self delivery ignored'); $result[] = $DR->get(); continue; diff --git a/include/items.php b/include/items.php index 3a2b5efb2..a9930470c 100644 --- a/include/items.php +++ b/include/items.php @@ -202,7 +202,7 @@ function collect_recipients($item, &$private_envelope,$include_groups = true) { // add ourself just in case we have nomadic clones that need to get a copy. if (!in_array($item['author_xchan'], $recipients)) { - $recipients[] = $item['author_xchan']; + // $recipients[] = $item['author_xchan']; } if($item['owner_xchan'] !== $item['author_xchan'] && !in_array($item['owner_xchan'], $recipients)) { |