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

Merge branch 'dev' of ../p3 into dev

Browse source
This commit is contained in:
nobody 2021-09-13 01:47:58 -07:00
commit 8e059b0015
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Zotlabs/Lib/Activity.php
View file

@ -1711,12 +1711,16 @@ class Activity {
static function encode_site() {
$ret = [];
$sys = get_sys_channel();
// encode the sys channel information and over-ride with site
// information
$ret = self::encode_person($sys,true,true);
$ret['type'] = 'Service';
$ret['id'] = z_root();
$ret['alsoKnownAs'] = z_root() . '/channel/sys';
$auto_follow = false;
$ret['preferredUsername'] = System::get_site_name();
@ -1730,7 +1734,6 @@ class Activity {
$ret['generator'] = [ 'type' => 'Application', 'name' => System::get_platform_name() ];
$ret['url'] = z_root();
$ret['inbox'] = z_root() . '/sysinbox';
$ret['manuallyApprovesFollowers'] = ((get_config('system','allowed_sites')) ? true : false);

4
Zotlabs/Module/Channel.php
View file

@ -114,7 +114,9 @@ class Channel extends Controller {
$obj->init();
}
}
if (intval($channel['channel_system'])) {
goaway(z_root());
}
as_return_and_die(Activity::encode_person($channel,true,true),$channel);
}