aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAlex S <alex.strizhakov@gmail.com>2019-04-02 15:57:57 +0700
committerAlex S <alex.strizhakov@gmail.com>2019-04-02 15:57:57 +0700
commit851c5bf0936fbc58bf509f79531e6cdc070efde5 (patch)
treea38c46acd7b9cdf658460cfe2561f88895efaf93 /docs
parent9b2188da7cab43a162d441294db7d3155e2eeab3 (diff)
downloadpleroma-851c5bf0936fbc58bf509f79531e6cdc070efde5.tar.gz
updating custom_emoji docs
Diffstat (limited to 'docs')
-rw-r--r--docs/config/custom_emoji.md39
1 files changed, 27 insertions, 12 deletions
diff --git a/docs/config/custom_emoji.md b/docs/config/custom_emoji.md
index e47a75c8e..d37220a72 100644
--- a/docs/config/custom_emoji.md
+++ b/docs/config/custom_emoji.md
@@ -18,21 +18,36 @@ 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.
-# Emoji tags
-
-Changing default tags:
-
-* For `Finmoji`, `emoji.txt` and `custom_emoji.txt` are added default tags, which can be configured in the `config.exs`:
-* For emoji loaded from globs:
- - `priv/static/emoji/custom/*.png` - `custom_tag`, can be configured in `config.exs`
- - `priv/static/emoji/custom/TagName/*.png` - folder (`TagName`) is used as tag
+# Emoji tags (groups)
+Default tags are set in `config.exs`.
+```
+config :pleroma, :emoji,
+ shortcode_globs: ["/emoji/custom/**/*.png"],
+ groups: [
+ Finmoji: "/finmoji/128px/*-128.png",
+ Custom: ["/emoji/*.png", "/emoji/custom/*.png"]
+ ]
+```
+Order of the `groups` matters, so to override default tags just put your group on the top of the list. E.g:
```
config :pleroma, :emoji,
shortcode_globs: ["/emoji/custom/**/*.png"],
- custom_tag: "Custom", # Default tag for emoji in `priv/static/emoji/custom` path
- finmoji_tag: "Finmoji", # Default tag for Finmoji
- emoji_tag: "Emoji", # Default tag for emoji.txt
- custom_emoji_tag: "Custom" # Default tag for custom_emoji.txt
+ groups: [
+ "Finmoji special": "/finmoji/128px/a_trusted_friend-128.png", # special file
+ "Cirno": "/emoji/custom/cirno*.png", # png files in /emoji/custom/ which start with `cirno`
+ "Special group": "/emoji/custom/special_folder/*.png", # png files in /emoji/custom/special_folder/
+ "Another group": "/emoji/custom/special_folder/*/.png", # png files in /emoji/custom/special_folder/ subfolders
+ Finmoji: "/finmoji/128px/*-128.png",
+ Custom: ["/emoji/*.png", "/emoji/custom/*.png"]
+ ]
```
+
+Priority of tag assign in emoji.txt and custom.txt:
+
+`tag in file > special group setting in config.exs > default setting in config.exs`
+
+Priority for globs:
+
+`special group setting in config.exs > default setting in config.exs`