use Kernel.put_in instead of Map.merge

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 036f1ac0b34fdb50bd713499cd2982b56d6794a5..4b8762761a971658b7dd27561728b0aec78cf332 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -110,6 +110,7 @@ config :pleroma, :instance,
   public: true,
   quarantined_instances: [],
   managed_config: true,
+  static_dir: "instance/static/",
   allowed_post_formats: [
     "text/plain",
     "text/html",
@@ -136,8 +137,8 @@ config :pleroma, :fe,
   logo_mask: true,
   logo_margin: "0.1em",
   background: "/static/aurora_borealis.jpg",
-  redirect_root_no_login: "/main/all",
-  redirect_root_login: "/main/friends",
+  redirect_root_no_login: "/~/main/all",
+  redirect_root_login: "/~/main/friends",
   show_instance_panel: true,
   scope_options_enabled: false,
   formatting_options_enabled: false,
@@ -162,6 +163,8 @@ config :pleroma, :mrf_rejectnonpublic,
   allow_followersonly: false,
   allow_direct: false
 
+config :pleroma, :mrf_hellthread, threshold: 10
+
 config :pleroma, :mrf_simple,
   media_removal: [],
   media_nsfw: [],