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 1930420562b28b470de6fc1dad058a63d83154fa..88c55acddf62c82e8dd98242d27ca4cfa692b0ee 100644
(file)
--- a/
lib/pleroma/web/activity_pub/views/object_view.ex
+++ b/
lib/pleroma/web/activity_pub/views/object_view.ex
@@
-4,7
+4,8
@@
defmodule Pleroma.Web.ActivityPub.ObjectView do
use Pleroma.Web, :view
defmodule Pleroma.Web.ActivityPub.ObjectView do
use Pleroma.Web, :view
- alias Pleroma.{Object, Activity}
+ alias Pleroma.Activity
+ alias Pleroma.Object
alias Pleroma.Web.ActivityPub.Transmogrifier
def render("object.json", %{object: %Object{} = object}) do
alias Pleroma.Web.ActivityPub.Transmogrifier
def render("object.json", %{object: %Object{} = object}) do
@@
-14,9
+15,10
@@
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()
base = Pleroma.Web.ActivityPub.Utils.make_json_ld_header()
- object = Object.normalize(activity
.data["object"]
)
+ object = Object.normalize(activity)
additional =
Transmogrifier.prepare_object(activity.data)
additional =
Transmogrifier.prepare_object(activity.data)
@@
-27,7
+29,7
@@
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
.data["object"]
)
+ object = Object.normalize(activity)
additional =
Transmogrifier.prepare_object(activity.data)
additional =
Transmogrifier.prepare_object(activity.data)
@@
-36,17
+38,17
@@
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",
"totalItems" => length(likes),
%{
"id" => "#{ap_id}/likes",
"type" => "OrderedCollection",
"totalItems" => length(likes),
- "first" => collection(likes, "#{ap_id}/
follower
s", 1)
+ "first" => collection(likes, "#{ap_id}/
like
s", 1)
}
|> Map.merge(Pleroma.Web.ActivityPub.Utils.make_json_ld_header())
end
}
|> Map.merge(Pleroma.Web.ActivityPub.Utils.make_json_ld_header())
end
@@
-65,8
+67,10
@@
defmodule Pleroma.Web.ActivityPub.ObjectView do
"orderedItems" => items
}
"orderedItems" => items
}
- if offset < total do
+ if offset
+ length(items)
< total do
Map.put(map, "next", "#{iri}?page=#{page + 1}")
Map.put(map, "next", "#{iri}?page=#{page + 1}")
+ else
+ map
end
end
end
end
end
end