diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-08-01 20:24:23 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-08-01 20:24:23 +0200 |
| commit | 2cfa14296186913a7fead419dd6324ba42e3a446 (patch) | |
| tree | 2ab943a2bc96097b0b35f607334ae12d59c98ea4 /app/lib/activitypub | |
| parent | ab967cf5a0980934a68a4a4852ad25d10eec778e (diff) | |
| parent | bfd5aea20686559f030ca0f2538bebc1943b398b (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `yarn.lock`: No real conflict, just a glitch-soc-only dependency textually too close to one updated upstream. Ported upstream changes.
Diffstat (limited to 'app/lib/activitypub')
| -rw-r--r-- | app/lib/activitypub/activity/reject.rb | 2 |
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' |