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 67acd7069ac6f10fa75691ea55e6c89bf03d2e49..abc95d902d1ce1486362ee89f69dfadf3d09a0a1 100644
(file)
--- a/
lib/pleroma/emoji/loader.ex
+++ b/
lib/pleroma/emoji/loader.ex
@@
-60,9
+60,7
@@
defmodule Pleroma.Emoji.Loader do
if not Enum.empty?(files) do
Logger.warn(
if not Enum.empty?(files) do
Logger.warn(
- "Found files in the emoji folder. These will be ignored, please move them to a subdirectory\nFound files: #{
- Enum.join(files, ", ")
- }"
+ "Found files in the emoji folder. These will be ignored, please move them to a subdirectory\nFound files: #{Enum.join(files, ", ")}"
)
end
)
end
@@
-105,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"]
@@
-117,14
+116,13
@@
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])
Logger.info(
load_from_file(emoji_txt, emoji_groups)
else
extensions = Config.get([:emoji, :pack_extensions])
Logger.info(
- "No emoji.txt found for pack \"#{pack_name}\", assuming all #{
- Enum.join(extensions, ", ")
- } files are emoji"
+ "No emoji.txt found for pack \"#{pack_name}\", assuming all #{Enum.join(extensions, ", ")} files are emoji"
)
make_shortcode_to_file_map(pack_dir, extensions)
)
make_shortcode_to_file_map(pack_dir, extensions)