Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 04:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
nobody 2021-01-22 16:39:55 -08:00
parent 0ada72744b
commit 8eb4f5a082
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Zotlabs/Lib/Activity.php
View file

@ -2907,7 +2907,7 @@ class Activity {
$allowed = true;
}
if (intval($channel['channel_system'])) {
if ($is_sys_channel) {
if (! check_pubstream_channelallowed($observer_hash)) {
$allowed = false;
@ -2926,6 +2926,9 @@ class Activity {
}
}
}
if (intval($item['item_private'])) {
$allowed = false;
}
}
$blocked = LibBlock::fetch($channel['channel_id'],BLOCKTYPE_SERVER);
@ -3123,7 +3126,7 @@ class Activity {
$current_act = $act;
$current_item = $item;
while($current_item['parent_mid'] !== $current_item['mid']) {
while ($current_item['parent_mid'] !== $current_item['mid']) {
$n = self::fetch($current_item['parent_mid']);
if (! $n) {
break;
@ -3169,7 +3172,7 @@ class Activity {
// don't leak any private conversations to the public stream
// even if they contain publicly addressed comments/reactions
if ($item['parent_mid'] === $item['mid'] && intval($channel['channel_system']) && intval($item['item_private'])) {
if (intval($channel['channel_system']) && intval($item['item_private'])) {
$p = [];
break;
}