MRF: reject non-public: use pattern match to remove unnecessary if block

This commit is contained in:
William Pitcock 2018-09-10 01:13:38 +00:00
parent 88094c266d
commit e0b8c0ccba

View file

@ -7,43 +7,42 @@ defmodule Pleroma.Web.ActivityPub.MRF.RejectNonPublic do
@allow_direct Keyword.get(@mrf_rejectnonpublic, :allow_direct) @allow_direct Keyword.get(@mrf_rejectnonpublic, :allow_direct)
@impl true @impl true
def filter(object) do def filter(%{"type" => "Create"} = object) do
if object["type"] == "Create" do user = User.get_cached_by_ap_id(object["actor"])
user = User.get_cached_by_ap_id(object["actor"]) public = "https://www.w3.org/ns/activitystreams#Public"
public = "https://www.w3.org/ns/activitystreams#Public"
# Determine visibility # Determine visibility
visibility = visibility =
cond do cond do
public in object["to"] -> "public" public in object["to"] -> "public"
public in object["cc"] -> "unlisted" public in object["cc"] -> "unlisted"
user.follower_address in object["to"] -> "followers" user.follower_address in object["to"] -> "followers"
true -> "direct" true -> "direct"
end
case visibility do
"public" ->
{:ok, object}
"unlisted" ->
{:ok, object}
"followers" ->
with true <- @allow_followersonly do
{:ok, object}
else
_e -> {:reject, nil}
end end
case visibility do "direct" ->
"public" -> with true <- @allow_direct do
{:ok, object} {:ok, object}
else
"unlisted" -> _e -> {:reject, nil}
{:ok, object} end
"followers" ->
with true <- @allow_followersonly do
{:ok, object}
else
_e -> {:reject, nil}
end
"direct" ->
with true <- @allow_direct do
{:ok, object}
else
_e -> {:reject, nil}
end
end
else
{:ok, object}
end end
end end
@impl true
def filter(object), do: {:ok, object}
end end