aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2023-03-30 12:08:43 +0000
committerMario <mario@mariovavti.com>2023-03-30 12:08:43 +0000
commitba71c53bc6565849ec5ad7af759173e92a498858 (patch)
tree351a89c4370ac5c264f7afc6aeffe917a8c18a86 /Zotlabs
parentb3cfeb573a47058f7c2a119829875a5286a078ad (diff)
downloadvolse-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.
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Daemon/Notifier.php1
-rw-r--r--Zotlabs/Lib/Libzot.php2
2 files changed, 2 insertions, 1 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;