diff options
| author | Unknown <jtsshieh@outlook.com> | 2018-02-24 20:33:07 -0500 |
|---|---|---|
| committer | Unknown <jtsshieh@outlook.com> | 2018-02-24 20:33:07 -0500 |
| commit | 882112976c312d5948e5505f26e90acf6d3ead78 (patch) | |
| tree | 7fb075133c19c99dcc4fb94645d2a9dd604d6d14 /commands/Utility/userinfo.js | |
| parent | fb86857f8de42c2eec2d0488ea6037c562666dd9 (diff) | |
| download | PokeBot-882112976c312d5948e5505f26e90acf6d3ead78.tar.gz PokeBot-882112976c312d5948e5505f26e90acf6d3ead78.tar.bz2 PokeBot-882112976c312d5948e5505f26e90acf6d3ead78.zip | |
Fixy fixy
Diffstat (limited to 'commands/Utility/userinfo.js')
| -rw-r--r-- | commands/Utility/userinfo.js | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/commands/Utility/userinfo.js b/commands/Utility/userinfo.js index 0154d98..d4ccb91 100644 --- a/commands/Utility/userinfo.js +++ b/commands/Utility/userinfo.js @@ -1,20 +1,4 @@ exports.run = async (bot, msg) => { -<<<<<<< HEAD - const { RichEmbed } = require('discord.js'); - if (!msg.mentions.users.first()) { - var user = msg.author; - } else { - var 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}`) -======= const { RichEmbed } = require('discord.js'); let user; if (!msg.mentions.members.first()) { @@ -30,7 +14,6 @@ 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}`) ->>>>>>> f6c8e529eb06a3d1121feeebb5de6c97eefbc571 ); }; |