projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Merge branch 'issue/1023' into 'develop'"
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
mrf
/
user_allow_list_policy.ex
diff --git
a/lib/pleroma/web/activity_pub/mrf/user_allow_list_policy.ex
b/lib/pleroma/web/activity_pub/mrf/user_allow_list_policy.ex
index 7389d6a969d32732a7046f57220056736833af93..1a28f2ba21d118563324d36b9e602d6d87eb60a9 100644
(file)
--- a/
lib/pleroma/web/activity_pub/mrf/user_allow_list_policy.ex
+++ b/
lib/pleroma/web/activity_pub/mrf/user_allow_list_policy.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.UserAllowListPolicy do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.MRF.UserAllowListPolicy do
@@
-14,7
+14,7
@@
defmodule Pleroma.Web.ActivityPub.MRF.UserAllowListPolicy do
if actor in allow_list do
{:ok, object}
else
if actor in allow_list do
{:ok, object}
else
- {:reject,
nil
}
+ {:reject,
"[UserAllowListPolicy] #{actor} not in the list"
}
end
end
end
end
@@
-24,7
+24,7
@@
defmodule Pleroma.Web.ActivityPub.MRF.UserAllowListPolicy do
allow_list =
Config.get(
allow_list =
Config.get(
- [:mrf_user_allowlist,
String.to_atom(actor_info.host)
],
+ [:mrf_user_allowlist,
actor_info.host
],
[]
)
[]
)