aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-09-13 16:06:34 +0200
committerlain <lain@soykaf.club>2019-09-13 16:06:34 +0200
commite5b3ad3d049a7c665285f724c53f6cafb0e10118 (patch)
tree0ac23a057dc96a1f6df9e64e7f4f579fbe12d844 /lib
parenta697f0d79148358da828d24ebfe12bbb9bb33b34 (diff)
downloadpleroma-e5b3ad3d049a7c665285f724c53f6cafb0e10118.tar.gz
ActivityPub: Use is_unicode_emoji? function.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex2
-rw-r--r--lib/pleroma/web/activity_pub/utils.ex4
2 files changed, 1 insertions, 5 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 6cd168427..4ee9b1885 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -315,7 +315,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
def react_with_emoji(user, object, emoji, options \\ []) do
with local <- Keyword.get(options, :local, true),
activity_id <- Keyword.get(options, :activity_id, nil),
- is_emoji?(emoji),
+ Pleroma.Emoji.is_unicode_emoji?(emoji),
reaction_data <- make_emoji_reaction_data(user, object, emoji, activity_id),
{:ok, activity} <- insert(reaction_data, local),
{:ok, object} <- add_emoji_reaction_to_object(activity, object) do
diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex
index 1e6a67deb..95e040c6c 100644
--- a/lib/pleroma/web/activity_pub/utils.ex
+++ b/lib/pleroma/web/activity_pub/utils.ex
@@ -277,10 +277,6 @@ defmodule Pleroma.Web.ActivityPub.Utils do
|> Repo.all()
end
- def is_emoji?(emoji) do
- String.length(emoji) == 1
- end
-
def make_emoji_reaction_data(user, object, emoji, activity_id) do
make_like_data(user, object, activity_id)
|> Map.put("type", "EmojiReaction")