From 8057157ee3172c370200f328373f0a7e32092b91 Mon Sep 17 00:00:00 2001
From: Roman Chvanikov <chvanikoff@pm.me>
Date: Fri, 31 Jan 2020 01:20:37 +0300
Subject: Make attachments cleanup optional

---
 config/config.exs      | 3 ++-
 config/description.exs | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index c57ef1bf7..60c982557 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -271,7 +271,8 @@ config :pleroma, :instance,
   account_field_name_length: 512,
   account_field_value_length: 2048,
   external_user_synchronization: true,
-  extended_nickname_format: true
+  extended_nickname_format: true,
+  cleanup_attachments: false
 
 config :pleroma, :feed,
   post_title: %{
diff --git a/config/description.exs b/config/description.exs
index 5f3c58b08..1ffb66287 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -764,6 +764,15 @@ config :pleroma, :config_description, [
           "Set to `true` to use extended local nicknames format (allows underscores/dashes)." <>
             " This will break federation with older software for theses nicknames."
       },
+      %{
+        key: :cleanup_attachments,
+        type: :boolean,
+        description: """
+        "Set to `true` to remove associated attachments when status is removed.
+        This will not affect duplicates and attachments without status.
+        Enabling this will increase load to database when deleting statuses on larger instances.
+        """
+      },
       %{
         key: :max_pinned_statuses,
         type: :integer,
-- 
cgit v1.2.3


From 3909b5b7b34bbf879fd7809eef6ec0ae286c2ef2 Mon Sep 17 00:00:00 2001
From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Wed, 5 Feb 2020 21:13:56 +0400
Subject: Remove AutoLinker `scheme` option from the config

---
 config/config.exs      | 1 -
 config/description.exs | 5 -----
 2 files changed, 6 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index c57ef1bf7..d01dd8d74 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -508,7 +508,6 @@ config :pleroma, :fetch_initial_posts,
 
 config :auto_linker,
   opts: [
-    scheme: true,
     extra: true,
     # TODO: Set to :no_scheme when it works properly
     validate_tld: true,
diff --git a/config/description.exs b/config/description.exs
index 5f3c58b08..a0cb03e48 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2171,11 +2171,6 @@ config :pleroma, :config_description, [
         type: :boolean,
         description: "Set to `false` to remove target='_blank' attribute"
       },
-      %{
-        key: :scheme,
-        type: :boolean,
-        description: "Set to `true` to link urls with schema http://google.com"
-      },
       %{
         key: :truncate,
         type: [:integer, false],
-- 
cgit v1.2.3


From bdf0a87be95f311b094273d67244914173ee9dac Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Wed, 5 Feb 2020 19:05:20 +0300
Subject: dropdown type

---
 config/description.exs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index a4d1a74a7..0ac1f4d8d 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -871,7 +871,7 @@ config :pleroma, :config_description, [
       },
       %{
         key: :limit_to_local_content,
-        type: [:atom, false],
+        type: {:dropdown, :atom},
         description:
           "Limit unauthenticated users to search for local statutes and users only. Default: `:unauthenticated`.",
         suggestions: [
@@ -942,7 +942,7 @@ config :pleroma, :config_description, [
     children: [
       %{
         key: :level,
-        type: :atom,
+        type: {:dropdown, :atom},
         description: "Log level",
         suggestions: [:debug, :info, :warn, :error]
       },
@@ -974,7 +974,7 @@ config :pleroma, :config_description, [
     children: [
       %{
         key: :level,
-        type: :atom,
+        type: {:dropdown, :atom},
         description: "Log level",
         suggestions: [:debug, :info, :warn, :error]
       },
@@ -998,7 +998,7 @@ config :pleroma, :config_description, [
     children: [
       %{
         key: :level,
-        type: :atom,
+        type: {:dropdown, :atom},
         description: "Log level",
         suggestions: [:debug, :info, :warn, :error]
       },
@@ -1969,7 +1969,7 @@ config :pleroma, :config_description, [
       },
       %{
         key: :verbose,
-        type: [:atom, false],
+        type: {:dropdown, :atom},
         description: "Logs verbose mode",
         suggestions: [false, :error, :warn, :info, :debug]
       },
-- 
cgit v1.2.3


From 7a2e153a8dec4337f16aeacab534f26f720cb5eb Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Thu, 6 Feb 2020 13:15:23 +0300
Subject: description change

---
 config/description.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index 0ac1f4d8d..6b912a07e 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2178,7 +2178,7 @@ config :pleroma, :config_description, [
       %{
         key: :new_window,
         type: :boolean,
-        description: "Set to `false` to remove target='_blank' attribute"
+        description: "Link urls will open in new window/tab"
       },
       %{
         key: :truncate,
-- 
cgit v1.2.3