Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

2020-04-20 12:37:17 +02:00 · 2020-04-20 12:37:17 +02:00 · 139b9d1338
commit 139b9d1338
parent 970b74383b 918a8094fc
48 changed files with 340 additions and 642 deletions
--- a/priv/repo/migrations/20200406100225_users_add_emoji.exs
+++ b/priv/repo/migrations/20200406100225_users_add_emoji.exs
@ -17,7 +17,10 @@ defmodule Pleroma.Repo.Migrations.UsersPopulateEmoji 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)