aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-10-03 16:54:04 +0000
committerMario <mario@mariovavti.com>2021-10-03 16:54:04 +0000
commitda923d7749764ca0d6038f72ca48c6960092228c (patch)
treeef5e82d580d1143236db31f2814cb22a648adaaa
parent55d905fdd934090ce4c6511a3db035e073cd1fcb (diff)
parent4ba70a3fae5722273d17c519d5ad3f270e781f53 (diff)
downloadvolse-hubzilla-da923d7749764ca0d6038f72ca48c6960092228c.tar.gz
volse-hubzilla-da923d7749764ca0d6038f72ca48c6960092228c.tar.bz2
volse-hubzilla-da923d7749764ca0d6038f72ca48c6960092228c.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
-rw-r--r--Zotlabs/Daemon/Directory.php7
-rw-r--r--Zotlabs/Daemon/Notifier.php11
-rw-r--r--Zotlabs/Lib/Queue.php2
3 files changed, 12 insertions, 8 deletions
diff --git a/Zotlabs/Daemon/Directory.php b/Zotlabs/Daemon/Directory.php
index 35d184206..3996b8079 100644
--- a/Zotlabs/Daemon/Directory.php
+++ b/Zotlabs/Daemon/Directory.php
@@ -49,8 +49,9 @@ class Directory {
);
// Now update all the connections
- if ($pushall)
+ if ($pushall) {
Master::Summon(array('Notifier', 'refresh_all', $channel['channel_id']));
+ }
return;
}
@@ -93,8 +94,8 @@ class Directory {
}
// Now update all the connections
- if ($pushall)
+ if ($pushall) {
Master::Summon(array('Notifier', 'refresh_all', $channel['channel_id']));
-
+ }
}
}
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index 64f192bb2..cdb54d37e 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -95,7 +95,6 @@ class Notifier {
return;
}
-
self::$deliveries = [];
self::$recipients = [];
self::$env_recips = [];
@@ -180,6 +179,11 @@ class Notifier {
self::$recipients[] = $rr['abook_xchan'];
}
}
+
+ // In case we deleted the channel, our abook entry has already vanished.
+ // In order to be able to update our clones we need to add ourself here.
+ self::$recipients[] = self::$channel['channel_hash'];
+
self::$private = false;
self::$packet_type = 'refresh';
}
@@ -190,14 +194,14 @@ class Notifier {
return;
}
- self::$channel = channelx_by_n($item_id);
+ self::$channel = channelx_by_n($item_id, true);
self::$recipients = [$xchan];
self::$private = true;
self::$packet_type = 'purge';
}
elseif ($cmd === 'purge_all') {
logger('notifier: purge_all: ' . $item_id);
- self::$channel = channelx_by_n($item_id);
+ self::$channel = channelx_by_n($item_id, true);
self::$recipients = [];
self::$private = false;
self::$packet_type = 'purge';
@@ -443,7 +447,6 @@ class Notifier {
}
}
-
$narr = [
'channel' => self::$channel,
'upstream' => $upstream,
diff --git a/Zotlabs/Lib/Queue.php b/Zotlabs/Lib/Queue.php
index 35eb1e264..e03816f05 100644
--- a/Zotlabs/Lib/Queue.php
+++ b/Zotlabs/Lib/Queue.php
@@ -195,7 +195,7 @@ class Queue {
$channel = null;
if($outq['outq_channel']) {
- $channel = channelx_by_n($outq['outq_channel']);
+ $channel = channelx_by_n($outq['outq_channel'], true);
}
$host_crypto = null;