From 912ca56e59884de2111272efc74bf75894f5ca02 Mon Sep 17 00:00:00 2001 From: lain Date: Sun, 18 Feb 2018 13:51:51 +0100 Subject: [PATCH] Mastodon StatusView: Return correct visibility. --- lib/pleroma/web/mastodon_api/views/status_view.ex | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex index 64f315597..e205a420d 100644 --- a/lib/pleroma/web/mastodon_api/views/status_view.ex +++ b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -96,7 +96,7 @@ def render("status.json", %{activity: %{data: %{"object" => object}} = activity} muted: false, sensitive: sensitive, spoiler_text: object["summary"] || "", - visibility: "public", + visibility: get_visibility(object), media_attachments: attachments |> Enum.take(4), mentions: mentions, tags: [], # fix, @@ -109,7 +109,20 @@ def render("status.json", %{activity: %{data: %{"object" => object}} = activity} } end + def get_visibility(object) do + public = "https://www.w3.org/ns/activitystreams#Public" + to = object["to"] || [] + cc = object["cc"] || [] + cond do + public in to -> "public" + public in cc -> "unlisted" + [] == cc -> "direct" + true -> "private" + end + end + def render("attachment.json", %{attachment: attachment}) do + IO.inspect(attachment) [%{"mediaType" => media_type, "href" => href} | _] = attachment["url"] type = cond do