From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 2 Jul 2020 14:57:57 +0000 (-0500)
Subject: Merge branch 'develop' into feature/1885-MRF-metadata
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=6b5563ed2cdb0bff95fbc42ba0e4687c8ed1311d;p=akkoma

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

6b5563ed2cdb0bff95fbc42ba0e4687c8ed1311d
diff --cc config/description.exs
index e0c07bf78,4ea8a2f50..39c6c5793
--- a/config/description.exs
+++ b/config/description.exs
@@@ -1383,8 -1390,7 +1392,8 @@@ config :pleroma, :config_description, 
    %{
      group: :pleroma,
      key: :mrf_simple,
 +    tab: :mrf,
-     label: "MRF simple",
+     label: "MRF Simple",
      type: :group,
      description: "Message Rewrite Facility",
      children: [
@@@ -1465,8 -1470,7 +1474,8 @@@
    %{
      group: :pleroma,
      key: :mrf_subchain,
 +    tab: :mrf,
-     label: "MRF subchain",
+     label: "MRF Subchain",
      type: :group,
      description:
        "This policy processes messages through an alternate pipeline when a given message matches certain criteria." <>
@@@ -1487,10 -1491,9 +1496,10 @@@
    %{
      group: :pleroma,
      key: :mrf_rejectnonpublic,
 +    tab: :mrf,
      description:
        "MRF RejectNonPublic settings. RejectNonPublic drops posts with non-public visibility settings.",
-     label: "MRF reject non public",
+     label: "MRF Reject Non Public",
      type: :group,
      children: [
        %{
@@@ -1509,8 -1512,7 +1518,8 @@@
    %{
      group: :pleroma,
      key: :mrf_hellthread,
 +    tab: :mrf,
-     label: "MRF hellthread",
+     label: "MRF Hellthread",
      type: :group,
      description: "Block messages with too much mentions",
      children: [
@@@ -1534,8 -1536,7 +1543,8 @@@
    %{
      group: :pleroma,
      key: :mrf_keyword,
 +    tab: :mrf,
-     label: "MRF keyword",
+     label: "MRF Keyword",
      type: :group,
      description: "Reject or Word-Replace messages with a keyword or regex",
      children: [
@@@ -1565,8 -1566,7 +1574,8 @@@
    %{
      group: :pleroma,
      key: :mrf_mention,
 +    tab: :mrf,
-     label: "MRF mention",
+     label: "MRF Mention",
      type: :group,
      description: "Block messages which mention a user",
      children: [
@@@ -1581,8 -1581,7 +1590,8 @@@
    %{
      group: :pleroma,
      key: :mrf_vocabulary,
 +    tab: :mrf,
-     label: "MRF vocabulary",
+     label: "MRF Vocabulary",
      type: :group,
      description: "Filter messages which belong to certain activity vocabularies",
      children: [
@@@ -2840,9 -2861,8 +2871,9 @@@
    },
    %{
      group: :pleroma,
 +    tab: :mrf,
      key: :mrf_normalize_markup,
-     label: "MRF normalize markup",
+     label: "MRF Normalize Markup",
      description: "MRF NormalizeMarkup settings. Scrub configured hypertext markup.",
      type: :group,
      children: [
@@@ -3033,8 -3056,7 +3067,8 @@@
    %{
      group: :pleroma,
      key: :mrf_object_age,
-     label: "MRF object age",
+     label: "MRF Object Age",
 +    tab: :mrf,
      type: :group,
      description: "Rejects or delists posts based on their age when received.",
      children: [