projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle empty shortcode/filename/new_shortcode/new_filename
[akkoma]
/
lib
/
pleroma
/
emoji.ex
diff --git
a/lib/pleroma/emoji.ex
b/lib/pleroma/emoji.ex
index ede734a53d5334aea323bfdd9efff90ad39611fd..170a7d0980d38fb9925bb905e5d26b7f02636fdc 100644
(file)
--- a/
lib/pleroma/emoji.ex
+++ b/
lib/pleroma/emoji.ex
@@
-122,6
+122,9
@@
defmodule Pleroma.Emoji do
fn pack -> load_pack(Path.join(emoji_dir_path, pack), emoji_groups) end
)
fn pack -> load_pack(Path.join(emoji_dir_path, pack), emoji_groups) end
)
+ # Clear out old emojis
+ :ets.delete_all_objects(@ets)
+
true = :ets.insert(@ets, emojis)
end
true = :ets.insert(@ets, emojis)
end
@@
-143,12
+146,12
@@
defmodule Pleroma.Emoji do
defp load_pack(pack_dir, emoji_groups) do
pack_name = Path.basename(pack_dir)
defp load_pack(pack_dir, emoji_groups) do
pack_name = Path.basename(pack_dir)
- pack_
toml = Path.join(pack_dir, "pack.toml
")
+ pack_
file = Path.join(pack_dir, "pack.json
")
- if File.exists?(pack_
toml
) do
-
toml = Toml.decode_file!(pack_toml
)
+ if File.exists?(pack_
file
) do
+
contents = Jason.decode!(File.read!(pack_file)
)
-
toml
["files"]
+
contents
["files"]
|> Enum.map(fn {name, rel_file} ->
filename = Path.join("/emoji/#{pack_name}", rel_file)
{name, filename, pack_name}
|> Enum.map(fn {name, rel_file} ->
filename = Path.join("/emoji/#{pack_name}", rel_file)
{name, filename, pack_name}