Tweaks

bot.js

@@ -42,9 +42,8 @@ const client = new Discord.Client( {
 	} : {
 		status: 'online',
 		activity: {
-			type: 'STREAMING',
-			name: process.env.prefix + 'help',
-			url: 'https://www.twitch.tv/wikibot'
+			type: 'PLAYING',
+			name: process.env.prefix + 'help'
 		}
 	} ),
 	ws: {
@@ -511,4 +510,4 @@ function graceful(signal) {
 }
 
 process.once( 'SIGINT', graceful );
-process.once( 'SIGTERM', graceful );
+process.once( 'SIGTERM', graceful );

cmds/help.js

@@ -15,7 +15,7 @@ const helpmap = {
 	command: ['minecraft.default', 'minecraft.command'],
 	bug: ['minecraft.bug'],
 	discussion: ['discussion.thread', 'discussion.post'],
-	info: ['info'],
+	//info: ['info'],
 	help: ['help.default', 'help.command', 'help.admin'],
 	settings: ['settings.default', 'settings.wiki', 'settings.lang', 'settings.role', 'settings.inline', 'settings.prefix', 'settings.channel'],
 	verify: ['verify'],
@@ -35,7 +35,7 @@ const helplist = {
 		'diff',
 		'minecraftHelp',
 		'discussion',
-		'info',
+		//'info',
 		'help',
 		'test'
 	],
@@ -162,4 +162,4 @@ module.exports = {
 	pause: true,
 	owner: false,
 	run: cmd_help
-};
+};

cmds/info.js

@@ -1,26 +1,26 @@
-const help_server = require('../functions/helpserver.js');
+// const help_server = require('../functions/helpserver.js');
 
-/**
- * Processes the "info" command.
- * @param {import('../util/i18n.js')} lang - The user language.
- * @param {import('discord.js').Message} msg - The Discord message.
- * @param {String[]} args - The command arguments.
- * @param {String} line - The command as plain text.
- * @param {import('../util/wiki.js')} wiki - The wiki for the message.
- */
-function cmd_info(lang, msg, args, line, wiki) {
-	if ( args.join('') ) this.LINK(lang, msg, line, wiki);
-	else {
-		msg.sendChannel( lang.get('general.disclaimer', '*MarkusRost*') + '\n<' + process.env.patreon + '>' );
-		help_server(lang, msg);
-		this.invite(lang, msg, args, line, wiki);
-	}
-}
+// /**
+//  * Processes the "info" command.
+//  * @param {import('../util/i18n.js')} lang - The user language.
+//  * @param {import('discord.js').Message} msg - The Discord message.
+//  * @param {String[]} args - The command arguments.
+//  * @param {String} line - The command as plain text.
+//  * @param {import('../util/wiki.js')} wiki - The wiki for the message.
+//  */
+// function cmd_info(lang, msg, args, line, wiki) {
+// 	if ( args.join('') ) this.LINK(lang, msg, line, wiki);
+// 	else {
+// 		msg.sendChannel( lang.get('general.disclaimer', '*MarkusRost*') + '\n<' + process.env.patreon + '>' );
+// 		help_server(lang, msg);
+// 		this.invite(lang, msg, args, line, wiki);
+// 	}
+// }
 
-module.exports = {
-	name: 'info',
-	everyone: true,
-	pause: false,
-	owner: false,
-	run: cmd_info
-};
+// module.exports = {
+// 	name: 'info',
+// 	everyone: true,
+// 	pause: false,
+// 	owner: false,
+// 	run: cmd_info
+// };

cmds/invite.js

@@ -1,29 +1,29 @@
-const {defaultPermissions} = require('../util/default.json');
+// const {defaultPermissions} = require('../util/default.json');
 
-/**
- * Processes the "invite" command.
- * @param {import('../util/i18n.js')} lang - The user language.
- * @param {import('discord.js').Message} msg - The Discord message.
- * @param {String[]} args - The command arguments.
- * @param {String} line - The command as plain text.
- * @param {import('../util/wiki.js')} wiki - The wiki for the message.
- */
-function cmd_invite(lang, msg, args, line, wiki) {
-	if ( args.join('') ) {
-		this.LINK(lang, msg, line, wiki);
-	} else {
-		msg.client.generateInvite({
-			permissions: defaultPermissions
-		}).then( invite => {
-			msg.sendChannel( lang.get('invite.bot') + '\n<' + invite + '%20applications.commands' + '>' );
-		}, log_error );
-	}
-}
+// /**
+//  * Processes the "invite" command.
+//  * @param {import('../util/i18n.js')} lang - The user language.
+//  * @param {import('discord.js').Message} msg - The Discord message.
+//  * @param {String[]} args - The command arguments.
+//  * @param {String} line - The command as plain text.
+//  * @param {import('../util/wiki.js')} wiki - The wiki for the message.
+//  */
+// function cmd_invite(lang, msg, args, line, wiki) {
+// 	if ( args.join('') ) {
+// 		this.LINK(lang, msg, line, wiki);
+// 	} else {
+// 		msg.client.generateInvite({
+// 			permissions: defaultPermissions
+// 		}).then( invite => {
+// 			msg.sendChannel( lang.get('invite.bot') + '\n<' + invite + '%20applications.commands' + '>' );
+// 		}, log_error );
+// 	}
+// }
 
-module.exports = {
-	name: 'invite',
-	everyone: true,
-	pause: false,
-	owner: false,
-	run: cmd_invite
-};
+// module.exports = {
+// 	name: 'invite',
+// 	everyone: true,
+// 	pause: false,
+// 	owner: false,
+// 	run: cmd_invite
+// };

dashboard/index.html

@@ -43,7 +43,7 @@
 				<img class="avatar" src="https://discord.com/assets/f8389ca1a741a115313bede9ac02e2c0.svg" alt="Discord">
 				<span>Server Selector</span>
 			</a>
-			<a id="support" href="https://discord.gg/v77RTk5" target="_blank" alt="Help with Wiki-Bot">
+			<a id="support" href="https://discord.com/invite/r5xDRcy" target="_blank" alt="Help with Wiki-Bot">
 				<img class="avatar" src="/src/icon.png" alt="Wiki-Bot">
 				<span>Support Server</span>
 			</a>

dashboard/login.html

@@ -48,7 +48,7 @@
 		</div>
 		<div id="navbar">
 			<div></div>
-			<a id="support" href="https://discord.gg/v77RTk5" target="_blank" alt="Help with Wiki-Bot">
+			<a id="support" href="https://discord.com/invite/r5xDRcy" target="_blank" alt="Help with Wiki-Bot">
 				<img class="avatar" src="/src/icon.png" alt="Wiki-Bot">
 				<span>Support Server</span>
 			</a>

database.js

@@ -8,18 +8,18 @@ db.on( 'error', dberror => {
 const schema = [`
 BEGIN TRANSACTION;
 
-CREATE TABLE patreons (
+CREATE TABLE IF NOT EXISTS patreons (
     patreon TEXT    PRIMARY KEY
                     UNIQUE
                     NOT NULL,
     count   INTEGER NOT NULL
 );
 
-CREATE INDEX idx_patreons_patreon ON patreons (
+CREATE INDEX IF NOT EXISTS idx_patreons_patreon ON patreons (
     patreon
 );
 
-CREATE TABLE discord (
+CREATE TABLE IF NOT EXISTS discord (
     main    TEXT    UNIQUE
                     CHECK (main = guild),
     guild   TEXT    NOT NULL
@@ -41,23 +41,23 @@ CREATE TABLE discord (
     )
 );
 
-CREATE INDEX idx_discord_channel ON discord (
+CREATE INDEX IF NOT EXISTS idx_discord_channel ON discord (
     guild,
     channel DESC
             NULLS LAST
 );
 
-CREATE INDEX idx_discord_patreon ON discord (
+CREATE INDEX IF NOT EXISTS idx_discord_patreon ON discord (
     patreon
 )
 WHERE patreon IS NOT NULL;
 
-CREATE INDEX idx_discord_voice ON discord (
+CREATE INDEX IF NOT EXISTS idx_discord_voice ON discord (
     voice
 )
 WHERE voice IS NOT NULL;
 
-CREATE TABLE verification (
+CREATE TABLE IF NOT EXISTS verification (
     guild      TEXT    NOT NULL
                        REFERENCES discord (main) ON DELETE CASCADE,
     configid   INTEGER NOT NULL,
@@ -78,13 +78,13 @@ CREATE TABLE verification (
     )
 );
 
-CREATE INDEX idx_verification_config ON verification (
+CREATE INDEX IF NOT EXISTS idx_verification_config ON verification (
     guild,
     configid ASC,
     channel
 );
 
-CREATE TABLE verifynotice (
+CREATE TABLE IF NOT EXISTS verifynotice (
     guild      TEXT    UNIQUE
                        NOT NULL
                        REFERENCES discord (main) ON DELETE CASCADE,
@@ -95,11 +95,11 @@ CREATE TABLE verifynotice (
                        DEFAULT 0
 );
 
-CREATE INDEX idx_verifynotice_guild ON verifynotice (
+CREATE INDEX IF NOT EXISTS idx_verifynotice_guild ON verifynotice (
     guild
 );
 
-CREATE TABLE rcgcdw (
+CREATE TABLE IF NOT EXISTS rcgcdw (
     guild    TEXT    NOT NULL
                      REFERENCES discord (main) ON DELETE CASCADE,
     configid INTEGER NOT NULL,
@@ -118,26 +118,26 @@ CREATE TABLE rcgcdw (
     )
 );
 
-CREATE INDEX idx_rcgcdw_wiki ON rcgcdw (
+CREATE INDEX IF NOT EXISTS idx_rcgcdw_wiki ON rcgcdw (
     wiki
 );
 
-CREATE INDEX idx_rcgcdw_webhook ON rcgcdw (
+CREATE INDEX IF NOT EXISTS idx_rcgcdw_webhook ON rcgcdw (
     webhook
 );
 
-CREATE INDEX idx_rcgcdw_config ON rcgcdw (
+CREATE INDEX IF NOT EXISTS idx_rcgcdw_config ON rcgcdw (
     guild,
     configid ASC
 );
 
-CREATE TABLE blocklist (
+CREATE TABLE IF NOT EXISTS blocklist (
     wiki   TEXT UNIQUE
                 NOT NULL,
     reason TEXT
 );
 
-CREATE INDEX idx_blocklist_wiki ON blocklist (
+CREATE INDEX IF NOT EXISTS idx_blocklist_wiki ON blocklist (
     wiki
 );
 
@@ -146,7 +146,7 @@ ALTER DATABASE "${process.env.PGDATABASE}" SET my.version TO 1;
 `,`
 BEGIN TRANSACTION;
 
-CREATE TABLE verifynotice (
+CREATE TABLE IF NOT EXISTS verifynotice (
     guild      TEXT    UNIQUE
                        NOT NULL
                        REFERENCES discord (main) ON DELETE CASCADE,
@@ -155,7 +155,7 @@ CREATE TABLE verifynotice (
     onmatch    TEXT
 );
 
-CREATE INDEX idx_verifynotice_guild ON verifynotice (
+CREATE INDEX IF NOT EXISTS idx_verifynotice_guild ON verifynotice (
     guild
 );
 
@@ -165,7 +165,7 @@ ALTER DATABASE "${process.env.PGDATABASE}" SET my.version TO 2;
 BEGIN TRANSACTION;
 
 ALTER TABLE verifynotice
-ADD COLUMN flags INTEGER NOT NULL DEFAULT 0;
+ADD COLUMN IF NOT EXISTS flags INTEGER NOT NULL DEFAULT 0;
 
 COMMIT TRANSACTION;
 ALTER DATABASE "${process.env.PGDATABASE}" SET my.version TO 3;
@@ -220,4 +220,4 @@ module.exports = db.connect().then( () => {
 	} ).then( () => {
 		return Promise.reject();
 	} );
-} );
+} );