Browse Source

Update main.js

Markus-Rost 7 years ago
parent
commit
11ad03d143
1 changed files with 9 additions and 24 deletions
  1. 9 24
      main.js

+ 9 - 24
main.js

@@ -57,7 +57,6 @@ var cmdmap = {
 	delete: cmd_multiline,
 	purge: cmd_multiline,
 	poll: cmd_multiline,
-	message: cmd_multiline,
 	voice: cmd_voice,
 	settings: cmd_settings,
 	info: cmd_info,
@@ -68,7 +67,6 @@ var multilinecmdmap = {
 	say: cmd_say,
 	delete: cmd_delete,
 	poll: cmd_umfrage,
-	message: cmd_message,
 	eval: cmd_eval
 }
 
@@ -79,7 +77,6 @@ var pausecmdmap = {
 	server: cmd_serverlist,
 	say: cmd_multiline,
 	delete: cmd_multiline,
-	message: cmd_multiline,
 	eval: cmd_multiline
 }
 
@@ -316,17 +313,14 @@ function cmd_invite(lang, msg, args, line) {
 }
 
 function cmd_eval(lang, msg, args, line) {
-	if ( msg.author.id == process.env.owner && args.length && args[0].replace( '!', '' ) == '<@' + client.user.id + '>' ) {
-		var text = 'Bitte gebe einen Befehl an!';
-		if ( args[1] != undefined ) {
-			try {
-				text = eval( args.slice(1).join(' ') );
-			} catch ( error ) {
-				text = error.name + ': ' + error.message;
-			}
+	if ( msg.author.id == process.env.owner && args.length ) {
+		try {
+			var text = eval( args.join(' ') );
+		} catch ( error ) {
+			var text = error.name + ': ' + error.message;
 		}
 		console.log( text );
-		msg.channel.send( '```js\n' + text + '```', {split:{prepend:'```js\n',append:'```'}} );
+		msg.channel.send( '```js\n' + text + '```', {split:{prepend:'```js\n',append:'```'}} ).catch( err => msg.channel.send( '```js\n' + err.name + ': ' + err.message + '```', {split:{prepend:'```js\n',append:'```'}} ) );
 	} else if ( msg.channel.type != 'text' || !pause[msg.guild.id] ) {
 		msg.react('❌');
 	}
@@ -380,6 +374,7 @@ function cmd_delete(lang, msg, args, line) {
 }
 
 function cmd_link(lang, msg, title, wiki, cmd) {
+	if ( cmd == '' && admin(msg) && !( msg.guild.id in settings ) ) cmd_settings(lang, msg, [], '');
 	var invoke = title.split(' ')[0].toLowerCase();
 	var args = title.split(' ').slice(1);
 	
@@ -421,10 +416,10 @@ function cmd_link(lang, msg, title, wiki, cmd) {
 										msg.react('🤷');
 									}
 									else if ( srbody.query.searchinfo.totalhits == 1 ) {
-										msg.channel.send( 'https://' + wiki + '.gamepedia.com/' + encodeURI( srbody.query.search[0].title.replace( / /g, '_' ) ) );
+										msg.channel.send( 'https://' + wiki + '.gamepedia.com/' + encodeURI( srbody.query.search[0].title.replace( / /g, '_' ) ) + '\n' + lang.search.infopage.replace( '%s', '`' + process.env.prefix + cmd + lang.search.page + ' ' + title + '`' ) );
 									}
 									else {
-										msg.channel.send( 'https://' + wiki + '.gamepedia.com/' + encodeURI( srbody.query.search[0].title.replace( / /g, '_' ) ) + '\n' + lang.search.info.replace( '%1$s', '`' + process.env.prefix + cmd + lang.search.search + ' ' + title + '`' ).replace( '%2$s', '`' + process.env.prefix + cmd + lang.search.page + ' ' + title + '`' ) );
+										msg.channel.send( 'https://' + wiki + '.gamepedia.com/' + encodeURI( srbody.query.search[0].title.replace( / /g, '_' ) ) + '\n' + lang.search.infosearch.replace( '%1$s', '`' + process.env.prefix + cmd + lang.search.page + ' ' + title + '`' ).replace( '%2$s', '`' + process.env.prefix + cmd + lang.search.search + ' ' + title + '`' ) );
 									}
 								}
 							} );
@@ -646,16 +641,6 @@ function cmd_multiline(lang, msg, args, line) {
 	msg.react('440871715938238494');
 }
 
-function cmd_message(lang, msg, args, line) {
-	if ( msg.author.id == process.env.owner && args.length && args[1] && args[0] == '<@' + client.user.id + '>' ) {
-		client.guilds.forEach( function(guild) {
-			guild.owner.send( guild.toString() + ':\n' + args.slice(1).join(' ') + '\n~<@' + process.env.owner + '>' );
-		} );
-	} else if ( msg.channel.type != 'text' || !pause[msg.guild.id] ) {
-		cmd_link(lang, msg, line.split(' ').slice(1).join(' '), lang.link, '');
-	}
-}
-
 function cmd_voice(lang, msg, args, line) {
 	if ( admin(msg) ) {
 		msg.reply( lang.voice.text + '\n`' + lang.voice.channel + ' – <' + lang.voice.name + '>`' );