No OneTemporary
Actions

Authored By

Unknown

Size

925 B

Referenced Files

None

Subscribers

None

View Options

	diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex
	index a8574b41e..0faa479ea 100644
	--- a/lib/pleroma/emoji.ex
	+++ b/lib/pleroma/emoji.ex
	@@ -145,7 +145,7 @@ defmodule Pleroma.Emoji do

	def unicode?(_), do: false

	- @emoji_regex ~r/\A:[A-Za-z0-9_-]+(@[A-Za-z0-9_.-]+)?:\z/
	+ @emoji_regex ~r/\A:[A-Za-z0-9_-]+(@[A-Za-z0-9_.:-]+)?:\z/

	def custom?(s) when is_binary(s), do: Regex.match?(@emoji_regex, s)

	diff --git a/test/pleroma/emoji_test.exs b/test/pleroma/emoji_test.exs
	index 38acd3ab9..a5f480aa5 100644
	--- a/test/pleroma/emoji_test.exs
	+++ b/test/pleroma/emoji_test.exs
	@@ -34,6 +34,7 @@ defmodule Pleroma.EmojiTest do
	assert Emoji.custom?(":blobcat:")
	assert Emoji.custom?(":blob_cat-2:")
	assert Emoji.custom?(":blobcat@remote.example:")
	+ assert Emoji.custom?(":blobcat@localhost:4000:")
	assert Emoji.custom?(":blobcat@.:")

	refute Emoji.custom?("blobcat")