Merge branch 'chore/update-fe-settings-and-docs' into 'develop'

Synchronize PleromaFE settings

See merge request pleroma/pleroma!2532

2 files changed, 139 insertions, 90 deletions

diff --git a/config/description.exs b/config/description.exs
index 36ec3d40a..a800d7823 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1105,38 +1105,40 @@ config :pleroma, :config_description, [
         description: "Settings for Pleroma FE",
         suggestions: [
           %{
-            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,
-            logoMask: false,
-            logoMargin: ".1em",
-            stickers: false,
-            enableEmojiPicker: false
+            theme: "pleroma-dark",
+            webPushNotifications: false
           }
         ],
         children: [
           %{
-            key: :theme,
-            type: :string,
-            description: "Which theme to use, they are defined in styles.json",
-            suggestions: ["pleroma-dark"]
-          },
-          %{
-            key: :logo,
-            type: :string,
-            description: "URL of the logo, defaults to Pleroma's logo",
-            suggestions: ["/static/logo.png"]
+            key: :alwaysShowSubjectInput,
+            label: "Always show subject input",
+            type: :boolean,
+            description: "When disabled, auto-hide the subject field if it's empty"
           },
           %{
             key: :background,
@@ -1146,46 +1148,35 @@ config :pleroma, :config_description, [
             suggestions: ["/images/city.jpg"]
           },
           %{
-            key: :redirectRootNoLogin,
-            label: "Redirect root no login",
-            type: :string,
-            description:
-              "Relative URL which indicates where to redirect when a user isn't logged in",
-            suggestions: ["/main/all"]
-          },
-          %{
-            key: :redirectRootLogin,
-            label: "Redirect root login",
-            type: :string,
+            key: :collapseMessageWithSubject,
+            label: "Collapse message with subject",
+            type: :boolean,
             description:
-              "Relative URL which indicates where to redirect when a user is logged in",
-            suggestions: ["/main/friends"]
+              "When a message has a subject (aka Content Warning), collapse it by default"
           },
           %{
-            key: :showInstanceSpecificPanel,
-            label: "Show instance specific panel",
+            key: :disableChat,
+            label: "PleromaFE Chat",
             type: :boolean,
-            description: "Whenether to show the instance's specific panel"
+            description: "Disables PleromaFE Chat component"
           },
           %{
-            key: :scopeOptionsEnabled,
-            label: "Scope options enabled",
+            key: :greentext,
+            label: "Greentext",
             type: :boolean,
-            description: "Enable setting a notice visibility and subject/CW when posting"
+            description: "Enables green text on lines prefixed with the > character."
           },
           %{
-            key: :formattingOptionsEnabled,
-            label: "Formatting options enabled",
+            key: :hideFilteredStatuses,
+            label: "Hide Filtered Statuses",
             type: :boolean,
-            description:
-              "Enable setting a formatting different than plain-text (ie. HTML, Markdown) when posting, relates to `:instance`, `allowed_post_formats`"
+            description: "Hides filtered statuses from timelines."
           },
           %{
-            key: :collapseMessageWithSubject,
-            label: "Collapse message with subject",
+            key: :hideMutedPosts,
+            label: "Hide Muted Posts",
             type: :boolean,
-            description:
-              "When a message has a subject (aka Content Warning), collapse it by default"
+            description: "Hides muted statuses from timelines."
           },
           %{
             key: :hidePostStats,
@@ -1194,6 +1185,12 @@ config :pleroma, :config_description, [
             description: "Hide notices statistics (repeats, favorites, ...)"
           },
           %{
+            key: :hideSitename,
+            label: "Hide Sitename",
+            type: :boolean,
+            description: "Hides instance name from PleromaFE banner."
+          },
+          %{
             key: :hideUserStats,
             label: "Hide user stats",
             type: :boolean,
@@ -1201,26 +1198,19 @@ config :pleroma, :config_description, [
               "Hide profile statistics (posts, posts per day, followers, followings, ...)"
           },
           %{
-            key: :scopeCopy,
-            label: "Scope copy",
-            type: :boolean,
-            description: "Copy the scope (private/unlisted/public) in replies to posts by default"
-          },
-          %{
-            key: :subjectLineBehavior,
-            label: "Subject line behavior",
+            key: :logo,
             type: :string,
-            description: "Allows changing the default behaviour of subject lines in replies.
-          `email`: copy and preprend re:, as in email,
-          `masto`: copy verbatim, as in Mastodon,
-          `noop`: don't copy the subject.",
-            suggestions: ["email", "masto", "noop"]
+            description: "URL of the logo, defaults to Pleroma's logo",
+            suggestions: ["/static/logo.png"]
           },
           %{
-            key: :alwaysShowSubjectInput,
-            label: "Always show subject input",
-            type: :boolean,
-            description: "When disabled, auto-hide the subject field if it's empty"
+            key: :logoMargin,
+            label: "Logo margin",
+            type: :string,
+            description:
+              "Allows you to adjust vertical margins between logo boundary and navbar borders. " <>
+                "The idea is that to have logo's image without any extra margins and instead adjust them to your need in layout.",
+            suggestions: [".1em"]
           },
           %{
             key: :logoMask,
@@ -1231,24 +1221,78 @@ config :pleroma, :config_description, [
                 "If you want a colorful logo you must disable logoMask."
           },
           %{
-            key: :logoMargin,
-            label: "Logo margin",
+            key: :minimalScopesMode,
+            label: "Minimal scopes mode",
+            type: :boolean,
+            description:
+              "Limit scope selection to Direct, User default, and Scope of post replying to. " <>
+                "Also prevents replying to a DM with a public post from PleromaFE."
+          },
+          %{
+            key: :nsfwCensorImage,
+            label: "NSFW Censor Image",
             type: :string,
             description:
-              "Allows you to adjust vertical margins between logo boundary and navbar borders. " <>
-                "The idea is that to have logo's image without any extra margins and instead adjust them to your need in layout.",
-            suggestions: [".1em"]
+              "URL of the image to use for hiding NSFW media attachments in the timeline.",
+            suggestions: ["/static/img/nsfw.png"]
+          },
+          %{
+            key: :postContentType,
+            label: "Post Content Type",
+            type: {:dropdown, :atom},
+            description: "Default post formatting option.",
+            suggestions: ["text/plain", "text/html", "text/markdown", "text/bbcode"]
+          },
+          %{
+            key: :redirectRootNoLogin,
+            label: "Redirect root no login",
+            type: :string,
+            description:
+              "Relative URL which indicates where to redirect when a user isn't logged in",
+            suggestions: ["/main/all"]
           },
           %{
-            key: :stickers,
+            key: :redirectRootLogin,
+            label: "Redirect root login",
+            type: :string,
+            description:
+              "Relative URL which indicates where to redirect when a user is logged in",
+            suggestions: ["/main/friends"]
+          },
+          %{
+            key: :scopeCopy,
+            label: "Scope copy",
+            type: :boolean,
+            description: "Copy the scope (private/unlisted/public) in replies to posts by default"
+          },
+          %{
+            key: :showFeaturesPanel,
+            label: "Show instance features panel",
             type: :boolean,
-            description: "Enables stickers."
+            description:
+              "Enables panel displaying functionality of the instance on the About page."
           },
           %{
-            key: :enableEmojiPicker,
-            label: "Emoji picker",
+            key: :showInstanceSpecificPanel,
+            label: "Show instance specific panel",
             type: :boolean,
-            description: "Enables emoji picker."
+            description: "Whether to show the instance's custom panel"
+          },
+          %{
+            key: :subjectLineBehavior,
+            label: "Subject line behavior",
+            type: :string,
+            description: "Allows changing the default behaviour of subject lines in replies.
+          `email`: copy and preprend re:, as in email,
+          `masto`: copy verbatim, as in Mastodon,
+          `noop`: don't copy the subject.",
+            suggestions: ["email", "masto", "noop"]
+          },
+          %{
+            key: :theme,
+            type: :string,
+            description: "Which theme to use. Available themes are defined in styles.json",
+            suggestions: ["pleroma-dark"]
           }
         ]
       },
diff --git a/priv/static/static/config.json b/priv/static/static/config.json
index c82678699..727dde73b 100644
--- a/priv/static/static/config.json
+++ b/priv/static/static/config.json
@@ -1,23 +1,28 @@
 {
-  "theme": "pleroma-dark",
+  "alwaysShowSubjectInput": true,
   "background": "/static/aurora_borealis.jpg",
-  "logo": "/static/logo.png",
-  "logoMask": true,
-  "logoMargin": ".1em",
-  "redirectRootNoLogin": "/main/all",
-  "redirectRootLogin": "/main/friends",
-  "showInstanceSpecificPanel": false,
   "collapseMessageWithSubject": false,
-  "scopeCopy": true,
-  "subjectLineBehavior": "email",
-  "postContentType": "text/plain",
-  "alwaysShowSubjectInput": true,
+  "disableChat": false,
+  "greentext": false,
+  "hideFilteredStatuses": false,
+  "hideMutedPosts": false,
   "hidePostStats": false,
+  "hideSitename": false,
   "hideUserStats": false,
   "loginMethod": "password",
-  "webPushNotifications": false,
+  "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,
-  "minimalScopesMode": false
+  "showInstanceSpecificPanel": false,
+  "subjectLineBehavior": "email",
+  "theme": "pleroma-dark",
+  "webPushNotifications": false
 }