diff options
| author | pokesudenk <thisis@notarealema.il> | 2018-02-24 20:30:47 -0500 |
|---|---|---|
| committer | pokesudenk <thisis@notarealema.il> | 2018-02-24 20:30:47 -0500 |
| commit | fb86857f8de42c2eec2d0488ea6037c562666dd9 (patch) | |
| tree | 472ad7936dcbaefd29e563ec783e6c21a453ab15 /commands/Utility | |
| parent | 0c0c1d837c7e5bb49fb9bddfde884f43f442a949 (diff) | |
| parent | f6c8e529eb06a3d1121feeebb5de6c97eefbc571 (diff) | |
| download | PokeBot-fb86857f8de42c2eec2d0488ea6037c562666dd9.tar.gz PokeBot-fb86857f8de42c2eec2d0488ea6037c562666dd9.tar.bz2 PokeBot-fb86857f8de42c2eec2d0488ea6037c562666dd9.zip | |
Merge branch 'master' of https://github.com/PokeWorld/PokeBot
Diffstat (limited to 'commands/Utility')
| -rw-r--r-- | commands/Utility/userinfo.js | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/commands/Utility/userinfo.js b/commands/Utility/userinfo.js index 851dc01..0154d98 100644 --- a/commands/Utility/userinfo.js +++ b/commands/Utility/userinfo.js @@ -1,4 +1,5 @@ exports.run = async (bot, msg) => { +<<<<<<< HEAD const { RichEmbed } = require('discord.js'); if (!msg.mentions.users.first()) { var user = msg.author; @@ -13,6 +14,23 @@ exports.run = async (bot, msg) => { .addField('Account Creation Date', user.user.createdAt) .addField('Join Guild Date', user.joinedAt) .addField('Names', 'Display Name: ' + user.displayName + `\nUsername: ${user.user.tag}`) +======= + const { RichEmbed } = require('discord.js'); + let user; + if (!msg.mentions.members.first()) { + user = msg.member; + } else { + user = msg.mentions.members.first(); + } + msg.channel.send( + new RichEmbed() + .setColor(0x00ae86) + .setTitle('User Information') + .addField('User ID', user.id) + .addField('Account Creation Date', user.user.createdAt) + .addField('Join Guild Date', user.joinedAt) + .addField('Names', 'Display Name: ' + user.displayName + `\nUsername: ${user.user.tag}`) +>>>>>>> f6c8e529eb06a3d1121feeebb5de6c97eefbc571 ); }; |