Add self links to federated statuses.
This commit is contained in:
parent
b34b046f16
commit
5d7831ee3e
|
@ -51,7 +51,8 @@ def to_simple_form(%{data: %{"object" => %{"type" => "Note"}}} = activity, user,
|
||||||
{:published, h.(inserted_at)},
|
{:published, h.(inserted_at)},
|
||||||
{:updated, h.(updated_at)},
|
{:updated, h.(updated_at)},
|
||||||
{:"ostatus:conversation", [], h.(activity.data["context"])},
|
{:"ostatus:conversation", [], h.(activity.data["context"])},
|
||||||
{:link, [href: h.(activity.data["context"]), rel: 'ostatus:conversation'], []}
|
{:link, [href: h.(activity.data["context"]), rel: 'ostatus:conversation'], []},
|
||||||
|
{:link, [type: ['application/atom+xml'], href: h.(activity.data["object"]["id"]), rel: 'self'], []}
|
||||||
] ++ attachments ++ in_reply_to ++ author ++ mentions
|
] ++ attachments ++ in_reply_to ++ author ++ mentions
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -80,6 +81,7 @@ def to_simple_form(%{data: %{"type" => "Like"}} = activity, user, with_author) d
|
||||||
]},
|
]},
|
||||||
{:"ostatus:conversation", [], h.(activity.data["context"])},
|
{:"ostatus:conversation", [], h.(activity.data["context"])},
|
||||||
{:link, [href: h.(activity.data["context"]), rel: 'ostatus:conversation'], []},
|
{:link, [href: h.(activity.data["context"]), rel: 'ostatus:conversation'], []},
|
||||||
|
{:link, [rel: 'self', type: ['application/atom+xml'], href: h.(activity.data["id"])], []},
|
||||||
{:"thr:in-reply-to", [ref: to_charlist(activity.data["object"])], []}
|
{:"thr:in-reply-to", [ref: to_charlist(activity.data["object"])], []}
|
||||||
] ++ author ++ mentions
|
] ++ author ++ mentions
|
||||||
end
|
end
|
||||||
|
@ -102,6 +104,7 @@ def to_simple_form(%{data: %{"type" => "Announce"}} = activity, user, with_autho
|
||||||
|
|
||||||
mentions = activity.data["to"] |> get_mentions
|
mentions = activity.data["to"] |> get_mentions
|
||||||
[
|
[
|
||||||
|
{:"activity:object-type", ['http://activitystrea.ms/schema/1.0/activity']},
|
||||||
{:"activity:verb", ['http://activitystrea.ms/schema/1.0/share']},
|
{:"activity:verb", ['http://activitystrea.ms/schema/1.0/share']},
|
||||||
{:id, h.(activity.data["id"])},
|
{:id, h.(activity.data["id"])},
|
||||||
{:title, ['#{user.nickname} repeated a notice']},
|
{:title, ['#{user.nickname} repeated a notice']},
|
||||||
|
@ -110,6 +113,7 @@ def to_simple_form(%{data: %{"type" => "Announce"}} = activity, user, with_autho
|
||||||
{:updated, h.(updated_at)},
|
{:updated, h.(updated_at)},
|
||||||
{:"ostatus:conversation", [], h.(activity.data["context"])},
|
{:"ostatus:conversation", [], h.(activity.data["context"])},
|
||||||
{:link, [href: h.(activity.data["context"]), rel: 'ostatus:conversation'], []},
|
{:link, [href: h.(activity.data["context"]), rel: 'ostatus:conversation'], []},
|
||||||
|
{:link, [rel: 'self', type: ['application/atom+xml'], href: h.(activity.data["id"])], []},
|
||||||
{:"thr:in-reply-to", [ref: to_charlist(activity.data["object"])], []},
|
{:"thr:in-reply-to", [ref: to_charlist(activity.data["object"])], []},
|
||||||
{:"activity:object", retweeted_xml}
|
{:"activity:object", retweeted_xml}
|
||||||
] ++ mentions ++ author
|
] ++ mentions ++ author
|
||||||
|
|
|
@ -26,6 +26,7 @@ test "a note activity" do
|
||||||
<updated>#{updated_at}</updated>
|
<updated>#{updated_at}</updated>
|
||||||
<ostatus:conversation>#{note_activity.data["context"]}</ostatus:conversation>
|
<ostatus:conversation>#{note_activity.data["context"]}</ostatus:conversation>
|
||||||
<link href="#{note_activity.data["context"]}" rel="ostatus:conversation" />
|
<link href="#{note_activity.data["context"]}" rel="ostatus:conversation" />
|
||||||
|
<link type="application/atom+xml" href="#{note_activity.data["object"]["id"]}" rel="self" />
|
||||||
<link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
|
<link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
@ -62,6 +63,7 @@ test "a reply note" do
|
||||||
<updated>#{updated_at}</updated>
|
<updated>#{updated_at}</updated>
|
||||||
<ostatus:conversation>#{answer.data["context"]}</ostatus:conversation>
|
<ostatus:conversation>#{answer.data["context"]}</ostatus:conversation>
|
||||||
<link href="#{answer.data["context"]}" rel="ostatus:conversation" />
|
<link href="#{answer.data["context"]}" rel="ostatus:conversation" />
|
||||||
|
<link type="application/atom+xml" href="#{answer.data["object"]["id"]}" rel="self" />
|
||||||
<thr:in-reply-to ref="#{note.data["object"]["id"]}" />
|
<thr:in-reply-to ref="#{note.data["object"]["id"]}" />
|
||||||
<link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
|
<link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
|
||||||
"""
|
"""
|
||||||
|
@ -94,6 +96,7 @@ test "an announce activity" do
|
||||||
|> NaiveDateTime.to_iso8601
|
|> NaiveDateTime.to_iso8601
|
||||||
|
|
||||||
expected = """
|
expected = """
|
||||||
|
<activity:object-type>http://activitystrea.ms/schema/1.0/activity</activity:object-type>
|
||||||
<activity:verb>http://activitystrea.ms/schema/1.0/share</activity:verb>
|
<activity:verb>http://activitystrea.ms/schema/1.0/share</activity:verb>
|
||||||
<id>#{announce.data["id"]}</id>
|
<id>#{announce.data["id"]}</id>
|
||||||
<title>#{user.nickname} repeated a notice</title>
|
<title>#{user.nickname} repeated a notice</title>
|
||||||
|
@ -102,6 +105,7 @@ test "an announce activity" do
|
||||||
<updated>#{updated_at}</updated>
|
<updated>#{updated_at}</updated>
|
||||||
<ostatus:conversation>#{announce.data["context"]}</ostatus:conversation>
|
<ostatus:conversation>#{announce.data["context"]}</ostatus:conversation>
|
||||||
<link href="#{announce.data["context"]}" rel="ostatus:conversation" />
|
<link href="#{announce.data["context"]}" rel="ostatus:conversation" />
|
||||||
|
<link rel="self" type="application/atom+xml" href="#{announce.data["id"]}"/>
|
||||||
<thr:in-reply-to ref="#{note.data["object"]["id"]}" />
|
<thr:in-reply-to ref="#{note.data["object"]["id"]}" />
|
||||||
<activity:object>
|
<activity:object>
|
||||||
#{note_xml}
|
#{note_xml}
|
||||||
|
@ -144,6 +148,7 @@ test "a like activity" do
|
||||||
</activity:object>
|
</activity:object>
|
||||||
<ostatus:conversation>#{like.data["context"]}</ostatus:conversation>
|
<ostatus:conversation>#{like.data["context"]}</ostatus:conversation>
|
||||||
<link href="#{like.data["context"]}" rel="ostatus:conversation" />
|
<link href="#{like.data["context"]}" rel="ostatus:conversation" />
|
||||||
|
<link rel="self" type="application/atom+xml" href="#{like.data["id"]}"/>
|
||||||
<thr:in-reply-to ref="#{note.data["id"]}" />
|
<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"]}"/>
|
<link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="#{note.data["actor"]}"/>
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in a new issue