logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 7dcac0bac0252e2c824e6139196dca9d28903ad8
parent: 414902cd9e61d19d4dcd848f60b47beaf23c095f
Author: kaniini <nenolod@gmail.com>
Date:   Tue, 23 Apr 2019 02:41:21 +0000

Merge branch 'develop' into 'develop'

Add shortcode_globs setting to documentation

See merge request pleroma/pleroma!1087

Diffstat:

Mdocs/config.md5+++++
Mdocs/config/custom_emoji.md5+++++
2 files changed, 10 insertions(+), 0 deletions(-)

diff --git 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 @@ -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.