Improved userinfo; Easter egg

5 files changed, 15 insertions, 69 deletions

diff --git a/bot_discord.js b/bot_discord.js
index fdce670..51bf373 100644
--- a/bot_discord.js
+++ b/bot_discord.js
@@ -23,7 +23,7 @@ const moment = require('moment');
 const readline = require('readline');
 const colors = require('colors');
 const DBL = require('dblapi.js');
-const i18next = require('i18next');
+//const i18next = require('i18next');
 const client = new Discord.Client({
 	disableEveryone: true,
 });
@@ -249,6 +249,7 @@ client.on('ready', () => {
 			'Coding bytes',
 			'Drawing shapes',
 			'Fighting Quad',
+			'Ultra Jump Mania!'
 		];
 		/*
     setInterval(() => {
@@ -284,7 +285,6 @@ client.on('guildMemberAdd', (member) => {
 		.setDescription(`A user has joined this server!`)
 		.addField('Username: ', `${member.displayName}`, true)
 		.addField('User ID: ', `${member.id}`, true)
-		.addField('Joined At: ', `${member.joinedAt.toUTCString()}`)
 		.addField('Created At: ', `${member.user.createdAt.toUTCString()}`)
 		//.addField('Invite Code: ', `${member.invite.code}`)
 		.setColor('#4bff31')
diff --git a/commands/ban.js b/commands/ban.js
index 0f2f011..3c8a809 100644
--- a/commands/ban.js
+++ b/commands/ban.js
@@ -24,7 +24,7 @@ module.exports.run = async (client, message, args) => {
 	if (!message.guild.member(client.user).hasPermission('BAN_MEMBERS')) return message.reply('Uhh... I don\'t have permission to ban members.');
 	const member = message.mentions.members.first();
 	if (!member) return message.reply('Uhh... Please mention a member first.');
-	member.ban(`Banned by ${message.author.tag} Reason: ` + mreason);
+	await member.ban(`Banned by ${message.author.tag} Reason: ` + mreason);
 	const embed = new Discord.MessageEmbed()
 		.setTitle('User Banned!')
 		.setColor('#1fd619')
diff --git a/commands/reload.js b/commands/reload.js
deleted file mode 100644
index 118aae4..0000000
--- a/commands/reload.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/** **************************************
- *
- *   Invite: Command for AleeBot
- *   Copyright (C) 2017-2020 Alee Productions
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * *************************************/
-// eslint-disable-next-line no-unused-vars
-module.exports.run = async (client, message, args) => {
-	/*
-    if (!['242775871059001344'].includes(message.author.id)) return message.reply('Nope! You need the person who created this bot to use this command.');
-    if (!args.length) return message.channel.send(`You didn't pass any command to reload, ${message.author}!`);
-    const commandName = args[0].toLowerCase();
-    const command = message.client.commands.get(commandName)
-	    || message.client.commands.find(cmd => cmd.aliases && cmd.aliases.includes(commandName));
-
-    if (!command) return message.channel.send(`There is no command with name or alias \`${commandName}\`, ${message.author}!`);
-    delete require.cache[require.resolve(`./${command.name}.js`)];
-    try {
-        const newCommand = require(`./${command.name}.js`);
-        message.client.commands.set(newCommand.name, newCommand);
-    } catch (error) {
-        console.log(error);
-        message.channel.send(`There was an error while reloading a command \`${command.name}\`:\n\`${error.message}\``);
-    }
-    message.channel.send(`Command \`${command.name}\` was reloaded!`);*/
-
-	message.reply('Coming soon.');
-
-};
-  
-exports.conf = {
-	aliases: [],
-	guildOnly: false,
-};
-exports.help = {
-	name: 'reload',
-	description: 'Reloads command.',
-	usage: 'reload [command]',
-	category: '- Owners Only',
-};
-  
-  
\ No newline at end of file
diff --git a/commands/userinfo.js b/commands/userinfo.js
index 74193ef..df5817f 100644
--- a/commands/userinfo.js
+++ b/commands/userinfo.js
@@ -19,13 +19,20 @@
  * *************************************/
 module.exports.run = async (client, message) => {
 	const Discord = require('discord.js');
+	let targetMember;
+	if (message.mentions.users.first()) {
+		targetMember = message.mentions.users.first();
+	} else {
+		targetMember = message.author;
+	}
+
 	const embed = new Discord.MessageEmbed()
-		.setAuthor(message.author.tag, message.author.avatarURL())
+		.setAuthor(targetMember.tag, targetMember.avatarURL())
 		.setDescription('User Information')
-		.setThumbnail(message.author.avatarURL())
-		.addField('Names', '**Username:** ' + message.author.username + '\n**Current Nickname:** ' + message.member.displayName)
-		.addField('Identity', `**User ID:** ${message.author.id} `)
-		.addField('Create and Join Times', '**Created At:** ' + message.member.user.createdAt.toUTCString() + '\n**Joined Guild At:** ' + message.member.joinedAt.toUTCString())
+		.setThumbnail(targetMember.avatarURL())
+		.addField('Names', '**Username:** ' + targetMember.username + '\n**Current Nickname:** ' + targetMember.displayName)
+		.addField('Identity', `**User ID:** ${targetMember.id} `)
+		//.addField('Create and Join Times', '**Created At:** ' + targetMember.user.createdAt.toUTCString() + '\n**Joined Guild At:** ' + targetMember.joinedAt.toUTCString())
 		.setColor('#1fd619');
 	await message.channel.send({embed});
 };
diff --git a/update_dep.bat b/update_dep.bat
deleted file mode 100644
index a90f20d..0000000
--- a/update_dep.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-@echo off
-title Installing/Updating Dependencies
-git pull
-yarn install
-pause
-exit