Merge remote-tracking branch 'Leone25/master'

README.md

@@ -28,13 +28,14 @@ The purpose of this bot is to dump the messages sent in a chat channel of discor
   |--|--|
   |`token`|Discord API bot token (found on the developer portal)|
   |`prefix`|The prefix that will be used to trigger commands|
-  |`servers`|Arrays of configured servers|
+  |`playing`|Sets the playing status|
+  |`godMode`|Array of user IDs who will be able to use the special commands|
+  |`servers`|Array of configured servers|
   |`servers.channel`|ID of Discord channel to listen to|
   |`servers.userMentionsMode`| Conversion settings for user mentions in Discord messages. 0 will set as the user ID, e.g. `@182925154211332097`. 1 will set as just the username, e.g. `@Owen`. 2 will set as just the in-server nickname, e.g. `@Not Owen`. 3 will set as the username + discriminator, e.g. `@Owen#1111` 4 will set as the user ID plus end marker, e.g. `@182925154211332097@`. 5 will set as just the username plus end marker, e.g. `@Owen@`. Anything else will set as just the in-server nickname plus end marker e.g. `@Not Owen@`.|
   |`servers.channelMentionsMode`| Conversion settings for channel mentions in Discord messages. 0 will set as the channel ID, e.g. `#224558110868635658`. 1 will set as the name, e.g. `#rules`. 2 will set the id in between two hastag, e.g. `#224558110868635658#`. Anything else will the channel name between two hastag, e.g. `#rules#`.|
   |`servers.roleMentionsMode`| Conversion settings for role mentions in Discord messages. 0 will set as the role ID, e.g. `&677081843086000128`. 1 will set as just the name of the role, e.g. `&foo`. Anything else will set as the name + color in hex, e.g. `&foo#ffffff`|
   |`servers.authorMode`|Conversion settings for the author of the message. 0 will set as the user ID, e.g. `@182925154211332097`. 1 will set as just the username, e.g. `@Owen`. 2 will set as the username + discriminator, e.g. `@Owen#1111`. Anything will set just the in-server nickname, e.g. `@Not Owen`.|
-  |`servers.allowDump`|Enables and disables the dump command (bolean)|
   |`servers.allowBots`|Filters bots messages if setted to false (bolean)|
   |`servers.prefix`(optional)|This sets a custom prefix for the channel for the dump command and overwrites the `prefix` on for that particular channel|
   |`servers.dbHost`|MySQL database host|
