From ac811afc44064d66e671155b1aeb7d09829ccf57 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Tue, 13 Dec 2022 13:54:05 +1100 Subject: [PATCH] use native discord timestamps --- bot/commands/Utility/server.js | 2 +- bot/commands/Utility/user.js | 8 +++----- package-lock.json | 11 ----------- package.json | 1 - 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/bot/commands/Utility/server.js b/bot/commands/Utility/server.js index 6f86054..2aa807c 100644 --- a/bot/commands/Utility/server.js +++ b/bot/commands/Utility/server.js @@ -80,7 +80,7 @@ module.exports = class Avatar extends Command { name: 'Roles', value: roles.size.toString(), inline: true }, { - name: 'Created', value: time(guild.createdAt, 'D') + `, ${time(guild.createdAt, 'R')}`, inline: true + name: 'Created', value: time(guild.createdAt, 'D') + time(guild.createdAt, 'R'), inline: true }, { name: 'Features', value: guild.features.join(', ') diff --git a/bot/commands/Utility/user.js b/bot/commands/Utility/user.js index 7b190c3..c66dcb0 100644 --- a/bot/commands/Utility/user.js +++ b/bot/commands/Utility/user.js @@ -1,7 +1,5 @@ const Command = require('../../base/Command.js'); -const dayjs = require('dayjs'); -dayjs.extend(require('dayjs/plugin/relativeTime')); - +const { time } = require('discord.js'); module.exports = class Avatar extends Command { constructor (name, category) { super (name, category); @@ -57,10 +55,10 @@ module.exports = class Avatar extends Command { name: 'Roles:', value: roles.join(' ') }, { - name: 'Joined Server', value: `${dayjs(member.joinedAt).format('D/M/YYYY HH:mm (UTCZ)')}\n*${dayjs().to(member.joinedAt)}*`, inline: true + name: 'Joined Server', value: time(member.joinedAt, 'D') + time(member.joinedAt, 'R'), inline: true }, { - name: 'Joined Discord', value: `${dayjs(member.user.createdAt).format('D/M/YYYY HH:mm (UTCZ)')}\n*${dayjs().to(member.user.createdAt)}*`, inline: true + name: 'Joined Discord', value: time(user.createdAt, 'D') + time(user.createdAt, 'R'), inline: true } ]); if (badges.length > 0) { diff --git a/package-lock.json b/package-lock.json index 47fad63..f1847cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,6 @@ "@sentry/node": "^7.23.0", "bufferutil": "^4.0.3", "chalk": "^4.1.2", - "dayjs": "^1.10.6", "discord.js": "^14.7.1", "erlpack": "^0.1.3", "eslint": "^8.29.0", @@ -459,11 +458,6 @@ "node": ">= 8" } }, - "node_modules/dayjs": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.6.tgz", - "integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ==" - }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -2087,11 +2081,6 @@ "which": "^2.0.1" } }, - "dayjs": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.6.tgz", - "integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ==" - }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", diff --git a/package.json b/package.json index 15c5220..bd8900c 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "@sentry/node": "^7.23.0", "bufferutil": "^4.0.3", "chalk": "^4.1.2", - "dayjs": "^1.10.6", "discord.js": "^14.7.1", "erlpack": "^0.1.3", "eslint": "^8.29.0",