2 files changed, 6 insertions, 9 deletions
diff --git a/commands/Moderation/lswarns.js b/commands/Moderation/lswarns.js
index dea3569..a9bf5d9 100644
--- a/commands/Moderation/lswarns.js
+++ b/commands/Moderation/lswarns.js
@@ -22,13 +22,12 @@ exports.run = async (bot, msg) => {
   const db = require('quick.db');
   const { RichEmbed } = require('discord.js');
 
-  const warns = await db.fetch(`warns_${msg.author.id}_count`);
+  const warns = await db.fetch(`warns_${msg.guild.id}_${msg.author.id}`);
   if (!warns) return await msg.reply('Yay! You have no warns.');
   const embed = new RichEmbed()
     .setTitle('Warns');
-  for (let i = 1; i <= warns; i++) {
-    const warning = await db.fetch(`warns_${msg.author.id}_warn_${i}`);
-    embed.addField('Warning #' + i, warning);
+  for (let i = 0; i < warns.count; i++) {
+    embed.addField('Warning #' + i, warns.reasons[i]);
   }
   msg.channel.send({ embed });
 };
diff --git a/commands/Moderation/warn.js b/commands/Moderation/warn.js
index 816367d..c59023c 100644
--- a/commands/Moderation/warn.js
+++ b/commands/Moderation/warn.js
@@ -29,14 +29,12 @@ exports.run = async (bot, msg, args) => {
   }
   msg.channel.send(`Successfully logged ${victim.user.tag}'s warning.`);
   const db = require('quick.db');
-  const warns = await db.fetch(`warns_${victim.user.id}_count`);
+  const warns = await db.fetch(`warns_${msg.guild.id}_${victim.user.id}`);
   if (warns) {
-    await db.set(`warns_${victim.user.id}_count`, warns + 1);
-    await db.set(`warns_${victim.user.id}_warn_${warns + 1}`, warnReason);
+    await db.set(`warns_${msg.guild.id}_${victim.user.id}`, { count : warns.count + 1, reasons : warns.reasons.push(warnReason)});
   }
   else {
-    await db.set(`warns_${victim.user.id}_count`, 1);
-    await db.set(`warns_${victim.user.id}_warn_1`, warnReason);
+    await db.set(`warns_${msg.guild.id}_${victim.user.id}`, { count : 1, reasons : [warnReason]});
   }
 
   const { RichEmbed } = require('discord.js');