this is necessary for any possibility of a federated future.
This commit is contained in:
parent
f896819c78
commit
be8a7e2de6
@ -382,12 +382,27 @@ function notifier_run($argv, $argc){
|
|||||||
|
|
||||||
$env_recips = (($private) ? array() : null);
|
$env_recips = (($private) ? array() : null);
|
||||||
|
|
||||||
$details = q("select xchan_hash, xchan_addr, xchan_guid, xchan_guid_sig from xchan where xchan_hash in (" . implode(',',$recipients) . ")");
|
$details = q("select xchan_hash, xchan_instance_url, xchan_addr, xchan_guid, xchan_guid_sig from xchan where xchan_hash in (" . implode(',',$recipients) . ")");
|
||||||
|
|
||||||
$recip_list = array();
|
$recip_list = array();
|
||||||
|
|
||||||
if($details) {
|
if($details) {
|
||||||
foreach($details as $d) {
|
foreach($details as $d) {
|
||||||
|
|
||||||
|
// If the recipient is federated from a traditional network they won't be able to
|
||||||
|
// handle nomadic identity. If we're publishing from a site that they aren't
|
||||||
|
// directly connected with, ignore them.
|
||||||
|
|
||||||
|
// FIXME: make sure we run through a notifier loop on the hub they're connected
|
||||||
|
// with if this post comes in from a different hub - so that we will deliver to them.
|
||||||
|
|
||||||
|
// On the down side, these channels will stop working if the hub they connected with
|
||||||
|
// goes down permanently, as they are (doh) not nomadic.
|
||||||
|
|
||||||
|
if(($d['xchan_instance_url']) && ($d['xchan_instance_url'] != z_root()))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
|
||||||
$recip_list[] = $d['xchan_addr'] . ' (' . $d['xchan_hash'] . ')';
|
$recip_list[] = $d['xchan_addr'] . ' (' . $d['xchan_hash'] . ')';
|
||||||
if($private)
|
if($private)
|
||||||
$env_recips[] = array('guid' => $d['xchan_guid'],'guid_sig' => $d['xchan_guid_sig']);
|
$env_recips[] = array('guid' => $d['xchan_guid'],'guid_sig' => $d['xchan_guid_sig']);
|
||||||
|
Reference in New Issue
Block a user