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

do not check send_stream permission for comments

Browse Source
This commit is contained in:
Mario Vavti 2019-06-27 13:11:59 +02:00
parent 49ba3ffee6
commit 302d2dbd51
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Zotlabs/Lib/Activity.php
View File

@ -1863,8 +1863,9 @@ class Activity {
// This is not part of the activitypub protocol - we might change this to show all public posts in pubstream at some point. // This is not part of the activitypub protocol - we might change this to show all public posts in pubstream at some point.
$pubstream = ((is_array($act->obj) && array_key_exists('to', $act->obj) && in_array(ACTIVITY_PUBLIC_INBOX, $act->obj['to'])) ? true : false); $pubstream = ((is_array($act->obj) && array_key_exists('to', $act->obj) && in_array(ACTIVITY_PUBLIC_INBOX, $act->obj['to'])) ? true : false);
$is_parent = (($item['parent_mid'] && $item['parent_mid'] === $item['mid']) ? true : false);
if(! perm_is_allowed($channel['channel_id'],$observer_hash,'send_stream') && ! ($is_sys_channel && $pubstream)) { if($is_parent && (! perm_is_allowed($channel['channel_id'],$observer_hash,'send_stream') && ! ($is_sys_channel && $pubstream))) {
logger('no permission'); logger('no permission');
return; return;
} }
@ -1920,9 +1921,7 @@ class Activity {
set_iconfig($item,'activitypub','recips',$act->raw_recips); set_iconfig($item,'activitypub','recips',$act->raw_recips);
$parent = (($item['parent_mid'] && $item['parent_mid'] === $item['mid']) ? true : false); if(! $is_parent) {
if(! $parent) {
$p = q("select parent_mid from item where mid = '%s' and uid = %d limit 1", $p = q("select parent_mid from item where mid = '%s' and uid = %d limit 1",
dbesc($item['parent_mid']), dbesc($item['parent_mid']),
intval($item['uid']) intval($item['uid'])
@ -1980,7 +1979,7 @@ class Activity {
} }
if(is_array($x) && $x['item_id']) { if(is_array($x) && $x['item_id']) {
if($parent) { if($is_parent) {
if($item['owner_xchan'] === $channel['channel_hash']) { if($item['owner_xchan'] === $channel['channel_hash']) {
// We are the owner of this conversation, so send all received comments back downstream // We are the owner of this conversation, so send all received comments back downstream
Master::Summon(array('Notifier','comment-import',$x['item_id'])); Master::Summon(array('Notifier','comment-import',$x['item_id']));
@ -2020,8 +2019,8 @@ class Activity {
} }
$replies = null; $replies = null;
if(isset($n['replies']['first']['items'])) { if(isset($a->obj['replies']['first']['items']))) {
$replies = $n['replies']['first']['items']; $replies = $a->obj['replies']['first']['items'];
// we already have this one // we already have this one
array_diff($replies, [$current_item['mid']]); array_diff($replies, [$current_item['mid']]);
} }