projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request 'Remove "default" image description' (#493) from ilja/akkoma:remov...
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
object_validators
/
emoji_react_validator.ex
diff --git
a/lib/pleroma/web/activity_pub/object_validators/emoji_react_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/emoji_react_validator.ex
index 306a57a93bf23740a0ada1501c275ac9e6a86963..80ec65cd741987a46c499b0c7a4164a68d6ced11 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/emoji_react_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/emoji_react_validator.ex
@@
-13,7
+13,6
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.EmojiReactValidator do
import Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations
@primary_key false
import Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations
@primary_key false
- @emoji_regex ~r/:[A-Za-z0-9_-]+:/
embedded_schema do
quote do
embedded_schema do
quote do
@@
-75,9
+74,6
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.EmojiReactValidator do
end
end
end
end
- defp matches_shortcode?(nil), do: false
- defp matches_shortcode?(s), do: Regex.match?(@emoji_regex, s)
-
defp fix_emoji_qualification(%{"content" => emoji} = data) do
new_emoji = Pleroma.Emoji.fully_qualify_emoji(emoji)
defp fix_emoji_qualification(%{"content" => emoji} = data) do
new_emoji = Pleroma.Emoji.fully_qualify_emoji(emoji)
@@
-98,7
+94,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.EmojiReactValidator do
defp validate_emoji(cng) do
content = get_field(cng, :content)
defp validate_emoji(cng) do
content = get_field(cng, :content)
- if Emoji.is_unicode_emoji?(content) || matches_shortcode?(content) do
+ if Emoji.is_unicode_emoji?(content) ||
Emoji.
matches_shortcode?(content) do
cng
else
cng
cng
else
cng