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-10 20:04:13 -06:00
parent e7b33c4cc6
commit 1d54204635
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
4 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -160,7 +160,7 @@ class DirectMessageController extends Controller
'messages' => []
];
});
}
}
} elseif(config('database.default') == 'mysql') {
if($action == 'inbox') {
$dms = DirectMessage::selectRaw('*, max(created_at) as createdAt')
@ -334,7 +334,7 @@ class DirectMessageController extends Controller
$dm->type = 'link';
$dm->meta = [
'domain' => parse_url($msg, PHP_URL_HOST),
'local' => parse_url($msg, PHP_URL_HOST) ==
'local' => parse_url($msg, PHP_URL_HOST) ==
parse_url(config('app.url'), PHP_URL_HOST)
];
$dm->save();
@ -501,7 +501,7 @@ class DirectMessageController extends Controller
return [
'required',
'mimes:' . config('pixelfed.media_types'),
'max:' . config('pixelfed.max_photo_size'),
'max:' . config_cache('pixelfed.max_photo_size'),
];
},
'to_id' => 'required'
@ -525,7 +525,7 @@ class DirectMessageController extends Controller
if(config('pixelfed.enforce_account_limit') == true) {
$size = Cache::remember($user->storageUsedKey(), now()->addDays(3), function() use($user) {
return Media::whereUserId($user->id)->sum('size') / 1000;
});
});
$limit = (int) config('pixelfed.max_account_size');
if ($size >= $limit) {
abort(403, 'Account size limit reached.');