From 62bfa33464df8cc413fa4f111ab62e189be0ca32 Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Sat, 8 Mar 2025 13:36:41 +0000
Subject: Rework how nickname protection works.

- Rename the command and module from kill to protect (this command
  hasn't actually killed users in a long time).
- Replace QUICK/IMMED with a duration option.
---
 modules/database/db_old.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'modules/database/db_old.cpp')

diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp
index 7f601068f..9812d291b 100644
--- a/modules/database/db_old.cpp
+++ b/modules/database/db_old.cpp
@@ -480,7 +480,10 @@ static void LoadNicks()
 
 			READ(read_uint32(&u32, f));
 			if (u32 & OLD_NI_KILLPROTECT)
-				nc->Extend<bool>("KILLPROTECT");
+			{
+				nc->Extend<bool>("PROTECT");
+				nc->Extend("PROTECT_AFTER", 60);
+			}
 			if (u32 & OLD_NI_MSG)
 				nc->Extend<bool>("MSG");
 			if (u32 & OLD_NI_MEMO_HARDMAX)
@@ -498,9 +501,15 @@ static void LoadNicks()
 			if (u32 & OLD_NI_HIDE_QUIT)
 				nc->Extend<bool>("HIDE_QUIT");
 			if (u32 & OLD_NI_KILL_QUICK)
-				nc->Extend<bool>("KILL_QUICK");
+			{
+				nc->Extend<bool>("PROTECT");
+				nc->Extend("PROTECT_AFTER", 20);
+			}
 			if (u32 & OLD_NI_KILL_IMMED)
-				nc->Extend<bool>("KILL_IMMED");
+			{
+				nc->Extend<bool>("PROTECT");
+				nc->Extend<time_t>("PROTECT_AFTER", 0);
+			}
 			if (u32 & OLD_NI_MEMO_MAIL)
 				nc->Extend<bool>("MEMO_MAIL");
 			if (u32 & OLD_NI_HIDE_STATUS)
-- 
cgit