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

issue with OStatus comments being propagated downstream

Browse Source
This commit is contained in:
zotlabs 2017-07-26 17:38:34 -07:00 committed by git-marijus
parent e71cdf02a8
commit d3d184192d
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/feedutils.php
View File

@ -999,6 +999,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
foreach($items as $item) { foreach($items as $item) {
$is_reply = false; $is_reply = false;
$send_downstream = false;
$parent_link = ''; $parent_link = '';
logger('processing ' . $item->get_id(), LOGGER_DEBUG); logger('processing ' . $item->get_id(), LOGGER_DEBUG);
@ -1200,6 +1201,15 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
$status = 202; $status = 202;
continue; continue;
} }
// The salmon endpoint sets this to indicate that we should send comments from
// interactive feeds (such as OStatus) downstream to our followers
// We do not want to set it for non-interactive feeds or conversations we do not own
if(array_key_exists('send_downstream',$importer) && intval($importer['send_downstream'])
&& ($parent_item['owner_xchan'] == $importer['channel_hash'])) {
$send_downstream = true;
}
} }
else { else {
if((! perm_is_allowed($importer['channel_id'],$contact['xchan_hash'],'send_stream')) && (! $importer['system'])) { if((! perm_is_allowed($importer['channel_id'],$contact['xchan_hash'],'send_stream')) && (! $importer['system'])) {
@ -1229,6 +1239,11 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
$xx = item_store($datarray); $xx = item_store($datarray);
$r = $xx['item_id']; $r = $xx['item_id'];
if($send_downstream) {
\Zotlabs\Daemon\Master::Summon(array('Notifier', 'comment', $r));
}
continue; continue;
} }
else { else {