diff options
author | beatrix <beatrix.bitrot@gmail.com> | 2017-09-10 13:34:14 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-10 13:34:14 -0400 |
commit | c9df53044a333276853f7dc7ef2aed6d48df087f (patch) | |
tree | 011ea44fc94bcff6f8ec4e23c3edf887359243d2 /app/services/follow_service.rb | |
parent | 3dff74eecf5387b92b862893248710d2efb90eec (diff) | |
parent | 67ad4533732f2e5cfc8c7f7ad3abaf7a5eb2647b (diff) |
Merge pull request #142 from glitch-soc/sync/upstream-1.6.0rc4
Merge with 1.6.0rc4 STRAP IN BUCKAWOO HERE WE GO AGAIN
Diffstat (limited to 'app/services/follow_service.rb')
-rw-r--r-- | app/services/follow_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index a92eb6b88..941556b60 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -12,7 +12,7 @@ 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) + return if source_account.following?(target_account) || source_account.requested?(target_account) if target_account.locked? || target_account.activitypub? request_follow(source_account, target_account) |