moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Haelwenn 2020-04-18 06:59:23 +00:00
parent f1843db41d d698ecef9b
commit 79445ae5d2
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pleroma/web/activity_pub/activity_pub.ex
View File

@ -1430,7 +1430,10 @@ defp object_to_user_data(data) do
emojis = emojis =
data data
|> Map.get("tag", []) |> 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 -> |> Enum.reduce(%{}, fn %{"icon" => %{"url" => url}, "name" => name}, acc ->
Map.put(acc, String.trim(name, ":"), url) Map.put(acc, String.trim(name, ":"), url)
end) end)

5
priv/repo/migrations/20200406100225_users_add_emoji.exs
View File

@ -17,7 +17,10 @@ def up do
emoji = emoji =
user.source_data user.source_data
|> Map.get("tag", []) |> 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 -> |> Enum.reduce(%{}, fn %{"icon" => %{"url" => url}, "name" => name}, acc ->
Map.put(acc, String.trim(name, ":"), url) Map.put(acc, String.trim(name, ":"), url)
end) end)