From 5b19543f0afaaad7f8fc302946547ae5c18e8bb3 Mon Sep 17 00:00:00 2001
From: Ilja <ilja@ilja.space>
Date: Sat, 21 May 2022 18:48:21 +0200
Subject: Add new setting and Plug to allow for privilege settings for staff

---
 config/config.exs      |  2 ++
 config/description.exs | 12 ++++++++++++
 2 files changed, 14 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 6a5acda09..2d501e577 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -257,6 +257,8 @@ config :pleroma, :instance,
   password_reset_token_validity: 60 * 60 * 24,
   profile_directory: true,
   privileged_staff: false,
+  admin_privileges: [],
+  moderator_privileges: [],
   max_endorsed_users: 20,
   birthday_required: false,
   birthday_min_age: 0,
diff --git a/config/description.exs b/config/description.exs
index 704af8f68..b73b92c46 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -966,6 +966,18 @@ config :pleroma, :config_description, [
         description:
           "Let moderators access sensitive data (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
       },
+      %{
+        key: :admin_privileges,
+        type: {:list, :atom},
+        suggestions: [],
+        description: "What extra priviledges to allow admins (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
+      },
+      %{
+        key: :moderator_privileges,
+        type: {:list, :atom},
+        suggestions: [],
+        description: "What extra priviledges to allow moderators (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
+      },
       %{
         key: :birthday_required,
         type: :boolean,
-- 
cgit v1.2.3


From 9f6c36475914bfd1b8c02035341765b4d1bd4395 Mon Sep 17 00:00:00 2001
From: Ilja <ilja@ilja.space>
Date: Thu, 26 May 2022 12:49:09 +0200
Subject: Add privilege :user_deletion

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

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 2d501e577..496a1d57a 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -257,7 +257,7 @@ config :pleroma, :instance,
   password_reset_token_validity: 60 * 60 * 24,
   profile_directory: true,
   privileged_staff: false,
-  admin_privileges: [],
+  admin_privileges: [:user_deletion],
   moderator_privileges: [],
   max_endorsed_users: 20,
   birthday_required: false,
diff --git a/config/description.exs b/config/description.exs
index b73b92c46..b45d416b1 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -969,14 +969,16 @@ config :pleroma, :config_description, [
       %{
         key: :admin_privileges,
         type: {:list, :atom},
-        suggestions: [],
-        description: "What extra priviledges to allow admins (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
+        suggestions: [:user_deletion],
+        description:
+          "What extra priviledges to allow admins (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
       },
       %{
         key: :moderator_privileges,
         type: {:list, :atom},
-        suggestions: [],
-        description: "What extra priviledges to allow moderators (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
+        suggestions: [:user_deletion],
+        description:
+          "What extra priviledges to allow moderators (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
       },
       %{
         key: :birthday_required,
-- 
cgit v1.2.3


From 8a9144ca8b8e17df509dc8ac3934656b7dac8d77 Mon Sep 17 00:00:00 2001
From: Ilja <ilja@ilja.space>
Date: Thu, 26 May 2022 13:27:06 +0200
Subject: Add priviledges for :user_credentials

I only moved the ones from the :require_privileged_staff block for now
---
 config/config.exs      | 2 +-
 config/description.exs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 496a1d57a..2a5770bf4 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -257,7 +257,7 @@ config :pleroma, :instance,
   password_reset_token_validity: 60 * 60 * 24,
   profile_directory: true,
   privileged_staff: false,
-  admin_privileges: [:user_deletion],
+  admin_privileges: [:user_deletion, :user_credentials],
   moderator_privileges: [],
   max_endorsed_users: 20,
   birthday_required: false,
diff --git a/config/description.exs b/config/description.exs
index b45d416b1..4986ccce6 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -969,14 +969,14 @@ config :pleroma, :config_description, [
       %{
         key: :admin_privileges,
         type: {:list, :atom},
-        suggestions: [:user_deletion],
+        suggestions: [:user_deletion, :user_credentials],
         description:
           "What extra priviledges to allow admins (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
       },
       %{
         key: :moderator_privileges,
         type: {:list, :atom},
-        suggestions: [:user_deletion],
+        suggestions: [:user_deletion, :user_credentials],
         description:
           "What extra priviledges to allow moderators (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
       },
-- 
cgit v1.2.3


From 5a65e2dac5e689b8067e37817bbfe4a6fe1a0426 Mon Sep 17 00:00:00 2001
From: Ilja <ilja@ilja.space>
Date: Thu, 26 May 2022 14:51:53 +0200
Subject: Remove privileged_staff

Everything that was done through this setting, can now be set by giving the proper privileges to the roles.
---
 config/config.exs      |  3 +--
 config/description.exs | 10 ++--------
 2 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 2a5770bf4..4cdc90c7a 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -256,8 +256,7 @@ config :pleroma, :instance,
   show_reactions: true,
   password_reset_token_validity: 60 * 60 * 24,
   profile_directory: true,
-  privileged_staff: false,
-  admin_privileges: [:user_deletion, :user_credentials],
+  admin_privileges: [:user_deletion, :user_credentials, :statuses_read],
   moderator_privileges: [],
   max_endorsed_users: 20,
   birthday_required: false,
diff --git a/config/description.exs b/config/description.exs
index 4986ccce6..b0b8ecd88 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -960,23 +960,17 @@ config :pleroma, :config_description, [
         type: :boolean,
         description: "Enable profile directory."
       },
-      %{
-        key: :privileged_staff,
-        type: :boolean,
-        description:
-          "Let moderators access sensitive data (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
-      },
       %{
         key: :admin_privileges,
         type: {:list, :atom},
-        suggestions: [:user_deletion, :user_credentials],
+        suggestions: [:user_deletion, :user_credentials, :statuses_read],
         description:
           "What extra priviledges to allow admins (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
       },
       %{
         key: :moderator_privileges,
         type: {:list, :atom},
-        suggestions: [:user_deletion, :user_credentials],
+        suggestions: [:user_deletion, :user_credentials, :statuses_read],
         description:
           "What extra priviledges to allow moderators (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
       },
-- 
cgit v1.2.3


From cb60cc4e02af270fcccdcd552df4fa3ff858d67f Mon Sep 17 00:00:00 2001
From: Ilja <ilja@ilja.space>
Date: Thu, 26 May 2022 16:25:28 +0200
Subject: Add privileges for :user_tag

---
 config/config.exs      | 2 +-
 config/description.exs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 4cdc90c7a..f2001eef0 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -256,7 +256,7 @@ config :pleroma, :instance,
   show_reactions: true,
   password_reset_token_validity: 60 * 60 * 24,
   profile_directory: true,
-  admin_privileges: [:user_deletion, :user_credentials, :statuses_read],
+  admin_privileges: [:user_deletion, :user_credentials, :statuses_read, :user_tag],
   moderator_privileges: [],
   max_endorsed_users: 20,
   birthday_required: false,
diff --git a/config/description.exs b/config/description.exs
index b0b8ecd88..f455a2e46 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -963,14 +963,14 @@ config :pleroma, :config_description, [
       %{
         key: :admin_privileges,
         type: {:list, :atom},
-        suggestions: [:user_deletion, :user_credentials, :statuses_read],
+        suggestions: [:user_deletion, :user_credentials, :statuses_read, :user_tag],
         description:
           "What extra priviledges to allow admins (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
       },
       %{
         key: :moderator_privileges,
         type: {:list, :atom},
-        suggestions: [:user_deletion, :user_credentials, :statuses_read],
+        suggestions: [:user_deletion, :user_credentials, :statuses_read, :user_tag],
         description:
           "What extra priviledges to allow moderators (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
       },
-- 
cgit v1.2.3


From e102d25d2385761077c08e0b280359392f0592cb Mon Sep 17 00:00:00 2001
From: Ilja <ilja@ilja.space>
Date: Thu, 26 May 2022 16:41:48 +0200
Subject: Add privileges for :user_activation

---
 config/config.exs      |  8 +++++++-
 config/description.exs | 16 ++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index f2001eef0..53c0cc329 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -256,7 +256,13 @@ config :pleroma, :instance,
   show_reactions: true,
   password_reset_token_validity: 60 * 60 * 24,
   profile_directory: true,
-  admin_privileges: [:user_deletion, :user_credentials, :statuses_read, :user_tag],
+  admin_privileges: [
+    :user_deletion,
+    :user_credentials,
+    :statuses_read,
+    :user_tag,
+    :user_activation
+  ],
   moderator_privileges: [],
   max_endorsed_users: 20,
   birthday_required: false,
diff --git a/config/description.exs b/config/description.exs
index f455a2e46..51d3ad8aa 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -963,14 +963,26 @@ config :pleroma, :config_description, [
       %{
         key: :admin_privileges,
         type: {:list, :atom},
-        suggestions: [:user_deletion, :user_credentials, :statuses_read, :user_tag],
+        suggestions: [
+          :user_deletion,
+          :user_credentials,
+          :statuses_read,
+          :user_tag,
+          :user_activation
+        ],
         description:
           "What extra priviledges to allow admins (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
       },
       %{
         key: :moderator_privileges,
         type: {:list, :atom},
-        suggestions: [:user_deletion, :user_credentials, :statuses_read, :user_tag],
+        suggestions: [
+          :user_deletion,
+          :user_credentials,
+          :statuses_read,
+          :user_tag,
+          :user_activation
+        ],
         description:
           "What extra priviledges to allow moderators (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
       },
-- 
cgit v1.2.3


From 14e697a64fe2613649634d46a71acf4d9a7d7bd6 Mon Sep 17 00:00:00 2001
From: Ilja <ilja@ilja.space>
Date: Sat, 28 May 2022 08:51:49 +0200
Subject: Add privileges for :user_invite

---
 config/config.exs      | 3 ++-
 config/description.exs | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 53c0cc329..a0c18c75a 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -261,7 +261,8 @@ config :pleroma, :instance,
     :user_credentials,
     :statuses_read,
     :user_tag,
-    :user_activation
+    :user_activation,
+    :user_invite
   ],
   moderator_privileges: [],
   max_endorsed_users: 20,
diff --git a/config/description.exs b/config/description.exs
index 51d3ad8aa..7e74778c5 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -968,7 +968,8 @@ config :pleroma, :config_description, [
           :user_credentials,
           :statuses_read,
           :user_tag,
-          :user_activation
+          :user_activation,
+          :user_invite
         ],
         description:
           "What extra priviledges to allow admins (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
@@ -981,7 +982,8 @@ config :pleroma, :config_description, [
           :user_credentials,
           :statuses_read,
           :user_tag,
-          :user_activation
+          :user_activation,
+          :user_invite
         ],
         description:
           "What extra priviledges to allow moderators (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
-- 
cgit v1.2.3


From 3f26f1b30fe605635e3faf610f813f3ae3ad43ec Mon Sep 17 00:00:00 2001
From: Ilja <ilja@ilja.space>
Date: Sat, 28 May 2022 09:43:57 +0200
Subject: Add privileges for :report_handle

---
 config/config.exs      | 3 ++-
 config/description.exs | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index a0c18c75a..6fd7044e3 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -262,7 +262,8 @@ config :pleroma, :instance,
     :statuses_read,
     :user_tag,
     :user_activation,
-    :user_invite
+    :user_invite,
+    :report_handle
   ],
   moderator_privileges: [],
   max_endorsed_users: 20,
diff --git a/config/description.exs b/config/description.exs
index 7e74778c5..d0364340e 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -969,7 +969,8 @@ config :pleroma, :config_description, [
           :statuses_read,
           :user_tag,
           :user_activation,
-          :user_invite
+          :user_invite,
+          :report_handle
         ],
         description:
           "What extra priviledges to allow admins (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
@@ -983,7 +984,8 @@ config :pleroma, :config_description, [
           :statuses_read,
           :user_tag,
           :user_activation,
-          :user_invite
+          :user_invite,
+          :report_handle
         ],
         description:
           "What extra priviledges to allow moderators (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
-- 
cgit v1.2.3


From cbb26262a5957d3a72bef383a394bb3b2ad0215d Mon Sep 17 00:00:00 2001
From: Ilja <ilja@ilja.space>
Date: Sat, 28 May 2022 12:15:36 +0200
Subject: Add privileges for :user_read

---
 config/config.exs      | 3 ++-
 config/description.exs | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 6fd7044e3..778e6bf21 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -263,7 +263,8 @@ config :pleroma, :instance,
     :user_tag,
     :user_activation,
     :user_invite,
-    :report_handle
+    :report_handle,
+    :user_read
   ],
   moderator_privileges: [],
   max_endorsed_users: 20,
diff --git a/config/description.exs b/config/description.exs
index d0364340e..6d8cacace 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -970,7 +970,8 @@ config :pleroma, :config_description, [
           :user_tag,
           :user_activation,
           :user_invite,
-          :report_handle
+          :report_handle,
+          :user_read
         ],
         description:
           "What extra priviledges to allow admins (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
@@ -985,7 +986,8 @@ config :pleroma, :config_description, [
           :user_tag,
           :user_activation,
           :user_invite,
-          :report_handle
+          :report_handle,
+          :user_read
         ],
         description:
           "What extra priviledges to allow moderators (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
-- 
cgit v1.2.3


From 0ee8f33250f649c7807fd161b9d6588757f5dc94 Mon Sep 17 00:00:00 2001
From: Ilja <ilja@ilja.space>
Date: Sat, 11 Jun 2022 13:08:40 +0200
Subject: Add privilige :status_delete

It also allows to update a message, so it's not just deleting. I need a better name...
---
 config/config.exs      | 3 ++-
 config/description.exs | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 778e6bf21..ef2211426 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -264,7 +264,8 @@ config :pleroma, :instance,
     :user_activation,
     :user_invite,
     :report_handle,
-    :user_read
+    :user_read,
+    :status_delete
   ],
   moderator_privileges: [],
   max_endorsed_users: 20,
diff --git a/config/description.exs b/config/description.exs
index 6d8cacace..8ef649e99 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -971,7 +971,8 @@ config :pleroma, :config_description, [
           :user_activation,
           :user_invite,
           :report_handle,
-          :user_read
+          :user_read,
+          :status_delete
         ],
         description:
           "What extra priviledges to allow admins (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
@@ -987,7 +988,8 @@ config :pleroma, :config_description, [
           :user_activation,
           :user_invite,
           :report_handle,
-          :user_read
+          :user_read,
+          :status_delete
         ],
         description:
           "What extra priviledges to allow moderators (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
-- 
cgit v1.2.3


From ecd42a2ce112489bb09cadcffc3661314a37a7fa Mon Sep 17 00:00:00 2001
From: Ilja <ilja@ilja.space>
Date: Sat, 11 Jun 2022 22:18:21 +0200
Subject: Add privilige :emoji_management

---
 config/config.exs      | 3 ++-
 config/description.exs | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index ef2211426..263299e4d 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -265,7 +265,8 @@ config :pleroma, :instance,
     :user_invite,
     :report_handle,
     :user_read,
-    :status_delete
+    :status_delete,
+    :emoji_management
   ],
   moderator_privileges: [],
   max_endorsed_users: 20,
diff --git a/config/description.exs b/config/description.exs
index 8ef649e99..9f595fae0 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -972,7 +972,8 @@ config :pleroma, :config_description, [
           :user_invite,
           :report_handle,
           :user_read,
-          :status_delete
+          :status_delete,
+          :emoji_management
         ],
         description:
           "What extra priviledges to allow admins (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
@@ -989,7 +990,8 @@ config :pleroma, :config_description, [
           :user_invite,
           :report_handle,
           :user_read,
-          :status_delete
+          :status_delete,
+          :emoji_management
         ],
         description:
           "What extra priviledges to allow moderators (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
-- 
cgit v1.2.3


From 37fdf148b0963b62ab746a8ece2aacf893ba8934 Mon Sep 17 00:00:00 2001
From: Ilja <ilja@ilja.space>
Date: Fri, 1 Jul 2022 09:54:05 +0200
Subject: Rename privilege tags

I first focussed on getting things working
Now that they do and we know what tags there are, I put some thought in providing better names

I use the form <what_it_controls>_<what_it_allows_you_to_do>

:statuses_read    => :messages_read
:status_delete    => :messages_delete

:user_read        => :users_read
:user_deletion    => :users_delete
:user_activation  => :users_manage_activation_state
:user_invite      => :users_manage_invites
:user_tag         => :users_manage_tags
:user_credentials => :users_manage_credentials

:report_handle    => :reports_manage_reports

:emoji_management => :emoji_manage_emoji
---
 config/config.exs      | 20 ++++++++++----------
 config/description.exs | 40 ++++++++++++++++++++--------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 263299e4d..935d4fc98 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -257,16 +257,16 @@ config :pleroma, :instance,
   password_reset_token_validity: 60 * 60 * 24,
   profile_directory: true,
   admin_privileges: [
-    :user_deletion,
-    :user_credentials,
-    :statuses_read,
-    :user_tag,
-    :user_activation,
-    :user_invite,
-    :report_handle,
-    :user_read,
-    :status_delete,
-    :emoji_management
+    :users_delete,
+    :users_manage_credentials,
+    :messages_read,
+    :users_manage_tags,
+    :users_manage_activation_state,
+    :users_manage_invites,
+    :reports_manage_reports,
+    :users_read,
+    :messages_delete,
+    :emoji_manage_emoji
   ],
   moderator_privileges: [],
   max_endorsed_users: 20,
diff --git a/config/description.exs b/config/description.exs
index 9f595fae0..e5a49139e 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -964,16 +964,16 @@ config :pleroma, :config_description, [
         key: :admin_privileges,
         type: {:list, :atom},
         suggestions: [
-          :user_deletion,
-          :user_credentials,
-          :statuses_read,
-          :user_tag,
-          :user_activation,
-          :user_invite,
-          :report_handle,
-          :user_read,
-          :status_delete,
-          :emoji_management
+          :users_delete,
+          :users_manage_credentials,
+          :messages_read,
+          :users_manage_tags,
+          :users_manage_activation_state,
+          :users_manage_invites,
+          :reports_manage_reports,
+          :users_read,
+          :messages_delete,
+          :emoji_manage_emoji
         ],
         description:
           "What extra priviledges to allow admins (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
@@ -982,16 +982,16 @@ config :pleroma, :config_description, [
         key: :moderator_privileges,
         type: {:list, :atom},
         suggestions: [
-          :user_deletion,
-          :user_credentials,
-          :statuses_read,
-          :user_tag,
-          :user_activation,
-          :user_invite,
-          :report_handle,
-          :user_read,
-          :status_delete,
-          :emoji_management
+          :users_delete,
+          :users_manage_credentials,
+          :messages_read,
+          :users_manage_tags,
+          :users_manage_activation_state,
+          :users_manage_invites,
+          :reports_manage_reports,
+          :users_read,
+          :messages_delete,
+          :emoji_manage_emoji
         ],
         description:
           "What extra priviledges to allow moderators (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
-- 
cgit v1.2.3


From c0e4b1b3e27a4a8f8f02ea6a33b76c6f2a386d95 Mon Sep 17 00:00:00 2001
From: Ilja <ilja@ilja.space>
Date: Sat, 2 Jul 2022 07:52:39 +0200
Subject: Fix typo's

priviledge |-> privilege
---
 config/description.exs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index e5a49139e..e2ff91fb3 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -976,7 +976,7 @@ config :pleroma, :config_description, [
           :emoji_manage_emoji
         ],
         description:
-          "What extra priviledges to allow admins (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
+          "What extra privileges to allow admins (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
       },
       %{
         key: :moderator_privileges,
@@ -994,7 +994,7 @@ config :pleroma, :config_description, [
           :emoji_manage_emoji
         ],
         description:
-          "What extra priviledges to allow moderators (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
+          "What extra privileges to allow moderators (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
       },
       %{
         key: :birthday_required,
-- 
cgit v1.2.3


From 51f87ba30cf20a1ca6bc19d2229913d8e1eecda5 Mon Sep 17 00:00:00 2001
From: Ilja <ilja@ilja.space>
Date: Sat, 2 Jul 2022 07:59:46 +0200
Subject: Change order of privilege tags to make more sense

The tags were listed in different places
They were listed in a rather randomly order
I reordered them in a way I think makes more sense
---
 config/config.exs      | 12 ++++++------
 config/description.exs | 24 ++++++++++++------------
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 935d4fc98..eb56723fa 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -257,15 +257,15 @@ config :pleroma, :instance,
   password_reset_token_validity: 60 * 60 * 24,
   profile_directory: true,
   admin_privileges: [
-    :users_delete,
+    :users_read,
+    :users_manage_invites,
+    :users_manage_activation_state,
+    :users_manage_tags,
     :users_manage_credentials,
+    :users_delete,
     :messages_read,
-    :users_manage_tags,
-    :users_manage_activation_state,
-    :users_manage_invites,
-    :reports_manage_reports,
-    :users_read,
     :messages_delete,
+    :reports_manage_reports,
     :emoji_manage_emoji
   ],
   moderator_privileges: [],
diff --git a/config/description.exs b/config/description.exs
index e2ff91fb3..66ae53d42 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -964,15 +964,15 @@ config :pleroma, :config_description, [
         key: :admin_privileges,
         type: {:list, :atom},
         suggestions: [
-          :users_delete,
+          :users_read,
+          :users_manage_invites,
+          :users_manage_activation_state,
+          :users_manage_tags,
           :users_manage_credentials,
+          :users_delete,
           :messages_read,
-          :users_manage_tags,
-          :users_manage_activation_state,
-          :users_manage_invites,
-          :reports_manage_reports,
-          :users_read,
           :messages_delete,
+          :reports_manage_reports,
           :emoji_manage_emoji
         ],
         description:
@@ -982,15 +982,15 @@ config :pleroma, :config_description, [
         key: :moderator_privileges,
         type: {:list, :atom},
         suggestions: [
-          :users_delete,
+          :users_read,
+          :users_manage_invites,
+          :users_manage_activation_state,
+          :users_manage_tags,
           :users_manage_credentials,
+          :users_delete,
           :messages_read,
-          :users_manage_tags,
-          :users_manage_activation_state,
-          :users_manage_invites,
-          :reports_manage_reports,
-          :users_read,
           :messages_delete,
+          :reports_manage_reports,
           :emoji_manage_emoji
         ],
         description:
-- 
cgit v1.2.3


From 42d4bd3a5d49a472b8fcb85e6cd413eb0d6dab3f Mon Sep 17 00:00:00 2001
From: Ilja <ilja@ilja.space>
Date: Sat, 2 Jul 2022 08:55:14 +0200
Subject: Rename pipelines and add forgotten tags

I renamed some tags before, but forgot to rename the pipelines
I also had some tags which I forgot to add to the config, description, etc.

These have now been done/added
---
 config/config.exs      |  5 ++++-
 config/description.exs | 10 ++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index eb56723fa..994d333aa 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -265,8 +265,11 @@ config :pleroma, :instance,
     :users_delete,
     :messages_read,
     :messages_delete,
+    :instances_delete,
     :reports_manage_reports,
-    :emoji_manage_emoji
+    :moderation_log_read,
+    :emoji_manage_emoji,
+    :statistics_read
   ],
   moderator_privileges: [],
   max_endorsed_users: 20,
diff --git a/config/description.exs b/config/description.exs
index 66ae53d42..134cefa85 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -972,8 +972,11 @@ config :pleroma, :config_description, [
           :users_delete,
           :messages_read,
           :messages_delete,
+          :instances_delete,
           :reports_manage_reports,
-          :emoji_manage_emoji
+          :moderation_log_read,
+          :emoji_manage_emoji,
+          :statistics_read
         ],
         description:
           "What extra privileges to allow admins (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
@@ -990,8 +993,11 @@ config :pleroma, :config_description, [
           :users_delete,
           :messages_read,
           :messages_delete,
+          :instances_delete,
           :reports_manage_reports,
-          :emoji_manage_emoji
+          :moderation_log_read,
+          :emoji_manage_emoji,
+          :statistics_read
         ],
         description:
           "What extra privileges to allow moderators (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
-- 
cgit v1.2.3


From c045a49909c2a1078864484d0327e03dac73687b Mon Sep 17 00:00:00 2001
From: Ilja <ilja@ilja.space>
Date: Thu, 14 Jul 2022 08:40:26 +0200
Subject: Add privilege for announcements

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

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index b0b43e75a..6c5ac2ceb 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -269,6 +269,7 @@ config :pleroma, :instance,
     :instances_delete,
     :reports_manage_reports,
     :moderation_log_read,
+    :announcements_manage_announcements,
     :emoji_manage_emoji,
     :statistics_read
   ],
diff --git a/config/description.exs b/config/description.exs
index 2e7f06f81..b53354a79 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -984,6 +984,7 @@ config :pleroma, :config_description, [
           :instances_delete,
           :reports_manage_reports,
           :moderation_log_read,
+          :announcements_manage_announcements,
           :emoji_manage_emoji,
           :statistics_read
         ],
@@ -1005,6 +1006,7 @@ config :pleroma, :config_description, [
           :instances_delete,
           :reports_manage_reports,
           :moderation_log_read,
+          :announcements_manage_announcements,
           :emoji_manage_emoji,
           :statistics_read
         ],
-- 
cgit v1.2.3


From 5153eba3a89904f958e356aa086a6d02b4ca435e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Mon, 25 Jul 2022 19:53:01 +0200
Subject: Add authorized_fetch_mode to description.exs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 config/description.exs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index b29348edf..c6c6b1b5d 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1729,6 +1729,11 @@ config :pleroma, :config_description, [
         type: :boolean,
         description: "Sign object fetches with HTTP signatures"
       },
+      %{
+        key: :authorized_fetch_mode,
+        type: :boolean,
+        description: "Require HTTP signatures for AP fetches"
+      },
       %{
         key: :note_replies_output_limit,
         type: :integer,
-- 
cgit v1.2.3


From b53cf7d4b3991bde21e05277d7fb2ee01bf57f46 Mon Sep 17 00:00:00 2001
From: Ilja <ilja@ilja.space>
Date: Sun, 7 Aug 2022 07:22:33 +0200
Subject: Change default moderator privileges to better match what we
 previously had

Moderators were able to delete statusses via pleroma-fe. For that reason I now gave them :messages_delete by default.

They are also able to recieve reports through the notifications. For that reason I now gave them :reports_manage_reports by default.

They were also able to see deactivated accounts through pleroma-fe. However
* they were unable to tell if the account is deactivated or not (which was a bug and fixed by thes privileges MR this commit is part of)
* they were not able to actually change the activation state.
Because of this, I decided to *not* give them the privilege :users_manage_activation_state as this would give significantly more
privileges, while not giving it will actually improve the current experience as it works around the existing bug of not showing activation state.
---
 config/config.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 6c5ac2ceb..7f2927e37 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -273,7 +273,7 @@ config :pleroma, :instance,
     :emoji_manage_emoji,
     :statistics_read
   ],
-  moderator_privileges: [],
+  moderator_privileges: [:messages_delete, :reports_manage_reports],
   max_endorsed_users: 20,
   birthday_required: false,
   birthday_min_age: 0,
-- 
cgit v1.2.3


From 88c1c76d3eca3412d1e02008f1b8d96fe8fe0b96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9l=C3=A8ne?= <pleroma-dev@helene.moe>
Date: Mon, 15 Aug 2022 01:15:23 +0200
Subject: Migrations: delete contexts with BaseMigrator

Due to the lengthiness of this task, the migration has been adapted into
a BaseMigrator migration, running in the background instead.
---
 config/config.exs      |  2 ++
 config/description.exs | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 0fc959807..eadc255cc 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -673,6 +673,8 @@ config :pleroma, :features, improved_hashtag_timeline: :auto
 
 config :pleroma, :populate_hashtags_table, fault_rate_allowance: 0.01
 
+config :pleroma, :delete_context_objects, fault_rate_allowance: 0.01
+
 config :pleroma, :env, Mix.env()
 
 config :http_signatures,
diff --git a/config/description.exs b/config/description.exs
index c6c6b1b5d..c28447b37 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -495,6 +495,27 @@ config :pleroma, :config_description, [
       }
     ]
   },
+  %{
+    group: :pleroma,
+    key: :delete_context_objects,
+    type: :group,
+    description: "`delete_context_objects` background migration settings",
+    children: [
+      %{
+        key: :fault_rate_allowance,
+        type: :float,
+        description:
+          "Max accepted rate of objects that failed in the migration. Any value from 0.0 which tolerates no errors to 1.0 which will enable the feature even if context object deletion failed for all records.",
+        suggestions: [0.01]
+      },
+      %{
+        key: :sleep_interval_ms,
+        type: :integer,
+        description:
+          "Sleep interval between each chunk of processed records in order to decrease the load on the system (defaults to 0 and should be keep default on most instances)."
+      }
+    ]
+  },
   %{
     group: :pleroma,
     key: :instance,
-- 
cgit v1.2.3


From cc0f32c25339c534bb462773cfc2df33b7536edc Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Fri, 19 Aug 2022 22:54:56 -0600
Subject: Add glitch-lily as an installable frontend

---
 config/config.exs | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 0fc959807..666268a0a 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -761,6 +761,14 @@ config :pleroma, :frontends,
         "https://gitlab.com/soapbox-pub/soapbox-fe/-/jobs/artifacts/${ref}/download?job=build-production",
       "ref" => "v1.0.0",
       "build_dir" => "static"
+    },
+    "glitch-lily" => %{
+      "name" => "glitch-lily",
+      "git" => "https://lily-is.land/infra/glitch-lily",
+      "build_url" =>
+        "https://lily-is.land/infra/glitch-lily/-/jobs/artifacts/${ref}/download?job=build",
+      "ref" => "servant",
+      "build_dir" => "public"
     }
   }
 
