projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
mrf
/
reject_non_public.ex
diff --git
a/lib/pleroma/web/activity_pub/mrf/reject_non_public.ex
b/lib/pleroma/web/activity_pub/mrf/reject_non_public.ex
index da13fd7c7b9308030f690b4f364fa7b8891340af..3092f3272974ef223f7bec3a8f2f0aa18b5f97bd 100644
(file)
--- a/
lib/pleroma/web/activity_pub/mrf/reject_non_public.ex
+++ b/
lib/pleroma/web/activity_pub/mrf/reject_non_public.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.MRF.RejectNonPublic do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.MRF.RejectNonPublic do
@@
-10,7
+10,7
@@
defmodule Pleroma.Web.ActivityPub.MRF.RejectNonPublic do
@behaviour Pleroma.Web.ActivityPub.MRF
@behaviour Pleroma.Web.ActivityPub.MRF
- @public "https://www.w3.org/ns/activitystreams#Public"
+ require Pleroma.Constants
@impl true
def filter(%{"type" => "Create"} = object) do
@impl true
def filter(%{"type" => "Create"} = object) do
@@
-19,8
+19,8
@@
defmodule Pleroma.Web.ActivityPub.MRF.RejectNonPublic do
# Determine visibility
visibility =
cond do
# Determine visibility
visibility =
cond do
-
@public
in object["to"] -> "public"
-
@public
in object["cc"] -> "unlisted"
+
Pleroma.Constants.as_public()
in object["to"] -> "public"
+
Pleroma.Constants.as_public()
in object["cc"] -> "unlisted"
user.follower_address in object["to"] -> "followers"
true -> "direct"
end
user.follower_address in object["to"] -> "followers"
true -> "direct"
end
@@
-44,4
+44,8
@@
defmodule Pleroma.Web.ActivityPub.MRF.RejectNonPublic do
@impl true
def filter(object), do: {:ok, object}
@impl true
def filter(object), do: {:ok, object}
+
+ @impl true
+ def describe,
+ do: {:ok, %{mrf_rejectnonpublic: Pleroma.Config.get(:mrf_rejectnonpublic) |> Enum.into(%{})}}
end
end