diff options
author | lain <lain@soykaf.club> | 2020-01-30 16:07:37 +0100 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-01-30 16:07:37 +0100 |
commit | a0d9d42eaab397a1913038fea5c2d3630b812849 (patch) | |
tree | b69d3ddd0f171a64e6c5cf0393ab271b0738c83f /lib | |
parent | e2f2602fdc512d502cb41b8cdf07e6cc6362cf48 (diff) | |
download | pleroma-a0d9d42eaab397a1913038fea5c2d3630b812849.tar.gz pleroma-a0d9d42eaab397a1913038fea5c2d3630b812849.zip |
Emoji Reactions: Actually use the validation.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 1ac67b618..5c436941a 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -325,12 +325,14 @@ 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), - Pleroma.Emoji.is_unicode_emoji?(emoji), + true <- 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), :ok <- maybe_federate(activity) do {:ok, activity, object} + else + e -> {:error, e} end end @@ -345,6 +347,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do {:ok, object} <- remove_emoji_reaction_from_object(reaction_activity, object), :ok <- maybe_federate(activity) do {:ok, activity, object} + else + e -> {:error, e} end end |