harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mostly text formatting changes

Browse Source
This commit is contained in:
zotlabs 2017-04-25 19:42:06 -07:00
parent a342a5f8e0
commit 3a3bd582b1
1 changed files with 66 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
Zotlabs/Daemon/Notifier.php
View File

@ -391,7 +391,6 @@ class Notifier {
return; return;
} }
} }
} }
$walltowall = (($top_level_post && $channel['xchan_hash'] === $target_item['author_xchan']) ? true : false); $walltowall = (($top_level_post && $channel['xchan_hash'] === $target_item['author_xchan']) ? true : false);
@ -408,7 +407,7 @@ class Notifier {
if(! $recipients) if(! $recipients)
return; return;
// logger('notifier: recipients: ' . print_r($recipients,true), LOGGER_NORMAL, LOG_DEBUG); // logger('notifier: recipients: ' . print_r($recipients,true), LOGGER_NORMAL, LOG_DEBUG);
$env_recips = (($private) ? array() : null); $env_recips = (($private) ? array() : null);
@ -421,8 +420,13 @@ class Notifier {
foreach($details as $d) { foreach($details as $d) {
$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'],'hash' => $d['xchan_hash']); $env_recips[] = [
'guid' => $d['xchan_guid'],
'guid_sig' => $d['xchan_guid_sig'],
'hash' => $d['xchan_hash']
];
}
if($d['xchan_network'] === 'mail' && $normal_mode) { if($d['xchan_network'] === 'mail' && $normal_mode) {
$delivery_options = get_xconfig($d['xchan_hash'],'system','delivery_mode'); $delivery_options = get_xconfig($d['xchan_hash'],'system','delivery_mode');
@ -433,28 +437,28 @@ class Notifier {
} }
$narr = array( $narr = [
'channel' => $channel, 'channel' => $channel,
'upstream' => $upstream, 'upstream' => $upstream,
'env_recips' => $env_recips, 'env_recips' => $env_recips,
'packet_recips' => $packet_recips, 'packet_recips' => $packet_recips,
'recipients' => $recipients, 'recipients' => $recipients,
'item' => $item, 'item' => $item,
'target_item' => $target_item, 'target_item' => $target_item,
'top_level_post' => $top_level_post, 'top_level_post' => $top_level_post,
'private' => $private, 'private' => $private,
'relay_to_owner' => $relay_to_owner, 'relay_to_owner' => $relay_to_owner,
'uplink' => $uplink, 'uplink' => $uplink,
'cmd' => $cmd, 'cmd' => $cmd,
'mail' => $mail, 'mail' => $mail,
'single' => (($cmd === 'single_mail' || $cmd === 'single_activity') ? true : false), 'single' => (($cmd === 'single_mail' || $cmd === 'single_activity') ? true : false),
'location' => $location, 'location' => $location,
'request' => $request, 'request' => $request,
'normal_mode' => $normal_mode, 'normal_mode' => $normal_mode,
'packet_type' => $packet_type, 'packet_type' => $packet_type,
'walltowall' => $walltowall, 'walltowall' => $walltowall,
'queued' => array() 'queued' => []
); ];
call_hooks('notifier_process', $narr); call_hooks('notifier_process', $narr);
if($narr['queued']) { if($narr['queued']) {
@ -491,8 +495,6 @@ class Notifier {
$hubs = $r; $hubs = $r;
/** /**
* Reduce the hubs to those that are unique. For zot hubs, we need to verify uniqueness by the sitekey, * Reduce the hubs to those that are unique. For zot hubs, we need to verify uniqueness by the sitekey,
* since it may have been a re-install which has not yet been detected and pruned. * since it may have been a re-install which has not yet been detected and pruned.
@ -523,49 +525,47 @@ class Notifier {
if($hub['hubloc_network'] == 'zot') { if($hub['hubloc_network'] == 'zot') {
if(! in_array($hub['hubloc_sitekey'],$keys)) { if(! in_array($hub['hubloc_sitekey'],$keys)) {
$hublist[] = $hub['hubloc_host']; $hublist[] = $hub['hubloc_host'];
$dhubs[] = $hub; $dhubs[] = $hub;
$keys[] = $hub['hubloc_sitekey']; $keys[] = $hub['hubloc_sitekey'];
} }
} }
else { else {
if(! in_array($hub['hubloc_url'],$urls)) { if(! in_array($hub['hubloc_url'],$urls)) {
$hublist[] = $hub['hubloc_host']; $hublist[] = $hub['hubloc_host'];
$dhubs[] = $hub; $dhubs[] = $hub;
$urls[] = $hub['hubloc_url']; $urls[] = $hub['hubloc_url'];
} }
} }
} }
logger('notifier: will notify/deliver to these hubs: ' . print_r($hublist,true), LOGGER_DEBUG, LOG_DEBUG); logger('notifier: will notify/deliver to these hubs: ' . print_r($hublist,true), LOGGER_DEBUG, LOG_DEBUG);
foreach($dhubs as $hub) { foreach($dhubs as $hub) {
if($hub['hubloc_network'] !== 'zot') { if($hub['hubloc_network'] !== 'zot') {
$narr = [
$narr = array( 'channel' => $channel,
'channel' => $channel, 'upstream' => $upstream,
'upstream' => $upstream, 'env_recips' => $env_recips,
'env_recips' => $env_recips, 'packet_recips' => $packet_recips,
'packet_recips' => $packet_recips, 'recipients' => $recipients,
'recipients' => $recipients, 'item' => $item,
'item' => $item, 'target_item' => $target_item,
'target_item' => $target_item, 'hub' => $hub,
'hub' => $hub,
'top_level_post' => $top_level_post, 'top_level_post' => $top_level_post,
'private' => $private, 'private' => $private,
'relay_to_owner' => $relay_to_owner, 'relay_to_owner' => $relay_to_owner,
'uplink' => $uplink, 'uplink' => $uplink,
'cmd' => $cmd, 'cmd' => $cmd,
'mail' => $mail, 'mail' => $mail,
'single' => (($cmd === 'single_mail' || $cmd === 'single_activity') ? true : false), 'single' => (($cmd === 'single_mail' || $cmd === 'single_activity') ? true : false),
'location' => $location, 'location' => $location,
'request' => $request, 'request' => $request,
'normal_mode' => $normal_mode, 'normal_mode' => $normal_mode,
'packet_type' => $packet_type, 'packet_type' => $packet_type,
'walltowall' => $walltowall, 'walltowall' => $walltowall,
'queued' => array() 'queued' => []
); ];
call_hooks('notifier_hub',$narr); call_hooks('notifier_hub',$narr);
@ -617,14 +617,16 @@ class Notifier {
else { else {
$env = (($hub_env && $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']]) ? $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']] : ''); $env = (($hub_env && $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']]) ? $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']] : '');
$packet = zot_build_packet($channel,'notify',$env,(($private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto'],$hash); $packet = zot_build_packet($channel,'notify',$env,(($private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto'],$hash);
queue_insert(array( queue_insert(
'hash' => $hash, [
'account_id' => $target_item['aid'], 'hash' => $hash,
'channel_id' => $target_item['uid'], 'account_id' => $target_item['aid'],
'posturl' => $hub['hubloc_callback'], 'channel_id' => $target_item['uid'],
'notify' => $packet, 'posturl' => $hub['hubloc_callback'],
'msg' => json_encode($encoded_item) 'notify' => $packet,
)); 'msg' => json_encode($encoded_item)
]
);
// only create delivery reports for normal undeleted items // only create delivery reports for normal undeleted items
if(is_array($target_item) && array_key_exists('postopts',$target_item) && (! $target_item['item_deleted']) && (! get_config('system','disable_dreport'))) { if(is_array($target_item) && array_key_exists('postopts',$target_item) && (! $target_item['item_deleted']) && (! get_config('system','disable_dreport'))) {
@ -645,9 +647,9 @@ class Notifier {
if($normal_mode) { if($normal_mode) {
$x = q("select * from hook where hook = 'notifier_normal'"); $x = q("select * from hook where hook = 'notifier_normal'");
if($x) if($x) {
Master::Summon(array('Deliver_hooks',$target_item['id'])); Master::Summon( [ 'Deliver_hooks', $target_item['id'] ] );
}
} }
if($deliveries) if($deliveries)