From c876b04aebdc6e5c935572835211e48a5b3e0188 Mon Sep 17 00:00:00 2001
From: ilja <gitlab@spectraltheorem.be>
Date: Mon, 22 Apr 2019 11:17:53 +0200
Subject: [PATCH 1/2] Add shortcode_globs setting to documentation

---
 docs/config/custom_emoji.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/config/custom_emoji.md b/docs/config/custom_emoji.md
index ac28635d0..f72c0edbc 100644
--- a/docs/config/custom_emoji.md
+++ b/docs/config/custom_emoji.md
@@ -28,6 +28,11 @@ foo, /emoji/custom/foo.png
 
 The files should be PNG (APNG is okay with `.png` for `image/png` Content-type) and under 50kb for compatibility with mastodon.
 
+Default file extentions and locations for emojis are set in `config.exs`. To use different locations or file-extentions, add the `shortcode_globs` to your secrets file (`prod.secret.exs` or `dev.secret.exs`) and edit it. Note that not all fediverse-software will show emojis with other file extentions:
+```elixir
+config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png", "/emoji/custom/**/*.gif"]
+```
+
 ## Emoji tags (groups)
 
 Default tags are set in `config.exs`. To set your own tags, copy the structure to your secrets file (`prod.secret.exs` or `dev.secret.exs`) and edit it.

From 74ef14b04e6decf05bd61ef44ea459c24273f192 Mon Sep 17 00:00:00 2001
From: ilja <gitlab@spectraltheorem.be>
Date: Mon, 22 Apr 2019 19:42:02 +0200
Subject: [PATCH 2/2] Add :emoji settings to config.md

---
 docs/config.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/config.md b/docs/config.md
index ccf744f42..53d181a5e 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -486,3 +486,8 @@ config :ueberauth, Ueberauth,
     microsoft: {Ueberauth.Strategy.Microsoft, [callback_params: []]}
   ]
 ```
+
+## :emoji
+* `shortcode_globs`: Location of custom emoji files. `*` can be used as a wildcard. Example `["/emoji/custom/**/*.png"]`
+* `groups`: Emojis are ordered in groups (tags). This is an array of key-value pairs where the key is the groupname and the value the location or array of locations. `*` can be used as a wildcard. Example `[Custom: ["/emoji/*.png", "/emoji/custom/*.png"]]`
+* `default_manifest`: Location of the JSON-manifest. This manifest contains information about the emoji-packs you can download. Currently only one manifest can be added (no arrays).