Merge branch 'develop' into feature/database-compaction

[akkoma] / lib / pleroma / emoji.ex

diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex
index b60d19e8949dfa044c99feb0d5c9453872f60fb7..87c7f2ceca0313dbcc8170d80a89bffea431301e 100644 (file)
--- 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) ++
@@ -214,7 +214,7 @@ defmodule Pleroma.Emoji do
   end
 
   @doc """
-  Finds a matching group for the given extra filename
+  Finds a matching group for the given emoji filename
   """
   @spec match_extra(group_patterns(), String.t()) :: atom() | nil
   def match_extra(group_patterns, filename) do