Use utils where applicable

Author: holzmaster

src/commands/poll.ts

@@ -119,7 +119,7 @@ Optionen:
         let finishTime: Date | undefined;
         if (options.delayed) {
             const delayTime = Number(options.delayed);
-            finishTime = new Date(Date.now() + delayTime * 60 * 1000);
+            finishTime = new Date(Date.now() + timeUtils.minutes(delayTime));
 
             if (Number.isNaN(delayTime) || delayTime <= 0) {
                 return "Bruder keine ungültigen Zeiten angeben 🙄";

src/commands/selfban.ts

@@ -4,6 +4,7 @@ import type { MessageCommand } from "#commands/command.ts";
 import type { BotContext } from "#context.ts";
 import type { ProcessableMessage } from "#service/command.ts";
 
+import * as timeUtils from "#utils/time.ts";
 import * as banService from "#service/ban.ts";
 import { parseLegacyMessageParts } from "#service/command.ts";
 
@@ -75,7 +76,7 @@ export default class MinCommand implements MessageCommand {
             return err;
         }
 
-        const targetTime = new Date(Date.now() + durationInMinutes * 60 * 1000);
+        const targetTime = new Date(Date.now() + timeUtils.minutes(durationInMinutes));
 
         if (tilt) {
             const alarmEmote = message.guild?.emojis.cache.find(e => e.name === "alarm");

src/commands/vote2.ts

@@ -16,6 +16,7 @@ import {
     time,
 } from "discord.js";
 
+import * as timeUtils from "#utils/time.ts";
 import type { ApplicationCommand } from "#commands/command.ts";
 
 export default class Vote2Command implements ApplicationCommand {
@@ -109,7 +110,7 @@ export default class Vote2Command implements ApplicationCommand {
             .setLabel("👎")
             .setStyle(ButtonStyle.Secondary);
 
-        const end = new Date(Date.now() + duration * 1000);
+        const end = new Date(Date.now() + timeUtils.seconds(duration));
         const endStr = time(end, "R");
 
         const embed: APIEmbed = {
@@ -141,7 +142,7 @@ export default class Vote2Command implements ApplicationCommand {
         const collector: InteractionCollector<ButtonInteraction> =
             response.createMessageComponentCollector({
                 componentType: ComponentType.Button,
-                time: duration * 1000,
+                time: timeUtils.seconds(duration),
                 filter: i => !collector.users.has(i.user.id),
             });
 

src/service/lootDrop.ts

@@ -24,6 +24,7 @@ import type { BotContext } from "#context.ts";
 import type { Loot, LootId } from "#storage/db/model.ts";
 import type { LootTemplate } from "#storage/loot.ts";
 import { randomBoolean, randomEntry, randomEntryWeighted } from "#service/random.ts";
+import * as timeUtils from "#utils/time.ts";
 
 import * as lootService from "#service/loot.ts";
 import {
@@ -35,7 +36,7 @@ import {
 
 import log from "#log";
 
-const lootTimeoutMs = 60 * 1000;
+const lootTimeoutMs = timeUtils.minutes(1);
 
 export async function runDropAttempt(context: BotContext) {
     const lootConfig = context.commandConfig.loot;

src/storage/reminders.ts

@@ -1,4 +1,5 @@
 import type { Snowflake, User } from "discord.js";
+import { Temporal } from "@js-temporal/polyfill";
 
 import type { Reminder } from "./db/model.ts";
 
@@ -9,10 +10,10 @@ export async function removeReminder(reminderId: Reminder["id"], ctx = db()) {
     await ctx.deleteFrom("reminders").where("id", "=", reminderId).execute();
 }
 
-export function getCurrentReminders(now = new Date(), ctx = db()): Promise<Reminder[]> {
+export function getCurrentReminders(now = Temporal.Now.instant(), ctx = db()): Promise<Reminder[]> {
     return ctx
         .selectFrom("reminders")
-        .where("remindAt", "<=", now.toISOString())
+        .where("remindAt", "<=", now.toString())
         .selectAll()
         .execute();
 }