diff options
author | David Yip <yipdw@member.fsf.org> | 2018-05-18 07:53:04 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-05-18 08:47:10 -0500 |
commit | e0eebba46192e5ef2050347069c4098d33e9ec54 (patch) | |
tree | e58d15f7bd6d5c5f5ce53d880a7ad89bf3faaab2 /app/controllers/following_accounts_controller.rb | |
parent | 4c0770d6c8dac8177b8891a6fb97ccf440100fc2 (diff) | |
parent | 57b503d4ef0754e4651eae26b628cba60e1ab4e9 (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml
Diffstat (limited to 'app/controllers/following_accounts_controller.rb')
-rw-r--r-- | app/controllers/following_accounts_controller.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/following_accounts_controller.rb b/app/controllers/following_accounts_controller.rb index e7cd58739..098b2a20c 100644 --- a/app/controllers/following_accounts_controller.rb +++ b/app/controllers/following_accounts_controller.rb @@ -8,11 +8,15 @@ class FollowingAccountsController < ApplicationController format.html do use_pack 'public' + next if @account.user_hides_network? + follows @relationships = AccountRelationshipsPresenter.new(follows.map(&:target_account_id), current_user.account_id) if user_signed_in? end format.json do + raise Mastodon::NotPermittedError if params[:page].present? && @account.user_hides_network? + render json: collection_presenter, serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter, |