little changes and typos

diff --git a/config/config.exs b/config/config.exs
index 4a22167b2f69620b0cecc1282a2ee75f8df269ea..139ec0ace70c1a532003fd7674aed3829ca98bb9 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -57,7 +57,7 @@ config :pleroma, Pleroma.Uploaders.MDII,
 config :pleroma, :emoji,
   shortcode_globs: ["/emoji/custom/**/*.png"],
   groups: [
 config :pleroma, :emoji,
   shortcode_globs: ["/emoji/custom/**/*.png"],
   groups: [

-    # Place here groups, which have more priority on defaults. Example in `docs/config/custom_emoji.md`
+    # Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md`

     Finmoji: "/finmoji/128px/*-128.png",
     Custom: ["/emoji/*.png", "/emoji/custom/*.png"]
   ]
     Finmoji: "/finmoji/128px/*-128.png",
     Custom: ["/emoji/*.png", "/emoji/custom/*.png"]
   ]

diff --git a/docs/config/custom_emoji.md b/docs/config/custom_emoji.md
index d37220a72f805aab78a21e0a08fa002cd514a260..49a451fcc5f05c886060c0de895a4502aab1f042 100644 (file)
--- a/docs/config/custom_emoji.md
+++ b/docs/config/custom_emoji.md
@@ -30,7 +30,7 @@ config :pleroma, :emoji,
   ]
 ```
 
   ]
 ```
 

-Order of the `groups` matters, so to override default tags just put your group on the top of the list. E.g:
+Order of the `groups` matters, so to override default tags just put your group on top of the list. E.g:

 ```
 config :pleroma, :emoji,
   shortcode_globs: ["/emoji/custom/**/*.png"],
 ```
 config :pleroma, :emoji,
   shortcode_globs: ["/emoji/custom/**/*.png"],


@@ -44,7 +44,7 @@ config :pleroma, :emoji,
   ]
 ```
 
   ]
 ```
 

-Priority of tag assign in emoji.txt and custom.txt:
+Priority of tags assigns in emoji.txt and custom.txt:

 
 `tag in file > special group setting in config.exs > default setting in config.exs`
 
 
 `tag in file > special group setting in config.exs > default setting in config.exs`
 

diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex
index b60d19e8949dfa044c99feb0d5c9453872f60fb7..7a60f396146da085cba0e36f397181649a0533ce 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()
   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}]
 
   @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)
 
   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) ++
 
     emojis =
       (load_finmoji(finmoji_enabled) ++