diff options
| author | ThibG <thib@sitedethib.com> | 2019-04-01 20:06:13 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-04-01 20:06:13 +0200 |
| commit | 62bafa20a112ccdddaedb25723fc819dbbcd8e9a (patch) | |
| tree | bfad870e5366780dc13cc65280268695eb807858 /app/controllers/api/v1/accounts_controller.rb | |
| parent | 67eb47e25f1e7704dd9ecd32695ff3b53c807375 (diff) | |
| download | mastodon-62bafa20a112ccdddaedb25723fc819dbbcd8e9a.tar mastodon-62bafa20a112ccdddaedb25723fc819dbbcd8e9a.tar.gz mastodon-62bafa20a112ccdddaedb25723fc819dbbcd8e9a.tar.bz2 mastodon-62bafa20a112ccdddaedb25723fc819dbbcd8e9a.zip | |
Hide blocking accounts from blocked users (#10442)
* Revert "Add indication that you have been blocked in web UI (#10420)"
This reverts commit bd02ec6daa974dcd3231e73826a56e08dbeedadc.
* Revert "Add `blocked_by` relationship to the REST API (#10373)"
This reverts commit 9745de883b198375ba23f7fde879f6d75ce2df0f.
* Hide blocking accounts from search results
* Filter blocking accouts from account followers
* Filter blocking accouts from account's following accounts
* Filter blocking accounts from “reblogged by” and “favourited by” lists
* Remove blocking account from URL search
* Return 410 on trying to fetch user data from a user who blocked us
* Return 410 in /api/v1/account/statuses for suspended or blocking accounts
* Fix status filtering when performing URL search
* Restore some React improvements
Restore some cleanup from bd02ec6daa974dcd3231e73826a56e08dbeedadc
* Refactor by adding `without_blocking` scope
Diffstat (limited to 'app/controllers/api/v1/accounts_controller.rb')
| -rw-r--r-- | app/controllers/api/v1/accounts_controller.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb index b0c62778e..685e044c3 100644 --- a/app/controllers/api/v1/accounts_controller.rb +++ b/app/controllers/api/v1/accounts_controller.rb @@ -10,6 +10,7 @@ class Api::V1::AccountsController < Api::BaseController before_action :require_user!, except: [:show, :create] before_action :set_account, except: [:create] before_action :check_account_suspension, only: [:show] + before_action :check_account_block, only: [:show] before_action :check_enabled_registrations, only: [:create] respond_to :json @@ -75,6 +76,10 @@ class Api::V1::AccountsController < Api::BaseController gone if @account.suspended? end + def check_account_block + gone if current_account.present? && @account.blocking?(current_account) + end + def account_params params.permit(:username, :email, :password, :agreement, :locale) end |