X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=config%2Fconfig.exs;h=d42b136b772b09f549e9fa9b65e2a8125d5763a1;hb=0f2f7d2cec8297b1b5645643d7584cde561ce628;hp=a9539526d5383ddf4f692e663c35148b7d4088b4;hpb=bffddf5e31c53d0603de387c61b6011f70785b97;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index a9539526d..d42b136b7 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -58,7 +58,13 @@ config :pleroma, Pleroma.Uploaders.MDII,
   cgi: "https://mdii.sakura.ne.jp/mdii-post.cgi",
   files: "https://mdii.sakura.ne.jp"
 
-config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"]
+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"]
+  ]
 
 config :pleroma, :uri_schemes,
   valid_schemes: [
@@ -361,8 +367,11 @@ config :pleroma, Pleroma.Web.Federator.RetryQueue,
 config :pleroma_job_queue, :queues,
   federator_incoming: 50,
   federator_outgoing: 50,
+  web_push: 50,
   mailer: 10,
-  scheduled_activities: 10
+  transmogrifier: 20,
+  scheduled_activities: 10,
+  user: 10
 
 config :pleroma, :fetch_initial_posts,
   enabled: false,