diff options
| author | Ekaterina Vaartis <vaartis@cock.li> | 2019-04-18 18:04:02 +0300 |
|---|---|---|
| committer | Ekaterina Vaartis <vaartis@cock.li> | 2019-04-20 11:17:17 +0300 |
| commit | a141f0807bc84868fb84e3d628ab8f99f429d5c0 (patch) | |
| tree | 872642c635c33ecd735981f57384a7a4aa85cbf4 /config | |
| parent | eff725c3af4537b2d993f85a236636cd5d5e17d0 (diff) | |
| download | pleroma-a141f0807bc84868fb84e3d628ab8f99f429d5c0.tar.gz | |
Assume packs without emoji.txt only have emoji pictures, unhardcode
unhardcode: remove hardcoded /instance/static and actually use the config option
as it is used in other places.
packs without emoji.txt: these are now assumed to have .png files that
are all emojis, their names are used as shortcodes
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index c0c06b189..edb4195d0 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", "/instance/static/emoji/finmoji/128px/*-128.png"], - Custom: ["/emoji/*.png", "/emoji/custom/*.png", "/instance/static/emoji/**/*.png"] + Finmoji: ["/finmoji/128px/*-128.png"], + Custom: ["/emoji/*.png", "/emoji/custom/*.png"] ] config :pleroma, :uri_schemes, |