upstream to 1.7.7-alpha-10

CS2-SimpleAdmin/Database/Migrations/013_AddNameColumnToSaPlayerIpsTable.sql

@@ -1,4 +0,0 @@
-UPDATE `sa_players_ips` SET `address` = INET_ATON(address);
-ALTER TABLE `sa_players_ips` CHANGE `address` `address` INT UNSIGNED NOT NULL;
-ALTER TABLE `sa_players_ips` ADD `name` VARCHAR(64) NULL DEFAULT NULL AFTER `steamid`;
-ALTER TABLE `sa_players_ips` ADD INDEX(`used_at`);

CS2-SimpleAdmin/Database/Migrations/Mysql/005_CreateUnbansTable.sql

@@ -16,8 +16,8 @@ CREATE TABLE IF NOT EXISTS `sa_unmutes` (
  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
-INSERT INTO `sa_admins` (`id`, `player_name`, `player_steamid`, `flags`, `immunity`, `server_id`, `ends`, `created`) 
-VALUES (-1, 'Console', 'Console', '', '0', NULL, NULL, NOW());
+INSERT IGNORE INTO `sa_admins` (`id`, `player_name`, `player_steamid`, `flags`, `immunity`, `server_id`, `ends`, `created`) 
+VALUES (0, 'Console', 'Console', '', '0', NULL, NULL, NOW());
 
 UPDATE `sa_admins` SET `id` = 0 WHERE `id` = -1;
 

CS2-SimpleAdmin/Database/Migrations/Mysql/013_AddNameColumnToSaPlayerIpsTable.sql

@@ -0,0 +1,13 @@
+DELETE FROM `sa_players_ips`
+WHERE `id` NOT IN (
+    SELECT * FROM (
+          SELECT MIN(`id`)
+          FROM `sa_players_ips`
+          GROUP BY `steamid`
+      ) AS `keep_ids`
+);
+DELETE FROM sa_players_ips WHERE INET_ATON(address) IS NULL AND address IS NOT NULL;
+UPDATE `sa_players_ips` SET `address` = INET_ATON(address);
+ALTER TABLE `sa_players_ips` CHANGE `address` `address` INT UNSIGNED NOT NULL;
+ALTER TABLE `sa_players_ips` ADD INDEX (used_at DESC);
+ALTER TABLE `sa_players_ips` ADD `name` VARCHAR(64) NULL DEFAULT NULL AFTER `steamid`;

CS2-SimpleAdmin/Database/Migrations/Mysql/014_AddIndexesToMutesTable.sql

@@ -0,0 +1,3 @@
+ALTER TABLE sa_mutes ADD INDEX (player_steamid, status, ends);
+ALTER TABLE sa_mutes ADD INDEX(player_steamid, status, server_id, duration);
+ALTER TABLE sa_mutes ADD INDEX(player_steamid, type);

CS2-SimpleAdmin/Database/Migrations/Mysql/015_steamidToBigInt.sql

@@ -0,0 +1,23 @@
+ALTER TABLE `sa_bans` CHANGE `player_steamid` `player_steamid` BIGINT NULL DEFAULT NULL;
+UPDATE `sa_bans`
+SET admin_steamid = '0'
+WHERE admin_steamid NOT REGEXP '^[0-9]+$';
+ALTER TABLE `sa_bans` CHANGE `admin_steamid` `admin_steamid` BIGINT NOT NULL;
+
+ALTER TABLE `sa_mutes` CHANGE `player_steamid` `player_steamid` BIGINT NULL DEFAULT NULL;
+UPDATE `sa_mutes`
+SET admin_steamid = '0'
+WHERE admin_steamid NOT REGEXP '^[0-9]+$';
+ALTER TABLE `sa_mutes` CHANGE `admin_steamid` `admin_steamid` BIGINT NOT NULL;
+
+ALTER TABLE `sa_warns` CHANGE `player_steamid` `player_steamid` BIGINT NULL DEFAULT NULL;
+UPDATE `sa_warns`
+SET admin_steamid = '0'
+WHERE admin_steamid NOT REGEXP '^[0-9]+$';
+ALTER TABLE `sa_warns` CHANGE `admin_steamid` `admin_steamid` BIGINT NOT NULL;
+
+UPDATE `sa_admins`
+SET player_steamid = '0'
+WHERE player_steamid NOT REGEXP '^[0-9]+$';
+ALTER TABLE `sa_admins` CHANGE `player_steamid` `player_steamid` BIGINT NULL DEFAULT NULL;
+

CS2-SimpleAdmin/Database/Migrations/Sqlite/001_CreateTables.sql

@@ -0,0 +1,47 @@
+CREATE TABLE IF NOT EXISTS `sa_bans` (
+                                         `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                                         `player_name` VARCHAR(128),
+    `player_steamid` VARCHAR(64),
+    `player_ip` VARCHAR(128),
+    `admin_steamid` VARCHAR(64) NOT NULL,
+    `admin_name` VARCHAR(128) NOT NULL,
+    `reason` VARCHAR(255) NOT NULL,
+    `duration` INTEGER NOT NULL,
+    `ends` TIMESTAMP NULL,
+    `created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    `server_id` INTEGER NULL,
+    `status` TEXT NOT NULL DEFAULT 'ACTIVE'
+    );
+
+CREATE TABLE IF NOT EXISTS `sa_mutes` (
+                                          `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                                          `player_name` VARCHAR(128) NULL,
+    `player_steamid` VARCHAR(64) NOT NULL,
+    `admin_steamid` VARCHAR(64) NOT NULL,
+    `admin_name` VARCHAR(128) NOT NULL,
+    `reason` VARCHAR(255) NOT NULL,
+    `duration` INTEGER NOT NULL,
+    `ends` TIMESTAMP NULL,
+    `created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    `type` TEXT NOT NULL DEFAULT 'GAG',
+    `server_id` INTEGER NULL,
+    `status` TEXT NOT NULL DEFAULT 'ACTIVE'
+    );
+
+CREATE TABLE IF NOT EXISTS `sa_admins` (
+                                           `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                                           `player_name` VARCHAR(128) NOT NULL,
+    `player_steamid` VARCHAR(64) NOT NULL,
+    `flags` TEXT NULL,
+    `immunity` INTEGER NOT NULL DEFAULT 0,
+    `server_id` INTEGER NULL,
+    `ends` TIMESTAMP NULL,
+    `created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
+    );
+
+CREATE TABLE IF NOT EXISTS `sa_servers` (
+                                            `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                                            `hostname` VARCHAR(128) NOT NULL,
+    `address` VARCHAR(64) NOT NULL,
+    UNIQUE (`address`)
+    );

CS2-SimpleAdmin/Database/Migrations/Sqlite/002_CreateFlagsTable.sql

@@ -0,0 +1,6 @@
+CREATE TABLE IF NOT EXISTS `sa_admins_flags` (
+                                                 `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                                                 `admin_id` INTEGER NOT NULL,
+                                                 `flag` VARCHAR(64) NOT NULL,
+    FOREIGN KEY (`admin_id`) REFERENCES `sa_admins` (`id`) ON DELETE CASCADE
+    );

CS2-SimpleAdmin/Database/Migrations/Sqlite/004_MoveOldFlagsToFlagsTable.sql

@@ -0,0 +1,46 @@
+INSERT INTO sa_admins_flags (admin_id, flag)
+WITH RECURSIVE
+    min_admins AS (
+        SELECT MIN(id) AS admin_id, player_steamid, server_id
+        FROM sa_admins
+        WHERE player_steamid != 'Console'
+GROUP BY player_steamid, server_id
+    ),
+    split_flags AS (
+SELECT
+    ma.admin_id,
+    sa.flags,
+    1 AS pos,
+    CASE
+    WHEN INSTR(sa.flags || ',', ',') = 0 THEN sa.flags
+    ELSE SUBSTR(sa.flags, 1, INSTR(sa.flags || ',', ',') - 1)
+    END AS flag,
+    CASE
+    WHEN INSTR(sa.flags || ',', ',') = 0 THEN ''
+    ELSE SUBSTR(sa.flags, INSTR(sa.flags || ',', ',') + 1)
+    END AS remaining
+FROM min_admins ma
+    JOIN sa_admins sa ON ma.player_steamid = sa.player_steamid
+    AND (ma.server_id = sa.server_id OR (ma.server_id IS NULL AND sa.server_id IS NULL))
+WHERE sa.flags IS NOT NULL AND sa.flags != ''
+
+UNION ALL
+
+SELECT
+    admin_id,
+    flags,
+    pos + 1,
+    CASE
+    WHEN INSTR(remaining || ',', ',') = 0 THEN remaining
+    ELSE SUBSTR(remaining, 1, INSTR(remaining || ',', ',') - 1)
+    END AS flag,
+    CASE
+    WHEN INSTR(remaining || ',', ',') = 0 THEN ''
+    ELSE SUBSTR(remaining, INSTR(remaining || ',', ',') + 1)
+    END AS remaining
+FROM split_flags
+WHERE remaining != ''
+    )
+SELECT admin_id, TRIM(flag)
+FROM split_flags
+WHERE flag IS NOT NULL AND TRIM(flag) != '';

CS2-SimpleAdmin/Database/Migrations/Sqlite/005_CreateUnbansTable.sql

@@ -0,0 +1,23 @@
+CREATE TABLE IF NOT EXISTS `sa_unbans` (
+                                           `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                                           `ban_id` INTEGER NOT NULL,
+                                           `admin_id` INTEGER NOT NULL DEFAULT 0,
+                                           `reason` VARCHAR(255) NOT NULL DEFAULT 'Unknown',
+    `date` TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+    );
+
+CREATE TABLE IF NOT EXISTS `sa_unmutes` (
+                                            `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                                            `mute_id` INTEGER NOT NULL,
+                                            `admin_id` INTEGER NOT NULL DEFAULT 0,
+                                            `reason` VARCHAR(255) NOT NULL DEFAULT 'Unknown',
+    `date` TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+    );
+
+INSERT OR IGNORE INTO `sa_admins` (`id`, `player_name`, `player_steamid`, `flags`, `immunity`, `server_id`, `ends`, `created`) 
+VALUES (0, 'Console', 'Console', '', '0', NULL, NULL, CURRENT_TIMESTAMP);
+
+UPDATE `sa_admins` SET `id` = 0 WHERE `id` = -1;
+
+ALTER TABLE `sa_bans` ADD `unban_id` INTEGER NULL;
+ALTER TABLE `sa_mutes` ADD `unmute_id` INTEGER NULL;

CS2-SimpleAdmin/Database/Migrations/Sqlite/006_ServerGroupsFeature.sql

@@ -0,0 +1,21 @@
+CREATE TABLE IF NOT EXISTS `sa_groups` (
+                                           `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                                           `name` VARCHAR(255) NOT NULL,
+    `immunity` INTEGER NOT NULL DEFAULT 0
+    );
+
+CREATE TABLE IF NOT EXISTS `sa_groups_flags` (
+                                                 `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                                                 `group_id` INTEGER NOT NULL,
+                                                 `flag` VARCHAR(64) NOT NULL,
+    FOREIGN KEY (`group_id`) REFERENCES `sa_groups` (`id`) ON DELETE CASCADE
+    );
+
+CREATE TABLE IF NOT EXISTS `sa_groups_servers` (
+                                                   `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                                                   `group_id` INTEGER NOT NULL,
+                                                   `server_id` INTEGER NULL,
+                                                   FOREIGN KEY (`group_id`) REFERENCES `sa_groups` (`id`) ON DELETE CASCADE
+    );
+
+ALTER TABLE `sa_admins` ADD `group_id` INTEGER NULL;

CS2-SimpleAdmin/Database/Migrations/Sqlite/008_OnlineTimeInPenalties.sql

@@ -0,0 +1 @@
+ALTER TABLE `sa_mutes` ADD `passed` INTEGER NULL;

CS2-SimpleAdmin/Database/Migrations/Sqlite/009_BanAllUsedIpAddress.sql

@@ -0,0 +1,7 @@
+CREATE TABLE IF NOT EXISTS `sa_players_ips` (
+                                                `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                                                `steamid` INTEGER NOT NULL,
+                                                `address` VARCHAR(64) NOT NULL,
+    `used_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    UNIQUE (`steamid`, `address`)
+    );

CS2-SimpleAdmin/Database/Migrations/Sqlite/010_CreateWarnsTable.sql

@@ -0,0 +1,13 @@
+CREATE TABLE IF NOT EXISTS `sa_warns` (
+                                          `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                                          `player_name` VARCHAR(128) DEFAULT NULL,
+    `player_steamid` VARCHAR(64) NOT NULL,
+    `admin_steamid` VARCHAR(64) NOT NULL,
+    `admin_name` VARCHAR(128) NOT NULL,
+    `reason` VARCHAR(255) NOT NULL,
+    `duration` INTEGER NOT NULL,
+    `ends` TIMESTAMP NOT NULL,
+    `created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    `server_id` INTEGER DEFAULT NULL,
+    `status` TEXT NOT NULL DEFAULT 'ACTIVE'
+    );

CS2-SimpleAdmin/Database/Migrations/Sqlite/011_AddRconColumnToServersTable.sql

@@ -0,0 +1 @@
+ALTER TABLE `sa_servers` ADD `rcon_password` VARCHAR(128) NULL;

CS2-SimpleAdmin/Database/Migrations/Sqlite/012_AddUpdatedAtColumnToSaBansTable.sql

@@ -0,0 +1 @@
+ALTER TABLE `sa_bans` ADD COLUMN `updated_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;

CS2-SimpleAdmin/Database/Migrations/Sqlite/013_AddNameColumnToSaPlayerIpsTable.sql

@@ -0,0 +1,9 @@
+DELETE FROM `sa_players_ips`
+WHERE `id` NOT IN (
+    SELECT MIN(`id`)
+    FROM `sa_players_ips`
+    GROUP BY `steamid`
+);
+
+ALTER TABLE `sa_players_ips` ADD `name` VARCHAR(64) NULL DEFAULT NULL;
+CREATE INDEX IF NOT EXISTS `idx_sa_players_ips_used_at` ON `sa_players_ips` (`used_at` DESC);

CS2-SimpleAdmin/Database/Migrations/Sqlite/014_AddIndexesToMutesTable.sql

@@ -0,0 +1,3 @@
+CREATE INDEX IF NOT EXISTS `idx_sa_mutes_steamid_status_ends` ON `sa_mutes` (`player_steamid`, `status`, `ends`);
+CREATE INDEX IF NOT EXISTS `idx_sa_mutes_steamid_status_server_duration` ON `sa_mutes` (`player_steamid`, `status`, `server_id`, `duration`);
+CREATE INDEX IF NOT EXISTS `idx_sa_mutes_steamid_type` ON `sa_mutes` (`player_steamid`, `type`);

CS2-SimpleAdmin/Database/Migrations/Sqlite/015_steamidToBigInt.sql

@@ -0,0 +1,15 @@
+UPDATE `sa_bans`
+SET admin_steamid = '0'
+WHERE admin_steamid NOT GLOB '[0-9]*';
+
+UPDATE `sa_mutes`
+SET admin_steamid = '0'
+WHERE admin_steamid NOT GLOB '[0-9]*';
+
+UPDATE `sa_warns`
+SET admin_steamid = '0'
+WHERE admin_steamid NOT GLOB '[0-9]*';
+
+UPDATE `sa_admins`
+SET player_steamid = '0'
+WHERE player_steamid NOT GLOB '[0-9]*';