From 1085675ec41702b6e6416ae9f905905466228c01 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Sat, 20 May 2017 10:44:57 +0200 Subject: [PATCH] Output ref instead of href for conversation. --- lib/pleroma/web/ostatus/activity_representer.ex | 6 +++--- test/web/ostatus/activity_representer_test.exs | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/pleroma/web/ostatus/activity_representer.ex b/lib/pleroma/web/ostatus/activity_representer.ex index ccf71218c..85140282c 100644 --- a/lib/pleroma/web/ostatus/activity_representer.ex +++ b/lib/pleroma/web/ostatus/activity_representer.ex @@ -54,7 +54,7 @@ def to_simple_form(%{data: %{"object" => %{"type" => "Note"}}} = activity, user, {: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 @@ def to_simple_form(%{data: %{"type" => "Like"}} = activity, user, with_author) d {: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 @@ def to_simple_form(%{data: %{"type" => "Announce"}} = activity, user, with_autho {: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 0f011f31c..06ffbdf69 100644 --- a/test/web/ostatus/activity_representer_test.exs +++ b/test/web/ostatus/activity_representer_test.exs @@ -25,7 +25,7 @@ test "a note activity" do #{inserted_at} #{updated_at} #{note_activity.data["context"]} - + @@ -63,7 +63,7 @@ test "a reply note" do #{inserted_at} #{updated_at} #{answer.data["context"]} - + @@ -106,7 +106,7 @@ test "an announce activity" do #{inserted_at} #{updated_at} #{announce.data["context"]} - + #{note_xml} @@ -149,7 +149,7 @@ test "a like activity" do #{note.data["id"]} #{like.data["context"]} - +