mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 05:15:16 +00:00
remove a number of sys channel prohibitions since it is now an active and fully functional channel
This commit is contained in:
parent
17105fcd15
commit
1c70859010
6 changed files with 12 additions and 15 deletions
|
@ -3584,11 +3584,6 @@ class Activity {
|
|||
|
||||
if ($is_sys_channel) {
|
||||
|
||||
if (! $pubstream) {
|
||||
$allowed = false;
|
||||
$reason[] = 'unlisted post delivered to sys channel';
|
||||
}
|
||||
|
||||
if (! check_pubstream_channelallowed($observer_hash)) {
|
||||
$allowed = false;
|
||||
$reason[] = 'pubstream channel blocked';
|
||||
|
|
|
@ -28,9 +28,9 @@ class Followers extends Controller {
|
|||
http_status_exit(404, 'Not found');
|
||||
}
|
||||
|
||||
if (intval($channel['channel_system'])) {
|
||||
http_status_exit(403,'Permission denied');
|
||||
}
|
||||
// if (intval($channel['channel_system'])) {
|
||||
// http_status_exit(403,'Permission denied');
|
||||
// }
|
||||
|
||||
Libprofile::load(argv(1));
|
||||
|
||||
|
|
|
@ -26,9 +26,9 @@ class Following extends Controller {
|
|||
http_status_exit(404, 'Not found');
|
||||
}
|
||||
|
||||
if (intval($channel['channel_system'])) {
|
||||
http_status_exit(403,'Permission denied');
|
||||
}
|
||||
// if (intval($channel['channel_system'])) {
|
||||
// http_status_exit(403,'Permission denied');
|
||||
// }
|
||||
|
||||
Libprofile::load(argv(1));
|
||||
|
||||
|
|
|
@ -261,6 +261,8 @@ class Inbox extends Controller {
|
|||
|
||||
|
||||
foreach ($channels as $channel) {
|
||||
|
||||
// Even though activitypub may be enabled for the site, check if the channel has specifically disabled it
|
||||
if (! PConfig::Get($channel['channel_id'],'system','activitypub',Config::Get('system','activitypub',ACTIVITYPUB_ENABLED))) {
|
||||
continue;
|
||||
}
|
||||
|
|
|
@ -210,9 +210,9 @@ return;
|
|||
killme();
|
||||
}
|
||||
|
||||
if (intval($channel['channel_system'])) {
|
||||
killme();
|
||||
}
|
||||
// if (intval($channel['channel_system'])) {
|
||||
// killme();
|
||||
// }
|
||||
|
||||
if (ActivityStreams::is_as_request()) {
|
||||
$sigdata = HTTPSig::verify(($_SERVER['REQUEST_METHOD'] === 'POST') ? file_get_contents('php://input') : EMPTY_STR);
|
||||
|
|
|
@ -164,7 +164,7 @@ class Pubstream extends Controller {
|
|||
}
|
||||
else {
|
||||
$sys = get_sys_channel();
|
||||
$uids = " and ( item.uid = " . intval($sys['channel_id']) . " )";
|
||||
$uids = " and item_private = 0 and ( item.uid = " . intval($sys['channel_id']) . " )";
|
||||
$sql_extra = item_permissions_sql($sys['channel_id']);
|
||||
App::$data['firehose'] = intval($sys['channel_id']);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue