projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
relay: set invisible to true
[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 efe16b2bf5688526b25b709c5c17eb729adc62e8..d8a3ec288d1eaf25cc625df97496fa45ee41f56c 100644
(file)
--- a/
lib/pleroma/web/activity_pub/views/object_view.ex
+++ b/
lib/pleroma/web/activity_pub/views/object_view.ex
@@
-1,10
+1,11
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-201
8
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-201
9
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.ObjectView do
use Pleroma.Web, :view
# SPDX-License-Identifier: AGPL-3.0-only
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)