From 54db01d1560d4eb8d53b37fd99817d738f0f976c Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Tue, 23 May 2023 09:58:58 +0200
Subject: [PATCH] DEV: Delete old personal message settings (#21381)

Followup to e62e93f

Both enable_personal_messages and min_trust_to_send_messages
have been deprecated for a long time now, they can be deleted.
---
 config/site_settings.yml                        |  8 --------
 ...3109_delete_old_personal_message_settings.rb | 17 +++++++++++++++++
 lib/site_settings/deprecated_settings.rb        |  2 --
 3 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 db/migrate/20230523073109_delete_old_personal_message_settings.rb

diff --git a/config/site_settings.yml b/config/site_settings.yml
index 8dabe6a8a0a..51f8bb2cdb7 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -832,10 +832,6 @@ posting:
       ja: 4
       zh_CN: 4
       zh_TW: 4
-  enable_personal_messages:
-    default: true
-    client: true
-    hidden: true
   enable_system_message_replies:
     default: true
   personal_message_enabled_groups:
@@ -1596,10 +1592,6 @@ trust:
   min_trust_to_allow_self_wiki:
     default: 3
     enum: "TrustLevelSetting"
-  min_trust_to_send_messages:
-    default: 1
-    enum: "TrustLevelSetting"
-    hidden: true
   min_trust_to_send_email_messages:
     default: "4"
     enum: "TrustLevelAndStaffSetting"
diff --git a/db/migrate/20230523073109_delete_old_personal_message_settings.rb b/db/migrate/20230523073109_delete_old_personal_message_settings.rb
new file mode 100644
index 00000000000..e1772a84b25
--- /dev/null
+++ b/db/migrate/20230523073109_delete_old_personal_message_settings.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class DeleteOldPersonalMessageSettings < ActiveRecord::Migration[7.0]
+  def up
+    execute <<~SQL
+      DELETE FROM site_settings WHERE name = 'enable_personal_messages'
+    SQL
+
+    execute <<~SQL
+      DELETE FROM site_settings WHERE name = 'min_trust_to_send_messages'
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/lib/site_settings/deprecated_settings.rb b/lib/site_settings/deprecated_settings.rb
index a8b0ace6805..37c07a09076 100644
--- a/lib/site_settings/deprecated_settings.rb
+++ b/lib/site_settings/deprecated_settings.rb
@@ -8,8 +8,6 @@ module SiteSettings::DeprecatedSettings
     # [<old setting>, <new_setting>, <override>, <version to drop>]
     ["search_tokenize_chinese_japanese_korean", "search_tokenize_chinese", true, "2.9"],
     ["default_categories_regular", "default_categories_normal", true, "3.0"],
-    ["min_trust_to_send_messages", "personal_message_enabled_groups", false, "3.0"],
-    ["enable_personal_messages", "personal_message_enabled_groups", false, "3.0"],
   ]
 
   def setup_deprecated_methods