aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-02-19 22:21:50 +0100
committerMario Vavti <mario@mariovavti.com>2018-02-19 22:21:50 +0100
commit66309a3fea4b087ffef53ea93d5573278515dcf0 (patch)
treeb592893fdd7eab33f0c4a240194f875b8286426f
parent2047801b858d56ba72da0a430903890bea0130cd (diff)
parent04185b05ab141cdb8b96f5fa9e4106b4a2cde732 (diff)
downloadvolse-hubzilla-66309a3fea4b087ffef53ea93d5573278515dcf0.tar.gz
volse-hubzilla-66309a3fea4b087ffef53ea93d5573278515dcf0.tar.bz2
volse-hubzilla-66309a3fea4b087ffef53ea93d5573278515dcf0.zip
Merge remote-tracking branch 'mike/master' into dev
-rw-r--r--Zotlabs/Daemon/Notifier.php16
1 files changed, 15 insertions, 1 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index 957b859af..47db32206 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -640,7 +640,21 @@ class Notifier {
}
else {
$env = (($hub_env && $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']]) ? $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']] : '');
- $packet = zot6_build_packet($channel,'notify',$env, json_encode($encoded_item), (($private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto'],$hash);
+
+ // currently zot6 delivery is only performed on normal items and not sync items or mail or anything else
+ // Eventually we will do this for all deliveries, but for now ensure this is precisely what we are dealing
+ // with before switching to zot6 as the primary zot6 handler checks for the existence of a message delivery report
+ // to trigger dequeue'ing
+
+ $z6 = (($encoded_item && $encoded_item['type'] === 'activity' && (! $encoded_item['allow_cid'])) ? true : false);
+ if($z6) {
+ $packet = zot6_build_packet($channel,'notify',$env, json_encode($encoded_item), (($private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto'],$hash);
+ }
+ else {
+ $packet = zot6_build_packet($channel,'notify',$env, (($private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto'],$hash);
+
+ }
+
queue_insert(
[
'hash' => $hash,