diff options
| -rw-r--r-- | bot_discord.js | 62 | ||||
| -rw-r--r-- | commands/userinfo.js | 18 |
2 files changed, 15 insertions, 65 deletions
diff --git a/bot_discord.js b/bot_discord.js index 02fe670..991a294 100644 --- a/bot_discord.js +++ b/bot_discord.js @@ -19,7 +19,6 @@ * *************************************/ const Discord = require('discord.js'); const moment = require('moment'); -//const Sequelize = require('sequelize'); const readline = require('readline'); const colors = require('colors'); const DBL = require('dblapi.js'); @@ -198,49 +197,6 @@ rl.on('line', function(cmd) { } rl.prompt(); }); -/* -const sequelizeLogging = new Sequelize('database', 'user', 'password', { - host: 'localhost', - dialect: 'sqlite', - logging: false, - // SQLite only - storage: 'logging.sqlite', -}); - -const Logging = sequelizeLogging.define('logging', { - serverid: { - type: Sequelize.INTEGER, - unique: true, - }, - channelid: Sequelize.INTEGER, - username: Sequelize.STRING, - usage_count: { - type: Sequelize.INTEGER, - defaultValue: 0, - allowNull: false, - }, -}); - -const sequelizeQuote = new Sequelize('database', 'user', 'password', { - host: 'localhost', - dialect: 'sqlite', - logging: false, - // SQLite only - storage: 'quote.sqlite', -}); - -const Quote = sequelizeQuote.define('quote', { - quoteid: { - type: Sequelize.INTEGER, - unique: true, - }, - author: Sequelize.STRING, - authorImage: Sequelize.STRING, - quote: Sequelize.STRING, - year: Sequelize.INTEGER -}); - -*/ client.on('ready', () => { log('[>] AleeBot is now ready!'.green); @@ -255,13 +211,13 @@ client.on('ready', () => { setInterval(() => { dbl.postStats(client.guilds.size, client.shards.Id, client.shards.total); }, 1800000);*/ - client.user.setPresence({ - activity: { - name: activities[Math.floor(Math.random() * activities.length)] - }, - status: 'online', - afk: false, - }); + client.user.setPresence({ + activity: { + name: activities[Math.floor(Math.random() * activities.length)] + }, + status: 'online', + afk: false, + }); }, 200000); if (readyEmbedMessage === true) { const readyEmbed = new Discord.MessageEmbed() @@ -325,7 +281,7 @@ client.on('messageUpdate', async (oldMessage, newMessage) => { } const logEmbed = new Discord.MessageEmbed() .setAuthor('AleeBot Logging', client.user.avatarURL()) - .setDescription(`A message from ${oldMessage.author.username} was edited`) + .setDescription(`A message from ${oldMessage.author.username} was edited in <#${oldMessage.channel.id}>`) .addField('Before: ', `\`\`\`${oldMessage.content}\`\`\``) .addField('After: ', `\`\`\`${newMessage.content}\`\`\``) .setColor('#ffff1a') @@ -342,7 +298,7 @@ client.on('messageDelete', (message) => { if (message.guild.id !== '243022206437687296') return; const logEmbed = new Discord.MessageEmbed() .setAuthor('AleeBot Logging', client.user.avatarURL()) - .setDescription(`A message from ${message.author.username} was deleted`) + .setDescription(`A message from ${message.author.username} was deleted in <#${message.channel.id}>`) .addField('Deleted Message: ', `\`\`\`${message.content}\`\`\``) .setColor('#ff021b') .setTimestamp() diff --git a/commands/userinfo.js b/commands/userinfo.js index df5817f..f12454a 100644 --- a/commands/userinfo.js +++ b/commands/userinfo.js @@ -19,22 +19,16 @@ * *************************************/ 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(targetMember.tag, targetMember.avatarURL()) + .setAuthor(message.author.tag, message.author.avatarURL()) .setDescription('User Information') - .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()) + .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()) .setColor('#1fd619'); await message.channel.send({embed}); + }; exports.conf = { |