From fd9e80fc719cb13a4bb6545436196fcf12505830 Mon Sep 17 00:00:00 2001 From: Matthew R Date: Thu, 4 Feb 2021 23:17:34 -0500 Subject: [PATCH 1/3] add new stuff to whois --- src/commands/whois.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/commands/whois.ts b/src/commands/whois.ts index 658539c..f23cb1a 100644 --- a/src/commands/whois.ts +++ b/src/commands/whois.ts @@ -213,8 +213,8 @@ export default class Whois extends Command { if (serverAcknowledgements.length > 0) { embed.addField('Acknowledgements', serverAcknowledgements[0]); } - if (ackResolve?.acknowledgements?.length > 0) { - embed.addField('Bot Acknowledgements', ackResolve.acknowledgements.join(', ')); + if (ackResolve?.additionalRoles?.length > 0) { + embed.addField('Extra Acknowledgements', ackResolve.acknowledgements.join(', ')); } embed.setFooter(this.client.user.username, this.client.user.avatarURL); embed.setTimestamp(); From 4c09a5c6efdbc51301d02a4721ffd55975f577f7 Mon Sep 17 00:00:00 2001 From: Matthew R Date: Thu, 4 Feb 2021 23:20:24 -0500 Subject: [PATCH 2/3] fixes --- src/commands/whois.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/whois.ts b/src/commands/whois.ts index f23cb1a..6b6c49b 100644 --- a/src/commands/whois.ts +++ b/src/commands/whois.ts @@ -214,7 +214,7 @@ export default class Whois extends Command { embed.addField('Acknowledgements', serverAcknowledgements[0]); } if (ackResolve?.additionalRoles?.length > 0) { - embed.addField('Extra Acknowledgements', ackResolve.acknowledgements.join(', ')); + embed.addField('Additional Acknowledgements', ackResolve.acknowledgements.join(', ')); } embed.setFooter(this.client.user.username, this.client.user.avatarURL); embed.setTimestamp(); From da8f5e0004b041208487e61bece2e4f04d499cd9 Mon Sep 17 00:00:00 2001 From: Matthew R Date: Thu, 4 Feb 2021 23:21:29 -0500 Subject: [PATCH 3/3] fixes to score --- src/commands/score.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/commands/score.ts b/src/commands/score.ts index d829658..e91c7b8 100644 --- a/src/commands/score.ts +++ b/src/commands/score.ts @@ -2,8 +2,7 @@ /* eslint-disable no-continue */ /* eslint-disable default-case */ import moment from 'moment'; -import { v4 as uuid } from 'uuid'; -import { Message, User, TextChannel } from 'eris'; +import { Message, User } from 'eris'; import { Client, Command, RichEmbed } from '../class'; import { getTotalMessageCount } from '../intervals/score'; import Score_Hist from './score_hist'; @@ -114,7 +113,7 @@ export default class Score extends Command { const testDate = (new Date(new Date(inq.date).setHours(1460))); // eslint-disable-next-line no-useless-escape if (testDate > new Date()) { - desc += `${inq.iid ? `__[${inq.iid}]__\n` : ''}**Department/Service:** ${inq.name.replace(/\*/gmi, '')}\n**Reason:** ${inq.reason}\n**Date:** ${inq.date.toLocaleString('en-us')}\n**Expires:** ${moment(testDate).calendar()}\n\n`; + desc += `${inq.iid ? `__[${inq.iid}]__\n` : ''}**Department/Service:** ${inq.name.replace(/\*/gmi, '')}\n**Reason:** ${inq.reason}\n**Date:** ${moment(inq.date).format('MMMM Do YYYY, h:mm:ss')}\n**Expires:** ${moment(testDate).calendar()}\n\n`; inqAdded++; } });