From 6d40876ae82c6e1752bdf56db88d9af254cf0d1b Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 2 Nov 2019 21:12:44 -0600 Subject: [PATCH] Update Site Config --- app/Util/Site/Config.php | 8 ++++++++ config/instance.php | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/Util/Site/Config.php b/app/Util/Site/Config.php index 3e6c5351f..f80d68c26 100644 --- a/app/Util/Site/Config.php +++ b/app/Util/Site/Config.php @@ -36,6 +36,14 @@ class Config { 'site' => [ 'domain' => config('pixelfed.domain.app'), 'url' => config('app.url') + ], + + 'username' => [ + 'remote' => [ + 'formats' => config('instance.username.remote.formats'), + 'format' => config('instance.username.remote.format'), + 'custom' => config('instance.username.remote.custom') + ] ] ]; }); diff --git a/config/instance.php b/config/instance.php index b01b43c38..706d06274 100644 --- a/config/instance.php +++ b/config/instance.php @@ -39,5 +39,11 @@ return [ 'body' => env('PAGE_503_BODY', 'Our service is in maintenance mode, please try again later.') ] ], - + 'username' => [ + 'remote' => [ + 'formats' => ['@', 'from', 'custom'], + 'format' => in_array(env('USERNAME_REMOTE_FORMAT', '@'), ['@','from','custom']) ? env('USERNAME_REMOTE_FORMAT', '@') : '@', + 'custom' => env('USERNAME_REMOTE_CUSTOM_TEXT', null) + ] + ], ]; \ No newline at end of file