Jelajahi Sumber

minor fixes

Markus-Rost 3 tahun lalu
induk
melakukan
bb18021bf7
3 mengubah file dengan 11 tambahan dan 4 penghapusan
  1. 9 2
      cmds/get.js
  2. 1 1
      dashboard/src/index.js
  3. 1 1
      util/wiki.js

+ 9 - 2
cmds/get.js

@@ -14,7 +14,11 @@ var db = require('../util/database.js');
  */
 async function cmd_get(lang, msg, args, line, wiki) {
 	var id = args.join().replace( /^\\?<(?:@!?|#)(\d+)>$/, '$1' );
-	if ( /^\d+$/.test(id) ) {
+	if ( !/^\d+$/.test(id) ) {
+		if ( !msg.channel.isGuild() || !pause[msg.guild.id] ) this.LINK(lang, msg, line, wiki);
+		return;
+	}
+	try {
 		var guild = await msg.client.shard.broadcastEval( `if ( this.guilds.cache.has('${id}') ) {
 			var guild = this.guilds.cache.get('${id}');
 			( {
@@ -140,7 +144,10 @@ async function cmd_get(lang, msg, args, line, wiki) {
 		}
 		
 		msg.replyMsg( 'I couldn\'t find a result for `' + id + '`', {}, true );
-	} else if ( !msg.channel.isGuild() || !pause[msg.guild.id] ) this.LINK(lang, msg, line, wiki);
+	} catch ( error ) {
+		log_error(error);
+		msg.reactEmoji('error');
+	}
 }
 
 module.exports = {

+ 1 - 1
dashboard/src/index.js

@@ -150,7 +150,7 @@ if ( wiki ) {
 			if ( regex ) wikinew = regex[1];
 			else if ( !wiki.validity.valid ) return wiki.reportValidity();
 			else {
-				wikinew = wikinew.replace( /\/(?:api|load|index)\.php(?:|\?.*)$/, '' ).replace( /\/$/, '' );
+				wikinew = wikinew.replace( /\/(?:index|api|load|rest)\.php(?:|\?.*)$/, '' ).replace( /\/$/, '' );
 			}
 			var readonly = wiki.readOnly;
 			wiki.readOnly = true;

+ 1 - 1
util/wiki.js

@@ -243,7 +243,7 @@ class Wiki extends URL {
 				regex = input.match( new RegExp( project.regex + `(?:${project.articlePath}|${project.scriptPath}|/?$)` ) );
 				if ( regex ) return new this('https://' + regex[1] + project.scriptPath);
 			}
-			let wiki = input.replace( /\/(?:api|load|index)\.php(?:|\?.*)$/, '/' );
+			let wiki = input.replace( /\/(?:index|api|load|rest)\.php(?:|\?.*)$/, '/' );
 			if ( !wiki.endsWith( '/' ) ) wiki += '/';
 			return new this(wiki);
 		}