From d458f4fdcafe847a7db8b1c663cfd945019816b7 Mon Sep 17 00:00:00 2001
From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Sat, 8 Feb 2020 19:58:02 +0300
Subject: [#1505] Added tests, changelog entry, tweaked config settings related
 to replies output on outgoing federation.

---
 config/config.exs      |  5 +----
 config/description.exs | 20 ++++++--------------
 2 files changed, 7 insertions(+), 18 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 370828c1c..62a10ca41 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -340,6 +340,7 @@ config :pleroma, :activitypub,
   unfollow_blocked: true,
   outgoing_blocks: true,
   follow_handshake_timeout: 500,
+  note_replies_output_limit: 5,
   sign_object_fetches: true
 
 config :pleroma, :streamer,
@@ -624,10 +625,6 @@ config :pleroma, :modules, runtime_dir: "instance/modules"
 
 config :pleroma, configurable_from_database: false
 
-config :pleroma, :mastodon_compatibility,
-  # https://git.pleroma.social/pleroma/pleroma/issues/1505
-  federated_note_replies_limit: 5
-
 config :swarm, node_blacklist: [~r/myhtml_.*$/]
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
diff --git a/config/description.exs b/config/description.exs
index 909ae00d9..9fd52f50e 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1790,6 +1790,12 @@ config :pleroma, :config_description, [
         type: :boolean,
         description: "Sign object fetches with HTTP signatures"
       },
+      %{
+        key: :note_replies_output_limit,
+        type: :integer,
+        description:
+          "The number of Note replies' URIs to be included with outgoing federation (`5` to match Mastodon hardcoded value, `0` to disable the output)."
+      },
       %{
         key: :follow_handshake_timeout,
         type: :integer,
@@ -3097,20 +3103,6 @@ config :pleroma, :config_description, [
       }
     ]
   },
-  %{
-    group: :pleroma,
-    key: :mastodon_compatibility,
-    type: :group,
-    description: "Mastodon compatibility-related settings.",
-    children: [
-      %{
-        key: :federated_note_replies_limit,
-        type: :integer,
-        description:
-          "The number of Note self-reply URIs to be included with outgoing federation (`5` to mimic Mastodon hardcoded value, `0` to disable)."
-      }
-    ]
-  },
   %{
     group: :pleroma,
     type: :group,
-- 
cgit v1.2.3