projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make error message about author's inability to vote more sensible
[akkoma]
/
lib
/
pleroma
/
emoji.ex
diff --git
a/lib/pleroma/emoji.ex
b/lib/pleroma/emoji.ex
index 6390cce4c5ff13a00569d7c5eabb85a5fe00475f..7d12eff7fe2982901b130ee4a604e71536c5e046 100644
(file)
--- a/
lib/pleroma/emoji.ex
+++ b/
lib/pleroma/emoji.ex
@@
-22,7
+22,7
@@
defmodule Pleroma.Emoji do
@ets __MODULE__.Ets
@ets_options [:ordered_set, :protected, :named_table, {:read_concurrency, true}]
@ets __MODULE__.Ets
@ets_options [:ordered_set, :protected, :named_table, {:read_concurrency, true}]
- @groups
Application.get_env(:pleroma, :emoji)[:groups]
+ @groups
Pleroma.Config.get([:emoji, :groups])
@doc false
def start_link do
@doc false
def start_link do
@@
-112,7
+112,7
@@
defmodule Pleroma.Emoji do
# Compat thing for old custom emoji handling & default emoji,
# it should run even if there are no emoji packs
# 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] || []
+ shortcode_globs =
Pleroma.Config.get([:emoji, :shortcode_globs], [])
emojis =
(load_from_file("config/emoji.txt") ++
emojis =
(load_from_file("config/emoji.txt") ++