-- 
cgit v1.2.3


From d67d19134400e79d3a773229bd55438684ffb7ed Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Wed, 24 Aug 2022 23:39:02 -0600
Subject: Fix fedi-fe build URL

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

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 666268a0a..1653358a0 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -741,7 +741,7 @@ config :pleroma, :frontends,
       "name" => "fedi-fe",
       "git" => "https://git.pleroma.social/pleroma/fedi-fe",
       "build_url" =>
-        "https://git.pleroma.social/pleroma/fedi-fe/-/jobs/artifacts/${ref}/download?job=build",
+        "https://git.pleroma.social/pleroma/fedi-fe/-/jobs/artifacts/${ref}/download?job=build_release",
       "ref" => "master",
       "custom-http-headers" => [
         {"service-worker-allowed", "/"}
-- 
cgit v1.2.3


From 21ab7369cad6504be2f815aec888b38023d7a17a Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Fri, 2 Sep 2022 22:35:08 +0200
Subject: Bump minimum Elixir version to 1.10

With the release of Elixir 1.14, Elixir 1.9 is now end-of-life.

Elixir 1.10 Release Notes:
https://github.com/elixir-lang/elixir/releases/tag/v1.10.0
---
 config/config.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 1653358a0..6adb63e5f 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -37,7 +37,7 @@
 # FIGURATION! EDIT YOUR SECRET FILE (either prod.secret.exs, dev.secret.exs).
 #
 # This file is responsible for configuring your application
-# and its dependencies with the aid of the Mix.Config module.
+# and its dependencies with the aid of the Config module.
 #
 # This configuration file is loaded before any dependency and
 # is restricted to this project.
-- 
cgit v1.2.3


From c6bc52391460079efe18f48ed72eb6fd22757ab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Mon, 5 Sep 2022 20:22:58 +0200
Subject: Clarify `birthday_min_age` config description
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 config/description.exs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index c28447b37..3a2a65272 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1005,7 +1005,8 @@ config :pleroma, :config_description, [
         key: :birthday_min_age,
         type: :integer,
         description:
-          "Minimum required age for users to create account. Only used if birthday is required."
+          "Minimum required age (in days) for users to create account. Only used if birthday is required.",
+        suggestions: [6570]
       }
     ]
   },
