Merge branch 'develop' into feature/1885-MRF-metadata

[akkoma] / config / description.exs

diff --git a/config/description.exs b/config/description.exs
index 4ea8a2f50b86a33ff838e93f2f872e49dcf15592..39c6c57938f861a3c034c13fb01cc8b22c599d6d 100644 (file)
--- a/config/description.exs
+++ b/config/description.exs
@@ -196,7 +196,9 @@ config :pleroma, :config_description, [
       %{
         key: :args,
         type: [:string, {:list, :string}, {:list, :tuple}],
-        description: "List of actions for the mogrify command",
+        description:
+          "List of actions for the mogrify command. It's possible to add self-written settings as string. " <>
+            "For example `[\"auto-orient\", \"strip\", {\"resize\", \"3840x1080>\"}]` string will be parsed into list of the settings.",
         suggestions: [
           "strip",
           "auto-orient",
@@ -1390,6 +1392,7 @@ config :pleroma, :config_description, [
   %{
     group: :pleroma,
     key: :mrf_simple,
+    tab: :mrf,
     label: "MRF Simple",
     type: :group,
     description: "Message Rewrite Facility",
@@ -1455,6 +1458,7 @@ config :pleroma, :config_description, [
   %{
     group: :pleroma,
     key: :mrf_activity_expiration,
+    tab: :mrf,
     label: "MRF Activity Expiration Policy",
     type: :group,
     description: "Adds expiration to all local Create Note activities",
@@ -1470,6 +1474,7 @@ config :pleroma, :config_description, [
   %{
     group: :pleroma,
     key: :mrf_subchain,
+    tab: :mrf,
     label: "MRF Subchain",
     type: :group,
     description:
@@ -1491,6 +1496,7 @@ config :pleroma, :config_description, [
   %{
     group: :pleroma,
     key: :mrf_rejectnonpublic,
+    tab: :mrf,
     description:
       "MRF RejectNonPublic settings. RejectNonPublic drops posts with non-public visibility settings.",
     label: "MRF Reject Non Public",
@@ -1512,6 +1518,7 @@ config :pleroma, :config_description, [
   %{
     group: :pleroma,
     key: :mrf_hellthread,
+    tab: :mrf,
     label: "MRF Hellthread",
     type: :group,
     description: "Block messages with too much mentions",
@@ -1536,6 +1543,7 @@ config :pleroma, :config_description, [
   %{
     group: :pleroma,
     key: :mrf_keyword,
+    tab: :mrf,
     label: "MRF Keyword",
     type: :group,
     description: "Reject or Word-Replace messages with a keyword or regex",
@@ -1566,6 +1574,7 @@ config :pleroma, :config_description, [
   %{
     group: :pleroma,
     key: :mrf_mention,
+    tab: :mrf,
     label: "MRF Mention",
     type: :group,
     description: "Block messages which mention a user",
@@ -1581,6 +1590,7 @@ config :pleroma, :config_description, [
   %{
     group: :pleroma,
     key: :mrf_vocabulary,
+    tab: :mrf,
     label: "MRF Vocabulary",
     type: :group,
     description: "Filter messages which belong to certain activity vocabularies",
@@ -2861,6 +2871,7 @@ config :pleroma, :config_description, [
   },
   %{
     group: :pleroma,
+    tab: :mrf,
     key: :mrf_normalize_markup,
     label: "MRF Normalize Markup",
     description: "MRF NormalizeMarkup settings. Scrub configured hypertext markup.",
@@ -3057,6 +3068,7 @@ config :pleroma, :config_description, [
     group: :pleroma,
     key: :mrf_object_age,
     label: "MRF Object Age",
+    tab: :mrf,
     type: :group,
     description: "Rejects or delists posts based on their age when received.",
     children: [
@@ -3400,6 +3412,8 @@ config :pleroma, :config_description, [
   %{
     group: :pleroma,
     key: :mrf,
+    tab: :mrf,
+    label: "MRF",
     type: :group,
     description: "General MRF settings",
     children: [