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

document the issue with cloned delivery to self vs normal delivery to self

Browse Source
This commit is contained in:
redmatrix 2015-09-30 16:27:24 -07:00
parent b62e7e7d8b
commit 5265c190d4
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/zot.php
View File

@ -1566,6 +1566,8 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
} }
} }
logger('sender: ' . print_r($sender,true));
foreach($deliveries as $d) { foreach($deliveries as $d) {
$local_public = $public; $local_public = $public;
@ -1584,8 +1586,17 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
$channel = $r[0]; $channel = $r[0];
$DR->addto_recipient($channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>'); $DR->addto_recipient($channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>');
// breaks comments? /**
// if($d['hash'] === $sender['hash']) { * @FIXME: Somehow we need to block normal message delivery from our clones, as the delivered
* message doesn't have ACL information in it as the cloned copy does. That copy
* will normally arrive first via sync delivery, but this isn't guaranteed.
* There's a chance the current delivery could take place before the cloned copy arrives
* hence the item could have the wrong ACL and *could* be used in subsequent deliveries or
* access checks. So far all attempts at identifying this situation precisely
* have caused issues with delivery of relayed comments.
*/
// if(($d['hash'] === $sender['hash']) && ($sender['url'] !== z_root()) && (! $relay)) {
// $DR->update('self delivery ignored'); // $DR->update('self delivery ignored');
// $result[] = $DR->get(); // $result[] = $DR->get();
// continue; // continue;