summaryrefslogtreecommitdiff
path: root/priv/repo/migrations
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-04-18 06:59:23 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-04-18 06:59:23 +0000
commit79445ae5d25d7d0f775107eeede167dfd9aeb1bf (patch)
tree846c2e638e922623aa399d96d9eda79691602512 /priv/repo/migrations
parentf1843db41d27c695b4fdb92b13fe6642102a35bc (diff)
parentd698ecef9b5ede19474f1a45b776f8ad9f8b7678 (diff)
downloadpleroma-79445ae5d25d7d0f775107eeede167dfd9aeb1bf.tar.gz
pleroma-79445ae5d25d7d0f775107eeede167dfd9aeb1bf.zip
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
Diffstat (limited to 'priv/repo/migrations')
-rw-r--r--priv/repo/migrations/20200406100225_users_add_emoji.exs5
1 files changed, 4 insertions, 1 deletions
diff --git a/priv/repo/migrations/20200406100225_users_add_emoji.exs b/priv/repo/migrations/20200406100225_users_add_emoji.exs
index 9f57abb5c..f248108de 100644
--- 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)