summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
authorJorty <jorty@jort.space>2018-06-30 17:20:08 -0400
committerJorty <jorty@jort.space>2018-06-30 17:58:44 -0400
commitc171f9790bc2d6a1b215792ade1b1cfc7e458ac4 (patch)
tree21ba463576051fa935af0443975b13d4becbf0bd /config/config.exs
parent0bfbf15b379a95e7fad50e8f611cf6c5e67cfa9c (diff)
downloadpleroma-c171f9790bc2d6a1b215792ade1b1cfc7e458ac4.tar.gz
pleroma-c171f9790bc2d6a1b215792ade1b1cfc7e458ac4.zip
Move emoji glob setting to config.exs
Also, a bit of formatting, and the glob includes an "/emoji/" prefix to make it more intuitive to users
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index cf6cbaa9d..96350d064 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -12,6 +12,8 @@ config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
config :pleroma, Pleroma.Upload, uploads: "uploads"
+config :pleroma, :emoji, shortcode_glob: "/emoji/by-shortcode/**/*.png"
+
# Configures the endpoint
config :pleroma, Pleroma.Web.Endpoint,
url: [host: "localhost"],