Browse Source

fix widgets again

Markus-Rost 4 năm trước cách đây
mục cha
commit
be60a6baae
2 tập tin đã thay đổi với 5 bổ sung5 xóa
  1. 3 3
      cmds/rcscript.js
  2. 2 2
      cmds/settings.js

+ 3 - 3
cmds/rcscript.js

@@ -4,7 +4,7 @@ const allLangs = Lang.allLangs(true);
 var db = require('../util/database.js');
 var db = require('../util/database.js');
 
 
 const fs = require('fs');
 const fs = require('fs');
-const rcscriptExists = fs.existsSync('./RcGcDb');
+const rcscriptExists = fs.existsSync('./RcGcDb/start.py');
 
 
 var allSites = [];
 var allSites = [];
 const getAllSites = require('../util/allSites.js');
 const getAllSites = require('../util/allSites.js');
@@ -311,7 +311,7 @@ function cmd_rcscript(lang, msg, args, line, wiki) {
 			}
 			}
 			if ( args[0] === 'lang' ) {
 			if ( args[0] === 'lang' ) {
 				if ( !args[1] ) {
 				if ( !args[1] ) {
-					return msg.replyMsg( lang.get('rcscript.current_lang') + ' `' + allLangs.names[selected_row.lang] + '`\n`' + cmd + ' lang ' + lang.get('rcscript.new_lang') + '`\n' + lang.get('rcscript.help_lang') + ' `' + Object.values(allLangs.names).join('`, `') + '`', {files:[`./RcGcDb/locale/widgets/${selected_row.lang}.png`]}, true );
+					return msg.replyMsg( lang.get('rcscript.current_lang') + ' `' + allLangs.names[selected_row.lang] + '`\n`' + cmd + ' lang ' + lang.get('rcscript.new_lang') + '`\n' + lang.get('rcscript.help_lang') + ' `' + Object.values(allLangs.names).join('`, `') + '`', {files:( msg.uploadFiles() ? [`./RcGcDb/locale/widgets/${selected_row.lang}.png`] : [] )}, true );
 				}
 				}
 				if ( !( args[1] in allLangs.map ) ) {
 				if ( !( args[1] in allLangs.map ) ) {
 					return msg.replyMsg( lang.get('settings.langinvalid') + '\n`' + cmd + ' lang ' + lang.get('rcscript.new_lang') + '`\n' + lang.get('rcscript.help_lang') + ' `' + Object.values(allLangs.names).join('`, `') + '`', {}, true );
 					return msg.replyMsg( lang.get('settings.langinvalid') + '\n`' + cmd + ' lang ' + lang.get('rcscript.new_lang') + '`\n' + lang.get('rcscript.help_lang') + ' `' + Object.values(allLangs.names).join('`, `') + '`', {}, true );
@@ -327,7 +327,7 @@ function cmd_rcscript(lang, msg, args, line, wiki) {
 						return error;
 						return error;
 					}
 					}
 					console.log( '- RcGcDw successfully updated.' );
 					console.log( '- RcGcDw successfully updated.' );
-					msg.replyMsg( lang.get('rcscript.updated_lang') + ' `' + allLangs.names[allLangs.map[args[1]]] + '`\n`' + cmd + '`', {files:[`./RcGcDb/locale/widgets/${allLangs.map[args[1]]}.png`]}, true );
+					msg.replyMsg( lang.get('rcscript.updated_lang') + ' `' + allLangs.names[allLangs.map[args[1]]] + '`\n`' + cmd + '`', {files:( msg.uploadFiles() ? [`./RcGcDb/locale/widgets/${allLangs.map[args[1]]}.png`] : [] )}, true );
 				} );
 				} );
 			}
 			}
 			if ( args[0] === 'display' ) {
 			if ( args[0] === 'display' ) {

+ 2 - 2
cmds/settings.js

@@ -206,7 +206,7 @@ function cmd_settings(lang, msg, args, line, wiki) {
 			prelang += 'lang';
 			prelang += 'lang';
 			var langhelp = '\n' + lang.get('settings.langhelp', prefix + 'settings ' + prelang) + ' `' + Object.values(allLangs.names).join('`, `') + '`';
 			var langhelp = '\n' + lang.get('settings.langhelp', prefix + 'settings ' + prelang) + ' `' + Object.values(allLangs.names).join('`, `') + '`';
 			if ( !args[1] ) {
 			if ( !args[1] ) {
-				return msg.replyMsg( lang.get('settings.' + prelang) + ' `' + allLangs.names[( channel || guild ).lang] + '`' + langhelp, {files:[`./i18n/widgets/${( channel || guild ).lang}.png`]}, true );
+				return msg.replyMsg( lang.get('settings.' + prelang) + ' `' + allLangs.names[( channel || guild ).lang] + '`' + langhelp, {files:( msg.uploadFiles() ? [`./i18n/widgets/${( channel || guild ).lang}.png`] : [] )}, true );
 			}
 			}
 			if ( !( args[1] in allLangs.map ) ) {
 			if ( !( args[1] in allLangs.map ) ) {
 				return msg.replyMsg( lang.get('settings.langinvalid') + langhelp, {}, true );
 				return msg.replyMsg( lang.get('settings.langinvalid') + langhelp, {}, true );
@@ -244,7 +244,7 @@ function cmd_settings(lang, msg, args, line, wiki) {
 					if ( msg.guild.id in voice ) voice[msg.guild.id] = guild.lang;
 					if ( msg.guild.id in voice ) voice[msg.guild.id] = guild.lang;
 				}
 				}
 				if ( channel || !( msg.guild.id in patreons ) || !rows.some( row => row.channel === msg.channel.id ) ) lang = new Lang(allLangs.map[args[1]]);
 				if ( channel || !( msg.guild.id in patreons ) || !rows.some( row => row.channel === msg.channel.id ) ) lang = new Lang(allLangs.map[args[1]]);
-				msg.replyMsg( lang.get('settings.' + prelang + 'changed') + ' `' + allLangs.names[allLangs.map[args[1]]] + '`\n' + lang.get('settings.langhelp', prefix + 'settings ' + prelang) + ' `' + Object.values(allLangs.names).join('`, `') + '`', {files:[`./i18n/widgets/${allLangs.map[args[1]]}.png`]}, true );
+				msg.replyMsg( lang.get('settings.' + prelang + 'changed') + ' `' + allLangs.names[allLangs.map[args[1]]] + '`\n' + lang.get('settings.langhelp', prefix + 'settings ' + prelang) + ' `' + Object.values(allLangs.names).join('`, `') + '`', {files:( msg.uploadFiles() ? [`./i18n/widgets/${allLangs.map[args[1]]}.png`] : [] )}, true );
 				var channels = rows.filter( row => row.channel && row.lang === guild.lang && row.wiki === guild.wiki && row.prefix === guild.prefix && row.inline === guild.inline ).map( row => row.channel );
 				var channels = rows.filter( row => row.channel && row.lang === guild.lang && row.wiki === guild.wiki && row.prefix === guild.prefix && row.inline === guild.inline ).map( row => row.channel );
 				if ( channels.length ) db.run( 'DELETE FROM discord WHERE channel IN (' + channels.map( row => '?' ).join(', ') + ')', channels, function (delerror) {
 				if ( channels.length ) db.run( 'DELETE FROM discord WHERE channel IN (' + channels.map( row => '?' ).join(', ') + ')', channels, function (delerror) {
 					if ( delerror ) {
 					if ( delerror ) {