summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorEkaterina Vaartis <vaartis@cock.li>2019-04-17 23:54:09 +0300
committerEkaterina Vaartis <vaartis@cock.li>2019-04-20 11:17:17 +0300
commitc26724cc5580a13d9e7e7468860eff8e49e02ba2 (patch)
tree2cff62eec405e0e30ed0501f8951c4b1bd06b17a /config
parent6ca82c18a738205483dbbef2fd4de662d70227fb (diff)
downloadpleroma-c26724cc5580a13d9e7e7468860eff8e49e02ba2.tar.gz
pleroma-c26724cc5580a13d9e7e7468860eff8e49e02ba2.zip
Remove finmoji and add a way to download emojis in packs
These packs are stored in a git repo on pleroma gitlab
Diffstat (limited to 'config')
-rw-r--r--config/config.exs4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs
index 1114dc84d..c0c06b189 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -100,8 +100,8 @@ config :pleroma, :emoji,
shortcode_globs: ["/emoji/custom/**/*.png"],
groups: [
# Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md`
- Finmoji: "/finmoji/128px/*-128.png",
- Custom: ["/emoji/*.png", "/emoji/custom/*.png"]
+ Finmoji: ["/finmoji/128px/*-128.png", "/instance/static/emoji/finmoji/128px/*-128.png"],
+ Custom: ["/emoji/*.png", "/emoji/custom/*.png", "/instance/static/emoji/**/*.png"]
]
config :pleroma, :uri_schemes,