From f95b354c3d8016c74c6b1cddb829a3f3046bf24c Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 3 Mar 2019 21:33:48 +0200
Subject: [PATCH] configs update

---
 config/config.exs | 38 ++++++++++++--------------------------
 1 file changed, 12 insertions(+), 26 deletions(-)

diff --git a/config/config.exs b/config/config.exs
index 38a71fcb8..de93d9921 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -149,7 +149,10 @@ config :pleroma, :instance,
   federating: true,
   federation_reachability_timeout_days: 7,
   allow_relay: true,
-  rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
+  rewrite_policy: [
+    Pleroma.Web.ActivityPub.MRF.HellthreadPolicy,
+    Pleroma.Web.ActivityPub.MRF.AntiFollowbotPolicy
+  ],
   public: true,
   quarantined_instances: ["pleroma.rareome.ga"],
   managed_config: true,
@@ -178,41 +181,24 @@ config :pleroma, :markup,
     Pleroma.HTML.Scrubber.Default
   ]
 
-# Deprecated, will be gone in 1.0
-config :pleroma, :fe,
-  theme: "sigsegv2",
-  logo: "/static/logo.svg",
-  background: "/static/sigsegv_s.png",
-  redirect_root_no_login: "/main/all",
-  redirect_root_login: "/main/friends",
-  logo_mask: true,
-  logo_margin: "0.1em",
-  show_instance_panel: true,
-  scope_options_enabled: false,
-  formatting_options_enabled: false,
-  collapse_message_with_subject: false,
-  hide_post_stats: false,
-  hide_user_stats: false,
-  scope_copy: false,
-  subject_line_behavior: "noop",
-  always_show_subject_input: false
-
 config :pleroma, :frontend_configurations,
   pleroma_fe: %{
-    theme: "pleroma-dark",
-    logo: "/static/logo.png",
-    background: "/images/city.jpg",
+    theme: "sigsegv2",
+    logo: "/static/logo.svg",
+    background: "/static/sigsegv_s.png",
     redirectRootNoLogin: "/main/all",
     redirectRootLogin: "/main/friends",
+    logoMask: true,
+    logoMargin: "0.1em",
     showInstanceSpecificPanel: true,
     scopeOptionsEnabled: false,
     formattingOptionsEnabled: false,
     collapseMessageWithSubject: false,
     hidePostStats: false,
     hideUserStats: false,
-    scopeCopy: true,
-    subjectLineBehavior: "email",
-    alwaysShowSubjectInput: true
+    scopeCopy: false,
+    subjectLineBehavior: "noop",
+    alwaysShowSubjectInput: false
   }
 
 config :pleroma, :activitypub,