Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'

migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo

Closes #1697

See merge request pleroma/pleroma!2403

lib/pleroma/web/activity_pub/activity_pub.ex

@@ -1430,7 +1430,10 @@ defp object_to_user_data(data) do
     emojis =
       data
       |> Map.get("tag", [])
-      |> Enum.filter(fn data -> data["type"] == "Emoji" and data["icon"] end)
+      |> Enum.filter(fn
+        %{"type" => "Emoji"} -> true
+        _ -> false
+      end)
       |> Enum.reduce(%{}, fn %{"icon" => %{"url" => url}, "name" => name}, acc ->
         Map.put(acc, String.trim(name, ":"), url)
       end)

priv/repo/migrations/20200406100225_users_add_emoji.exs

@@ -17,7 +17,10 @@ def up do
       emoji =
         user.source_data
         |> Map.get("tag", [])
-        |> Enum.filter(fn data -> data["type"] == "Emoji" and data["icon"] end)
+        |> Enum.filter(fn
+          %{"type" => "Emoji"} -> true
+          _ -> false
+        end)
         |> Enum.reduce(%{}, fn %{"icon" => %{"url" => url}, "name" => name}, acc ->
           Map.put(acc, String.trim(name, ":"), url)
         end)