Merge branch 'feature/dm-sanity' into 'develop'

DM sanitization See merge request pleroma/pleroma!458
2019-01-21 12:35:10 +00:00 · 2019-01-21 12:35:10 +00:00 · 69454c8345
commit 69454c8345
parent 52006f8f8a aa37313416
8 changed files with 186 additions and 4 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