projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/develop' into reactions
[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 94d05f49b35177f9822b70e1428f6ec4f6accc89..88c55acddf62c82e8dd98242d27ca4cfa692b0ee 100644
(file)
--- a/
lib/pleroma/web/activity_pub/views/object_view.ex
+++ b/
lib/pleroma/web/activity_pub/views/object_view.ex
@@
-15,7
+15,8
@@
defmodule Pleroma.Web.ActivityPub.ObjectView do
Map.merge(base, additional)
end
Map.merge(base, additional)
end
- def render("object.json", %{object: %Activity{data: %{"type" => "Create"}} = activity}) do
+ def render("object.json", %{object: %Activity{data: %{"type" => activity_type}} = activity})
+ when activity_type in ["Create", "Listen"] do
base = Pleroma.Web.ActivityPub.Utils.make_json_ld_header()
object = Object.normalize(activity)
base = Pleroma.Web.ActivityPub.Utils.make_json_ld_header()
object = Object.normalize(activity)
@@
-37,12
+38,12
@@
defmodule Pleroma.Web.ActivityPub.ObjectView do
Map.merge(base, additional)
end
Map.merge(base, additional)
end
- def render("likes.json",
ap_id, likes, page
) do
+ def render("likes.json",
%{ap_id: ap_id, likes: likes, page: page}
) do
collection(likes, "#{ap_id}/likes", page)
|> Map.merge(Pleroma.Web.ActivityPub.Utils.make_json_ld_header())
end
collection(likes, "#{ap_id}/likes", page)
|> Map.merge(Pleroma.Web.ActivityPub.Utils.make_json_ld_header())
end
- def render("likes.json",
ap_id, likes
) do
+ def render("likes.json",
%{ap_id: ap_id, likes: likes}
) do
%{
"id" => "#{ap_id}/likes",
"type" => "OrderedCollection",
%{
"id" => "#{ap_id}/likes",
"type" => "OrderedCollection",