UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-09 16:24:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update AdminSettingsController

Browse source
This commit is contained in:
Daniel Supernault 2023-05-07 05:08:45 -06:00
parent 6ea2bdc782
commit ccbba56633
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/Http/Controllers/Admin/AdminSettingsController.php
View file

@ -10,8 +10,10 @@ use App\Models\InstanceActor;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Util\Lexer\PrettyNumber; use App\Util\Lexer\PrettyNumber;
use App\Models\ConfigCache; use App\Models\ConfigCache;
use App\Services\AccountService;
use App\Services\ConfigCacheService; use App\Services\ConfigCacheService;
use App\Util\Site\Config; use App\Util\Site\Config;
use Illuminate\Support\Str;
trait AdminSettingsController trait AdminSettingsController
{ {
@ -28,6 +30,9 @@ trait AdminSettingsController
$mp4 = in_array('video/mp4', $types); $mp4 = in_array('video/mp4', $types);
$webp = in_array('image/webp', $types); $webp = in_array('image/webp', $types);
$availableAdmins = User::whereIsAdmin(true)->get();
$currentAdmin = config_cache('instance.admin.pid') ? AccountService::get(config_cache('instance.admin.pid'), true) : null;
// $system = [ // $system = [
// 'permissions' => is_writable(base_path('storage')) && is_writable(base_path('bootstrap')), // 'permissions' => is_writable(base_path('storage')) && is_writable(base_path('bootstrap')),
// 'max_upload_size' => ini_get('post_max_size'), // 'max_upload_size' => ini_get('post_max_size'),
@ -45,6 +50,8 @@ trait AdminSettingsController
'cloud_storage', 'cloud_storage',
'cloud_disk', 'cloud_disk',
'cloud_ready', 'cloud_ready',
'availableAdmins',
'currentAdmin'
// 'system' // 'system'
)); ));
} }
@ -63,8 +70,14 @@ trait AdminSettingsController
'type_gif' => 'nullable', 'type_gif' => 'nullable',
'type_mp4' => 'nullable', 'type_mp4' => 'nullable',
'type_webp' => 'nullable', 'type_webp' => 'nullable',
'admin_account_id' => 'nullable',
]); ]);
if($request->filled('admin_account_id')) {
ConfigCacheService::put('instance.admin.pid', $request->admin_account_id);
Cache::forget('api:v1:instance-data:contact');
Cache::forget('api:v1:instance-data-response-v1');
}
if($request->filled('rule_delete')) { if($request->filled('rule_delete')) {
$index = (int) $request->input('rule_delete'); $index = (int) $request->input('rule_delete');
$rules = ConfigCacheService::get('app.rules'); $rules = ConfigCacheService::get('app.rules');
@ -75,8 +88,8 @@ trait AdminSettingsController
unset($json[$index]); unset($json[$index]);
$json = json_encode(array_values($json)); $json = json_encode(array_values($json));
ConfigCacheService::put('app.rules', $json); ConfigCacheService::put('app.rules', $json);
Cache::forget('api:v1:instance-data:rules'); Cache::forget('api:v1:instance-data:rules');
Cache::forget('api:v1:instance-data-response-v1'); Cache::forget('api:v1:instance-data-response-v1');
return 200; return 200;
} }
@ -124,8 +137,8 @@ trait AdminSettingsController
if($cc && $cc->v != $val) { if($cc && $cc->v != $val) {
ConfigCacheService::put($value, $val); ConfigCacheService::put($value, $val);
} else if(!empty($val)) { } else if(!empty($val)) {
ConfigCacheService::put($value, $val); ConfigCacheService::put($value, $val);
} }
} }
$bools = [ $bools = [
@ -141,8 +154,8 @@ trait AdminSettingsController
'show_custom_js' => 'uikit.show_custom.js', 'show_custom_js' => 'uikit.show_custom.js',
'cloud_storage' => 'pixelfed.cloud_storage', 'cloud_storage' => 'pixelfed.cloud_storage',
'account_autofollow' => 'account.autofollow', 'account_autofollow' => 'account.autofollow',
'show_directory' => 'landing.show_directory', 'show_directory' => 'instance.landing.show_directory',
'show_explore_feed' => 'landing.show_explore_feed', 'show_explore_feed' => 'instance.landing.show_explore',
]; ];
foreach ($bools as $key => $value) { foreach ($bools as $key => $value) {