lechindianer/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

ActivityPub: Use is_unicode_emoji? function.

Browse source
This commit is contained in:
lain 2019-09-13 16:06:34 +02:00
parent a697f0d791
commit e5b3ad3d04
3 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -315,7 +315,7 @@ def update(%{to: to, cc: cc, actor: actor, object: object} = params) do
def react_with_emoji(user, object, emoji, options \\ []) do def react_with_emoji(user, object, emoji, options \\ []) do
with local <- Keyword.get(options, :local, true), with local <- Keyword.get(options, :local, true),
activity_id <- Keyword.get(options, :activity_id, nil), 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), reaction_data <- make_emoji_reaction_data(user, object, emoji, activity_id),
{:ok, activity} <- insert(reaction_data, local), {:ok, activity} <- insert(reaction_data, local),
{:ok, object} <- add_emoji_reaction_to_object(activity, object) do {:ok, object} <- add_emoji_reaction_to_object(activity, object) do

4
lib/pleroma/web/activity_pub/utils.ex
View file

@ -277,10 +277,6 @@ def get_object_likes(%{data: %{"id" => id}}) do
|> Repo.all() |> Repo.all()
end end
def is_emoji?(emoji) do
String.length(emoji) == 1
end
def make_emoji_reaction_data(user, object, emoji, activity_id) do def make_emoji_reaction_data(user, object, emoji, activity_id) do
make_like_data(user, object, activity_id) make_like_data(user, object, activity_id)
|> Map.put("type", "EmojiReaction") |> Map.put("type", "EmojiReaction")

1
test/web/pleroma_api/pleroma_api_controller_test.exs
View file

@ -8,7 +8,6 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do
alias Pleroma.Conversation.Participation alias Pleroma.Conversation.Participation
alias Pleroma.Repo alias Pleroma.Repo
alias Pleroma.Web.CommonAPI alias Pleroma.Web.CommonAPI
alias Pleroma.Web.MastodonAPI.AccountView
import Pleroma.Factory import Pleroma.Factory