diff options
| author | Andrew Manning <tamanning@zoho.com> | 2018-02-20 21:11:59 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2018-02-20 21:11:59 -0500 |
| commit | 8e5c1135c3e2644ea8501eda067e2b994faa44ab (patch) | |
| tree | 6b72038214359dcf8eff040a68874583e7174800 /Zotlabs/Daemon | |
| parent | 89a825cd038df7da609d64ef0254ba58caaede31 (diff) | |
| parent | 85a6dd60316eefbdaf072e59621d681a3cf2546b (diff) | |
| download | volse-hubzilla-8e5c1135c3e2644ea8501eda067e2b994faa44ab.tar.gz volse-hubzilla-8e5c1135c3e2644ea8501eda067e2b994faa44ab.tar.bz2 volse-hubzilla-8e5c1135c3e2644ea8501eda067e2b994faa44ab.zip | |
Merge branch 'dev' into oauth2
Diffstat (limited to 'Zotlabs/Daemon')
| -rw-r--r-- | Zotlabs/Daemon/Notifier.php | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 957b859af..fa2368a92 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' && (! array_key_exists('allow_cid',$encoded_item))) ? 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 = zot_build_packet($channel,'notify',$env, (($private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto'],$hash); + + } + queue_insert( [ 'hash' => $hash, |