@@ -57,7 +58,7 @@ The purpose of this bot is to dump the messages sent in a chat channel of discor
   `images` text NOT NULL
 ) COLLATE 'utf8mb4_unicode_ci';
 ```
-  7. Start the bot by running ` node index.js ` or ` nodemon ` (`start.bat` on Windows)
+  7. Start the bot by running ` node index.js ` or ` nodemon `
   8. Congratulation, your bot is up and running!
 
 ## To do stuff

config.json.example

@@ -2,6 +2,7 @@
 	"token": "DISCORD_TOKEN",
 	"prefix": "!",
 	"playing": "Linking...",
+	"godMode": [],
 	"servers": [
 		{
 			"channel": "DISCORD_CHANNEL",
@@ -9,9 +10,9 @@
 			"channelMentionsMode":"1",
 			"roleMentionsMode": "2",
 			"authorMode": "2",
-			"allowDump": true,
 			"allowBots": false,
 			"dbHost": "MYSQL_HOST",
+			"dbPort": "3306",
 			"dbUser": "MYSQL_USER",
 			"dbPassword": "MYSQL_PASSWORD",
 			"db": "MYSQL_DB",

index.js

@@ -11,46 +11,58 @@ client.on('ready', () => {
 		client.user.setPresence({ status: 'online', game: { name: config.playing } });
 	}
 	console.log(getTimestamp(), `Logged in as ${client.user.tag}!`);
-	console.log(getTimestamp(), `To send missing messages run ${config.prefix}dump [quantity(default and limited to 99)]`);	
+	console.log(getTimestamp(), `To send missing messages run ${config.prefix}dump [quantity]`);	
 });
 
-client.on('message', message => {
+client.on('message', async message => {
 
-	
-	
 	var serverData = undefined;
 
-	config.servers.forEach(function(server) {
+	config.servers.forEach((server) => {
 		if (message.channel.id==server.channel) serverData = server;
 	});
 
-	if (serverData==undefined) return;
+	let godMode = config.godMode.includes(message.author.id);
+
+	if (serverData==undefined && !godMode) return;
 	
 	if (message.author.bot== true && serverData.allowBots != true) return;
 	
-	if (message.content.startsWith(`${serverData.prefix||config.prefix}ping`)) {
+	if (godMode && message.content.startsWith(`${(serverData||config).prefix}ping`)) {
 		message.channel.send('Pong! :ping_pong:');
 		return;
-	} else if (message.content.startsWith(`${serverData.prefix||config.prefix}dump`) && serverData.allowDump == true) {
+	} else if (godMode && message.content.startsWith(`${(serverData||config).prefix}dump`)) {
 		
 		console.log(getTimestamp(), 'Warning, dump in progress! May cause slowdows.');
 		
-		number = message.content.slice(6);
-		
-		if (number=='') number = 99;
+		let args = message.content.split(' ');
+
+		let channel = null;
+
+		try {
+			if (message.channel.id != args[1]) {
+				config.servers.forEach((server) => {
+					if (args[1]==server.channel) serverData = server;
+				});
+			}
+			channel = await client.channels.fetch(args[1]);
+		} catch (e) {
+			return;
+		}
+
+		number = Number(args[2]);
 		
 		//console.log(number);
 		
-		message.delete(2);
-		
-		var channel = message.channel;
+		message.delete({});
 		
-		async function run() {
-			var fetched = await channel.fetchMessages({limit: number});
-			//console.log(fetched);
+		async function run(last) {
+			var fetched = await channel.messages.fetch({limit: isNaN(number) ? 100 : Math.min(100, number), before: last}).then(res => res.array());
+			if (!isNaN(number)) number -= fetched.length;
 			
 			var connection = mysql.createConnection({
 				host     : serverData.dbHost,
+				port	 : serverData.dbPort,
 				user     : serverData.dbUser,
 				password : serverData.dbPassword,
 				database : serverData.db
@@ -69,7 +81,7 @@ client.on('message', message => {
 					controlled[i] = false;
 				}
 				
-				fetched.forEach(messageNow => {
+				fetched.forEach((messageNow) => {
 					
 					var found = false;
 					var edited = true;
@@ -97,17 +109,25 @@ client.on('message', message => {
 				});
 				//console.log(messages);
 				
-				while(true) {
-					break;
-				}
-				
-				sendLoop(messages, serverData, 1000);
+				sendLoop(messages, serverData, 100);
+				if (isNaN(number) || number >= 0) setTimeout(run, 10000, (fetched[fetched.length-1] || {id:null}).id);
 			});
 
 			connection.end();
 		}
 		
 		run();
+	} else if (godMode && message.content.startsWith(`${(serverData||config).prefix}leave`)) {
+		let args = message.content.split(' ');
+
+		let guild = await client.guilds.fetch(args[1]);
+
+		console.log(getTimestamp(), `Left guild "${guild.name}" id:${guild.id}`);
+
+		guild.leave();
+		return;
+	} else if (godMode && serverData == undefined) {
+		return;
 	} else {
 		sendToDB(message, serverData);
 	}
@@ -143,11 +163,10 @@ client.on('messageUpdate', async (messageOld, messageNew) => {
 	});
 
 	if (serverData==undefined) return;
-	
-	var channel = messageNew.channel;
 		
 	var connection = mysql.createConnection({
 		host     : serverData.dbHost,
+		port	 : serverData.dbPort,
 		user     : serverData.dbUser,
 		password : serverData.dbPassword,
 		database : serverData.db
@@ -190,15 +209,15 @@ client.on('messageDelete', message => {
 
 client.login(config.token);
 
-function sendLoop(messages, serverData, delay) {
+async function sendLoop(messages, serverData, delay) {
 	
 	if (messages.length == 0) {
 		return;
 	}
 	if (messages[0].action == 0) {
-		sendToDB(messages[0].message, serverData);
+		await sendToDB(messages[0].message, serverData);
 	} else if (messages[0].action == 1) {
-		updateDB(messages[0].message, serverData);
+		await updateDB(messages[0].message, serverData);
 	} else if (messages[0].maction == 2) {
 		deleteFromDB(messages[0].message, serverData);
 	}
@@ -209,43 +228,43 @@ function sendLoop(messages, serverData, delay) {
 	
 }
 
-function updateDB(message, serverData) {
+async function updateDB(message, serverData) {
 	
 	var connection = mysql.createConnection({
 		host     : serverData.dbHost,
+		port	 : serverData.dbPort,
 		user     : serverData.dbUser,
 		password : serverData.dbPassword,
 		database : serverData.db
 	});
 	
-	var post = prepareMessage(message, serverData);
+	var post = await prepareMessage(message, serverData);
 	var sql = 'UPDATE '+serverData.dbTable+' SET ? WHERE id='+message.id;
 	connection.connect();
 
 	connection.query(sql, post, function (error, results, fields) {
 		if (error) throw error;
-		console.log(getTimestamp(), 'Data updated in db. Result: ', results);
 	});
 
 	connection.end();
 }
 
-function sendToDB(message, serverData) {
+async function sendToDB(message, serverData) {
 	
 	var connection = mysql.createConnection({
 		host     : serverData.dbHost,
+		port	 : serverData.dbPort,
 		user     : serverData.dbUser,
 		password : serverData.dbPassword,
 		database : serverData.db
 	});
 
-	var post = prepareMessage(message, serverData);
+	var post = await prepareMessage(message, serverData);
 	var sql = 'INSERT INTO '+serverData.dbTable+' SET ?';
 	connection.connect();
 
 	connection.query(sql, post, function (error, results, fields) {
 		if (error) throw error;
-		console.log(getTimestamp(), 'Data sent to db. Result: ', results);
 	});
 
 	connection.end();
@@ -254,6 +273,7 @@ function sendToDB(message, serverData) {
 function deleteFromDB(message, serverData) {
 	var connection = mysql.createConnection({
 		host     : serverData.dbHost,
+		port	 : serverData.dbPort,
 		user     : serverData.dbUser,
 		password : serverData.dbPassword,
 		database : serverData.db
@@ -264,113 +284,104 @@ function deleteFromDB(message, serverData) {
 
 	connection.query(sql, function (error, results, fields) {
 		if (error) throw error;
-		console.log(getTimestamp(), 'Data deleted in db. Result: ', results);
 	});
 
 	connection.end();
 }
 
 function prepareMessage(message, serverData) {
-	var l = [];
+	
+	return new Promise(async (resolve) => {
+		var l = [];
 
-	var msgCopy = message.content;
+		var msgCopy = message.content;
 
-	msgCopy.replace(urlRegex, function(url) {
-        l.push(url);
-    });
+		msgCopy.replace(urlRegex, function(url) {
+			l.push(url);
+		});
 
-	var i = [];
+		var i = [];
 
-	message.attachments.forEach(attachment => {
-		i.push(attachment.url);
-	});
-	
-	var mentions = [];
-	message.mentions.members.forEach((member) => {
-		mentions.push({"userId": member.user.id, "username": member.user.username, "discriminator": member.user.discriminator, "nickname": member.nickname || member.user.username});
-	});
-	
-	var messageContent = message.content;
-	for (mention of mentions) {
-		if(messageContent.includes(mention.userId)) {
+		message.attachments.forEach(attachment => {
+			i.push(attachment.url);
+		});
+		
+		let messageContent = message.content;
+
+		await asyncForEach(message.mentions.users.array(), async (user) => {
+			console.log(user);
 			if (serverData.userMentionsMode == 0) {
-				messageContent = messageContent.replace(new RegExp("<@"+mention.userId+">", 'g'), "@"+mention.userId);
-				messageContent = messageContent.replace(new RegExp("<@!"+mention.userId+">", 'g'), "@"+mention.userId);
+				messageContent = messageContent.replace(new RegExp("<@!"+user.id+">", 'g'), "@"+user.id);
 			} else if (serverData.userMentionsMode == 1) {
-				messageContent = messageContent.replace(new RegExp("<@"+mention.userId+">", 'g'), "@"+mention.username);
-				messageContent = messageContent.replace(new RegExp("<@!"+mention.userId+">", 'g'), "@"+mention.username);
+				messageContent = messageContent.replace(new RegExp("<@!"+user.id+">", 'g'), "@"+user.username);
 			} else if (serverData.userMentionsMode == 2) {
-				messageContent = messageContent.replace(new RegExp("<@"+mention.userId+">", 'g'), "@"+mention.nickname);
-				messageContent = messageContent.replace(new RegExp("<@!"+mention.userId+">", 'g'), "@"+mention.nickname);
+				let nickname = await message.guild.members.fetch(user.id).then(res => res.nickname);
+				messageContent = messageContent.replace(new RegExp("<@!"+user.id+">", 'g'), "@"+nickname);
 			} else if (serverData.userMentionsMode == 3) {
-				messageContent = messageContent.replace(new RegExp("<@"+mention.userId+">", 'g'), "@"+mention.username+"#"+mention.discriminator);
-				messageContent = messageContent.replace(new RegExp("<@!"+mention.userId+">", 'g'), "@"+mention.username+"#"+mention.discriminator);
+				messageContent = messageContent.replace(new RegExp("<@!"+user.id+">", 'g'), "@"+user.username+"#"+user.discriminator);
 			} else if (serverData.userMentionsMode == 4) {
-				messageContent = messageContent.replace(new RegExp("<@"+mention.userId+">", 'g'), "@"+mention.userId+"@");
-				messageContent = messageContent.replace(new RegExp("<@!"+mention.userId+">", 'g'), "@"+mention.userId+"@");
+				messageContent = messageContent.replace(new RegExp("<@!"+user.id+">", 'g'), "@"+user.id+"@");
 			} else if (serverData.userMentionsMode == 5) {
-				messageContent = messageContent.replace(new RegExp("<@"+mention.userId+">", 'g'), "@"+mention.username+"@");
-				messageContent = messageContent.replace(new RegExp("<@!"+mention.userId+">", 'g'), "@"+mention.username+"@");
+				messageContent = messageContent.replace(new RegExp("<@!"+user.id+">", 'g'), "@"+user.username+"@");
 			} else {
-				messageContent = messageContent.replace(new RegExp("<@"+mention.userId+">", 'g'), "@"+mention.nickname+"@");
-				messageContent = messageContent.replace(new RegExp("<@!"+mention.userId+">", 'g'), "@"+mention.nickname+"@");
+				let nickname = await message.guild.members.fetch(user.id).then(res => res.nickname);
+				messageContent = messageContent.replace(new RegExp("<@!"+user.id+">", 'g'), "@"+nickname+"@");
 			} 
-			
-		}
-	}
-	
-	var mentions = [];
-	message.mentions.channels.forEach(channel => {
-		mentions.push({"channelId": channel.id, "name": channel.name});
-	});
-	for (mention of mentions) {
-		if(messageContent.includes(mention.channelId)) {
-			if (serverData.channelMentionsMode == 0) {
-				messageContent = messageContent.replace(new RegExp("<#"+mention.channelId+">", 'g'), "#"+mention.channelId);
-				messageContent = messageContent.replace(new RegExp("<#!"+mention.channelId+">", 'g'), "#"+mention.channelId);
-			} else if (serverData.channelMentionsMode == 1) {
-				messageContent = messageContent.replace(new RegExp("<#"+mention.channelId+">", 'g'), "#"+mention.name);
-				messageContent = messageContent.replace(new RegExp("<#!"+mention.channelId+">", 'g'), "#"+mention.name);
-			} else if (serverData.channelMentionsMode == 2) {
-				messageContent = messageContent.replace(new RegExp("<#"+mention.channelId+">", 'g'), "#"+mention.channelId+"#");
-				messageContent = messageContent.replace(new RegExp("<#!"+mention.channelId+">", 'g'), "#"+mention.channelId+"#");
-			} else {
-				messageContent = messageContent.replace(new RegExp("<#"+mention.channelId+">", 'g'), "#"+mention.name+"#");
-				messageContent = messageContent.replace(new RegExp("<#!"+mention.channelId+">", 'g'), "#"+mention.name+"#");
+		});
+		
+		var mentions = [];
+		message.mentions.channels.forEach(channel => {
+			mentions.push({"channelId": channel.id, "name": channel.name});
+		});
+		for (mention of mentions) {
+			if(messageContent.includes(mention.channelId)) {
+				if (serverData.channelMentionsMode == 0) {
+					messageContent = messageContent.replace(new RegExp("<#"+mention.channelId+">", 'g'), "#"+mention.channelId);
+					messageContent = messageContent.replace(new RegExp("<#!"+mention.channelId+">", 'g'), "#"+mention.channelId);
+				} else if (serverData.channelMentionsMode == 1) {
+					messageContent = messageContent.replace(new RegExp("<#"+mention.channelId+">", 'g'), "#"+mention.name);
+					messageContent = messageContent.replace(new RegExp("<#!"+mention.channelId+">", 'g'), "#"+mention.name);
+				} else if (serverData.channelMentionsMode == 2) {
+					messageContent = messageContent.replace(new RegExp("<#"+mention.channelId+">", 'g'), "#"+mention.channelId+"#");
+					messageContent = messageContent.replace(new RegExp("<#!"+mention.channelId+">", 'g'), "#"+mention.channelId+"#");
+				} else {
+					messageContent = messageContent.replace(new RegExp("<#"+mention.channelId+">", 'g'), "#"+mention.name+"#");
+					messageContent = messageContent.replace(new RegExp("<#!"+mention.channelId+">", 'g'), "#"+mention.name+"#");
+				}
 			}
 		}
-	}
-	
-	var mentions = [];
-	message.mentions.roles.forEach(role => {
-		mentions.push({"roleId": role.id, "name": role.name, "color": role.color.toString(16)});
-	});
-	for (mention of mentions) {
-		if(messageContent.includes(mention.roleId)) {
-			if (serverData.roleMentionsMode == 0) {
-				messageContent = messageContent.replace(new RegExp("<@&"+mention.roleId+">", 'g'), "&"+mention.roleId);
-				messageContent = messageContent.replace(new RegExp("<@&!"+mention.roleId+">", 'g'), "&"+mention.roleId);
-			} else if (serverData.roleMentionsMode == 1) {
-				messageContent = messageContent.replace(new RegExp("<@&"+mention.roleId+">", 'g'), "&"+mention.name);
-				messageContent = messageContent.replace(new RegExp("<@&!"+mention.roleId+">", 'g'), "&"+mention.name);
-			} else {
-				messageContent = messageContent.replace(new RegExp("<@&"+mention.roleId+">", 'g'), "&"+mention.name+"#"+mention.color);
-				messageContent = messageContent.replace(new RegExp("<@&!"+mention.roleId+">", 'g'), "&"+mention.name+"#"+mention.color);
+		
+		var mentions = [];
+		message.mentions.roles.forEach(role => {
+			mentions.push({"roleId": role.id, "name": role.name, "color": role.color.toString(16)});
+		});
+		for (mention of mentions) {
+			if(messageContent.includes(mention.roleId)) {
+				if (serverData.roleMentionsMode == 0) {
+					messageContent = messageContent.replace(new RegExp("<@&"+mention.roleId+">", 'g'), "&"+mention.roleId);
+					messageContent = messageContent.replace(new RegExp("<@&!"+mention.roleId+">", 'g'), "&"+mention.roleId);
+				} else if (serverData.roleMentionsMode == 1) {
+					messageContent = messageContent.replace(new RegExp("<@&"+mention.roleId+">", 'g'), "&"+mention.name);
+					messageContent = messageContent.replace(new RegExp("<@&!"+mention.roleId+">", 'g'), "&"+mention.name);
+				} else {
+					messageContent = messageContent.replace(new RegExp("<@&"+mention.roleId+">", 'g'), "&"+mention.name+"#"+mention.color);
+					messageContent = messageContent.replace(new RegExp("<@&!"+mention.roleId+">", 'g'), "&"+mention.name+"#"+mention.color);
+				}
 			}
 		}
-	}
 
-	if (serverData.authorMode == 0) {
-		var author = message.author.id;
-	} else if (serverData.authorMode == 1) {
-		var author = message.author.username;
-	} else if (serverData.authorMode == 2) {
-		var author = message.author.tag;
-	} else {
-		var author = message.member.nickname || message.author.username;
-	}
-	
-	return {message:emoji.unemojify(messageContent), id:message.id, time:message.createdTimestamp, timeEdit:(message.editedTimestamp || ""), user:author, links:JSON.stringify(l), images:JSON.stringify(i)};
+		if (serverData.authorMode == 0) {
+			var author = message.author.id;
+		} else if (serverData.authorMode == 1) {
+			var author = message.author.username;
+		} else if (serverData.authorMode == 2) {
+			var author = message.author.tag;
+		} else {
+			var author = message.member.nickname || message.author.username;
+		}
+		
+		resolve({message:emoji.unemojify(messageContent), id:message.id, time:message.createdTimestamp, timeEdit:(message.editedTimestamp || ""), user:author, links:JSON.stringify(l), images:JSON.stringify(i)});
+	});
 }
 
 function getTimestamp() {
@@ -378,3 +389,9 @@ function getTimestamp() {
 	
 	return "["+d.getDate()+"/"+(d.getMonth()+1)+"/"+d.getFullYear()+" - "+d.getHours()+":"+d.getMinutes()+":"+d.getSeconds()+"."+d.getMilliseconds()+"]";
 }
+
+async function asyncForEach(array, callback) {
+	for (let index = 0; index < array.length; index++) {
+	  	await callback(array[index], index, array);
+	}
+}

package.json

@@ -1,11 +1,11 @@
 {
   "name": "SiteLink",
-  "version": "0.0.1",
+  "version": "1.0.0",
   "dependencies": {
-    "discord.js": "^11.5.1",
+    "discord.js": "^12.5.1",
     "mysql": "^2.17.1",
     "node-emoji": "^1.10.0",
-    "npm": "^6.14.6"
+    "npm": "^7.5.4"
   },
   "scripts": {
     "instal": "npm install",

start.bat

@@ -1 +0,0 @@
-nodemon index.js