Browse Source

Don't use MW `legaltitlechars` list

Markus-Rost 5 years ago
parent
commit
17f30ce8a2
1 changed files with 3 additions and 2 deletions
  1. 3 2
      main.js

+ 3 - 2
main.js

@@ -341,6 +341,7 @@ var minecraftcmdmap = {
 }
 
 function cmd_helpsetup(lang, msg) {
+	msg.defaultSettings = false;
 	msg.replyMsg( lang.settings.missing.replaceSave( '%1$s', '`' + process.env.prefix + ' settings lang`' ).replaceSave( '%2$s', '`' + process.env.prefix + ' settings wiki`' ) );
 }
 
@@ -4836,7 +4837,7 @@ function newMessage(msg, wiki = defaultSettings.wiki, lang = i18n[defaultSetting
 					console.log( ( channel.type === 'text' ? msg.guild.name : '@' + author.username ) + ': ' + line );
 					let content = line.replace( /(?<!\\)```.+?```/gs, 'n' ).replace( /(?<!\\)`.+?`/gs, '\n' );
 					
-					let regex = new RegExp( '(?<!\\\\)(|\\|\\|)\\[\\[([' + " %!\"$&'()*,\\-.\\/0-9:;=?@A-Z\\\\^_`a-z~\\x80-\\xFF+" + ']+)\\]\\]\\1', 'g' );
+					let regex = new RegExp( '(?<!\\\\)(|\\|\\|)\\[\\[([^' + "#<>\\[\\]\\|{}\\x01-\\x1F\\x7F" + ']+)(?<!\\\\)\\]\\]\\1', 'g' );
 					let entry = null;
 					while ( ( entry = regex.exec(content) ) !== null ) {
 						if ( linkcount < linkmaxcount ) {
@@ -4856,7 +4857,7 @@ function newMessage(msg, wiki = defaultSettings.wiki, lang = i18n[defaultSetting
 					console.log( ( channel.type === 'text' ? msg.guild.name : '@' + author.username ) + ': ' + line );
 					let content = line.replace( /(?<!\\)```.+?```/gs, 'n' ).replace( /(?<!\\)`.+?`/gs, '\n' );
 					
-					let regex = new RegExp( '(?<!\\\\)(|\\|\\|)\\{\\{([' + " %!\"$&'()*,\\-.\\/0-9:;=?@A-Z\\\\^_`a-z~\\x80-\\xFF+" + ']+)\\}\\}\\1', 'g' );
+					let regex = new RegExp( '(?<!\\\\)(|\\|\\|)(?<!\\{)\\{\\{([^' + "#<>\\[\\]\\|{}\\x01-\\x1F\\x7F" + ']+)(?<!\\\\)\\}\\}\\1', 'g' );
 					let entry = null;
 					while ( ( entry = regex.exec(content) ) !== null ) {
 						if ( count < maxcount ) {