Merge branch 'dev'

merge-requests/18/merge
Matthew 2021-02-02 02:14:17 -05:00
commit 3601c2a380
No known key found for this signature in database
GPG Key ID: 210AF32ADE3B5C4B
1 changed files with 4 additions and 2 deletions

View File

@ -113,8 +113,10 @@ export default class Score extends Command {
inqs.forEach((inq) => { inqs.forEach((inq) => {
const testDate = (new Date(new Date(inq.date).setHours(1460))); const testDate = (new Date(new Date(inq.date).setHours(1460)));
// eslint-disable-next-line no-useless-escape // 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')} ET\n**Expires:** ${moment(testDate).calendar()}\n\n`; 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`;
inqAdded++; inqAdded++;
}
}); });
if (inqAdded <= 0) desc = ''; if (inqAdded <= 0) desc = '';
if (desc.length >= 1900) { if (desc.length >= 1900) {