Merge remote-tracking branch 'upstream/master' into feature/starboard

# Conflicts:
#	src/store/storage.ts

Author: Pdzly

.github/workflows/sentry.yml

@@ -59,7 +59,7 @@ jobs:
         run: bun install --frozen-lockfile
 
       - name: Download CI build artifact
-        uses: dawidd6/action-download-artifact@v3
+        uses: dawidd6/action-download-artifact@v6
         with:
           run_id: ${{ github.event.workflow_run.id }}
           name: build-bin-${{ github.event.workflow_run.head_sha }}

biome.json

@@ -0,0 +1,35 @@
+{
+  "$schema": "https://biomejs.dev/schemas/2.2.2/schema.json",
+  "vcs": {
+    "enabled": false,
+    "clientKind": "git",
+    "useIgnoreFile": false
+  },
+  "files": {
+    "ignoreUnknown": false,
+    "includes": ["src/**/*"]
+  },
+  "formatter": {
+    "enabled": true,
+    "indentStyle": "tab"
+  },
+  "linter": {
+    "enabled": true,
+    "rules": {
+      "recommended": true
+    }
+  },
+  "javascript": {
+    "formatter": {
+      "quoteStyle": "double"
+    }
+  },
+  "assist": {
+    "enabled": true,
+    "actions": {
+      "source": {
+        "organizeImports": "on"
+      }
+    }
+  }
+}

bun.lock

@@ -1,6 +1,6 @@
 {
   "name": "devdenbot",
-  "version": "8.4.5",
+  "version": "9.0.0",
   "type": "module",
   "main": "src/index.ts",
   "engines": {
@@ -66,6 +66,7 @@
   ],
   "repository": "https://github.com/TheDeveloperDen/DevDenBot.git",
   "devDependencies": {
+    "@biomejs/biome": "^2.2.2",
     "@eslint/eslintrc": "^3.3.1",
     "@eslint/js": "^9.32.0",
     "@microsoft/eslint-formatter-sarif": "3.1.0",

package.json

@@ -1,5 +1,5 @@
 import { actualMention } from "./util/users.js";
-import { Config } from "./config.type.js";
+import type { Config } from "./config.type.js";
 import { ButtonBuilder, ButtonStyle, EmbedBuilder } from "discord.js";
 
 // Config file for the Developer Den server (.gg/devden)

src/Config.prod.ts

@@ -1,5 +1,5 @@
 import { actualMention } from "./util/users.js";
-import { Config } from "./config.type.js";
+import type { Config } from "./config.type.js";
 import { config as prodConfig } from "./Config.prod.js";
 
 // Config file for the DevDen Testing server

src/Config.ts

@@ -1,6 +1,6 @@
-import { Snowflake } from "discord.js";
-import { BrandingConfig } from "./util/branding.js";
-import { InformationMessage } from "./modules/information/information.js";
+import type { Snowflake } from "discord.js";
+import type { BrandingConfig } from "./util/branding.js";
+import type { InformationMessage } from "./modules/information/information.js";
 
 export interface Config {
   guildId: string;

src/config.type.ts

@@ -1,6 +1,6 @@
-import { createLogger, format, transports } from "winston";
-import * as path from "path";
+import * as path from "node:path";
 import { stringify } from "safe-stable-stringify";
+import { createLogger, format, transports } from "winston";
 
 const timestamp = format.timestamp({
   format: "YYYY-MM-DD HH:mm:ss",
@@ -51,7 +51,7 @@ const cliFormat = format.combine(
     const metaString = Object.keys(filteredMeta).length
       ? stringify(filteredMeta, null, 2)
       : "";
-    return `[${timestamp}] ${level}${source ? ` (${source})` : ""}: ${message}${metaString ? " " + metaString : ""}`;
+    return `[${timestamp}] ${level}${source ? ` (${source})` : ""}: ${message}${metaString ? ` ${metaString}` : ""}`;
   }),
 );
 

src/logging.ts

@@ -1,11 +1,11 @@
-import Module from "./module.js";
-import { getOrCreateUserById } from "../store/models/DDUser.js";
 import stringSimilarity from "string-similarity";
 import { logger } from "../logging.js";
+import { getOrCreateUserById } from "../store/models/DDUser.js";
 import { FAQ } from "../store/models/FAQ.js";
+import { isSpecialUser } from "../util/users.js";
 import { createFaqEmbed } from "./faq/faq.util.js";
+import type Module from "./module.js";
 import { tierOf } from "./xp/xpRoles.util.js";
-import { isSpecialUser } from "../util/users.js";
 
 const targets = [
   "i need help",

src/modules/askToAsk.module.ts

@@ -1,22 +1,22 @@
 import { afterEach, beforeAll, expect, mock, test } from "bun:test";
-import {
-  handleBumpStreak,
-  setLastBumpNotificationTime,
-} from "./bump.listener.js";
-import {
+import type {
   Client,
   Message,
   MessageInteraction,
   PartialTextBasedChannelFields,
   User,
 } from "discord.js";
+import { Bump } from "../../store/models/Bump.js";
+import { clearBumpsCache } from "../../store/models/bumps.js";
 import {
   clearUserCache,
   getOrCreateUserById,
 } from "../../store/models/DDUser.js";
 import { getSequelizeInstance, initStorage } from "../../store/storage.js";
-import { Bump } from "../../store/models/Bump.js";
-import { clearBumpsCache } from "../../store/models/bumps.js";
+import {
+  handleBumpStreak,
+  setLastBumpNotificationTime,
+} from "./bump.listener.js";
 
 beforeAll(async () => {
   await initStorage();
@@ -107,9 +107,7 @@ test("simple bump with big streak", async () => {
   for (let i = 0; i < 9; i++) {
     await Bump.create({
       userId: BigInt(fakeUser.id),
-      timestamp: new Date(
-        new Date().getTime() - 1000 * 60 * 60 * 24 * (10 - i),
-      ),
+      timestamp: new Date(Date.now() - 1000 * 60 * 60 * 24 * (10 - i)),
       messageId: BigInt(10 + i),
     });
   }
@@ -136,7 +134,7 @@ test("simple bump with big streak", async () => {
 
 test("speedy bump ", async () => {
   const { ddUser, fakeUser, mockReact, mockChannel } = await setupMocks();
-  setLastBumpNotificationTime(new Date(new Date().getTime() - 1000));
+  setLastBumpNotificationTime(new Date(Date.now() - 1000));
   await handleBumpStreak(
     ddUser,
     { user: fakeUser } as unknown as MessageInteraction,
@@ -157,9 +155,7 @@ test("End other user's streak", async () => {
   for (let i = 0; i < 5; i++) {
     await Bump.create({
       userId: BigInt(fakeUser.id),
-      timestamp: new Date(
-        new Date().getTime() - 1000 * 60 * 60 * 24 * (10 - i),
-      ),
+      timestamp: new Date(Date.now() - 1000 * 60 * 60 * 24 * (10 - i)),
       messageId: BigInt(10 + i),
     });
   }