From d0f33354f6fdb8a959c6003f7582cc6ab182b487 Mon Sep 17 00:00:00 2001
From: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Date: Mon, 22 Nov 2021 23:28:19 -0800
Subject: [PATCH] Add admin ckey to known alts panel (#62761)

About The Pull Request

Adds the admin who added the known alt to the known alts panel.
Changelog

cl
admin: The admin who adds a known alt is now logged in the table.
/cl
---
 SQL/database_changelog.txt        | 14 +++++++++++---
 SQL/tgstation_schema.sql          |  1 +
 SQL/tgstation_schema_prefixed.sql |  1 +
 code/__DEFINES/subsystems.dm      |  2 +-
 code/modules/admin/known_alts.dm  | 10 ++++++----
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/SQL/database_changelog.txt b/SQL/database_changelog.txt
index 2c538a1d8f3..653a7679a8a 100644
--- a/SQL/database_changelog.txt
+++ b/SQL/database_changelog.txt
@@ -1,13 +1,21 @@
 Any time you make a change to the schema files, remember to increment the database schema version. Generally increment the minor number, major should be reserved for significant changes to the schema. Both values go up to 255.
 
-The latest database version is 5.19; The query to update the schema revision table is:
+The latest database version is 5.20; The query to update the schema revision table is:
 
-INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 19);
+INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 20);
 or
-INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 19);
+INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 20);
 
 In any query remember to add a prefix to the table names if you use one.
 
+Version 5.20, 11 November 2021, by Mothblocks
+Adds `admin_ckey` field to the `known_alts` table to track who added what.
+
+```
+ALTER TABLE `known_alts`
+ADD COLUMN `admin_ckey` VARCHAR(32) NOT NULL DEFAULT '*no key*' AFTER `ckey2`;
+```
+
 -----------------------------------------------------
 Version 5.19, 10 November 2021, by WalterMeldron
 Adds an urgent column to tickets for ahelps marked as urgent.
diff --git a/SQL/tgstation_schema.sql b/SQL/tgstation_schema.sql
index 2a5bb7bfde5..11187db7a8a 100644
--- a/SQL/tgstation_schema.sql
+++ b/SQL/tgstation_schema.sql
@@ -672,6 +672,7 @@ CREATE TABLE `known_alts` (
     `id` INT NOT NULL AUTO_INCREMENT,
     `ckey1` VARCHAR(32) NOT NULL,
     `ckey2` VARCHAR(32) NOT NULL,
+    `admin_ckey` VARCHAR(32) NOT NULL DEFAULT '*no key*',
     PRIMARY KEY (`id`),
     UNIQUE INDEX `unique_contraints` (`ckey1` , `ckey2`)
 );
diff --git a/SQL/tgstation_schema_prefixed.sql b/SQL/tgstation_schema_prefixed.sql
index c599e3466b8..703163b6205 100644
--- a/SQL/tgstation_schema_prefixed.sql
+++ b/SQL/tgstation_schema_prefixed.sql
@@ -672,6 +672,7 @@ CREATE TABLE `SS13_known_alts` (
     `id` INT NOT NULL AUTO_INCREMENT,
     `ckey1` VARCHAR(32) NOT NULL,
     `ckey2` VARCHAR(32) NOT NULL,
+    `admin_ckey` VARCHAR(32) NOT NULL DEFAULT '*no key*',
     PRIMARY KEY (`id`),
     UNIQUE INDEX `unique_contraints` (`ckey1` , `ckey2`)
 );
diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
index 94fd44f7a3c..ddc2e1bc043 100644
--- a/code/__DEFINES/subsystems.dm
+++ b/code/__DEFINES/subsystems.dm
@@ -20,7 +20,7 @@
  *
  * make sure you add an update to the schema_version stable in the db changelog
  */
-#define DB_MINOR_VERSION 19
+#define DB_MINOR_VERSION 20
 
 
 //! ## Timing subsystem
diff --git a/code/modules/admin/known_alts.dm b/code/modules/admin/known_alts.dm
index 8ea595e1aca..d6486f77bd7 100644
--- a/code/modules/admin/known_alts.dm
+++ b/code/modules/admin/known_alts.dm
@@ -55,11 +55,12 @@ GLOBAL_DATUM_INIT(known_alts, /datum/known_alts, new)
 				return
 
 			var/datum/db_query/query_add_known_alt = SSdbcore.NewQuery({"
-				INSERT INTO [format_table_name("known_alts")] (ckey1, ckey2)
-				VALUES (:ckey1, :ckey2)
+				INSERT INTO [format_table_name("known_alts")] (ckey1, ckey2, admin_ckey)
+				VALUES (:ckey1, :ckey2, :admin_ckey)
 			"}, list(
 				"ckey1" = ckey1,
 				"ckey2" = ckey2,
+				"admin_ckey" = usr.ckey,
 			))
 
 			if (query_add_known_alt.warn_execute())
@@ -132,7 +133,7 @@ GLOBAL_DATUM_INIT(known_alts, /datum/known_alts, new)
 	if (!SSdbcore.Connect())
 		return cached_known_alts || list()
 
-	var/datum/db_query/query_known_alts = SSdbcore.NewQuery("SELECT id, ckey1, ckey2 FROM [format_table_name("known_alts")] ORDER BY id DESC")
+	var/datum/db_query/query_known_alts = SSdbcore.NewQuery("SELECT id, ckey1, ckey2, admin_ckey FROM [format_table_name("known_alts")] ORDER BY id DESC")
 	query_known_alts.warn_execute()
 
 	if (query_known_alts.last_error)
@@ -145,6 +146,7 @@ GLOBAL_DATUM_INIT(known_alts, /datum/known_alts, new)
 		cached_known_alts += list(list(
 			query_known_alts.item[2],
 			query_known_alts.item[3],
+			query_known_alts.item[4],
 
 			// The ID
 			query_known_alts.item[1],
@@ -166,7 +168,7 @@ GLOBAL_DATUM_INIT(known_alts, /datum/known_alts, new)
 	var/list/known_alts_html = list()
 
 	for (var/known_alt in load_known_alts())
-		known_alts_html += "<a href='?src=[REF(src)];[HrefToken()];action=delete;id=[known_alt[3]]'>\[-\] Delete</a> <b>[known_alt[1]]</b> is an alt of <b>[known_alt[2]]</b>."
+		known_alts_html += "<a href='?src=[REF(src)];[HrefToken()];action=delete;id=[known_alt[4]]'>\[-\] Delete</a> <b>[known_alt[1]]</b> is an alt of <b>[known_alt[2]]</b> (added by <b>[known_alt[3]]</b>)."
 
 	var/html = {"
 		<head>