From 037f96c5aeaa4b31e03ecc875a76450f2b7e8b24 Mon Sep 17 00:00:00 2001 From: René Klačan Date: Mon, 5 Jun 2017 03:24:18 +0200 Subject: Don't follow account if it's already followed (#3575) Closes https://github.com/tootsuite/mastodon/issues/3102 --- app/services/follow_service.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app') diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index 23e721fac..4de75e98d 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -12,6 +12,8 @@ class FollowService < BaseService raise ActiveRecord::RecordNotFound if target_account.nil? || target_account.id == source_account.id || target_account.suspended? raise Mastodon::NotPermittedError if target_account.blocking?(source_account) || source_account.blocking?(target_account) + return if source_account.following?(target_account) + if target_account.locked? request_follow(source_account, target_account) else -- cgit