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

For private messages, use hush-hush ultra top-secret mode by default

Browse Source
This commit is contained in:
friendica 2012-11-18 19:19:16 -08:00
parent 8611c3da68
commit db77309bc3
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/items.php
View File

@ -7,7 +7,7 @@ require_once('include/Photo.php');
function collect_recipients($item) { function collect_recipients($item,&$private) {
if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) { if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) {
$allow_people = expand_acl($item['allow_cid']); $allow_people = expand_acl($item['allow_cid']);
@ -18,6 +18,7 @@ function collect_recipients($item) {
$recipients = array_unique(array_merge($allow_people,$allow_groups)); $recipients = array_unique(array_merge($allow_people,$allow_groups));
$deny = array_unique(array_merge($deny_people,$deny_groups)); $deny = array_unique(array_merge($deny_people,$deny_groups));
$recipients = array_diff($recipients,$deny); $recipients = array_diff($recipients,$deny);
$private = true;
} }
else { else {
$recipients = array(); $recipients = array();
@ -31,6 +32,7 @@ function collect_recipients($item) {
$recipients[] = $rr['abook_xchan']; $recipients[] = $rr['abook_xchan'];
} }
} }
$private = false;
} }
return $recipients; return $recipients;
} }

14
include/notifier.php
View File

@ -209,17 +209,18 @@ function notifier_run($argv, $argc){
if($relay_to_owner) { if($relay_to_owner) {
logger('notifier: followup relay', LOGGER_DEBUG); logger('notifier: followup relay', LOGGER_DEBUG);
$recipients = array($parent_item['owner_xchan']); $recipients = array($parent_item['owner_xchan']);
$private = true;
if(! $encoded_item['flags']) if(! $encoded_item['flags'])
$encoded_item['flags'] = array(); $encoded_item['flags'] = array();
$encoded_item['flags'][] = 'relay'; $encoded_item['flags'][] = 'relay';
} }
else { else {
logger('notifier: normal distribution', LOGGER_DEBUG); logger('notifier: normal distribution', LOGGER_DEBUG);
$recipients = collect_recipients($parent_item); $private = false;
$recipients = collect_recipients($parent_item,$private);
// FIXME add any additional recipients such as mentions, etc. // FIXME add any additional recipients such as mentions, etc.
// don't send deletions onward for other people's stuff // don't send deletions onward for other people's stuff
// TODO verify this is needed - copied logic from same place in old code // TODO verify this is needed - copied logic from same place in old code
@ -227,8 +228,6 @@ function notifier_run($argv, $argc){
logger('notifier: ignoring delete notification for non-wall item'); logger('notifier: ignoring delete notification for non-wall item');
return; return;
} }
} }
logger('notifier: encoded item: ' . print_r($encoded_item,true)); logger('notifier: encoded item: ' . print_r($encoded_item,true));
@ -238,6 +237,9 @@ function notifier_run($argv, $argc){
return; return;
logger('notifier: recipients: ' . print_r($recipients,true)); logger('notifier: recipients: ' . print_r($recipients,true));
// Now we have collected recipients (except for external mentions, FIXME)
// Let's reduce this to a set of hubs.
$r = q("select distinct(hubloc_callback),hubloc_host,hubloc_sitekey from hubloc $r = q("select distinct(hubloc_callback),hubloc_host,hubloc_sitekey from hubloc
where hubloc_hash in (" . implode(',',$recipients) . ") group by hubloc_callback"); where hubloc_hash in (" . implode(',',$recipients) . ") group by hubloc_callback");
if(! $r) { if(! $r) {
@ -245,8 +247,6 @@ function notifier_run($argv, $argc){
return; return;
} }
$hubs = $r; $hubs = $r;
if(! $hubs)
return;
$interval = ((get_config('system','delivery_interval') !== false) $interval = ((get_config('system','delivery_interval') !== false)
? intval(get_config('system','delivery_interval')) : 2 ); ? intval(get_config('system','delivery_interval')) : 2 );
@ -260,8 +260,8 @@ function notifier_run($argv, $argc){
$current_count = 0; $current_count = 0;
foreach($hubs as $hub) { foreach($hubs as $hub) {
$n = zot_build_packet($channel,'notify',null,null);
$hash = random_string(); $hash = random_string();
$n = zot_build_packet($channel,'notify',null,(($private) ? $hub['hubloc_sitekey'],$hash);
q("insert into outq ( outq_hash, outq_account, outq_channel, outq_posturl, outq_created, outq_updated, outq_notify, outq_msg ) values ( '%s', %d, %d, '%s', '%s', '%s', '%s', '%s' )", q("insert into outq ( outq_hash, outq_account, outq_channel, outq_posturl, outq_created, outq_updated, outq_notify, outq_msg ) values ( '%s', %d, %d, '%s', '%s', '%s', '%s', '%s' )",
dbesc($hash), dbesc($hash),
intval($target_item['aid']), intval($target_item['aid']),

5
include/zot.php
View File

@ -85,7 +85,7 @@ function zot_notify($channel,$url,$type = 'notify',$recipients = null, $remote_k
* *
*/ */
function zot_build_packet($channel,$type = 'notify',$recipients = null, $remote_key = null) { function zot_build_packet($channel,$type = 'notify',$recipients = null, $remote_key = null, $secret = null) {
$data = array( $data = array(
'type' => $type, 'type' => $type,
@ -103,6 +103,9 @@ function zot_build_packet($channel,$type = 'notify',$recipients = null, $remote_
if($recipients) if($recipients)
$data['recipients'] = $recipients; $data['recipients'] = $recipients;
if($secret)
$data['secret'] = $secret;
// Hush-hush ultra top-secret mode // Hush-hush ultra top-secret mode
if($remote_key) { if($remote_key) {