projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Migrations: generate unset user keys
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
views
/
object_view.ex
diff --git
a/lib/pleroma/web/activity_pub/views/object_view.ex
b/lib/pleroma/web/activity_pub/views/object_view.ex
index d8a3ec288d1eaf25cc625df97496fa45ee41f56c..29e2bbc815c2dc9a6f2773a71b58da03ece45f61 100644
(file)
--- a/
lib/pleroma/web/activity_pub/views/object_view.ex
+++ b/
lib/pleroma/web/activity_pub/views/object_view.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
21
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.ObjectView do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.ObjectView do
@@
-16,9
+16,9
@@
defmodule Pleroma.Web.ActivityPub.ObjectView do
end
def render("object.json", %{object: %Activity{data: %{"type" => activity_type}} = activity})
end
def render("object.json", %{object: %Activity{data: %{"type" => activity_type}} = activity})
- when activity_type in ["Create"
, "Listen"
] do
+ when activity_type in ["Create"] do
base = Pleroma.Web.ActivityPub.Utils.make_json_ld_header()
base = Pleroma.Web.ActivityPub.Utils.make_json_ld_header()
- object = Object.normalize(activity)
+ object = Object.normalize(activity
, fetch: false
)
additional =
Transmogrifier.prepare_object(activity.data)
additional =
Transmogrifier.prepare_object(activity.data)
@@
-29,11
+29,11
@@
defmodule Pleroma.Web.ActivityPub.ObjectView do
def render("object.json", %{object: %Activity{} = activity}) do
base = Pleroma.Web.ActivityPub.Utils.make_json_ld_header()
def render("object.json", %{object: %Activity{} = activity}) do
base = Pleroma.Web.ActivityPub.Utils.make_json_ld_header()
- object
= Object.normalize(activity
)
+ object
_id = Object.normalize(activity, id_only: true
)
additional =
Transmogrifier.prepare_object(activity.data)
additional =
Transmogrifier.prepare_object(activity.data)
- |> Map.put("object", object
.data["id"]
)
+ |> Map.put("object", object
_id
)
Map.merge(base, additional)
end
Map.merge(base, additional)
end