Merge pull request #5376 from pixelfed/staging

Update DirectMessageController, remove 72h limit for admins
pull/5379/head
daniel 3 months ago committed by GitHub
commit f7519b6a79
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -307,7 +307,9 @@ class DirectMessageController extends Controller
$user = $request->user();
abort_if($user->has_roles && ! UserRoleService::can('can-direct-message', $user->id), 403, 'Invalid permissions for this action');
abort_if($user->created_at->gt(now()->subHours(72)), 400, 'You need to wait a bit before you can DM another account');
if (! $user->is_admin) {
abort_if($user->created_at->gt(now()->subHours(72)), 400, 'You need to wait a bit before you can DM another account');
}
$profile = $user->profile;
$recipient = Profile::where('id', '!=', $profile->id)->findOrFail($request->input('to_id'));

Loading…
Cancel
Save