From 918ee46417036e3325b6a1d6e8d51ca78bcb31ac Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Tue, 19 May 2020 16:05:39 -0500
Subject: [PATCH 1/2] Synchronize :fe settings in config.exs

---
 config/config.exs | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/config/config.exs b/config/config.exs
index c51884f3a..7b99a41aa 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -271,20 +271,32 @@
 
 config :pleroma, :frontend_configurations,
   pleroma_fe: %{
-    theme: "pleroma-dark",
-    logo: "/static/logo.png",
-    background: "/images/city.jpg",
-    redirectRootNoLogin: "/main/all",
-    redirectRootLogin: "/main/friends",
-    showInstanceSpecificPanel: true,
-    scopeOptionsEnabled: false,
-    formattingOptionsEnabled: false,
+    alwaysShowSubjectInput: true,
+    background: "/static/aurora_borealis.jpg",
     collapseMessageWithSubject: false,
+    disableChat: false,
+    greentext: false,
+    hideFilteredStatuses: false,
+    hideMutedPosts: false,
     hidePostStats: false,
+    hideSitename: false,
     hideUserStats: false,
+    loginMethod: "password",
+    logo: "/static/logo.png",
+    logoMargin: ".1em",
+    logoMask: true,
+    minimalScopesMode: false,
+    noAttachmentLinks: false,
+    nsfwCensorImage: "",
+    postContentType: "text/plain",
+    redirectRootLogin: "/main/friends",
+    redirectRootNoLogin: "/main/all",
     scopeCopy: true,
+    showFeaturesPanel: true,
+    showInstanceSpecificPanel: false,
     subjectLineBehavior: "email",
-    alwaysShowSubjectInput: true
+    theme: "pleroma-dark",
+    webPushNotifications: false
   },
   masto_fe: %{
     showInstanceSpecificPanel: true

From 4c48626585d2efae21625d106dac7e28b3227925 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 20 May 2020 12:22:31 -0500
Subject: [PATCH 2/2] Also add new sidebarRight setting

---
 config/config.exs      | 1 +
 config/description.exs | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/config/config.exs b/config/config.exs
index 7b99a41aa..e9a727557 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -292,6 +292,7 @@
     redirectRootLogin: "/main/friends",
     redirectRootNoLogin: "/main/all",
     scopeCopy: true,
+    sidebarRight: false,
     showFeaturesPanel: true,
     showInstanceSpecificPanel: false,
     subjectLineBehavior: "email",
diff --git a/config/description.exs b/config/description.exs
index 324cae8cf..716bcf4ff 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1117,6 +1117,7 @@
             redirectRootLogin: "/main/friends",
             redirectRootNoLogin: "/main/all",
             scopeCopy: true,
+            sidebarRight: false,
             showFeaturesPanel: true,
             showInstanceSpecificPanel: false,
             subjectLineBehavior: "email",
@@ -1256,6 +1257,12 @@
             type: :boolean,
             description: "Copy the scope (private/unlisted/public) in replies to posts by default"
           },
+          %{
+            key: :sidebarRight,
+            label: "Sidebar on Right",
+            type: :boolean,
+            description: "Change alignment of sidebar and panels to the right."
+          },
           %{
             key: :showFeaturesPanel,
             label: "Show instance features panel",