diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-09-30 12:25:13 -0500 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-09-30 12:25:13 -0500 |
| commit | 22e7a7947900cc974715b0c9d1d6b1a44d2ed1eb (patch) | |
| tree | 918ab95c4f465c9c1fbfcd6706483e3310a38ce5 /app/controllers/api/base_controller.rb | |
| parent | 63046c8cb9df8e797d53566f2050313d757b089b (diff) | |
| parent | b5edf30160eab3776e44b34325a4ea00d9f71dc5 (diff) | |
Merge remote-tracking branch 'upstream/master' into merge-glitch
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 ac49a4dca..818819a3f 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 |