diff options
author | Starfall <us@starfall.systems> | 2020-10-08 20:34:20 -0500 |
---|---|---|
committer | Starfall <us@starfall.systems> | 2020-10-08 20:34:20 -0500 |
commit | 220958fc9fff236e61560f20079be28dea7e23fc (patch) | |
tree | 6a0f4588fc367462e82d5304b1eab9cf5c890445 /app/controllers/api/base_controller.rb | |
parent | 4966c6cc24107c728fe8e0de7ffc4d0a8cc5510d (diff) | |
parent | cd861c051ce5500df49d2fc41b2a6084faa34620 (diff) |
Merge branch 'glitch' into main
Diffstat (limited to 'app/controllers/api/base_controller.rb')
-rw-r--r-- | app/controllers/api/base_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index 467225547..e962c4e97 100644 --- a/app/controllers/api/base_controller.rb +++ b/app/controllers/api/base_controller.rb @@ -96,12 +96,12 @@ class Api::BaseController < ApplicationController def require_user! if !current_user render json: { error: 'This method requires an authenticated user' }, status: 422 - elsif current_user.disabled? - render json: { error: 'Your login is currently disabled' }, status: 403 elsif !current_user.confirmed? render json: { error: 'Your login is missing a confirmed e-mail address' }, status: 403 elsif !current_user.approved? render json: { error: 'Your login is currently pending approval' }, status: 403 + elsif !current_user.functional? + render json: { error: 'Your login is currently disabled' }, status: 403 else set_user_activity end |