merge 1

Signed-off-by: miguel456 <me@nogueira.codes>

app/Http/Middleware/ForceLogoutMiddleware.php

@@ -21,6 +21,7 @@
 
 namespace App\Http\Middleware;
 
+use App\Services\AccountSuspensionService;
 use Closure;
 use Illuminate\Support\Facades\Auth;
 
@@ -35,10 +36,10 @@ class ForceLogoutMiddleware
      */
     public function handle($request, Closure $next)
     {
-        if (Auth::user()->isBanned()) {
-            Auth::logout();
 
-            $request->session()->flash('error', __('Your account is suspended. You will not be able to login or register until the suspension is lifted.'));
+        if ((new AccountSuspensionService())->isSuspended(Auth::user())) {
+            Auth::logout();
+            $request->session()->flash('error', __('Your account is suspended. If you think this was a mistake, please contact an admin.'));
 
             return redirect('/');
         }