yetangitu/pixelfed
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update config() to config_cache()

Browse source
This commit is contained in:
Daniel Supernault 2021-05-11 20:14:51 -06:00
parent 3a9203e039
commit 7895097fc1
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
6 changed files with 149 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Api/ApiV1Controller.php
View file

@ -1059,7 +1059,7 @@ class ApiV1Controller extends Controller
$profile = $user->profile; $profile = $user->profile;
if(config('pixelfed.enforce_account_limit') == true) { if(config_cache('pixelfed.enforce_account_limit') == true) {
$size = Cache::remember($user->storageUsedKey(), now()->addDays(3), function() use($user) { $size = Cache::remember($user->storageUsedKey(), now()->addDays(3), function() use($user) {
return Media::whereUserId($user->id)->sum('size') / 1000; return Media::whereUserId($user->id)->sum('size') / 1000;
}); });

2
app/Http/Controllers/ComposeController.php
View file

@ -92,7 +92,7 @@ class ComposeController extends Controller
abort_if($limitReached == true, 429); abort_if($limitReached == true, 429);
if(config('pixelfed.enforce_account_limit') == true) { if(config_cache('pixelfed.enforce_account_limit') == true) {
$size = Cache::remember($user->storageUsedKey(), now()->addDays(3), function() use($user) { $size = Cache::remember($user->storageUsedKey(), now()->addDays(3), function() use($user) {
return Media::whereUserId($user->id)->sum('size') / 1000; return Media::whereUserId($user->id)->sum('size') / 1000;
}); });

2
app/Http/Controllers/DirectMessageController.php
View file

@ -522,7 +522,7 @@ class DirectMessageController extends Controller
$hidden = false; $hidden = false;
} }
if(config('pixelfed.enforce_account_limit') == true) { if(config_cache('pixelfed.enforce_account_limit') == true) {
$size = Cache::remember($user->storageUsedKey(), now()->addDays(3), function() use($user) { $size = Cache::remember($user->storageUsedKey(), now()->addDays(3), function() use($user) {
return Media::whereUserId($user->id)->sum('size') / 1000; return Media::whereUserId($user->id)->sum('size') / 1000;
}); });

2
app/Http/Controllers/Settings/HomeSettings.php
View file

@ -25,7 +25,7 @@ trait HomeSettings
$id = Auth::user()->profile->id; $id = Auth::user()->profile->id;
$storage = []; $storage = [];
$used = Media::whereProfileId($id)->sum('size'); $used = Media::whereProfileId($id)->sum('size');
$storage['limit'] = config('pixelfed.max_account_size') * 1024; $storage['limit'] = config_cache('pixelfed.max_account_size') * 1024;
$storage['used'] = $used; $storage['used'] = $used;
$storage['percentUsed'] = ceil($storage['used'] / $storage['limit'] * 100); $storage['percentUsed'] = ceil($storage['used'] / $storage['limit'] * 100);
$storage['limitPretty'] = PrettyNumber::size($storage['limit']); $storage['limitPretty'] = PrettyNumber::size($storage['limit']);

2
app/Util/Site/Config.php
View file

@ -23,7 +23,7 @@ class Config {
'optimize_video' => config('pixelfed.optimize_video'), 'optimize_video' => config('pixelfed.optimize_video'),
'media_types' => config_cache('pixelfed.media_types'), 'media_types' => config_cache('pixelfed.media_types'),
'enforce_account_limit' => config('pixelfed.enforce_account_limit') 'enforce_account_limit' => config_cache('pixelfed.enforce_account_limit')
], ],
'activitypub' => [ 'activitypub' => [

2
resources/views/settings/home.blade.php
View file

@ -67,7 +67,7 @@
</select> </select>
</div> </div>
</div> </div>
@if(config('pixelfed.enforce_account_limit')) @if(config_cache('pixelfed.enforce_account_limit'))
<div class="pt-3"> <div class="pt-3">
<p class="font-weight-bold text-muted text-center">Storage Usage</p> <p class="font-weight-bold text-muted text-center">Storage Usage</p>
</div> </div>