From db783bdca57192a4c8b6ffc0aed509e00ce03d15 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 16 Oct 2018 19:39:53 -0300 Subject: Update Discord table fields to be discord-bot compliant --- npc/003-3/malindou.txt | 4 ++-- npc/commands/discord.txt | 5 +++-- sql-files/main.sql | 4 +++- sql-files/upgrades/2018-08-03--11-37.sql | 4 +++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/npc/003-3/malindou.txt b/npc/003-3/malindou.txt index 7f242e96a..a8789a065 100644 --- a/npc/003-3/malindou.txt +++ b/npc/003-3/malindou.txt @@ -130,10 +130,10 @@ OnInit: // Current UPDATE value: Ter Out 16 17:17:20 -03 2018 // This is a hack because I'm too lazy to be bothered with standard SQL Upgrade system if ($UPDATE < 1539721040) { - query_sql("CREATE TABLE IF NOT EXISTS `discord` (`account_id` INT(11) UNSIGNED NOT NULL DEFAULT '0',`discord_id` VARCHAR(255) NOT NULL DEFAULT '') ENGINE=MyISAM"); + query_sql("CREATE TABLE IF NOT EXISTS `discord` (`account_id` INT(11) UNSIGNED NOT NULL DEFAULT '0',`discord_id` VARCHAR(255) NOT NULL DEFAULT '',`discord_name` VARCHAR(255) NOT NULL DEFAULT '',`verified` ENUM(0, 1) NOT NULL DEFAULT '0') ENGINE=MyISAM"); $UPDATE=1539721040; debugmes ""; - debugmes "* SQL Upgrade (will not work on new installations)"; + debugmes "* SQL Upgrade (no effect on new installations)"; debugmes ""; } diff --git a/npc/commands/discord.txt b/npc/commands/discord.txt index f854e23b0..2b6264519 100644 --- a/npc/commands/discord.txt +++ b/npc/commands/discord.txt @@ -20,7 +20,7 @@ OnCall: close; @discord=1; - .@nb = query_sql("select `discord_id` from `discord` WHERE `account_id` == "+getcharid(3), .@discord$); + .@nb = query_sql("select `discord_name` from `discord` WHERE `account_id` == "+getcharid(3), .@discord$); do @@ -40,7 +40,8 @@ OnCall: input .@discord$; .@discord$=escape_sql(.@discord$); mes ""; - query_sql("UPDATE `discord` SET `discord_id` = '"+.@discord$+"' WHERE `account_id` == "+getcharid(3)); + query_sql("UPDATE `discord` SET `discord_name` = '"+.@discord$+"' WHERE `account_id` == "+getcharid(3)); + query_sql("UPDATE `discord` SET `verified` = '0' WHERE `account_id` == "+getcharid(3)); break; case 2: query_sql("DELETE FROM `discord` WHERE `account_id` == "+getcharid(3)); diff --git a/sql-files/main.sql b/sql-files/main.sql index eba0291a0..bf95ca1ef 100644 --- a/sql-files/main.sql +++ b/sql-files/main.sql @@ -283,7 +283,9 @@ CREATE TABLE IF NOT EXISTS `charlog` ( CREATE TABLE IF NOT EXISTS `discord` ( `account_id` INT(11) UNSIGNED NOT NULL DEFAULT '0', - `discord_id` VARCHAR(255) NOT NULL DEFAULT '' + `discord_id` VARCHAR(255) NOT NULL DEFAULT '', + `discord_name` VARCHAR(255) NOT NULL DEFAULT '', + `verified` ENUM(0, 1) NOT NULL DEFAULT '0' ) ENGINE=MyISAM; -- diff --git a/sql-files/upgrades/2018-08-03--11-37.sql b/sql-files/upgrades/2018-08-03--11-37.sql index c9a532b26..90e82534a 100644 --- a/sql-files/upgrades/2018-08-03--11-37.sql +++ b/sql-files/upgrades/2018-08-03--11-37.sql @@ -24,7 +24,9 @@ ALTER TABLE `quest` CHANGE `count3` `count3` INT(11) UNSIGNED NOT NULL DEFAULT ' CREATE TABLE IF NOT EXISTS `discord` ( `account_id` INT(11) UNSIGNED NOT NULL DEFAULT '0', - `discord_id` VARCHAR(255) NOT NULL DEFAULT '' + `discord_id` VARCHAR(255) NOT NULL DEFAULT '', + `discord_name` VARCHAR(255) NOT NULL DEFAULT '', + `verified` ENUM(0, 1) NOT NULL DEFAULT '0' ) ENGINE=MyISAM; -- cgit v1.2.3-60-g2f50