some fixes

bot.js

@@ -236,6 +236,7 @@ client.on( 'raw', rawEvent => {
 	}
 	var channel = client.channels.cache.get(interaction.channel_id);
 	if ( !interaction.guild_id ) {
+		if ( global.shardId !== 0 ) return;
 		return slash[interaction.data.name](interaction, new Lang(), new Wiki(), channel);
 	}
 	db.get( 'SELECT wiki, lang, role FROM discord WHERE guild = ? AND (channel = ? OR channel = ? OR channel IS NULL) ORDER BY channel DESC', [interaction.guild_id, interaction.channel_id, '#' + channel?.parentID], (dberror, row) => {

cmds/settings.js

@@ -148,8 +148,9 @@ function cmd_settings(lang, msg, args, line, wiki) {
 					var sql = 'UPDATE discord SET wiki = ? WHERE guild = ? AND wiki = ?';
 					var sqlargs = [wikinew.href, msg.guild.id, guild.wiki];
 					if ( !rows.length ) {
-						sql = 'INSERT INTO discord(wiki, guild, main) VALUES(?, ?, ?)';
-						sqlargs[2] = msg.guild.id;
+						sqlargs.pop();
+						sql = 'INSERT INTO discord(wiki, guild, main, lang) VALUES(?, ?, ?, ?)';
+						sqlargs.push(msg.guild.id, lang.lang);
 					}
 					else if ( channel ) {
 						sql = 'UPDATE discord SET wiki = ? WHERE guild = ? AND channel = ?';
@@ -283,8 +284,8 @@ function cmd_settings(lang, msg, args, line, wiki) {
 			var sql = 'UPDATE discord SET role = ? WHERE guild = ?';
 			var sqlargs = [role, msg.guild.id];
 			if ( !rows.length ) {
-				sql = 'INSERT INTO discord(role, guild, main) VALUES(?, ?, ?)';
-				sqlargs.push(msg.guild.id);
+				sql = 'INSERT INTO discord(role, guild, main, lang) VALUES(?, ?, ?, ?)';
+				sqlargs.push(msg.guild.id, lang.lang);
 			}
 			else if ( channel ) {
 				sql = 'UPDATE discord SET role = ? WHERE guild = ? AND channel = ?';
@@ -345,8 +346,8 @@ function cmd_settings(lang, msg, args, line, wiki) {
 			var sql = 'UPDATE discord SET prefix = ? WHERE guild = ?';
 			var sqlargs = [args[1], msg.guild.id];
 			if ( !rows.length ) {
-				sql = 'INSERT INTO discord(prefix, guild, main) VALUES(?, ?, ?)';
-				sqlargs.push(msg.guild.id);
+				sql = 'INSERT INTO discord(prefix, guild, main, lang) VALUES(?, ?, ?, ?)';
+				sqlargs.push(msg.guild.id, lang.lang);
 			}
 			return db.run( sql, sqlargs, function (dberror) {
 				if ( dberror ) {
@@ -374,8 +375,8 @@ function cmd_settings(lang, msg, args, line, wiki) {
 			var sql = 'UPDATE discord SET inline = ? WHERE guild = ?';
 			var sqlargs = [value, msg.guild.id];
 			if ( !rows.length ) {
-				sql = 'INSERT INTO discord(inline, guild, main) VALUES(?, ?, ?)';
-				sqlargs.push(msg.guild.id);
+				sql = 'INSERT INTO discord(inline, guild, main, lang) VALUES(?, ?, ?, ?)';
+				sqlargs.push(msg.guild.id, lang.lang);
 			}
 			else if ( channel ) {
 				sql = 'UPDATE discord SET inline = ? WHERE guild = ? AND channel = ?';

cmds/voice.js

@@ -1,4 +1,4 @@
-const {defaultSettings} = require('../util/default.json');
+const help_setup = require('../functions/helpsetup.js');
 var db = require('../util/database.js');
 
 /**
@@ -18,6 +18,7 @@ function cmd_voice(lang, msg, args, line, wiki) {
 		}
 		args[1] = args.slice(1).join(' ').trim()
 		if ( args[0].toLowerCase() === 'toggle' && !args[1] ) {
+			if ( msg.defaultSettings ) return help_setup(lang, msg);
 			if ( process.env.READONLY ) return msg.replyMsg( lang.get('general.readonly') + '\n' + process.env.invite, {}, true );
 			var value = ( voice[msg.guild.id] ? null : 1 );
 			return db.run( 'UPDATE discord SET voice = ? WHERE guild = ? AND channel IS NULL', [value, msg.guild.id], function (dberror) {
@@ -26,16 +27,6 @@ function cmd_voice(lang, msg, args, line, wiki) {
 					msg.replyMsg( lang.get('settings.save_failed'), {}, true );
 					return dberror;
 				}
-				if ( !this.changes ) return db.run( 'INSERT INTO discord(main, guild, voice) VALUES(?, ?, ?)', [msg.guild.id, msg.guild.id, value], function (error) {
-					if ( error ) {
-						console.log( '- Error while adding the voice settings: ' + error );
-						msg.replyMsg( lang.get('settings.save_failed'), {}, true );
-						return error;
-					}
-					console.log( '- Voice settings successfully added.' );
-					voice[msg.guild.id] = defaultSettings.lang;
-					msg.replyMsg( lang.get('voice.enabled') + '\n`' + lang.get('voice.channel') + ' – <' + lang.get('voice.name') + '>`', {}, true );
-				} );
 				console.log( '- Voice settings successfully updated.' );
 				if ( value ) {
 					voice[msg.guild.id] = lang.lang;

interactions/inline.js

@@ -266,7 +266,7 @@ function slash_inline(interaction, lang, wiki, channel) {
 							if ( display.includes( ',' ) && !/ ([^\(\)]+)$/.test(display) ) {
 								display = display.replace( /^([^,]+), .*$/, '$1' );
 							}
-							display = display.replace( / ([^\(\)]+)$/, '' );
+							display = display.replace( / \([^\(\)]+\)$/, '' );
 							if ( link.url || link.ns  !== 0 ) {
 								display = display.split(':').slice(1).join(':');
 							}