squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Unify object representation.

Browse Source
This commit is contained in:
lain 2018-02-24 20:16:41 +01:00
parent 2b5d265954
commit 82e34cae95
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/pleroma/web/activity_pub/transmogrifier.ex
View File

@ -122,18 +122,23 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
if object = Object.get_by_ap_id(id), do: {:ok, object}, else: nil
end
@doc
"""
internal -> Mastodon
"""
def prepare_outgoing(%{"type" => "Create", "object" => %{"type" => "Note"} = object} = data) do
object = object
def prepare_object(object) do
object
|> set_sensitive
|> add_hashtags
|> add_mention_tags
|> add_attributed_to
|> prepare_attachments
|> set_conversation
end
@doc
"""
internal -> Mastodon
"""
def prepare_outgoing(%{"type" => "Create", "object" => %{"type" => "Note"} = object} = data) do
object = object
|> prepare_object
data = data
|> Map.put("object", object)

4
lib/pleroma/web/activity_pub/views/object_view.ex
View File

@ -1,5 +1,6 @@
defmodule Pleroma.Web.ActivityPub.ObjectView do
use Pleroma.Web, :view
alias Pleroma.Web.ActivityPub.Transmogrifier
def render("object.json", %{object: object}) do
base = %{
@ -20,8 +21,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectView do
]
}
additional = Map.take(object.data, ["id", "to", "cc", "actor", "content", "summary", "type"])
|> Map.put("attributedTo", object.data["actor"])
additional = Transmogrifier.prepare_object(object.data)
Map.merge(base, additional)
end
end