logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: e85287284611f7de431d9c51353125c265ebfe3f
parent: 41a01bec2337e7021634f2e9c78d86a1c3002fcf
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Wed, 28 Feb 2018 06:55:06 +0100

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


Diffstat:

Mapp/lib/activitypub/activity/reject.rb2++
1 file changed, 2 insertions(+), 0 deletions(-)

diff --git 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