summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAlex S <alex.strizhakov@gmail.com>2019-04-02 15:44:56 +0700
committerAlex S <alex.strizhakov@gmail.com>2019-04-02 15:44:56 +0700
commit9b2188da7cab43a162d441294db7d3155e2eeab3 (patch)
tree9abf4c50211298e383032c590f661768500d3da0 /config
parent49733f61763091514faa49493fdc20b795c08c1c (diff)
downloadpleroma-9b2188da7cab43a162d441294db7d3155e2eeab3.tar.gz
pleroma-9b2188da7cab43a162d441294db7d3155e2eeab3.zip
refactoring of emoji tags config to use groups
Diffstat (limited to 'config')
-rw-r--r--config/config.exs9
1 files changed, 5 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs
index 245c7d268..4a22167b2 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -56,10 +56,11 @@ config :pleroma, Pleroma.Uploaders.MDII,
config :pleroma, :emoji,
shortcode_globs: ["/emoji/custom/**/*.png"],
- custom_tag: "Custom",
- finmoji_tag: "Finmoji",
- emoji_tag: "Emoji",
- custom_emoji_tag: "Custom"
+ groups: [
+ # Place here groups, which have more priority on defaults. Example in `docs/config/custom_emoji.md`
+ Finmoji: "/finmoji/128px/*-128.png",
+ Custom: ["/emoji/*.png", "/emoji/custom/*.png"]
+ ]
config :pleroma, :uri_schemes,
valid_schemes: [