summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-11-17 22:29:08 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2018-11-17 22:30:53 +0000
commitf6be980f4faaef9408333fe59f0bb915dd087fd0 (patch)
tree97b704754516db4f929cf7bb79cc9c5a0365134a /lib
parentb471344b6361945aff94685db8d3065da0e5228a (diff)
downloadpleroma-f6be980f4faaef9408333fe59f0bb915dd087fd0.tar.gz
pleroma-f6be980f4faaef9408333fe59f0bb915dd087fd0.zip
activitypub: object view: avoid leaking private details
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/views/object_view.ex13
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/views/object_view.ex b/lib/pleroma/web/activity_pub/views/object_view.ex
index 1911ddfb7..ff664636c 100644
--- a/lib/pleroma/web/activity_pub/views/object_view.ex
+++ b/lib/pleroma/web/activity_pub/views/object_view.ex
@@ -10,7 +10,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectView do
Map.merge(base, additional)
end
- def render("object.json", %{object: %Activity{} = activity}) do
+ def render("object.json", %{object: %Activity{data: %{"type" => "Create"}} = activity}) do
base = Pleroma.Web.ActivityPub.Utils.make_json_ld_header()
object = Object.normalize(activity.data["object"])
@@ -20,4 +20,15 @@ defmodule Pleroma.Web.ActivityPub.ObjectView do
Map.merge(base, additional)
end
+
+ def render("object.json", %{object: %Activity{} = activity}) do
+ base = Pleroma.Web.ActivityPub.Utils.make_json_ld_header()
+ object = Object.normalize(activity.data["object"])
+
+ additional =
+ Transmogrifier.prepare_object(activity.data)
+ |> Map.put("object", object.data["id"])
+
+ Map.merge(base, additional)
+ end
end