From fcf1937a408101a4e15207bdecc36cc90f63031c Mon Sep 17 00:00:00 2001 From: lain Date: Wed, 7 Mar 2018 15:45:13 +0100 Subject: [PATCH] Correctly handle unlisted messages coming in through Ostatus. --- lib/pleroma/web/ostatus/handlers/note_handler.ex | 6 +++++- test/web/ostatus/ostatus_test.exs | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/pleroma/web/ostatus/handlers/note_handler.ex b/lib/pleroma/web/ostatus/handlers/note_handler.ex index 7b7ed2d5a..38f9fc478 100644 --- a/lib/pleroma/web/ostatus/handlers/note_handler.ex +++ b/lib/pleroma/web/ostatus/handlers/note_handler.ex @@ -88,6 +88,7 @@ def fetch_replied_to_activity(entry, inReplyTo) do end end + # TODO: Clean this up a bit. def handle_note(entry, doc \\ nil) do with id <- XML.string_from_xpath("//id", entry), activity when is_nil(activity) <- Activity.get_create_activity_by_object_ap_id(id), @@ -104,15 +105,18 @@ def handle_note(entry, doc \\ nil) do mentions <- get_mentions(entry), to <- make_to_list(actor, mentions), date <- XML.string_from_xpath("//published", entry), + unlisted <- XML.string_from_xpath("//mastodon:scope", entry) == "unlisted", + cc <- if(unlisted, do: ["https://www.w3.org/ns/activitystreams#Public"], else: []), note <- CommonAPI.Utils.make_note_data(actor.ap_id, to, context, content_html, attachments, inReplyToActivity, [], cw), note <- note |> Map.put("id", id) |> Map.put("tag", tags), note <- note |> Map.put("published", date), note <- note |> Map.put("emoji", get_emoji(entry)), note <- add_external_url(note, entry), + note <- note |> Map.put("cc", cc), # TODO: Handle this case in make_note_data note <- (if inReplyTo && !inReplyToActivity, do: note |> Map.put("inReplyTo", inReplyTo), else: note) do - res = ActivityPub.create(%{to: to, actor: actor, context: context, object: note, published: date, local: false}) + res = ActivityPub.create(%{to: to, actor: actor, context: context, object: note, published: date, local: false, additional: %{"cc" => cc}}) User.increase_note_count(actor) res else diff --git a/test/web/ostatus/ostatus_test.exs b/test/web/ostatus/ostatus_test.exs index bb995199c..7f67b9ec0 100644 --- a/test/web/ostatus/ostatus_test.exs +++ b/test/web/ostatus/ostatus_test.exs @@ -90,6 +90,15 @@ test "handle incoming notes - Mastodon, with CW" do assert "https://www.w3.org/ns/activitystreams#Public" in activity.data["to"] end + test "handle incoming unlisted messages, put public into cc" do + incoming = File.read!("test/fixtures/mastodon-note-unlisted.xml") + {:ok, [activity]} = OStatus.handle_incoming(incoming) + refute "https://www.w3.org/ns/activitystreams#Public" in activity.data["to"] + assert "https://www.w3.org/ns/activitystreams#Public" in activity.data["cc"] + refute "https://www.w3.org/ns/activitystreams#Public" in activity.data["object"]["to"] + assert "https://www.w3.org/ns/activitystreams#Public" in activity.data["object"]["cc"] + end + test "handle incoming retweets - Mastodon, with CW" do incoming = File.read!("test/fixtures/cw_retweet.xml") {:ok, [[_activity, retweeted_activity]]} = OStatus.handle_incoming(incoming)