diff options
| author | Andrew Manning <andrew@reticu.li> | 2016-11-30 21:22:51 -0500 |
|---|---|---|
| committer | Andrew Manning <andrew@reticu.li> | 2016-11-30 21:22:51 -0500 |
| commit | 3f838e1dbccab819ce0cf93b079afea8d41d2a7a (patch) | |
| tree | f76eb1fbb01cb3917474613c0f0bcfbe74ba0aa3 /Zotlabs/Daemon | |
| parent | 50a8ba8c18b081ce60ba7ab1a74ba30d8ff43794 (diff) | |
| parent | c845eed114ec3cea90acd35c419110d9ab76051f (diff) | |
| download | volse-hubzilla-3f838e1dbccab819ce0cf93b079afea8d41d2a7a.tar.gz volse-hubzilla-3f838e1dbccab819ce0cf93b079afea8d41d2a7a.tar.bz2 volse-hubzilla-3f838e1dbccab819ce0cf93b079afea8d41d2a7a.zip | |
Merge remote-tracking branch 'upstream/dev' into doco
Diffstat (limited to 'Zotlabs/Daemon')
| -rw-r--r-- | Zotlabs/Daemon/Notifier.php | 8 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Ratenotif.php | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 36edbc057..63ced4f56 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -491,7 +491,7 @@ class Notifier { // Now we have collected recipients (except for external mentions, FIXME) // Let's reduce this to a set of hubs. - $r = q("select * from hubloc where hubloc_hash in (" . implode(',',$recipients) . ") + $r = q("select hubloc.*, site.site_crypto from hubloc left join site on site_url = hubloc_url where hubloc_hash in (" . implode(',',$recipients) . ") and hubloc_error = 0 and hubloc_deleted = 0" ); @@ -603,8 +603,8 @@ class Notifier { $packet = zot_build_packet($channel,$packet_type,(($packet_recips) ? $packet_recips : null)); } elseif($packet_type === 'request') { - $packet = zot_build_packet($channel,$packet_type,$env_recips,$hub['hubloc_sitekey'],$hash, - array('message_id' => $request_message_id) + $packet = zot_build_packet($channel,$packet_type,$env_recips,$hub['hubloc_sitekey'],$hub['site_crypto'], + $hash, array('message_id' => $request_message_id) ); } @@ -618,7 +618,7 @@ class Notifier { )); } else { - $packet = zot_build_packet($channel,'notify',$env_recips,(($private) ? $hub['hubloc_sitekey'] : null),$hash); + $packet = zot_build_packet($channel,'notify',$env_recips,(($private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto'],$hash); queue_insert(array( 'hash' => $hash, 'account_id' => $target_item['aid'], diff --git a/Zotlabs/Daemon/Ratenotif.php b/Zotlabs/Daemon/Ratenotif.php index 1cba5e26d..a94b89004 100644 --- a/Zotlabs/Daemon/Ratenotif.php +++ b/Zotlabs/Daemon/Ratenotif.php @@ -77,7 +77,7 @@ class Ratenotif { continue; $hash = random_string(); - $n = zot_build_packet($channel,'notify',null,null,$hash); + $n = zot_build_packet($channel,'notify',null,null,'',$hash); queue_insert(array( 'hash' => $hash, |