projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update references to pleroma in docs
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
mrf
/
steal_emoji_policy.ex
diff --git
a/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex
b/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex
index 0dd415732fa7d7d6623d00be156bb22c83f2271a..61e95b49a13f9dda8784e82f2b0ab4f03717c0a3 100644
(file)
--- a/
lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex
+++ b/
lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex
@@
-12,6
+12,14
@@
defmodule Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy do
defp accept_host?(host), do: host in Config.get([:mrf_steal_emoji, :hosts], [])
defp accept_host?(host), do: host in Config.get([:mrf_steal_emoji, :hosts], [])
+ defp shortcode_matches?(shortcode, pattern) when is_binary(pattern) do
+ shortcode == pattern
+ end
+
+ defp shortcode_matches?(shortcode, pattern) do
+ String.match?(shortcode, pattern)
+ end
+
defp steal_emoji({shortcode, url}, emoji_dir_path) do
url = Pleroma.Web.MediaProxy.url(url)
defp steal_emoji({shortcode, url}, emoji_dir_path) do
url = Pleroma.Web.MediaProxy.url(url)
@@
-72,7
+80,7
@@
defmodule Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy do
reject_emoji? =
[:mrf_steal_emoji, :rejected_shortcodes]
|> Config.get([])
reject_emoji? =
[:mrf_steal_emoji, :rejected_shortcodes]
|> Config.get([])
- |> Enum.find(false, fn
regex -> String.match?(shortcode, regex
) end)
+ |> Enum.find(false, fn
pattern -> shortcode_matches?(shortcode, pattern
) end)
!reject_emoji?
end)
!reject_emoji?
end)
@@
-122,8
+130,12
@@
defmodule Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy do
%{
key: :rejected_shortcodes,
type: {:list, :string},
%{
key: :rejected_shortcodes,
type: {:list, :string},
- description: "Regex-list of shortcodes to reject",
- suggestions: [""]
+ description: """
+ A list of patterns or matches to reject shortcodes with.
+
+ Each pattern can be a string or [Regex](https://hexdocs.pm/elixir/Regex.html) in the format of `~r/PATTERN/`.
+ """,
+ suggestions: ["foo", ~r/foo/]
},
%{
key: :size_limit,
},
%{
key: :size_limit,