From 0af3401553bfc8366779bf64ebe257c962eb82eb Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 5 Feb 2017 20:58:09 +0100 Subject: [PATCH] Don't allow people to follow people they blocked without unblocking first --- .../components/features/account/components/header.jsx | 2 +- app/services/follow_service.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/components/features/account/components/header.jsx b/app/assets/javascripts/components/features/account/components/header.jsx index dead11265b..30e0449c51 100644 --- a/app/assets/javascripts/components/features/account/components/header.jsx +++ b/app/assets/javascripts/components/features/account/components/header.jsx @@ -44,7 +44,7 @@ const Header = React.createClass({ ); - } else { + } else if (!account.getIn(['relationship', 'blocking'])) { actionBtn = (
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index 87c16a6219..9f34cb6ac5 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -8,7 +8,7 @@ class FollowService < BaseService target_account = follow_remote_account_service.call(uri) raise ActiveRecord::RecordNotFound if target_account.nil? || target_account.id == source_account.id || target_account.suspended? - raise Mastodon::NotPermitted if target_account.blocking?(source_account) + raise Mastodon::NotPermitted if target_account.blocking?(source_account) || source_account.blocking?(target_account) if target_account.locked? request_follow(source_account, target_account)