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

Output mastodon-style conversation ids.

Browse Source
This commit is contained in:
Roger Braun 2017-09-04 11:04:04 +02:00
parent 1b1f861bad
commit 10e40206c6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pleroma/web/ostatus/activity_representer.ex
View File

@ -82,7 +82,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
{:content, [type: 'html'], h.(activity.data["object"]["content"] |> String.replace(~r/[\n\r]/, ""))}, {:content, [type: 'html'], h.(activity.data["object"]["content"] |> String.replace(~r/[\n\r]/, ""))},
{:published, h.(inserted_at)}, {:published, h.(inserted_at)},
{:updated, h.(updated_at)}, {:updated, h.(updated_at)},
{:"ostatus:conversation", [], h.(activity.data["context"])}, {:"ostatus:conversation", [ref: h.(activity.data["context"])], h.(activity.data["context"])},
{:link, [ref: h.(activity.data["context"]), rel: 'ostatus:conversation'], []}, {:link, [ref: h.(activity.data["context"]), rel: 'ostatus:conversation'], []},
] ++ get_links(activity) ++ categories ++ attachments ++ in_reply_to ++ author ++ mentions ] ++ get_links(activity) ++ categories ++ attachments ++ in_reply_to ++ author ++ mentions
end end
@ -108,7 +108,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
{:"activity:object-type", ['http://activitystrea.ms/schema/1.0/note']}, {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/note']},
{:id, h.(activity.data["object"])}, # For notes, federate the object id. {:id, h.(activity.data["object"])}, # For notes, federate the object id.
]}, ]},
{:"ostatus:conversation", [], h.(activity.data["context"])}, {:"ostatus:conversation", [ref: h.(activity.data["context"])], h.(activity.data["context"])},
{:link, [ref: h.(activity.data["context"]), rel: 'ostatus:conversation'], []}, {:link, [ref: h.(activity.data["context"]), rel: 'ostatus:conversation'], []},
{:link, [rel: 'self', type: ['application/atom+xml'], href: h.(activity.data["id"])], []}, {: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"])], []}
@ -138,7 +138,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
{:content, [type: 'html'], ['RT #{retweeted_activity.data["object"]["content"]}']}, {:content, [type: 'html'], ['RT #{retweeted_activity.data["object"]["content"]}']},
{:published, h.(inserted_at)}, {:published, h.(inserted_at)},
{:updated, h.(updated_at)}, {:updated, h.(updated_at)},
{:"ostatus:conversation", [], h.(activity.data["context"])}, {:"ostatus:conversation", [ref: h.(activity.data["context"])], h.(activity.data["context"])},
{:link, [ref: h.(activity.data["context"]), rel: 'ostatus:conversation'], []}, {:link, [ref: h.(activity.data["context"]), rel: 'ostatus:conversation'], []},
{:link, [rel: 'self', type: ['application/atom+xml'], href: h.(activity.data["id"])], []}, {:link, [rel: 'self', type: ['application/atom+xml'], href: h.(activity.data["id"])], []},
{:"activity:object", retweeted_xml} {:"activity:object", retweeted_xml}

8
test/web/ostatus/activity_representer_test.exs
View File

@ -34,7 +34,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
<content type="html">#{note_activity.data["object"]["content"]}</content> <content type="html">#{note_activity.data["object"]["content"]}</content>
<published>#{note_activity.data["object"]["published"]}</published> <published>#{note_activity.data["object"]["published"]}</published>
<updated>#{note_activity.data["object"]["published"]}</updated> <updated>#{note_activity.data["object"]["published"]}</updated>
<ostatus:conversation>#{note_activity.data["context"]}</ostatus:conversation> <ostatus:conversation ref="#{note_activity.data["context"]}">#{note_activity.data["context"]}</ostatus:conversation>
<link ref="#{note_activity.data["context"]}" rel="ostatus:conversation" /> <link ref="#{note_activity.data["context"]}" rel="ostatus:conversation" />
<link type="application/atom+xml" href="#{note_activity.data["object"]["id"]}" rel="self" /> <link type="application/atom+xml" href="#{note_activity.data["object"]["id"]}" rel="self" />
<link type="text/html" href="#{note_activity.data["object"]["id"]}" rel="alternate" /> <link type="text/html" href="#{note_activity.data["object"]["id"]}" rel="alternate" />
@ -71,7 +71,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
<content type="html">#{answer.data["object"]["content"]}</content> <content type="html">#{answer.data["object"]["content"]}</content>
<published>#{answer.data["object"]["published"]}</published> <published>#{answer.data["object"]["published"]}</published>
<updated>#{answer.data["object"]["published"]}</updated> <updated>#{answer.data["object"]["published"]}</updated>
<ostatus:conversation>#{answer.data["context"]}</ostatus:conversation> <ostatus:conversation ref="#{answer.data["context"]}">#{answer.data["context"]}</ostatus:conversation>
<link ref="#{answer.data["context"]}" rel="ostatus:conversation" /> <link ref="#{answer.data["context"]}" rel="ostatus:conversation" />
<link type="application/atom+xml" href="#{answer.data["object"]["id"]}" rel="self" /> <link type="application/atom+xml" href="#{answer.data["object"]["id"]}" rel="self" />
<link type="text/html" href="#{answer.data["object"]["id"]}" rel="alternate" /> <link type="text/html" href="#{answer.data["object"]["id"]}" rel="alternate" />
@ -110,7 +110,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
<content type="html">RT #{note.data["object"]["content"]}</content> <content type="html">RT #{note.data["object"]["content"]}</content>
<published>#{announce.data["published"]}</published> <published>#{announce.data["published"]}</published>
<updated>#{announce.data["published"]}</updated> <updated>#{announce.data["published"]}</updated>
<ostatus:conversation>#{announce.data["context"]}</ostatus:conversation> <ostatus:conversation ref="#{announce.data["context"]}">#{announce.data["context"]}</ostatus:conversation>
<link ref="#{announce.data["context"]}" rel="ostatus:conversation" /> <link ref="#{announce.data["context"]}" rel="ostatus:conversation" />
<link rel="self" type="application/atom+xml" href="#{announce.data["id"]}"/> <link rel="self" type="application/atom+xml" href="#{announce.data["id"]}"/>
<activity:object> <activity:object>
@ -147,7 +147,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
<activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type> <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
<id>#{note.data["id"]}</id> <id>#{note.data["id"]}</id>
</activity:object> </activity:object>
<ostatus:conversation>#{like.data["context"]}</ostatus:conversation> <ostatus:conversation ref="#{like.data["context"]}">#{like.data["context"]}</ostatus:conversation>
<link ref="#{like.data["context"]}" rel="ostatus:conversation" /> <link ref="#{like.data["context"]}" rel="ostatus:conversation" />
<link rel="self" type="application/atom+xml" href="#{like.data["id"]}"/> <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"]}" />