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

don't send deleted items upstream - only downstream.

Browse Source
This commit is contained in:
friendica 2015-02-24 20:21:21 -08:00
parent 08f054130f
commit 1434130264
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/notifier.php
View File

@ -315,9 +315,12 @@ function notifier_run($argv, $argc){
$r = fetch_post_tags($r); $r = fetch_post_tags($r);
$target_item = $r[0]; $target_item = $r[0];
$deleted_item = false;
if($target_item['item_restrict'] & ITEM_DELETED) if($target_item['item_restrict'] & ITEM_DELETED) {
logger('notifier: target item ITEM_DELETED', LOGGER_DEBUG); logger('notifier: target item ITEM_DELETED', LOGGER_DEBUG);
$deleted_item = true;
}
$unforwardable = ITEM_UNPUBLISHED|ITEM_DELAYED_PUBLISH|ITEM_WEBPAGE|ITEM_BUILDBLOCK|ITEM_PDL; $unforwardable = ITEM_UNPUBLISHED|ITEM_DELAYED_PUBLISH|ITEM_WEBPAGE|ITEM_BUILDBLOCK|ITEM_PDL;
if($target_item['item_restrict'] & $unforwardable) { if($target_item['item_restrict'] & $unforwardable) {
@ -376,7 +379,7 @@ function notifier_run($argv, $argc){
// tag_deliver'd post which needs to be sent back to the original author // tag_deliver'd post which needs to be sent back to the original author
if(($cmd === 'uplink') && ($parent_item['item_flags'] & ITEM_UPLINK) && (! $top_level_post)) { if(($cmd === 'uplink') && ($parent_item['item_flags'] & ITEM_UPLINK) && (! $top_level_post) && (! $deleted_item)) {
logger('notifier: uplink'); logger('notifier: uplink');
$uplink = true; $uplink = true;
} }
@ -397,7 +400,7 @@ function notifier_run($argv, $argc){
// if our parent is a tag_delivery recipient, uplink to the original author causing // if our parent is a tag_delivery recipient, uplink to the original author causing
// a delivery fork. // a delivery fork.
if(($parent_item['item_flags'] & ITEM_UPLINK) && (! $top_level_post) && ($cmd !== 'uplink')) { if(($parent_item['item_flags'] & ITEM_UPLINK) && (! $top_level_post) && ($cmd !== 'uplink') && (! $deleted_item)) {
logger('notifier: uplinking this item'); logger('notifier: uplinking this item');
proc_run('php','include/notifier.php','uplink',$item_id); proc_run('php','include/notifier.php','uplink',$item_id);
} }