From: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Fri, 17 Apr 2020 12:32:15 +0000 (+0200)
Subject: migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=46f051048fb1afb02fe81b872ae9f595f2c5f2c1;p=akkoma

migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
---

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 35af0f7dc..d403405a0 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1430,7 +1430,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     emojis =
       data
       |> Map.get("tag", [])
-      |> Enum.filter(fn %{"type" => t} -> t == "Emoji" end)
+      |> Enum.filter(fn data -> data["type"] == "Emoji" and data["icon"] end)
       |> Enum.reduce(%{}, fn %{"icon" => %{"url" => url}, "name" => name}, acc ->
         Map.put(acc, String.trim(name, ":"), url)
       end)
diff --git a/priv/repo/migrations/20200406100225_users_add_emoji.exs b/priv/repo/migrations/20200406100225_users_add_emoji.exs
index d0254c170..9f57abb5c 100644
--- a/priv/repo/migrations/20200406100225_users_add_emoji.exs
+++ b/priv/repo/migrations/20200406100225_users_add_emoji.exs
@@ -17,7 +17,7 @@ defmodule Pleroma.Repo.Migrations.UsersPopulateEmoji do
       emoji =
         user.source_data
         |> Map.get("tag", [])
-        |> Enum.filter(fn %{"type" => t} -> t == "Emoji" end)
+        |> Enum.filter(fn data -> data["type"] == "Emoji" and data["icon"] end)
         |> Enum.reduce(%{}, fn %{"icon" => %{"url" => url}, "name" => name}, acc ->
           Map.put(acc, String.trim(name, ":"), url)
         end)