-- 
cgit v1.2.3


From 467b6cad6fce69d64c88342c3cd94eb05955441a Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Sat, 17 Sep 2022 16:34:33 -0400
Subject: Reduce incoming and outgoing federation queue sizes to 5

---
 config/config.exs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index e07c3c779..4e21ce457 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -559,8 +559,8 @@ config :pleroma, Oban,
     token_expiration: 5,
     filter_expiration: 1,
     backup: 1,
-    federator_incoming: 50,
-    federator_outgoing: 50,
+    federator_incoming: 5,
+    federator_outgoing: 5,
     ingestion_queue: 50,
     web_push: 50,
     mailer: 10,
-- 
cgit v1.2.3


From 4121bca8957838f094ef134de4b54e492517e527 Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Thu, 4 Mar 2021 13:06:12 +0300
Subject: expanding WebFinger

---
 config/config.exs | 2 ++
 config/test.exs   | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 4e21ce457..a84b15a37 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -869,6 +869,8 @@ config :pleroma, ConcurrentLimiter, [
   {Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, [max_running: 5, max_waiting: 5]}
 ]
 
+config :pleroma, Pleroma.Web.WebFinger, domain: nil, update_nickname_on_user_fetch: true
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"
diff --git a/config/test.exs b/config/test.exs
index d5c25f65e..f5eb6e5c2 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -129,6 +129,8 @@ config :pleroma, :pipeline,
 
 config :pleroma, :cachex, provider: Pleroma.CachexMock
 
