Add an ostatus representer for like activities.
This commit is contained in:
parent
a3e82c5c24
commit
93de603966
2 changed files with 76 additions and 5 deletions
|
@ -10,11 +10,17 @@ defp get_in_reply_to(%{"object" => %{ "inReplyTo" => in_reply_to}}) do
|
||||||
defp get_in_reply_to(_), do: []
|
defp get_in_reply_to(_), do: []
|
||||||
|
|
||||||
defp get_mentions(to) do
|
defp get_mentions(to) do
|
||||||
Enum.map(to, fn
|
Enum.map(to, fn (id) ->
|
||||||
("https://www.w3.org/ns/activitystreams#Public") ->
|
cond do
|
||||||
{:link, [rel: "mentioned", "ostatus:object-type": "http://activitystrea.ms/schema/1.0/collection", href: "http://activityschema.org/collection/public"], []}
|
# Special handling for the AP/Ostatus public collections
|
||||||
(id) ->
|
"https://www.w3.org/ns/activitystreams#Public" == id ->
|
||||||
{:link, [rel: "mentioned", "ostatus:object-type": "http://activitystrea.ms/schema/1.0/person", href: id], []}
|
{:link, [rel: "mentioned", "ostatus:object-type": "http://activitystrea.ms/schema/1.0/collection", href: "http://activityschema.org/collection/public"], []}
|
||||||
|
# Ostatus doesn't handle follower collections, ignore these.
|
||||||
|
Regex.match?(~r/^#{Pleroma.Web.base_url}.+followers$/, id) ->
|
||||||
|
[]
|
||||||
|
true ->
|
||||||
|
{:link, [rel: "mentioned", "ostatus:object-type": "http://activitystrea.ms/schema/1.0/person", href: id], []}
|
||||||
|
end
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -49,6 +55,35 @@ def to_simple_form(%{data: %{"object" => %{"type" => "Note"}}} = activity, user,
|
||||||
] ++ attachments ++ in_reply_to ++ author ++ mentions
|
] ++ attachments ++ in_reply_to ++ author ++ mentions
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def to_simple_form(%{data: %{"type" => "Like"}} = activity, user, with_author) do
|
||||||
|
h = fn(str) -> [to_charlist(str)] end
|
||||||
|
|
||||||
|
updated_at = activity.updated_at
|
||||||
|
|> NaiveDateTime.to_iso8601
|
||||||
|
inserted_at = activity.inserted_at
|
||||||
|
|> NaiveDateTime.to_iso8601
|
||||||
|
|
||||||
|
in_reply_to = get_in_reply_to(activity.data)
|
||||||
|
author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: []
|
||||||
|
mentions = activity.data["to"] |> get_mentions
|
||||||
|
|
||||||
|
[
|
||||||
|
{:"activity:verb", ['http://activitystrea.ms/schema/1.0/favorite']},
|
||||||
|
{:id, h.(activity.data["id"])},
|
||||||
|
{:title, ['New favorite by #{user.nickname}']},
|
||||||
|
{:content, [type: 'html'], ['#{user.nickname} favorited something']},
|
||||||
|
{:published, h.(inserted_at)},
|
||||||
|
{:updated, h.(updated_at)},
|
||||||
|
{:"activity:object", [
|
||||||
|
{:"activity:object-type", ['http://activitystrea.ms/schema/1.0/note']},
|
||||||
|
{:id, h.(activity.data["object"])}, # For notes, federate the object id.
|
||||||
|
]},
|
||||||
|
{:"ostatus:conversation", [], h.(activity.data["context"])},
|
||||||
|
{:link, [href: h.(activity.data["context"]), rel: 'ostatus:conversation'], []},
|
||||||
|
{:"thr:in-reply-to", [ref: to_charlist(activity.data["object"])], []}
|
||||||
|
] ++ author ++ mentions
|
||||||
|
end
|
||||||
|
|
||||||
def wrap_with_entry(simple_form) do
|
def wrap_with_entry(simple_form) do
|
||||||
[{
|
[{
|
||||||
:entry, [
|
:entry, [
|
||||||
|
|
|
@ -3,6 +3,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
|
||||||
|
|
||||||
alias Pleroma.Web.OStatus.ActivityRepresenter
|
alias Pleroma.Web.OStatus.ActivityRepresenter
|
||||||
alias Pleroma.{User, Activity}
|
alias Pleroma.{User, Activity}
|
||||||
|
alias Pleroma.Web.ActivityPub.ActivityPub
|
||||||
|
|
||||||
import Pleroma.Factory
|
import Pleroma.Factory
|
||||||
|
|
||||||
|
@ -72,6 +73,41 @@ test "a reply note" do
|
||||||
assert clean(res) == clean(expected)
|
assert clean(res) == clean(expected)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "a like activity" do
|
||||||
|
note = insert(:note)
|
||||||
|
user = insert(:user)
|
||||||
|
{:ok, like, _note} = ActivityPub.like(user, note)
|
||||||
|
|
||||||
|
updated_at = like.updated_at
|
||||||
|
|> NaiveDateTime.to_iso8601
|
||||||
|
inserted_at = like.inserted_at
|
||||||
|
|> NaiveDateTime.to_iso8601
|
||||||
|
|
||||||
|
tuple = ActivityRepresenter.to_simple_form(like, user)
|
||||||
|
refute is_nil(tuple)
|
||||||
|
|
||||||
|
res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary
|
||||||
|
|
||||||
|
expected = """
|
||||||
|
<activity:verb>http://activitystrea.ms/schema/1.0/favorite</activity:verb>
|
||||||
|
<id>#{like.data["id"]}</id>
|
||||||
|
<title>New favorite by #{user.nickname}</title>
|
||||||
|
<content type="html">#{user.nickname} favorited something</content>
|
||||||
|
<published>#{inserted_at}</published>
|
||||||
|
<updated>#{updated_at}</updated>
|
||||||
|
<activity:object>
|
||||||
|
<activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
|
||||||
|
<id>#{note.data["id"]}</id>
|
||||||
|
</activity:object>
|
||||||
|
<ostatus:conversation>#{like.data["context"]}</ostatus:conversation>
|
||||||
|
<link href="#{like.data["context"]}" rel="ostatus:conversation" />
|
||||||
|
<thr:in-reply-to ref="#{note.data["id"]}" />
|
||||||
|
<link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="#{note.data["actor"]}"/>
|
||||||
|
"""
|
||||||
|
|
||||||
|
assert clean(res) == clean(expected)
|
||||||
|
end
|
||||||
|
|
||||||
test "an unknown activity" do
|
test "an unknown activity" do
|
||||||
tuple = ActivityRepresenter.to_simple_form(%Activity{}, nil)
|
tuple = ActivityRepresenter.to_simple_form(%Activity{}, nil)
|
||||||
assert is_nil(tuple)
|
assert is_nil(tuple)
|
||||||
|
|
Loading…
Reference in a new issue