Leahnaya/pkmn-classic-framework
1
0
Fork 0
mirror of https://github.com/mm201/pkmn-classic-framework.git synced 2026-08-01 23:53:39 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Store email notification fields in database.

Browse Source
This commit is contained in:
Greg Edwards 2021-02-06 21:11:40 -05:00
parent a31aee38ad
commit ca27fcadaa
2 changed files with 64 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
library/Data/DataMysql.cs
View File

@ -1085,24 +1085,33 @@ namespace PkmnFoundations.Data
new MySqlParameter("@country", profile.Country),
new MySqlParameter("@region", profile.Region),
new MySqlParameter("@ot", profile.OT),
new MySqlParameter("@name", profile.Name.RawData)
new MySqlParameter("@name", profile.Name.RawData),
new MySqlParameter("@mac_address", profile.MacAddress),
new MySqlParameter("@email", profile.Email),
new MySqlParameter("@has_notifications", profile.HasNotifications),
new MySqlParameter("@client_secret", profile.ClientSecret),
new MySqlParameter("@mail_secret", profile.MailSecret)
};
if (exists != 0)
{
return tran.ExecuteNonQuery("UPDATE GtsProfiles4 SET Data = @data, " +
"Version = @version, Language = @language, Country = @country, " +
"Region = @region, OT = @ot, Name = @name, ParseVersion = 1, " +
"TimeUpdated = UTC_TIMESTAMP() " +
"Region = @region, OT = @ot, Name = @name, MacAddress = @mac_address, " +
"Email = @email, HasNotifications = @has_notifications, " +
"ClientSecret = @client_secret, MailSecret = @mail_secret, " +
"ParseVersion = 2, TimeUpdated = UTC_TIMESTAMP() " +
"WHERE pid = @pid", _params) > 0;
}
else
{
return tran.ExecuteNonQuery("INSERT INTO GtsProfiles4 " +
"(pid, Data, Version, Language, Country, Region, OT, Name, " +
"MacAddress, Email, HasNotifications, ClientSecret, MailSecret, " +
"ParseVersion, TimeAdded, TimeUpdated) VALUES " +
"(@pid, @data, @version, @language, @country, @region, @ot, " +
"@name, 1, UTC_TIMESTAMP(), UTC_TIMESTAMP())", _params) > 0;
"@name, @mac_address, @email, @has_notifications, " +
"@client_secret, @mail_secret, 2, UTC_TIMESTAMP(), UTC_TIMESTAMP())", _params) > 0;
}
}
#endregion
@ -1982,6 +1991,11 @@ namespace PkmnFoundations.Data
public bool GamestatsSetProfile5(MySqlTransaction tran, TrainerProfile5 profile)
{
// Although GenV doesn't actually support email notifications,
// we're using the same database structure here as for GenIV
// as a rule of least surprise and maybe in the hopes of
// removing this code duplication eventually.
if (profile.Data.Length != 100) throw new FormatException("Profile data must be 100 bytes.");
long exists = (long)tran.ExecuteScalar("SELECT EXISTS(SELECT * FROM GtsProfiles5 WHERE pid = @pid)", new MySqlParameter("@pid", profile.PID));
@ -1994,24 +2008,33 @@ namespace PkmnFoundations.Data
new MySqlParameter("@country", profile.Country),
new MySqlParameter("@region", profile.Region),
new MySqlParameter("@ot", profile.OT),
new MySqlParameter("@name", profile.Name.RawData)
new MySqlParameter("@name", profile.Name.RawData),
new MySqlParameter("@mac_address", profile.MacAddress),
new MySqlParameter("@email", profile.Email),
new MySqlParameter("@has_notifications", profile.HasNotifications),
new MySqlParameter("@client_secret", profile.ClientSecret),
new MySqlParameter("@mail_secret", profile.MailSecret)
};
if (exists != 0)
{
return tran.ExecuteNonQuery("UPDATE GtsProfiles5 SET Data = @data, " +
"Version = @version, Language = @language, Country = @country, " +
"Region = @region, OT = @ot, Name = @name, ParseVersion = 1, " +
"TimeUpdated = UTC_TIMESTAMP() " +
"Region = @region, OT = @ot, Name = @name, MacAddress = @mac_address, " +
"Email = @email, HasNotifications = @has_notifications, " +
"ClientSecret = @client_secret, MailSecret = @mail_secret, " +
"ParseVersion = 2, TimeUpdated = UTC_TIMESTAMP() " +
"WHERE pid = @pid", _params) > 0;
}
else
{
return tran.ExecuteNonQuery("INSERT INTO GtsProfiles5 " +
"(pid, Data, Version, Language, Country, Region, OT, Name, " +
"MacAddress, Email, HasNotifications, ClientSecret, MailSecret, " +
"ParseVersion, TimeAdded, TimeUpdated) VALUES " +
"(@pid, @data, @version, @language, @country, @region, @ot, " +
"@name, 1, UTC_TIMESTAMP(), UTC_TIMESTAMP())", _params) > 0;
"@name, @mac_address, @email, @has_notifications, " +
"@client_secret, @mail_secret, 2, UTC_TIMESTAMP(), UTC_TIMESTAMP())", _params) > 0;
}
}
#endregion

