Merge pull request #1896 from pixelfed/staging

Update site config service
pull/1913/head
daniel 2019-12-17 20:57:00 -07:00 zatwierdzone przez GitHub
commit 149d569823
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 16 dodań i 1 usunięć

Wyświetl plik

@ -3,6 +3,7 @@
namespace App\Util\Site;
use Cache;
use Illuminate\Support\Str;
class Config {
@ -35,7 +36,8 @@ class Config {
'site' => [
'domain' => config('pixelfed.domain.app'),
'url' => config('app.url')
'url' => config('app.url'),
'description' => config('instance.description')
],
'username' => [
@ -44,6 +46,18 @@ class Config {
'format' => config('instance.username.remote.format'),
'custom' => config('instance.username.remote.custom')
]
],
'features' => [
'mobile_apis' => config('pixelfed.oauth_enabled'),
'circles' => false,
'stories' => false,
'video' => Str::contains(config('pixelfed.media_types'), 'video/mp4'),
'import' => [
'instagram' => config('pixelfed.import.instagram.enabled'),
'mastodon' => false,
'pixelfed' => false
]
]
];
});

Wyświetl plik

@ -2,6 +2,7 @@
return [
'description' => env('INSTANCE_DESCRIPTION', null),
'announcement' => [
'enabled' => env('INSTANCE_ANNOUNCEMENT_ENABLED', false),
'message' => env('INSTANCE_ANNOUNCEMENT_MESSAGE', 'Example announcement message.<br><span class="font-weight-normal">Something else here</span>')