X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Femoji.ex;h=170a7d0980d38fb9925bb905e5d26b7f02636fdc;hb=209395c7e60afe7115f22afd6936d9c6bdd7bb72;hp=ede734a53d5334aea323bfdd9efff90ad39611fd;hpb=6a42641b8d806f40f697303995fb12af39a93bd8;p=akkoma

diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex
index ede734a53..170a7d098 100644
--- 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
           )
 
+        # Clear out old emojis
+        :ets.delete_all_objects(@ets)
+
         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)
 
-    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}