diff options
author | ThibG <thib@sitedethib.com> | 2020-11-09 11:30:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-09 11:30:28 +0100 |
commit | 67125534bc0fd48a45d6cb17a5c78712d8e87150 (patch) | |
tree | b718c8b54a0bd63eab69abaef2267c8f0aa9a9b9 /app/controllers/concerns/account_owned_concern.rb | |
parent | cfb16b9b70a50ec5451c9aebb2c35d3a44701311 (diff) | |
parent | ecd83f495c18486bc7ea901423f6fccfd910b277 (diff) |
Merge pull request #1454 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/concerns/account_owned_concern.rb')
-rw-r--r-- | app/controllers/concerns/account_owned_concern.rb | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/app/controllers/concerns/account_owned_concern.rb b/app/controllers/concerns/account_owned_concern.rb index 460f71f65..62e379846 100644 --- a/app/controllers/concerns/account_owned_concern.rb +++ b/app/controllers/concerns/account_owned_concern.rb @@ -29,6 +29,24 @@ module AccountOwnedConcern end def check_account_suspension - expires_in(3.minutes, public: true) && gone if @account.suspended? + if @account.suspended_permanently? + permanent_suspension_response + elsif @account.suspended? && !skip_temporary_suspension_response? + temporary_suspension_response + end + end + + def skip_temporary_suspension_response? + false + end + + def permanent_suspension_response + expires_in(3.minutes, public: true) + gone + end + + def temporary_suspension_response + expires_in(3.minutes, public: true) + forbidden end end |