From: ThibG <thib@sitedethib.com>
Date: Mon, 24 Aug 2020 14:56:21 +0000 (+0200)
Subject: Fix dereferencing remote statuses not using the correct account (#14656)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=92319d73409a02689e05ae491a15ce81003a7b7e;p=mastodon.git

Fix dereferencing remote statuses not using the correct account (#14656)

Follow-up to #14359

In the case of limited toots, the receiver may not be explicitly part of the
audience. If a specific user's inbox URI was specified, it makes sense to
dereference the toot from the corresponding user, instead of trying to find
someone in the explicit audience.
---

diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index f0ef4d553..a379a7ef4 100644
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -168,6 +168,8 @@ class ActivityPub::Activity
   end
 
   def signed_fetch_account
+    return Account.find(@options[:delivered_to_account_id]) if @options[:delivered_to_account_id].present?
+
     first_mentioned_local_account || first_local_follower
   end