diff options
| author | Alex S <alex.strizhakov@gmail.com> | 2019-04-02 16:13:34 +0700 |
|---|---|---|
| committer | Alex S <alex.strizhakov@gmail.com> | 2019-04-02 16:13:34 +0700 |
| commit | 08d64b977f74abb7cb42bf985116eba91d9a6166 (patch) | |
| tree | 5ef47f4e4f8161d3c09e7cf047178ae7eae6620d /lib | |
| parent | 851c5bf0936fbc58bf509f79531e6cdc070efde5 (diff) | |
| download | pleroma-08d64b977f74abb7cb42bf985116eba91d9a6166.tar.gz | |
little changes and typos
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/emoji.ex | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex index b60d19e89..7a60f3961 100644 --- a/lib/pleroma/emoji.ex +++ b/lib/pleroma/emoji.ex @@ -15,8 +15,8 @@ defmodule Pleroma.Emoji do use GenServer @type pattern :: Regex.t() | module() | String.t() - @type patterns :: pattern | [pattern] - @type group_patterns :: keyword(patterns) + @type patterns :: pattern() | [pattern()] + @type group_patterns :: keyword(patterns()) @ets __MODULE__.Ets @ets_options [:ordered_set, :protected, :named_table, {:read_concurrency, true}] @@ -80,7 +80,7 @@ defmodule Pleroma.Emoji do defp load do finmoji_enabled = Keyword.get(Application.get_env(:pleroma, :instance), :finmoji_enabled) - shortcode_globs = Keyword.get(Application.get_env(:pleroma, :emoji, []), :shortcode_globs, []) + shortcode_globs = Application.get_env(:pleroma, :emoji)[:shortcode_globs] || [] emojis = (load_finmoji(finmoji_enabled) ++ |