diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-04-17 13:40:25 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-04-17 13:40:25 +0000 |
| commit | 6936854878860d1f6d04db1cd14a00208c6a5728 (patch) | |
| tree | 31848b31d5c8976b8196ebc3d2c62b540e66ac9c | |
| parent | 09bd1d12c112fe45563c25a76afde65a3381aa26 (diff) | |
| parent | 46f051048fb1afb02fe81b872ae9f595f2c5f2c1 (diff) | |
| download | pleroma-6936854878860d1f6d04db1cd14a00208c6a5728.tar.gz | |
Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
Closes #1695
See merge request pleroma/pleroma!2398
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 2 | ||||
| -rw-r--r-- | priv/repo/migrations/20200406100225_users_add_emoji.exs | 2 |
2 files changed, 2 insertions, 2 deletions
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) |