Skip to content

Commit ad802e2

Browse files
committed
fix: remove require module and improve accountinfo output
1 parent cef33ab commit ad802e2

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

commands/functionality/accountinfo.js

+6-7
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ module.exports = {
3535

3636
const ntnuiExpiryDate = expiryDate.toFormat("DDD");
3737

38-
const registryDateTime = DateTime.fromISO(accountInfo.get("createdAt"), {
39-
setZone: true,
40-
})
38+
const registryDateTime = DateTime.fromJSDate(accountInfo.get("createdAt"))
4139
.setZone("Europe/Oslo")
4240
.setLocale("en");
4341

@@ -50,7 +48,7 @@ module.exports = {
5048

5149
const registryDate = registryDateTime.toFormat("DDD', 'T");
5250

53-
const updateDateTime = DateTime.fromISO(accountInfo.get("updatedAt"), {
51+
const updateDateTime = DateTime.fromJSDate(accountInfo.get("updatedAt"), {
5452
setZone: true,
5553
})
5654
.setZone("Europe/Oslo")
@@ -64,7 +62,8 @@ module.exports = {
6462
}
6563

6664
const updateDate = updateDateTime.toFormat("DDD', 'T");
67-
const timestamp = updateDateTime.toFormat("X");
65+
let timestamp = updateDateTime.toFormat("X");
66+
timestamp = `<t:${timestamp}:R>`;
6867

6968
const now = DateTime.now().setZone("Europe/Oslo");
7069

@@ -77,13 +76,13 @@ module.exports = {
7776
} else if (!valid) {
7877
// Group membership expired
7978
return interaction.editReply({
80-
content: `⌛ Your **${process.env.GROUP_NAME}** membership has expired. Your **NTNUI** membership expires ${ntnuiExpiryDate}. \n\n🕒 You linked your Discord account to NTNUI at ${registryDate}.\n🔃 Updated at ${updateDate} (${timestamp}).`,
79+
content: `⌛ Your **${process.env.GROUP_NAME}** membership has expired. Your **NTNUI** membership expires ${ntnuiExpiryDate}.\n\n🕒 You linked your Discord account to NTNUI at ${registryDate}.\n🔃 Updated at ${updateDate} (${timestamp}).`,
8180
flags: MessageFlags.Ephemeral,
8281
});
8382
} else {
8483
// Both memberships in good standing
8584
return interaction.editReply({
86-
content: `✅ Your **${process.env.GROUP_NAME}** membership is in good standing!\n⏳ Your **NTNUI** membership expires ${ntnuiExpiryDate}\n\n🕒 You linked your Discord account to NTNUI at ${registryDate}.\n🔃 Updated at ${updateDate} (${timestamp}).`,
85+
content: `✅ Your **${process.env.GROUP_NAME}** membership is in good standing!\n⏳ Your **NTNUI** membership expires ${ntnuiExpiryDate}.\n\n🕒 You linked your Discord account to NTNUI at ${registryDate}.\n🔃 Updated at ${updateDate} (${timestamp}).`,
8786
flags: MessageFlags.Ephemeral,
8887
});
8988
}

db.js

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
const { Schema, default: mongoose } = require("mongoose");
2-
const moment = require("moment-timezone");
3-
const dateOslo = moment.tz(Date.now(), "Europe/Oslo");
42

53
const membershipSchema = new Schema(
64
{

0 commit comments

Comments
 (0)