projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add timeline visibility options
[akkoma]
/
lib
/
pleroma
/
emoji
/
loader.ex
diff --git
a/lib/pleroma/emoji/loader.ex
b/lib/pleroma/emoji/loader.ex
index 95937a892bf567400a3d0a76a167b9c063b64fc9..abc95d902d1ce1486362ee89f69dfadf3d09a0a1 100644
(file)
--- a/
lib/pleroma/emoji/loader.ex
+++ b/
lib/pleroma/emoji/loader.ex
@@
-103,6
+103,7
@@
defmodule Pleroma.Emoji.Loader do
pack_file = Path.join(pack_dir, "pack.json")
if File.exists?(pack_file) do
pack_file = Path.join(pack_dir, "pack.json")
if File.exists?(pack_file) do
+ Logger.info("Loading emoji pack from JSON: #{pack_file}")
contents = Jason.decode!(File.read!(pack_file))
contents["files"]
contents = Jason.decode!(File.read!(pack_file))
contents["files"]
@@
-115,6
+116,7
@@
defmodule Pleroma.Emoji.Loader do
emoji_txt = Path.join(pack_dir, "emoji.txt")
if File.exists?(emoji_txt) do
emoji_txt = Path.join(pack_dir, "emoji.txt")
if File.exists?(emoji_txt) do
+ Logger.info("Loading emoji pack from emoji.txt: #{emoji_txt}")
load_from_file(emoji_txt, emoji_groups)
else
extensions = Config.get([:emoji, :pack_extensions])
load_from_file(emoji_txt, emoji_groups)
else
extensions = Config.get([:emoji, :pack_extensions])