Merge branch 'develop' of https://git.youjo.love/fox/youjo-be into develop

lib/pleroma/web/activity_pub/builder.ex

@@ -90,9 +90,11 @@ defmodule Pleroma.Web.ActivityPub.Builder do
       Enum.find(
         existing_reactions,
         fn [name, _, url] ->
+          if url != nil do
             url = URI.parse(url)
             url.host == instance && name == emoji_code
           end
+        end
       )
 
     if matching_reaction do

test/pleroma/web/pleroma_api/controllers/emoji_reaction_controller_test.exs

@@ -76,7 +76,12 @@ defmodule Pleroma.Web.PleromaAPI.EmojiReactionControllerTest do
     note =
       insert(:note,
         user: user,
-        data: %{"reactions" => [["wow", [other_user.ap_id], "https://remote/emoji/wow"]]}
+        data: %{
+          "reactions" => [
+            ["👍", [other_user.ap_id], nil],
+            ["wow", [other_user.ap_id], "https://remote/emoji/wow"]
+          ]
+        }
       )
 
     activity = insert(:note_activity, note: note, user: user)
@@ -89,6 +94,13 @@ defmodule Pleroma.Web.PleromaAPI.EmojiReactionControllerTest do
       |> json_response(200)
 
     assert result["pleroma"]["emoji_reactions"] == [
+             %{
+               "account_ids" => [other_user.id],
+               "count" => 1,
+               "me" => false,
+               "name" => "👍",
+               "url" => nil
+             },
              %{
                "name" => "wow@remote",
                "count" => 2,