andrew-projects-archive/PokeBot
1
0
Fork 0
mirror of https://github.com/UniverseDevGroup/PokeBot.git synced 2025-01-22 17:32:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/PokeWorld/PokeBot

Browse source
This commit is contained in:
pokesudenk 2018-02-24 20:30:47 -05:00
commit fb86857f8d
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
commands/Fun/story.js
View file

@ -13,10 +13,10 @@ exports.run = async (bot, msg) => {
];
const storySelected = [Math.floor(Math.random() * stories.length)];
const embed = new Discord.RichEmbed()
.setColor(0x00ae86)
.setTitle(`Pokebot Storytime`)
.setDescription(stories[storySelected])
.setFooter('PokeBot Beta');
.setColor(0x00ae86)
.setTitle('Pokebot Storytime')
.setDescription(stories[storySelected])
.setFooter('PokeBot Beta');
msg.channel.send(embed);
});
};

18
commands/Utility/userinfo.js
View file

@ -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
);
};