Output ref instead of href for conversation.

diff --git a/lib/pleroma/web/ostatus/activity_representer.ex b/lib/pleroma/web/ostatus/activity_representer.ex
index ccf71218cbde338cb4cd2ef94f7ab7253846e0bd..85140282cfa72d75a33485c77d92ee2366703cd5 100644 (file)
--- a/lib/pleroma/web/ostatus/activity_representer.ex
+++ b/lib/pleroma/web/ostatus/activity_representer.ex
@@ -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

diff --git a/test/web/ostatus/activity_representer_test.exs b/test/web/ostatus/activity_representer_test.exs
index 0f011f31cbfc34c5f4d3c1d2bc5784b67057762f..06ffbdf698f47f6a0493215cab2edfd4fc3c1453 100644 (file)
--- a/test/web/ostatus/activity_representer_test.exs
+++ b/test/web/ostatus/activity_representer_test.exs
@@ -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"]}"/>