From 10e40206c6890cc1d88a391ab620ef859ed71521 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Mon, 4 Sep 2017 11:04:04 +0200 Subject: [PATCH] Output mastodon-style conversation ids. --- 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 842e44ee4..d4b897e19 100644 --- a/lib/pleroma/web/ostatus/activity_representer.ex +++ b/lib/pleroma/web/ostatus/activity_representer.ex @@ -82,7 +82,7 @@ def to_simple_form(%{data: %{"object" => %{"type" => "Note"}}} = activity, user, {:content, [type: 'html'], h.(activity.data["object"]["content"] |> String.replace(~r/[\n\r]/, ""))}, {:published, h.(inserted_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'], []}, ] ++ get_links(activity) ++ categories ++ attachments ++ in_reply_to ++ author ++ mentions end @@ -108,7 +108,7 @@ def to_simple_form(%{data: %{"type" => "Like"}} = activity, user, with_author) d {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/note']}, {: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, [rel: 'self', type: ['application/atom+xml'], href: h.(activity.data["id"])], []}, {:"thr:in-reply-to", [ref: to_charlist(activity.data["object"])], []} @@ -138,7 +138,7 @@ def to_simple_form(%{data: %{"type" => "Announce"}} = activity, user, with_autho {:content, [type: 'html'], ['RT #{retweeted_activity.data["object"]["content"]}']}, {:published, h.(inserted_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, [rel: 'self', type: ['application/atom+xml'], href: h.(activity.data["id"])], []}, {:"activity:object", retweeted_xml} diff --git a/test/web/ostatus/activity_representer_test.exs b/test/web/ostatus/activity_representer_test.exs index 0129e3758..47eecb247 100644 --- a/test/web/ostatus/activity_representer_test.exs +++ b/test/web/ostatus/activity_representer_test.exs @@ -34,7 +34,7 @@ test "a note activity" do #{note_activity.data["object"]["content"]} #{note_activity.data["object"]["published"]} #{note_activity.data["object"]["published"]} - #{note_activity.data["context"]} + #{note_activity.data["context"]} @@ -71,7 +71,7 @@ test "a reply note" do #{answer.data["object"]["content"]} #{answer.data["object"]["published"]} #{answer.data["object"]["published"]} - #{answer.data["context"]} + #{answer.data["context"]} @@ -110,7 +110,7 @@ test "an announce activity" do RT #{note.data["object"]["content"]} #{announce.data["published"]} #{announce.data["published"]} - #{announce.data["context"]} + #{announce.data["context"]} @@ -147,7 +147,7 @@ test "a like activity" do http://activitystrea.ms/schema/1.0/note #{note.data["id"]} - #{like.data["context"]} + #{like.data["context"]}