Merge branch 'master' into feature/improve-moderation

Author: bristermitten

bun.lock

@@ -0,0 +1,5 @@
+[test]
+preload = ["./tests/setup.ts"]
+
+[test.env-file]
+path = ".env.test"

bunfig.toml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   postgres:
     image: postgres:18
@@ -12,7 +10,7 @@ services:
     ports:
       - "3306:5432"
     volumes:
-      - postgres_data:/var/lib/postgresql/data
+      - postgres_data:/var/lib/postgresql
     healthcheck:
       test: [ "CMD-SHELL", "pg_isready -U postgres" ]
       interval: 10s

docker-compose.dev.yml

@@ -0,0 +1,18 @@
+services:
+  postgres-test:
+    image: postgres:18
+    container_name: postgres-test
+    restart: unless-stopped
+    environment:
+      POSTGRES_USER: root
+      POSTGRES_PASSWORD: password
+      POSTGRES_DB: database_test
+    ports:
+      - "5444:5432"
+    tmpfs:
+      - /var/lib/postgresql
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U root -d database_test" ]
+      interval: 5s
+      timeout: 3s
+      retries: 5

docker-compose.test.yml

@@ -9,7 +9,7 @@
 	"scripts": {
 		"version": "echo $npm_package_version",
 		"lint": "bunx biome check --fix",
-		"typecheck": "bunx tsc --noEmit --build tsconfig.json",
+		"typecheck": "bunx tsc  --build --noEmit tsconfig.json",
 		"typecheck:prod": "bunx tsc --noEmit -p tsconfig.production.json",
 		"watch-dev": "bun --watch src/index.ts",
 		"start": "bun --trace-warnings src/index.ts",
@@ -80,7 +80,7 @@
 		"@types/sqlite3": "^5.1.0",
 		"@types/string-similarity": "^4.0.2",
 		"@types/validator": "^13.15.10",
-		"globals": "^16.5.0",
+		"globals": "^17.0.0",
 		"husky": "^9.1.7",
 		"lint-staged": "^16.2.7",
 		"nodemon": "^3.1.11",

package.json

@@ -23,7 +23,10 @@ export const config: Config = {
 	commands: {
 		daily: "1059214166075912225",
 	},
-
+	deletedMessageLog: {
+		cacheTtlMs: 1000 * 60 * 60 * 24,
+		excludedChannels: [],
+	},
 	roles: {
 		tiers: [
 			"821743100203368458", // @everyone (tier 0)

src/Config.prod.ts

@@ -23,6 +23,10 @@ const devConfig: Config = {
 	commands: {
 		daily: "1029850807794937949",
 	},
+	deletedMessageLog: {
+		cacheTtlMs: 1000 * 60 * 60 * 24,
+		excludedChannels: [],
+	},
 	roles: {
 		tiers: [
 			"904478147351806012", // @everyone (tier 0)

src/Config.ts

@@ -104,6 +104,12 @@ export interface Config {
 		archiveChannel: string;
 		pingRole?: Snowflake;
 	};
+	deletedMessageLog?: {
+		/** Cache TTL in milliseconds (default: 24 hours) */
+		cacheTtlMs?: number;
+		/** Additional channel IDs to exclude from tracking (mod channels auto-excluded) */
+		excludedChannels?: Snowflake[];
+	};
 	branding: BrandingConfig;
 	informationMessage?: InformationMessage;
 	threatDetection?: ThreatDetectionConfig;