diff options
| author | kaniini <nenolod@gmail.com> | 2019-04-23 02:41:21 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-04-23 02:41:21 +0000 |
| commit | 7dcac0bac0252e2c824e6139196dca9d28903ad8 (patch) | |
| tree | 1c15303fe7d8d1fa374b1df63494735f82e266fc | |
| parent | 414902cd9e61d19d4dcd848f60b47beaf23c095f (diff) | |
| parent | 74ef14b04e6decf05bd61ef44ea459c24273f192 (diff) | |
| download | pleroma-7dcac0bac0252e2c824e6139196dca9d28903ad8.tar.gz | |
Merge branch 'develop' into 'develop'
Add shortcode_globs setting to documentation
See merge request pleroma/pleroma!1087
| -rw-r--r-- | docs/config.md | 5 | ||||
| -rw-r--r-- | docs/config/custom_emoji.md | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/docs/config.md b/docs/config.md index d8eb4f8b5..7b6631f9b 100644 --- a/docs/config.md +++ b/docs/config.md @@ -487,3 +487,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). 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. |