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

Output ref instead of href for conversation.

Browse Source
This commit is contained in:
Roger Braun 2017-05-20 10:44:57 +02:00
parent 9d97be4413
commit 1085675ec4
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

@ -54,7 +54,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
{:published, h.(inserted_at)},
{:updated, h.(updated_at)},
{:"ostatus:conversation", [], h.(activity.data["context"])},
{:link, [href: h.(activity.data["context"]), rel: 'ostatus:conversation'], []},
{:link, [ref: h.(activity.data["context"]), rel: 'ostatus:conversation'], []},
{:link, [type: ['application/atom+xml'], href: h.(activity.data["object"]["id"]), rel: 'self'], []}
] ++ categories ++ attachments ++ in_reply_to ++ author ++ mentions
end
@ -83,7 +83,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
{: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'], []},
{:link, [ref: 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"])], []}
] ++ author ++ mentions
@ -115,7 +115,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
{:published, h.(inserted_at)},
{:updated, h.(updated_at)},
{:"ostatus:conversation", [], h.(activity.data["context"])},
{:link, [href: 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"])], []},
{:"activity:object", retweeted_xml}
] ++ mentions ++ author

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

@ -25,7 +25,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
<published>#{inserted_at}</published>
<updated>#{updated_at}</updated>
<ostatus:conversation>#{note_activity.data["context"]}</ostatus:conversation>
<link href="#{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" />
<category term="2hu"/>
<link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
@ -63,7 +63,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
<published>#{inserted_at}</published>
<updated>#{updated_at}</updated>
<ostatus:conversation>#{answer.data["context"]}</ostatus:conversation>
<link href="#{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" />
<category term="2hu"/>
<thr:in-reply-to ref="#{note.data["object"]["id"]}" />
@ -106,7 +106,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
<published>#{inserted_at}</published>
<updated>#{updated_at}</updated>
<ostatus:conversation>#{announce.data["context"]}</ostatus:conversation>
<link href="#{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"]}"/>
<activity:object>
#{note_xml}
@ -149,7 +149,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
<id>#{note.data["id"]}</id>
</activity:object>
<ostatus:conversation>#{like.data["context"]}</ostatus:conversation>
<link href="#{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"]}"/>
<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"]}"/>