summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2021-12-17 14:35:01 +0000
committerlain <lain@soykaf.club>2021-12-17 14:35:01 +0000
commit8cfd527589517176add18bb130e3d7d5875e74e3 (patch)
tree269d36d56112e35ee46cb60f84e586c1ae99f32b
parent6eb7d69e60a96e577de92de232ed48e509f23cd4 (diff)
parent31b9034a2775d108ba5f73ebb7ee0eb598177105 (diff)
Merge branch 'verbose-emoji-loader' into 'develop'
emoji/loader.ex: be more verbose about which emoji pack config is loading now See merge request pleroma/pleroma!3567
-rw-r--r--lib/pleroma/emoji/loader.ex2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/emoji/loader.ex b/lib/pleroma/emoji/loader.ex
index 95937a892..abc95d902 100644
--- 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
+ Logger.info("Loading emoji pack from JSON: #{pack_file}")
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
+ Logger.info("Loading emoji pack from emoji.txt: #{emoji_txt}")
load_from_file(emoji_txt, emoji_groups)
else
extensions = Config.get([:emoji, :pack_extensions])