56
library/database.sql
View File

@ -1,13 +1,13 @@
# ************************************************************
# Sequel Pro SQL dump
# Version 4096
# Version 4541
#
# http://www.sequelpro.com/
# http://code.google.com/p/sequel-pro/
# https://github.com/sequelpro/sequelpro
#
# Host: 127.0.0.1 (MySQL 5.5.40)
# Host: hoenn.local (MySQL 5.5.5-10.3.10-MariaDB)
# Database: gts
# Generation Time: 2015-05-02 20:12:33 +0000
# Generation Time: 2021-02-01 07:35:50 +0000
# ************************************************************
@ -108,7 +108,7 @@ CREATE TABLE `GtsBattleSubway5` (
`Unknown5` bigint(20) DEFAULT NULL,
`ParseVersion` int(10) unsigned DEFAULT NULL,
`Rank` tinyint(3) unsigned DEFAULT NULL,
`RoomNum` tinyint(3) unsigned NOT NULL DEFAULT '0',
`RoomNum` tinyint(3) unsigned NOT NULL DEFAULT 0,
`BattlesWon` tinyint(3) unsigned DEFAULT NULL,
`Position` int(10) unsigned DEFAULT NULL,
`TimeAdded` datetime DEFAULT NULL,
@ -127,7 +127,7 @@ DROP TABLE IF EXISTS `GtsBattleSubwayLeaders5`;
CREATE TABLE `GtsBattleSubwayLeaders5` (
`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
`pid` int(11) NOT NULL DEFAULT '0',
`pid` int(11) NOT NULL DEFAULT 0,
`Name` binary(16) DEFAULT NULL,
`Version` tinyint(3) unsigned DEFAULT NULL,
`Language` tinyint(3) unsigned DEFAULT NULL,
@ -139,7 +139,7 @@ CREATE TABLE `GtsBattleSubwayLeaders5` (
`Unknown2` tinyint(3) unsigned DEFAULT NULL,
`ParseVersion` int(10) unsigned DEFAULT NULL,
`Rank` tinyint(3) unsigned DEFAULT NULL,
`RoomNum` tinyint(3) unsigned NOT NULL DEFAULT '0',
`RoomNum` tinyint(3) unsigned NOT NULL DEFAULT 0,
`TimeAdded` datetime DEFAULT NULL,
`TimeUpdated` datetime DEFAULT NULL,
PRIMARY KEY (`id`),
@ -202,7 +202,7 @@ CREATE TABLE `GtsBattleTower4` (
`Unknown5` bigint(20) DEFAULT NULL,
`ParseVersion` int(10) unsigned DEFAULT NULL,
`Rank` tinyint(3) unsigned DEFAULT NULL,
`RoomNum` tinyint(3) unsigned NOT NULL DEFAULT '0',
`RoomNum` tinyint(3) unsigned NOT NULL DEFAULT 0,
`BattlesWon` tinyint(3) unsigned DEFAULT NULL,
`Position` int(10) unsigned DEFAULT NULL,
`TimeAdded` datetime DEFAULT NULL,
@ -221,7 +221,7 @@ DROP TABLE IF EXISTS `GtsBattleTowerLeaders4`;
CREATE TABLE `GtsBattleTowerLeaders4` (
`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
`pid` int(11) NOT NULL DEFAULT '0',
`pid` int(11) NOT NULL DEFAULT 0,
`Name` binary(16) DEFAULT NULL,
`Version` tinyint(3) unsigned DEFAULT NULL,
`Language` tinyint(3) unsigned DEFAULT NULL,
@ -233,7 +233,7 @@ CREATE TABLE `GtsBattleTowerLeaders4` (
`Unknown2` tinyint(3) unsigned DEFAULT NULL,
`ParseVersion` int(10) unsigned DEFAULT NULL,
`Rank` tinyint(3) unsigned DEFAULT NULL,
`RoomNum` tinyint(3) unsigned NOT NULL DEFAULT '0',
`RoomNum` tinyint(3) unsigned NOT NULL DEFAULT 0,
`TimeAdded` datetime DEFAULT NULL,
`TimeUpdated` datetime DEFAULT NULL,
PRIMARY KEY (`id`),
@ -446,13 +446,18 @@ DROP TABLE IF EXISTS `GtsProfiles4`;
CREATE TABLE `GtsProfiles4` (
`pid` int(11) NOT NULL,
`Data` blob,
`Data` blob DEFAULT NULL,
`Version` tinyint(3) unsigned DEFAULT NULL,
`Language` tinyint(3) unsigned DEFAULT NULL,
`Country` tinyint(3) unsigned DEFAULT NULL,
`Region` tinyint(3) unsigned DEFAULT NULL,
`OT` int(10) unsigned DEFAULT NULL,
`Name` binary(16) DEFAULT NULL,
`MacAddress` binary(6) DEFAULT NULL,
`Email` varchar(64) DEFAULT NULL,
`HasNotifications` bit(1) DEFAULT NULL,
`ClientSecret` smallint(6) DEFAULT NULL,
`MailSecret` smallint(6) DEFAULT NULL,
`ParseVersion` int(10) unsigned DEFAULT NULL,
`TimeAdded` datetime NOT NULL,
`TimeUpdated` datetime NOT NULL,
@ -469,13 +474,18 @@ DROP TABLE IF EXISTS `GtsProfiles5`;
CREATE TABLE `GtsProfiles5` (
`pid` int(11) NOT NULL,
`Data` blob,
`Data` blob DEFAULT NULL,
`Version` tinyint(3) unsigned DEFAULT NULL,
`Language` tinyint(3) unsigned DEFAULT NULL,
`Country` tinyint(3) unsigned DEFAULT NULL,
`Region` tinyint(3) unsigned DEFAULT NULL,
`OT` int(10) unsigned DEFAULT NULL,
`Name` binary(16) DEFAULT NULL,
`MacAddress` binary(6) DEFAULT NULL,
`Email` varchar(64) DEFAULT NULL,
`HasNotifications` bit(1) DEFAULT NULL,
`ClientSecret` smallint(6) DEFAULT NULL,
`MailSecret` smallint(6) DEFAULT NULL,
`ParseVersion` int(10) unsigned DEFAULT NULL,
`TimeAdded` datetime NOT NULL,
`TimeUpdated` datetime NOT NULL,
@ -492,8 +502,8 @@ DROP TABLE IF EXISTS `pkmncf_plaza_profiles`;
CREATE TABLE `pkmncf_plaza_profiles` (
`pid` int(11) NOT NULL,
`DataPrefix` blob,
`Data` blob,
`DataPrefix` blob DEFAULT NULL,
`Data` blob DEFAULT NULL,
`Version` tinyint(3) unsigned DEFAULT NULL,
`Language` tinyint(3) unsigned DEFAULT NULL,
`Country` tinyint(3) unsigned DEFAULT NULL,
@ -533,8 +543,8 @@ CREATE TABLE `pkmncf_pokedex_abilities` (
DROP TABLE IF EXISTS `pkmncf_pokedex_countries`;
CREATE TABLE `pkmncf_pokedex_countries` (
`id` int(10) unsigned NOT NULL DEFAULT '0',
`Value4` tinyint(3) unsigned DEFAULT '0',
`id` int(10) unsigned NOT NULL DEFAULT 0,
`Value4` tinyint(3) unsigned DEFAULT 0,
`Value5` tinyint(3) unsigned DEFAULT NULL,
`iso-3166-1` char(2) DEFAULT NULL,
`Name_JA` varchar(30) DEFAULT '',
@ -558,9 +568,9 @@ CREATE TABLE `pkmncf_pokedex_countries` (
DROP TABLE IF EXISTS `pkmncf_pokedex_country_regions`;
CREATE TABLE `pkmncf_pokedex_country_regions` (
`id` int(10) unsigned NOT NULL DEFAULT '0',
`country_id` int(10) unsigned NOT NULL DEFAULT '0',
`Value4` tinyint(3) unsigned NOT NULL DEFAULT '0',
`id` int(10) unsigned NOT NULL DEFAULT 0,
`country_id` int(10) unsigned NOT NULL DEFAULT 0,
`Value4` tinyint(3) unsigned NOT NULL DEFAULT 0,
`Value5` tinyint(3) unsigned DEFAULT NULL,
`iso-3166-2` varchar(4) DEFAULT NULL,
`Name_JA` varchar(30) DEFAULT '',
@ -931,8 +941,8 @@ CREATE TABLE `TerminalBattleVideos4` (
`Metagame` tinyint(3) unsigned NOT NULL,
`Country` tinyint(3) unsigned NOT NULL,
`Region` tinyint(3) unsigned NOT NULL,
`Views` int(10) unsigned NOT NULL DEFAULT '0',
`Saves` int(10) unsigned NOT NULL DEFAULT '0',
`Views` int(10) unsigned NOT NULL DEFAULT 0,
`Saves` int(10) unsigned NOT NULL DEFAULT 0,
PRIMARY KEY (`id`),
KEY `SerialNumber` (`SerialNumber`),
KEY `TimeAdded` (`TimeAdded`),
@ -963,8 +973,8 @@ CREATE TABLE `TerminalBattleVideos5` (
`Metagame` tinyint(3) unsigned NOT NULL,
`Country` tinyint(3) unsigned NOT NULL,
`Region` tinyint(3) unsigned NOT NULL,
`Views` int(10) unsigned NOT NULL DEFAULT '0',
`Saves` int(10) unsigned NOT NULL DEFAULT '0',
`Views` int(10) unsigned NOT NULL DEFAULT 0,
`Saves` int(10) unsigned NOT NULL DEFAULT 0,
PRIMARY KEY (`id`),
KEY `SerialNumber` (`SerialNumber`),
KEY `TimeAdded` (`TimeAdded`),