diff options
author | William Pitcock <nenolod@dereferenced.org> | 2019-01-17 23:19:15 +0000 |
---|---|---|
committer | William Pitcock <nenolod@dereferenced.org> | 2019-01-17 23:21:31 +0000 |
commit | dbc4e92509594139a906ce9546f442b531430c57 (patch) | |
tree | c199297c306566b5b39b87de30e23ba0432ee12a /lib | |
parent | 33b473cc021d2d027c11021178af90298230e06e (diff) | |
download | pleroma-dbc4e92509594139a906ce9546f442b531430c57.tar.gz |
activitypub: transmogrifier: do not clobber the addressing on relayed announcements
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/activity_pub/transmogrifier.ex | 3 |
1 files changed, 2 insertions, 1 deletions
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 |