aboutsummaryrefslogtreecommitdiff
path: root/docs/config
diff options
context:
space:
mode:
authorSachin Joshi <satchin.joshi@gmail.com>2019-05-01 00:21:30 +0545
committerSachin Joshi <satchin.joshi@gmail.com>2019-05-01 00:21:30 +0545
commitcd6da3606b0170b1a5c7d64b96f1621896cc0930 (patch)
tree76086dd4145017de644bdeb17a389bb4d8c7a298 /docs/config
parent963d5774af7efb57fa306b3ac164049f8958a72c (diff)
parent77690b9d03facf74483e3379f72b5b51c9f1bd4e (diff)
downloadpleroma-cd6da3606b0170b1a5c7d64b96f1621896cc0930.tar.gz
Merge branch 'develop' into bugfix/web-notification-special-char
Diffstat (limited to 'docs/config')
-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.