+config :pleroma, Pleroma.Web.WebFinger, update_nickname_on_user_fetch: false
+
 config :pleroma, :side_effects,
   ap_streamer: Pleroma.Web.ActivityPub.ActivityPubMock,
   logger: Pleroma.LoggerMock
-- 
cgit v1.2.3


From 7c64f705f6ee0364f1e016004bb0baf79d88dae2 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 2 Nov 2022 21:56:43 -0400
Subject: Update to Phoenix 1.6 and chase dependencies

Also bump minimum Elixir to 1.11
---
 config/test.exs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index f5eb6e5c2..b1d4a8160 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -81,10 +81,7 @@ config :web_push_encryption, :vapid_details,
     "BLH1qVhJItRGCfxgTtONfsOKDc9VRAraXw-3NsmjMngWSh7NxOizN6bkuRA7iLTMPS82PjwJAr3UoK9EC1IFrz4",
   private_key: "_-XZ0iebPrRfZ_o0-IatTdszYa8VCH1yLN-JauK7HHA"
 
-config :pleroma, Oban,
-  queues: false,
-  crontab: false,
-  plugins: false
+config :pleroma, Oban, testing: :manual
 
 config :pleroma, Pleroma.ScheduledActivity,
   daily_user_limit: 2,
-- 
cgit v1.2.3


