1 files changed, 41 insertions, 1 deletions
diff --git a/commands/Moderation/timeout.js b/commands/Moderation/timeout.js
index 9a8dc9a..c74ecf0 100644
--- a/commands/Moderation/timeout.js
+++ b/commands/Moderation/timeout.js
@@ -18,6 +18,45 @@
  *
  * *************************************/
 
+<<<<<<< HEAD
+exports.run = async (bot, msg) => {
+  if (!msg.member.hasPermission('BAN_MEMBERS')) return msg.reply('You don\'t have permission to put members in time-out..');
+  if (!msg.guild.member(bot.user).hasPermission('MANAGE_ROLES')) return msg.reply('I cannot put anyone in time-out.');
+
+  const member = msg.mentions.members.first();
+  if (!member) return await msg.reply('Who do I put in time-out?');
+
+  msg.member.removeRoles(msg.member.roles);
+  msg.member.addRole(msg.guild.roles.find('name', 'Timeout'));
+
+  const { RichEmbed } = require('discord.js');
+  try {
+    const embed = new RichEmbed()
+      .setColor(0x00ae86)
+      .setAuthor(member.user.tag, member.user.avatarURL)
+      .setTitle(`Time Out: **${member.user.tag}**`)
+      .setDescription(`*${member.user.tag}* was placed in time-out by *${msg.author.tag}*.`)
+      .addField('Moderator', msg.author.tag)
+      .setTimestamp()
+      .setFooter(`${msg.author.tag} put ${member.user.tag} in time-out.`, msg.author.avatarURL);
+    msg.guild.channels.find('name', 'logs').send({ embed });
+  }
+  catch (err) {
+    console.error(err.stack);
+  }
+};
+
+exports.conf = {
+  aliases: [],
+  guildOnly: true,
+};
+
+exports.help = {
+  name: 'timeout',
+  description: 'Put a user in time-out',
+  usage: '@user',
+};
+=======
 exports.run = async (bot, msg, args) => {
     if (!msg.member.hasPermission('BAN_MEMBERS')) return msg.reply('You don\'t have permission to put members in time-out..');
     if (!msg.guild.member(bot.user).hasPermission('MANAGE_ROLES')) return msg.reply('I cannot put anyone in time-out.');
@@ -54,4 +93,5 @@ exports.run = async (bot, msg, args) => {
     description: 'Put a user in time-out',
     usage: '@user',
   };
-  
-\ No newline at end of file
+  
+>>>>>>> 4d253ab491041e147e9943d8820ba06f611df2d5