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

disconnect

Browse Source
This commit is contained in:
friendica
2015-04-23 21:13:59 -07:00
parent 4759fa662b
commit 5ac177391b
4 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/notifier.php
View File

@@ -343,6 +343,11 @@ function notifier_run($argv, $argc){
$deleted_item = true;
}
if(strpos($target_item['postopts'],'nodeliver') !== false) {
logger('notifier: target item is undeliverable', LOGGER_DEBUG);
return;
}
$unforwardable = ITEM_UNPUBLISHED|ITEM_DELAYED_PUBLISH|ITEM_WEBPAGE|ITEM_BUILDBLOCK|ITEM_PDL;
if($target_item['item_restrict'] & $unforwardable) {
logger('notifier: target item not forwardable: flags ' . $target_item['item_restrict'], LOGGER_DEBUG);
@@ -373,6 +378,12 @@ function notifier_run($argv, $argc){
if(! $r)
return;
if(strpos($r[0]['postopts'],'nodeliver') !== false) {
logger('notifier: target item is undeliverable', LOGGER_DEBUG);
return;
}
xchan_query($r);
$r = fetch_post_tags($r);
@@ -591,18 +602,15 @@ function notifier_run($argv, $argc){
foreach($dhubs as $hub) {
if(defined('DIASPORA_RELIABILITY_EMULATION')) {
$cointoss = mt_rand(0,2);
if($cointoss == 2) {
continue;
}
}
if($hub['hubloc_network'] === 'diaspora' || $hub['hubloc_network'] === 'friendica-over-diaspora') {
if(! get_config('system','diaspora_enabled'))
continue;
// allow this to be set per message
if(strpos($target_item['postopts'],'nodspr') !== false)
continue;
require_once('include/diaspora.php');
diaspora_process_outbound(array(