From 6f047cc308352cb3437f95e31e73487bba194abe Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Wed, 9 Nov 2022 22:36:42 -0500
Subject: Do not strip reported statuses when configured not to

---
 config/config.exs      | 1 +
 config/description.exs | 6 ++++++
 2 files changed, 7 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index a84b15a37..f7564036a 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -228,6 +228,7 @@ config :pleroma, :instance,
   max_pinned_statuses: 1,
   attachment_links: false,
   max_report_comment_size: 1000,
+  report_strip_status: true,
   safe_dm_mentions: false,
   healthcheck: false,
   remote_post_retention_days: 90,
diff --git a/config/description.exs b/config/description.exs
index 3a2a65272..99a2f8030 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -815,6 +815,12 @@ config :pleroma, :config_description, [
           1_000
         ]
       },
+      %{
+        key: :report_strip_status,
+        label: "Report strip status",
+        type: :boolean,
+        description: "Strip status when closing or resolving a report."
+      },
       %{
         key: :safe_dm_mentions,
         label: "Safe DM mentions",
-- 
cgit v1.2.3


From eb70676931c712c97737eb7adc2dd705d37dee2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Fri, 11 Nov 2022 12:13:30 +0100
Subject: Update links to Soapbox
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 config/config.exs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index a84b15a37..21e7433f8 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -756,12 +756,12 @@ config :pleroma, :frontends,
         "https://git.pleroma.social/pleroma/admin-fe/-/jobs/artifacts/${ref}/download?job=build",
       "ref" => "develop"
     },
