Show gitea as the main one

Signed-off-by: loicbersier <loic.bersier1@gmail.com>

commands/general/tweet.js

@@ -33,7 +33,7 @@ class tweetCommand extends Command {
 	async exec(message, args) {
 		if (args.text) {
 			// Very simple link detection
-			if (args.text.includes('http') && !args.text.includes('twitter.com')) return message.channel.send('You may not tweet links outside of twitter.com');
+			if (new RegExp('([a-zA-Z0-9]+://)?([a-zA-Z0-9_]+:[a-zA-Z0-9_]+@)?([a-zA-Z0-9.-]+\\.[A-Za-z]{2,4})(:[0-9]+)?(/.*)?').test(args.text) && !args.text.includes('twitter.com')) return message.channel.send('You may not tweet links outside of twitter.com');
 			// Do not allow discord invites
 			if (args.text.includes('discord.gg') || args.text.includes('discord.com/invite/')) return message.channel.send('No discord invite allowed.');
 		}

commands/owner/addDonator.js

@@ -58,7 +58,7 @@ class addDonatorCommand extends Command {
 		if (!Donator) {
 			const body = {userID: args.id, comment: userComment};
 			donator.create(body);
-			return message.channel.send(`A new donator have been added! ${this.client.users.resolveID(args.id).tag} (${args.id}) ${userComment}`);
+			return message.channel.send(`A new donator have been added! ${this.client.users.resolve(args.id).tag} (${args.id}) ${userComment}`);
 		} else {
 			message.channel.send('This donator already exist, do you want to update it? y/n');
 			const filter = m =>  m.content && m.author.id === message.author.id;
@@ -70,9 +70,9 @@ class addDonatorCommand extends Command {
 						donator.update(body, {where: {userID: args.id}});
 						console.log(userComment);
 						if (userComment === '') {
-							return message.channel.send(`Removed the comment from ${this.client.users.resolveID(args.id).tag} (${args.id})`);
+							return message.channel.send(`Removed the comment from ${this.client.users.resolve(args.id).tag} (${args.id})`);
 						} else {
-							return message.channel.send(`You edited the comment for ${this.client.users.resolveID(args.id).tag} (${args.id}) with ${args.userComment}`);
+							return message.channel.send(`You edited the comment for ${this.client.users.resolve(args.id).tag} (${args.id}) with ${args.userComment}`);
 						}
 					}
 				})

commands/utility/about.js

@@ -22,12 +22,12 @@ class aboutCommand extends Command {
 	async exec(message) {
 		const Donator = await donator.findAll({order: ['id']});
 
-		let description = `This bot is made using [discord.js](https://github.com/discordjs/discord.js) & [Discord-Akairo](https://github.com/discord-akairo/discord-akairo)\nHelp command from [hoshi](https://github.com/1Computer1/hoshi)\n[Rantionary](https://github.com/RantLang/Rantionary) for their dictionnary.\nThanks to ${this.client.users.resolveID('336492042299637771').tag} (336492042299637771) for inspiring me for making this bot!\n\nThe people who donated for the bot <3\n`;
+		let description = `This bot is made using [discord.js](https://github.com/discordjs/discord.js) & [Discord-Akairo](https://github.com/discord-akairo/discord-akairo)\nHelp command from [hoshi](https://github.com/1Computer1/hoshi)\n[Rantionary](https://github.com/RantLang/Rantionary) for their dictionnary.\nThanks to ${this.client.users.resolve('336492042299637771').tag} (336492042299637771) for inspiring me for making this bot!\n\nThe people who donated for the bot <3\n`;
 		
 		if (Donator[0]) {
 			for (let i = 0; i < Donator.length; i++) {
-				if (this.client.users.resolveID(Donator[i].get('userID').toString()) !== null)
+				if (this.client.users.resolve(Donator[i].get('userID').toString()) !== null)
-					description += `**${this.client.users.resolveID(Donator[i].get('userID').toString()).tag} (${Donator[i].get('userID')}) | ${Donator[i].get('comment')}**\n`;
+					description += `**${this.client.users.resolve(Donator[i].get('userID').toString()).tag} (${Donator[i].get('userID')}) | ${Donator[i].get('comment')}**\n`;
 				else
 					description += `**A user of discord (${Donator[i].get('userID')}) | ${Donator[i].get('comment')} (This user no longer share a server with the bot)**\n`;
 			}
@@ -45,12 +45,12 @@ class aboutCommand extends Command {
 					.setTitle('About me')
 					.setDescription(description)
 					.addField('Current commit', out.stdout)
-					.addField('Current owner: ', `${this.client.users.resolveID(this.client.ownerID).tag} (${this.client.ownerID})`)
+					.addField('Current owner: ', `${this.client.users.resolve(this.client.ownerID).tag} (${this.client.ownerID})`)
+					.addField('Gitea (Main)', 'https://git.namejeff.xyz/Supositware/Haha-Yes', true)
 					.addField('Gitlab (Mirror)', 'https://gitlab.com/LoicBersier/DiscordBot', true)
 					.addField('Github (Mirror)', 'https://github.com/loicbersier/Haha-yes', true)
-					.addField('Gitea', 'https://git.namejeff.xyz/Supositware/Haha-Yes', true)
 					.setThumbnail('https://its.gamingti.me/ZiRe.png')
-					.setFooter(`Original bot made by ${this.client.users.resolveID('267065637183029248').tag} (267065637183029248)`); // Please this line
+					.setFooter(`Original bot made by ${this.client.users.resolve('267065637183029248').tag} (267065637183029248)`); // Please this line
 
 				message.channel.send(aboutEmbed);
 			});

commands/utility/donator.js

@@ -22,8 +22,8 @@ class donatorCommand extends Command {
 
 		if (Donator[0]) {
 			for (let i = 0; i < Donator.length; i++) {
-				if (this.client.users.resolveID(Donator[i].get('userID').toString()) !== null)
+				if (this.client.users.resolve(Donator[i].get('userID').toString()) !== null)
-					donatorMessage += `**${this.client.users.resolveID(Donator[i].get('userID').toString()).tag} (${Donator[i].get('userID')}) | ${Donator[i].get('comment')}**\n`;
+					donatorMessage += `**${this.client.users.resolve(Donator[i].get('userID').toString()).tag} (${Donator[i].get('userID')}) | ${Donator[i].get('comment')}**\n`;
 				else
 					donatorMessage += `**A user of discord (${Donator[i].get('userID')}) | ${Donator[i].get('comment')} (This user no longer share a server with the bot)**\n`;
 

event/listeners/commandblocked.js

@@ -38,7 +38,7 @@ class CommandBlockedListener extends Listener {
 			break;
 		case 'serverblacklist': 
 			Embed.setTitle('Server blacklisted.');
-			Embed.setDescription(`This server have been blacklisted... to appeal contact ${this.client.users.resolveID(this.client.ownerID).tag}, and now i will yeet out of here`);
+			Embed.setDescription(`This server have been blacklisted... to appeal contact ${this.client.users.resolve(this.client.ownerID).tag}, and now i will yeet out of here`);
 			message.channel.send(Embed);
 			message.guild.leave();
 			break;

event/listeners/ready.js

@@ -23,7 +23,7 @@ class ReadyListener extends Listener {
 		let channelSize = this.client.channels.cache.size;
 		let profilePicture = this.client.user.displayAvatarURL();
 		let clientID = this.client.user.id;
-		let author = this.client.users.resolveID(ownerID).tag;
+		let author = this.client.users.resolve(ownerID).tag;
 
 
 		//  Send stats to the console