hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

signup-info-prompt
Eugen Rochko 2018-02-28 06:55:06 +01:00 committed by GitHub
parent 41a01bec23
commit e852872846
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/activitypub/activity/reject.rb
View File

@ -17,6 +17,8 @@ class ActivityPub::Activity::Reject < ActivityPub::Activity
follow_request = FollowRequest.find_by(account: target_account, target_account: @account) follow_request = FollowRequest.find_by(account: target_account, target_account: @account)
follow_request&.reject! follow_request&.reject!
UnfollowService.new.call(target_account, @account) if target_account.following?(@account)
end end
def target_uri def target_uri