about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-08-01 18:20:37 +0200
committerGitHub <noreply@github.com>2020-08-01 18:20:37 +0200
commitbfd5aea20686559f030ca0f2538bebc1943b398b (patch)
tree39f69641b1868a8c96e2155381da5b60ee625e57 /app
parent7286d5ea48233bd20c3afbdee4cd416e6d34bb80 (diff)
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
Diffstat (limited to 'app')
-rw-r--r--app/lib/activitypub/activity/reject.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity/reject.rb b/app/lib/activitypub/activity/reject.rb
index 8d771ed81..886dddb23 100644
--- a/app/lib/activitypub/activity/reject.rb
+++ b/app/lib/activitypub/activity/reject.rb
@@ -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'