X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=9dc9387c82593174f25403b19aefd259984b1c53;hb=e8c2f9a73a37636a9a8ed5c2998617b841f482da;hp=edb4195d087cbe8d99718b2389f4ba37069b881e;hpb=a141f0807bc84868fb84e3d628ab8f99f429d5c0;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index edb4195d0..9dc9387c8 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -100,9 +100,9 @@ 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"]
-  ]
+    Custom: ["/emoji/*.png", "/emoji/**/*.png"]
+  ],
+  default_manifest: "https://git.pleroma.social/pleroma/emoji-index/raw/master/index.json"
 
 config :pleroma, :uri_schemes,
   valid_schemes: [
@@ -223,7 +223,6 @@ config :pleroma, :instance,
     "text/html",
     "text/markdown"
   ],
-  finmoji_enabled: true,
   mrf_transparency: true,
   autofollowed_nicknames: [],
   max_pinned_statuses: 1,
@@ -414,7 +413,8 @@ config :pleroma_job_queue, :queues,
   web_push: 50,
   mailer: 10,
   transmogrifier: 20,
-  scheduled_activities: 10
+  scheduled_activities: 10,
+  user: 10
 
 config :pleroma, :fetch_initial_posts,
   enabled: false,