summaryrefslogtreecommitdiff
path: root/docs/config/custom_emoji.md
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2019-04-25 13:41:10 +0700
committerEgor Kislitsyn <egor@kislitsyn.com>2019-04-25 13:41:10 +0700
commitc157e27a000a12dc8f660c056744a6611beb01b1 (patch)
tree36ae4721a1cb92983c7a8fed41b737e0a5a57486 /docs/config/custom_emoji.md
parente8c2f9a73a37636a9a8ed5c2998617b841f482da (diff)
parent3789945784a331790d73f69b407751df9f7d6e8f (diff)
downloadpleroma-c157e27a000a12dc8f660c056744a6611beb01b1.tar.gz
pleroma-c157e27a000a12dc8f660c056744a6611beb01b1.zip
Merge branch 'develop' into feature/disable-account
Diffstat (limited to 'docs/config/custom_emoji.md')
-rw-r--r--docs/config/custom_emoji.md5
1 files changed, 5 insertions, 0 deletions
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.