about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorRené Klačan <rene@klacan.sk>2017-06-05 03:24:18 +0200
committerEugen Rochko <eugen@zeonfederated.com>2017-06-05 03:24:18 +0200
commit037f96c5aeaa4b31e03ecc875a76450f2b7e8b24 (patch)
tree1a2ee1daa35c7c8e6838ce2510840eb3933088bd /app
parentf54dca06a91c4adb8c916a1af9a699166502efa2 (diff)
Don't follow account if it's already followed (#3575)
Closes https://github.com/tootsuite/mastodon/issues/3102
Diffstat (limited to 'app')
-rw-r--r--app/services/follow_service.rb2
1 files changed, 2 insertions, 0 deletions
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