From: William Pitcock <nenolod@dereferenced.org>
Date: Thu, 17 Jan 2019 23:19:15 +0000 (+0000)
Subject: activitypub: transmogrifier: do not clobber the addressing on relayed announcements
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=dbc4e92509594139a906ce9546f442b531430c57;p=akkoma

activitypub: transmogrifier: do not clobber the addressing on relayed announcements
---

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 86d11c874..fa3abe3d8 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -451,7 +451,8 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     with actor <- get_actor(data),
          %User{} = actor <- User.get_or_fetch_by_ap_id(actor),
          {:ok, object} <- get_obj_helper(object_id) || fetch_obj_helper(object_id),
-         {:ok, activity, _object} <- ActivityPub.announce(actor, object, id, false) do
+         public <- ActivityPub.is_public?(data),
+         {:ok, activity, _object} <- ActivityPub.announce(actor, object, id, false, public) do
       {:ok, activity}
     else
       _e -> :error