Merge branch 'develop' into rename/pleroma_activity_consistency

2019-01-23 13:05:58 +01:00 · 2019-01-23 13:05:58 +01:00 · 2de208817c
commit 2de208817c
parent 7390192c03 b624b7a150
17 changed files with 324 additions and 20 deletions
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@ -231,6 +231,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
      Enum.any?(to, &String.contains?(&1, "/followers")) ->
        "private"

+      length(cc) > 0 ->
+        "private"
+
      true ->
        "direct"
    end