projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make transparency_exclusions use tuples in admin-fe
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
mrf
/
keyword_policy.ex
diff --git
a/lib/pleroma/web/activity_pub/mrf/keyword_policy.ex
b/lib/pleroma/web/activity_pub/mrf/keyword_policy.ex
index ded0fe7f277de1a4ddbddadb688b2d6f3bd75f69..1383fa757365836c2d102212f2c0c9868cb9ff62 100644
(file)
--- a/
lib/pleroma/web/activity_pub/mrf/keyword_policy.ex
+++ b/
lib/pleroma/web/activity_pub/mrf/keyword_policy.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.MRF.KeywordPolicy do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.MRF.KeywordPolicy do
@@
-7,7
+7,7
@@
defmodule Pleroma.Web.ActivityPub.MRF.KeywordPolicy do
@moduledoc "Reject or Word-Replace messages with a keyword or regex"
@moduledoc "Reject or Word-Replace messages with a keyword or regex"
- @behaviour Pleroma.Web.ActivityPub.MRF
+ @behaviour Pleroma.Web.ActivityPub.MRF
.Policy
defp string_matches?(string, _) when not is_binary(string) do
false
end
defp string_matches?(string, _) when not is_binary(string) do
false
end
@@
-159,6
+159,8
@@
defmodule Pleroma.Web.ActivityPub.MRF.KeywordPolicy do
%{
key: :replace,
type: {:list, :tuple},
%{
key: :replace,
type: {:list, :tuple},
+ key_placeholder: "instance",
+ value_placeholder: "reason",
description: """
**Pattern**: a string or [Regex](https://hexdocs.pm/elixir/Regex.html) in the format of `~r/PATTERN/`.
description: """
**Pattern**: a string or [Regex](https://hexdocs.pm/elixir/Regex.html) in the format of `~r/PATTERN/`.