Merge branch 'openapi/pleroma-api/pleroma' into 'develop'

[akkoma] / config / description.exs

diff --git a/config/description.exs b/config/description.exs
index f353378ac0fcd3bf9b2f04a6c51905777d495af1..716bcf4ffa5ed94a64f57ad3172cd68e4957f4b6 100644 (file)
--- a/config/description.exs
+++ b/config/description.exs
@@ -679,15 +679,6 @@ config :pleroma, :config_description, [
           7
         ]
       },
-      %{
-        key: :federation_publisher_modules,
-        type: {:list, :module},
-        description:
-          "List of modules for federation publishing. Module names are shortened (removed leading `Pleroma.Web.` part), but on adding custom module you need to use full name.",
-        suggestions: [
-          Pleroma.Web.ActivityPub.Publisher
-        ]
-      },
       %{
         key: :allow_relay,
         type: :boolean,
@@ -1126,6 +1117,7 @@ config :pleroma, :config_description, [
             redirectRootLogin: "/main/friends",
             redirectRootNoLogin: "/main/all",
             scopeCopy: true,
+            sidebarRight: false,
             showFeaturesPanel: true,
             showInstanceSpecificPanel: false,
             subjectLineBehavior: "email",
@@ -1224,9 +1216,25 @@ config :pleroma, :config_description, [
             key: :minimalScopesMode,
             label: "Minimal scopes mode",
             type: :boolean,
-            description: "Limit scope selection to Direct, User default, and Scope of post replying to. " <>
+            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:
+              "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",
@@ -1249,6 +1257,19 @@ config :pleroma, :config_description, [
             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",
+            type: :boolean,
+            description:
+              "Enables panel displaying functionality of the instance on the About page."
+          },
           %{
             key: :showInstanceSpecificPanel,
             label: "Show instance specific panel",
@@ -1879,12 +1900,6 @@ config :pleroma, :config_description, [
       (see https://github.com/sorentwo/oban/issues/52).
     """,
     children: [
-      %{
-        key: :repo,
-        type: :module,
-        description: "Application's Ecto repo",
-        suggestions: [Pleroma.Repo]
-      },
       %{
         key: :verbose,
         type: {:dropdown, :atom},
@@ -2659,18 +2674,6 @@ config :pleroma, :config_description, [
       }
     ]
   },
-  %{
-    group: :http_signatures,
-    type: :group,
-    description: "HTTP Signatures settings",
-    children: [
-      %{
-        key: :adapter,
-        type: :module,
-        suggestions: [Pleroma.Signature]
-      }
-    ]
-  },
   %{
     group: :pleroma,
     key: :http,