logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: e706b42f519fe754af980fc758be492b24e3ccde
parent: 14ef35f402299d58b5d4dc9c927e6da6e00a7ddb
Author: kaniini <nenolod@gmail.com>
Date:   Sat,  1 Jun 2019 03:39:13 +0000

Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'

visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility

See merge request pleroma/pleroma!1230

Diffstat:

Mlib/pleroma/web/activity_pub/visibility.ex3+++
Mtest/web/activity_pub/visibilty_test.exs4++++
2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/lib/pleroma/web/activity_pub/visibility.ex b/lib/pleroma/web/activity_pub/visibility.ex @@ -66,6 +66,9 @@ defmodule Pleroma.Web.ActivityPub.Visibility do Enum.any?(to, &String.contains?(&1, "/followers")) -> "private" + object.data["directMessage"] == true -> + "direct" + length(cc) > 0 -> "private" diff --git a/test/web/activity_pub/visibilty_test.exs b/test/web/activity_pub/visibilty_test.exs @@ -117,4 +117,8 @@ defmodule Pleroma.Web.ActivityPub.VisibilityTest do assert Visibility.get_visibility(direct) == "direct" assert Visibility.get_visibility(unlisted) == "unlisted" end + + test "get_visibility with directMessage flag" do + assert Visibility.get_visibility(%{data: %{"directMessage" => true}}) == "direct" + end end