Browse Source

Fix #4852 - Check if already requested from FollowService (#4855)

master
Eugen Rochko 7 years ago
committed by GitHub
parent
commit
4b460bc571
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      app/services/follow_service.rb

+ 1
- 1
app/services/follow_service.rb View File

@ -12,7 +12,7 @@ class FollowService < BaseService
raise ActiveRecord::RecordNotFound if target_account.nil? || target_account.id == source_account.id || target_account.suspended? 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) 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? if target_account.locked? || target_account.activitypub?
request_follow(source_account, target_account) request_follow(source_account, target_account)

Loading…
Cancel
Save