Fix #5708: Reject->Follow will remove the follow if it exists (#6571)

2018-02-28 06:55:06 +01:00 · 2018-02-28 06:55:06 +01:00 · 5f70533e8a
parent 0ebd2a1718
commit 5f70533e8a
1 changed files with 2 additions and 0 deletions
--- a/app/lib/activitypub/activity/reject.rb
+++ b/app/lib/activitypub/activity/reject.rb
@ -17,6 +17,8 @@ class ActivityPub::Activity::Reject < ActivityPub::Activity

    follow_request = FollowRequest.find_by(account: target_account, target_account: @account)
    follow_request&.reject!
+
+    UnfollowService.new.call(target_account, @account) if target_account.following?(@account)
  end

  def target_uri