-    "soapbox-fe" => %{
-      "name" => "soapbox-fe",
-      "git" => "https://gitlab.com/soapbox-pub/soapbox-fe",
+    "soapbox" => %{
+      "name" => "soapbox",
+      "git" => "https://gitlab.com/soapbox-pub/soapbox",
       "build_url" =>
-        "https://gitlab.com/soapbox-pub/soapbox-fe/-/jobs/artifacts/${ref}/download?job=build-production",
-      "ref" => "v1.0.0",
+        "https://gitlab.com/soapbox-pub/soapbox/-/jobs/artifacts/${ref}/download?job=build-production",
+      "ref" => "v3.0.0-beta.1",
       "build_dir" => "static"
     },
     "glitch-lily" => %{
-- 
cgit v1.2.3


From 36519bdbee321354788fde71e33e74d7f6a353d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iva=CC=81n=20Raskovsky?= <raskovsky+git@gmail.com>
Date: Fri, 11 Nov 2022 12:22:21 -0300
Subject: allow custom db port

---
 config/benchmark.exs | 1 +
 config/docker.exs    | 1 +
 config/test.exs      | 1 +
 3 files changed, 3 insertions(+)

(limited to 'config')

diff --git a/config/benchmark.exs b/config/benchmark.exs
index 9a7ea5669..870ead150 100644
--- a/config/benchmark.exs
+++ b/config/benchmark.exs
@@ -40,6 +40,7 @@ config :pleroma, Pleroma.Repo,
   password: "postgres",
   database: "pleroma_benchmark",
   hostname: System.get_env("DB_HOST") || "localhost",
+  port: System.get_env("DB_PORT") || "5432",
   pool_size: 10
 
 # Reduce hash rounds for testing
diff --git a/config/docker.exs b/config/docker.exs
index f9f27d141..5db222485 100644
--- a/config/docker.exs
+++ b/config/docker.exs
@@ -18,6 +18,7 @@ config :pleroma, Pleroma.Repo,
   password: System.fetch_env!("DB_PASS"),
   database: System.get_env("DB_NAME", "pleroma"),
   hostname: System.get_env("DB_HOST", "db"),
+  port: System.get_env("DB_PORT", "5432"),
   pool_size: 10
 
 # Configure web push notifications
diff --git a/config/test.exs b/config/test.exs
index f5eb6e5c2..f7c130d40 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -47,6 +47,7 @@ config :pleroma, Pleroma.Repo,
   password: "postgres",
   database: "pleroma_test",
   hostname: System.get_env("DB_HOST") || "localhost",
+  port: System.get_env("DB_HOST") || "5432",
   pool: Ecto.Adapters.SQL.Sandbox,
   pool_size: 50
 
-- 
cgit v1.2.3


From e7c40c250998bd7d90b7a8be39a8d8e85686153d Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 11 Nov 2022 15:40:32 +0000
Subject: fix envvar

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

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index f7c130d40..ea6f61393 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -47,7 +47,7 @@ config :pleroma, Pleroma.Repo,
   password: "postgres",
   database: "pleroma_test",
   hostname: System.get_env("DB_HOST") || "localhost",
-  port: System.get_env("DB_HOST") || "5432",
+  port: System.get_env("DB_PORT") || "5432",
   pool: Ecto.Adapters.SQL.Sandbox,
   pool_size: 50
 
-- 
cgit v1.2.3


From 6b87b3f2eae62a7d6e20681468c367489a47f0a3 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Fri, 11 Nov 2022 11:39:43 -0500
Subject: Remove Quack logging backend

---
 config/config.exs      |  5 -----
 config/description.exs | 39 ---------------------------------------
 2 files changed, 44 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 21e7433f8..8dcb80b98 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -160,11 +160,6 @@ config :logger, :ex_syslogger,
   format: "$metadata[$level] $message",
   metadata: [:request_id]
 
-config :quack,
-  level: :warn,
-  meta: [:all],
-  webhook_url: "https://hooks.slack.com/services/YOUR-KEY-HERE"
-
 config :mime, :types, %{
   "application/xml" => ["xml"],
   "application/xrd+xml" => ["xrd+xml"],
diff --git a/config/description.exs b/config/description.exs
index 3a2a65272..a79cfd967 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1190,45 +1190,6 @@ config :pleroma, :config_description, [
       }
     ]
   },
-  %{
-    group: :quack,
-    type: :group,
-    label: "Quack Logger",
-    description: "Quack-related settings",
-    children: [
-      %{
-        key: :level,
-        type: {:dropdown, :atom},
-        description: "Log level",
-        suggestions: [:debug, :info, :warn, :error]
-      },
-      %{
-        key: :meta,
-        type: {:list, :atom},
-        description: "Configure which metadata you want to report on",
-        suggestions: [
-          :application,
-          :module,
-          :file,
-          :function,
-          :line,
-          :pid,
-          :crash_reason,
-          :initial_call,
-          :registered_name,
-          :all,
-          :none
-        ]
-      },
-      %{
-        key: :webhook_url,
-        label: "Webhook URL",
-        type: :string,
-        description: "Configure the Slack incoming webhook",
-        suggestions: ["https://hooks.slack.com/services/YOUR-KEY-HERE"]
-      }
-    ]
-  },
   %{
     group: :pleroma,
     key: :frontend_configurations,
-- 
cgit v1.2.3


From c2cfe0c690d1524f13e4e7eb5590d382c71b1c56 Mon Sep 17 00:00:00 2001
From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Sat, 12 Nov 2022 17:44:31 +0000
Subject: Clarify config description

---
 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 99a2f8030..b2072420a 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -819,7 +819,7 @@ config :pleroma, :config_description, [
         key: :report_strip_status,
         label: "Report strip status",
         type: :boolean,
-        description: "Strip status when closing or resolving a report."
+        description: "Strip associated statuses in reports to ids when closed/resolved, otherwise keep a copy"
       },
       %{
         key: :safe_dm_mentions,
-- 
cgit v1.2.3


From 14871fecd4c24f15e13c5a93217f44d01aa0d4a6 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 12 Nov 2022 14:16:52 -0500
Subject: Lint

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

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index b2072420a..f1b709d01 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -819,7 +819,8 @@ config :pleroma, :config_description, [
         key: :report_strip_status,
         label: "Report strip status",
         type: :boolean,
-        description: "Strip associated statuses in reports to ids when closed/resolved, otherwise keep a copy"
+        description:
+          "Strip associated statuses in reports to ids when closed/resolved, otherwise keep a copy"
       },
       %{
         key: :safe_dm_mentions,
-- 
cgit v1.2.3