From 9455bb195db1a79070445d0c913a1d3686736970 Mon Sep 17 00:00:00 2001
From: Matthew R <matthew@staff.libraryofcode.org>
Date: Tue, 5 May 2020 19:50:14 -0400
Subject: [PATCH] fix conflict

---
 src/commands/tier.ts    | 2 +-
 src/intervals/memory.ts | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/commands/tier.ts b/src/commands/tier.ts
index 0d2200e..ec625cf 100644
--- a/src/commands/tier.ts
+++ b/src/commands/tier.ts
@@ -33,7 +33,7 @@ export default class Tier extends Command {
       embed.setTitle('Cloud Account | Tier Change');
       embed.setColor('#0099ff');
       embed.addField('User', `${account.username} | <@${account.userID}>`, true);
-      embed.addField('Moderator', `<@${message.author.id}>`, true);
+      embed.addField('Technician', `<@${message.author.id}>`, true);
       embed.addField('Old Tier -> New Tier', `${account.tier} -> ${args[1]}`, true);
       embed.setFooter(this.client.user.username, this.client.user.avatarURL);
       embed.setTimestamp();
diff --git a/src/intervals/memory.ts b/src/intervals/memory.ts
index 173b98b..bb69754 100644
--- a/src/intervals/memory.ts
+++ b/src/intervals/memory.ts
@@ -39,7 +39,7 @@ export default function memory(client: Client) {
           embed.addField('Memory Usage', `${String(memoryConversion)} MB`, true);
           embed.addField('Memory Limit', `${String(userLimits.hard)} MB`, true);
           client.createMessage(channelID, { embed });
-          client.util.createModerationLog(acc.userID, client.guilds.get('446067825673633794').members.get(client.user.id), 1, '[AUTO] Exceeded resource limit for RAM.');
+          client.util.createModerationLog(acc.userID, client.guilds.get('446067825673633794').members.get(client.user.id), 1, `You have exceeded your resource limit of '${String(userLimits.hard)} MB'. Any process running on your user account has been sent a STOP/KILL signal. If you have any questions, please contact a Technician.`);
           client.util.transport.sendMail({
             to: acc.emailAddress,
             from: 'Library of Code sp-us | Cloud Services <help@libraryofcode.org>',
@@ -47,8 +47,8 @@ export default function memory(client: Client) {
             html: `
           <h1>Library of Code sp-us | Cloud Services</h1>
           <p>Your account has received an official warning from a Technician. Please get the underlying issue resolved to avoid <i>possible</i> moderative action.</p>
-          <p><strong>Reason:</strong> [AUTO] Exceeded resource limit for RAM.</p>
-          <p><strong>Moderator:</strong> ${client.user.username}</p>
+          <p><strong>Reason:</strong> You have exceeded your resource limit of '${String(userLimits.hard)} MB'. Any process running on your user account has been sent a STOP/KILL signal. If you have any questions, please contact a Technician.</p>
+          <p><strong>Moderator:</strong> SYSTEM</p>
   
           <b><i>Library of Code sp-us | Support Team</i></b>
           `,
@@ -84,7 +84,7 @@ export default function memory(client: Client) {
             client.util.transport.sendMail({
               to: acc.emailAddress,
               from: 'Library of Code sp-us | Cloud Services <help@libraryofcode.org>',
-              subject: 'Notification',
+              subject: 'Account Notification',
               html: `
             <h1>Library of Code sp-us | Cloud Services</h1>
             <p>You are about to reach your RAM resource limits, you are currently using '${String(memoryConversion)} MB' and your limit is '${String(userLimits.hard)} MB'. Please correct your usage to avoid further action.</p>