aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-07-26 17:38:34 -0700
committergit-marijus <mario@mariovavti.com>2017-07-27 11:31:22 +0200
commitd3d184192d93e614bbcf31f6149084e8489befe0 (patch)
tree8bc5a073ac6d816f46c2d39a73e4cc7f461ef0b3
parente71cdf02a8303689c933b98185e2671f49fc5a7d (diff)
downloadvolse-hubzilla-d3d184192d93e614bbcf31f6149084e8489befe0.tar.gz
volse-hubzilla-d3d184192d93e614bbcf31f6149084e8489befe0.tar.bz2
volse-hubzilla-d3d184192d93e614bbcf31f6149084e8489befe0.zip
issue with OStatus comments being propagated downstream
-rw-r--r--include/feedutils.php15
1 files changed, 15 insertions, 0 deletions
diff --git a/include/feedutils.php b/include/feedutils.php
index 4f68fdeef..dbf60f553 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -999,6 +999,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
foreach($items as $item) {
$is_reply = false;
+ $send_downstream = false;
$parent_link = '';
logger('processing ' . $item->get_id(), LOGGER_DEBUG);
@@ -1200,6 +1201,15 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
$status = 202;
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 {
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);
$r = $xx['item_id'];
+
+ if($send_downstream) {
+ \Zotlabs\Daemon\Master::Summon(array('Notifier', 'comment', $r));
+ }
+
continue;
}
else {