Fix handling of Reject Follow when a matching follow relationship exists (#14479)
* Add tests * Fix handling of Reject Follow when a matching follow relationship exists Regression from #12199
This commit is contained in:
parent
7286d5ea48
commit
bfd5aea206
2 changed files with 98 additions and 14 deletions
|
@ -4,7 +4,7 @@ class ActivityPub::Activity::Reject < ActivityPub::Activity
|
|||
def perform
|
||||
return reject_follow_for_relay if relay_follow?
|
||||
return follow_request_from_object.reject! unless follow_request_from_object.nil?
|
||||
return UnfollowService.new.call(follow_from_object.target_account, @account) unless follow_from_object.nil?
|
||||
return UnfollowService.new.call(follow_from_object.account, @account) unless follow_from_object.nil?
|
||||
|
||||
case @object['type']
|
||||
when 'Follow'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue