projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
extend reject MRF to check if originating instance is blocked
[akkoma]
/
lib
/
pleroma
/
config
/
deprecation_warnings.ex
diff --git
a/lib/pleroma/config/deprecation_warnings.ex
b/lib/pleroma/config/deprecation_warnings.ex
index 8a336c35a3d5ace64455f7926e5a2ccf68603b1c..73ef41145182440e88bd12e25873994bb09d072d 100644
(file)
--- a/
lib/pleroma/config/deprecation_warnings.ex
+++ b/
lib/pleroma/config/deprecation_warnings.ex
@@
-25,7
+25,7
@@
defmodule Pleroma.Config.DeprecationWarnings do
def check_simple_policy_tuples do
has_strings =
Config.get([:mrf_simple])
def check_simple_policy_tuples do
has_strings =
Config.get([:mrf_simple])
- |> Enum.any?(fn {_, v} -> Enum.any?(v, &is_binary/1) end)
+ |> Enum.any?(fn {_, v} ->
is_list(v) and
Enum.any?(v, &is_binary/1) end)
if has_strings do
Logger.warn("""
if has_strings do
Logger.warn("""
@@
-66,6
+66,7
@@
defmodule Pleroma.Config.DeprecationWarnings do
new_config =
Config.get([:mrf_simple])
new_config =
Config.get([:mrf_simple])
+ |> Enum.filter(fn {k, v} -> not is_atom(v) end)
|> Enum.map(fn {k, v} ->
{k,
Enum.map(v, fn
|> Enum.map(fn {k, v} ->
{k,
Enum.map(v, fn