From ffab8f7ec41fcc0eaa7a49b1503b8876a206f9a8 Mon Sep 17 00:00:00 2001
From: WubzyGD <63122940+WubzyGD@users.noreply.github.com>
Date: Sat, 10 Oct 2020 03:57:30 -0400
Subject: [PATCH 1/2] fix merge conflicts

---
 commands/deathnote.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/commands/deathnote.js b/commands/deathnote.js
index fd79366..c7ce72f 100644
--- a/commands/deathnote.js
+++ b/commands/deathnote.js
@@ -4,7 +4,10 @@ const moment = require('moment');
 const deaths = [
     "watching too much anime", "an overdose of waifus", "Hypotakunemia", "trying to self-isekai",
     "Bass:tm:", "cranking the music just a little too loud", "trying to swim in lava", "an unknown cause",
-    "Despacito"
+    "Despacito", "something really cliche and unoriginal", "'shrooms", 
+    "clicking 'I agree' without reading the Terms of Service", "alchemy", "rusty spoons",
+    "picking the wrong waifu", "body pillows", "fur-con", "something to do with lamb sauce",
+    "grandma's cookies"
 ]; // a list of preset death methods that can occur
 
 const before = [
@@ -64,7 +67,7 @@ module.exports = {
         let death = deaths[Math.floor(Math.random() * deaths.length)]; //kill method
         let reptype = responses[Object.keys(responses)[Math.floor(Math.random() * Object.keys(responses).length)]]; // report type
         let title = reptype.titles[Math.floor(Math.random() * reptype.titles.length)];
-        let pretext = before[Math.floor(Math.random() * before.length)];
+        let pretext = before[Math.floor(Math.random() * before.length)].replace(/{p}/g, message.member.displayName);
 
         let victim = message.mentions.members.first();
         let killer = message.member;

From d587e90bcbdc5767c1d55f1524b8e1cb5bc402a1 Mon Sep 17 00:00:00 2001
From: WubzyGD <63122940+WubzyGD@users.noreply.github.com>
Date: Sat, 10 Oct 2020 05:34:44 -0400
Subject: [PATCH 2/2] Fix staffrole

---
 commands/staffrole.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/commands/staffrole.js b/commands/staffrole.js
index 7fd0acc..dd9a56d 100644
--- a/commands/staffrole.js
+++ b/commands/staffrole.js
@@ -17,7 +17,7 @@ module.exports = {
         if (['view', 'v'].includes(args[0].trim().toLocaleLowerCase())) {return message.reply(
             tguild.staffrole.length
                 ? message.guild.roles.cache.has(tguild.staffrole)
-                    ? `\`People with the ${message.guild.roles.cache.get(tguild.staffrole).name}\` role can edit my setting here.`
+                    ? `People with the \`${message.guild.roles.cache.get(tguild.staffrole).name}\` role can edit my setting here.`
                     : `I have a role stored for this server, but it doesn't seem to exist anymore, so only admins can edit my settings right now.`
                 : 'Only admins may edit settings in this server.'
         );}
@@ -32,13 +32,13 @@ module.exports = {
         } else {
             tguild.staffrole = role.id;
             tguild.save();
-            let upm = message.reply("Sure thing!");
+            let upm = await message.reply("Sure thing!");
             await require('../util/wait')(1750);
             return upm.edit(new Discord.MessageEmbed()
                 .setAuthor('Staff role updated!', message.author.avatarURL())
-                .setDescription(`<@${tguild.staffrole}> can now edit my settings in this server.`)
+                .setDescription(`<@&${tguild.staffrole}> can now edit my settings in this server.`)
                 .addField('Auditing Admin', message.member.displayName, true)
-                .addField('Role-Holders', `${message.guild.members.cache.filter(m => m.roles.cache.has(tguild.staffrole) && !client.users.cache.get(m.id).bot)}+ members have this role`)
+                .addField('Role-Holders', `${message.guild.members.cache.filter(m => m.roles.cache.has(tguild.staffrole) && !client.users.cache.get(m.id).bot).size}+ members have this role`)
                 .setColor('c375f0')
                 .setFooter('Natsuki', client.user.avatarURL())
                 .setTimestamp()