projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ba19ba8
)
Fix emoji.txt / custom_emoji.txt / shortcode_globs handling
author
Ekaterina Vaartis
<vaartis@cock.li>
Sun, 21 Apr 2019 19:46:55 +0000
(22:46 +0300)
committer
Ekaterina Vaartis
<vaartis@cock.li>
Sun, 21 Apr 2019 20:07:14 +0000
(23:07 +0300)
lib/pleroma/emoji.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/emoji.ex
b/lib/pleroma/emoji.ex
index 071c7f6cdb141a737b3199e8b4b208e245a1ede9..6390cce4c5ff13a00569d7c5eabb85a5fe00475f 100644
(file)
--- a/
lib/pleroma/emoji.ex
+++ b/
lib/pleroma/emoji.ex
@@
-101,22
+101,27
@@
defmodule Pleroma.Emoji do
# Print the packs we've found
Logger.info("Found emoji packs: #{Enum.join(packs, ", ")}")
# Print the packs we've found
Logger.info("Found emoji packs: #{Enum.join(packs, ", ")}")
- # compat thing for old custom emoji handling
- shortcode_globs = Application.get_env(:pleroma, :emoji)[:shortcode_globs] || []
-
emojis =
emojis =
- (Enum.flat_map(
- packs,
- fn pack -> load_pack(Path.join(emoji_dir_path, pack)) end
- ) ++
- load_from_file("config/emoji.txt") ++
- load_from_file("config/custom_emoji.txt") ++
- load_from_globs(shortcode_globs))
- |> Enum.reject(fn value -> value == nil end)
+ Enum.flat_map(
+ packs,
+ fn pack -> load_pack(Path.join(emoji_dir_path, pack)) end
+ )
true = :ets.insert(@ets, emojis)
end
true = :ets.insert(@ets, emojis)
end
+ # Compat thing for old custom emoji handling & default emoji,
+ # it should run even if there are no emoji packs
+ shortcode_globs = Application.get_env(:pleroma, :emoji)[:shortcode_globs] || []
+
+ emojis =
+ (load_from_file("config/emoji.txt") ++
+ load_from_file("config/custom_emoji.txt") ++
+ load_from_globs(shortcode_globs))
+ |> Enum.reject(fn value -> value == nil end)
+
+ true = :ets.insert(@ets, emojis)
+
:ok
end
:ok
end