cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into diagonal-movement

Browse Source
This commit is contained in:
Couls
2019-06-02 21:59:58 -04:00
parent cdb867456e
commit 5979166f54
526 changed files with 97898 additions and 5530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SQL/paradise_schema.sql
+22 -8
View File
@@ -266,6 +266,8 @@ CREATE TABLE `player` (
`exp` mediumtext,
`clientfps` smallint(4) DEFAULT '0',
`atklog` smallint(4) DEFAULT '0',
`fuid` BIGINT(20) NULL DEFAULT NULL,
`fupdate` SMALLINT(4) NULL DEFAULT 0,
PRIMARY KEY (`id`),
UNIQUE KEY `ckey` (`ckey`)
) ENGINE=InnoDB AUTO_INCREMENT=32446 DEFAULT CHARSET=latin1;
@@ -523,15 +525,27 @@ CREATE TABLE `memo` (
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `discord`
-- Table structure for table `ipintel`
--
DROP TABLE IF EXISTS `discord`;
DROP TABLE IF EXISTS `ipintel`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE IF NOT EXISTS `discord` (
`ckey` varchar(32) NOT NULL,
`discord_id` bigint(20) NOT NULL,
`notify` int(11) NOT NULL,
PRIMARY KEY (`ckey`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE `ipintel` (
`ip` INT UNSIGNED NOT NULL ,
`date` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL ,
`intel` REAL NOT NULL DEFAULT '0',
PRIMARY KEY ( `ip` )
) ENGINE = INNODB;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `vpn_whitelist`
--
DROP TABLE IF EXISTS `vpn_whitelist`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `vpn_whitelist` (
`ckey` VARCHAR(32) NOT NULL,
`reason` text
PRIMARY KEY (`ckey`)
) ENGINE=INNODB;
SQL/paradise_schema_prefixed.sql
+22 -8
View File
@@ -265,6 +265,8 @@ CREATE TABLE `SS13_player` (
`exp` mediumtext,
`clientfps` smallint(4) DEFAULT '0',
`atklog` smallint(4) DEFAULT '0',
`fuid` BIGINT(20) NULL DEFAULT NULL,
`fupdate` SMALLINT(4) NULL DEFAULT 0,
PRIMARY KEY (`id`),
UNIQUE KEY `ckey` (`ckey`)
) ENGINE=InnoDB AUTO_INCREMENT=32446 DEFAULT CHARSET=latin1;
@@ -522,15 +524,27 @@ CREATE TABLE `SS13_memo` (
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `SS13_discord`
-- Table structure for table `SS13_ipintel`
--
DROP TABLE IF EXISTS `SS13_discord`;
DROP TABLE IF EXISTS `SS13_ipintel`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE IF NOT EXISTS `SS13_discord` (
`ckey` varchar(32) NOT NULL,
`discord_id` bigint(20) NOT NULL,
`notify` int(11) NOT NULL,
PRIMARY KEY (`ckey`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE `SS13_ipintel` (
`ip` INT UNSIGNED NOT NULL ,
`date` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL ,
`intel` REAL NOT NULL DEFAULT '0',
PRIMARY KEY ( `ip` )
) ENGINE = INNODB;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `SS13_vpn_whitelist`
--
DROP TABLE IF EXISTS `SS13_vpn_whitelist`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `SS13_vpn_whitelist` (
`ckey` VARCHAR(32) NOT NULL,
`reason` text,
PRIMARY KEY (`ckey`)
) ENGINE=INNODB;
SQL/updates/5-6.sql
+34
View File
@@ -0,0 +1,34 @@
#Updating the SQL from version 5 to version 6. -Kyep
#Make a table to track the results of VPN/proxy lookups for IPs (IPINTEL, TG PORT)
CREATE TABLE `ipintel` (
`ip` INT UNSIGNED NOT NULL ,
`date` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL ,
`intel` REAL NOT NULL DEFAULT '0',
PRIMARY KEY ( `ip` )
) ENGINE = INNODB;
#Make a table to track which ckeys are whitelisted for use of VPNs (IPINTEL, CUSTOM)
CREATE TABLE `vpn_whitelist` (
`ckey` VARCHAR(32) NOT NULL,
`reason` text,
PRIMARY KEY (`ckey`)
) ENGINE=INNODB;
# Add fuid (forum userid) which enables quick lookup of which ckey is associated with a specific forum account. (FORUM LINK)
ALTER TABLE `player` ADD `fuid` BIGINT(20) NULL DEFAULT NULL;
ALTER TABLE `player` ADD INDEX(`fuid`);
# Add fupdate (forum update required) which flags specific ckeys as having been banned/unbanned, which requires an update of their forum/etc permissions (FORUM LINK)
ALTER TABLE `player` ADD `fupdate` SMALLINT(4) NULL DEFAULT 0;
ALTER TABLE `player` ADD INDEX(`fupdate`);
#Make a table to track oauth tokens for linking forum/web accounts (FORUM LINK)
CREATE TABLE `oauth_tokens` (
`ckey` VARCHAR(32) NOT NULL,
`token` VARCHAR(32) NOT NULL,
PRIMARY KEY (`token`)
) ENGINE=INNODB;
#Drop the old 'discord' table that is not used anymore
DROP TABLE `discord`;