diff --git a/src/database/migrate.ts b/src/database/migrate.ts index a68ad9b..9570451 100644 --- a/src/database/migrate.ts +++ b/src/database/migrate.ts @@ -1,10 +1,10 @@ import "dotenv/config"; -import { migrate } from "drizzle-orm/node-postgres/migrator"; +import Database from "better-sqlite3"; import { migrate as migrateSqlite } from "drizzle-orm/better-sqlite3/migrator"; -import { initializeDatabase } from "./drizzle"; +import { migrate } from "drizzle-orm/node-postgres/migrator"; import { config } from "../config"; import { createChildLogger } from "../logger"; -import Database from "better-sqlite3"; +import { initializeDatabase } from "./drizzle"; const logger = createChildLogger("migrate"); diff --git a/src/moderation/aiAnalyzer.ts b/src/moderation/aiAnalyzer.ts index 9156774..c3534ec 100644 --- a/src/moderation/aiAnalyzer.ts +++ b/src/moderation/aiAnalyzer.ts @@ -1,5 +1,7 @@ import { config } from "../config"; import { createChildLogger } from "../logger"; +import { buildConversationPromptMessages } from "./conversationContext"; +import { runModerationAnalysis } from "./llmModerationClient"; import { getConversationContextBefore, getMessageById, @@ -7,8 +9,6 @@ import { getPendingMessagesByConversation, updateMessageAIAnalysis, } from "./messageStore"; -import { buildConversationPromptMessages } from "./conversationContext"; -import { runModerationAnalysis } from "./llmModerationClient"; import type { AnalysisQueueStatus, MessageRecord } from "./types"; const logger = createChildLogger("ai-analyzer"); diff --git a/src/moderation/broadcaster.ts b/src/moderation/broadcaster.ts index 5a97b9c..641ad41 100644 --- a/src/moderation/broadcaster.ts +++ b/src/moderation/broadcaster.ts @@ -1,11 +1,11 @@ import type { WebSocket } from "ws"; +import { createChildLogger } from "../logger"; import type { AnalysisQueueStatus, AttachmentRecord, MessageRecord, ModerationWsEvent, } from "./types"; -import { createChildLogger } from "../logger"; type ClientLike = Pick; diff --git a/src/moderation/llmModerationClient.ts b/src/moderation/llmModerationClient.ts index ca0834a..52b6b79 100644 --- a/src/moderation/llmModerationClient.ts +++ b/src/moderation/llmModerationClient.ts @@ -1,7 +1,7 @@ -import type { AnalysisResult, MessageRecord } from "./types"; import { config } from "../config"; import { createChildLogger } from "../logger"; import { retryWithBackoff } from "../retry"; +import type { AnalysisResult, MessageRecord } from "./types"; const log = createChildLogger("llmModerationClient"); diff --git a/src/moderation/messageCapture.ts b/src/moderation/messageCapture.ts index bda99a9..ddaa452 100644 --- a/src/moderation/messageCapture.ts +++ b/src/moderation/messageCapture.ts @@ -8,11 +8,11 @@ import { getMessageMetadata, } from "./messageMetadata"; import { - insertAttachment, - upsertMessageForCapture, - updateMessageAsEdited, - updateMessageAsDeleted, getMessageById, + insertAttachment, + updateMessageAsDeleted, + updateMessageAsEdited, + upsertMessageForCapture, } from "./messageStore"; import type { AttachmentRecord, diff --git a/src/routes/messageRoutes.ts b/src/routes/messageRoutes.ts index 4f5ba4b..63c9024 100644 --- a/src/routes/messageRoutes.ts +++ b/src/routes/messageRoutes.ts @@ -20,9 +20,9 @@ const aiStatuses = new Set([ function parseStatuses(value?: string): AIStatus[] | undefined { if (!value) return undefined; - return value.split(",").filter((item): item is AIStatus => - aiStatuses.has(item as AIStatus), - ); + return value + .split(",") + .filter((item): item is AIStatus => aiStatuses.has(item as AIStatus)); } export function createMessageRoutes(): Router { diff --git a/src/routes/voiceRoutes.ts b/src/routes/voiceRoutes.ts index b1726b3..da648fb 100644 --- a/src/routes/voiceRoutes.ts +++ b/src/routes/voiceRoutes.ts @@ -2,8 +2,8 @@ import type { Router } from "express"; import express from "express"; import { AppError } from "../errors"; import { createChildLogger } from "../logger"; -import type { VoiceController } from "../voiceController"; import type { ModerationBroadcaster } from "../moderation/broadcaster"; +import type { VoiceController } from "../voiceController"; import type { SharedUIState } from "./uiStateRoutes"; const logger = createChildLogger("voice-routes"); diff --git a/tests/moderation/llmModerationClient.test.ts b/tests/moderation/llmModerationClient.test.ts index d9052cd..c5cdf53 100644 --- a/tests/moderation/llmModerationClient.test.ts +++ b/tests/moderation/llmModerationClient.test.ts @@ -1,9 +1,9 @@ -import { describe, expect, it, vi, beforeEach } from "vitest"; -import type { MessageRecord } from "../../src/moderation/types"; +import { beforeEach, describe, expect, it, vi } from "vitest"; import { parseModerationResponse, runModerationAnalysis, } from "../../src/moderation/llmModerationClient"; +import type { MessageRecord } from "../../src/moderation/types"; vi.mock("../../src/retry", () => ({ retryWithBackoff: vi.fn((fn) => fn()), diff --git a/tests/moderation/messageStoreQueries.test.ts b/tests/moderation/messageStoreQueries.test.ts index fb7da2f..1dce619 100644 --- a/tests/moderation/messageStoreQueries.test.ts +++ b/tests/moderation/messageStoreQueries.test.ts @@ -1,19 +1,19 @@ import { afterAll, beforeAll, beforeEach, describe, expect, it } from "vitest"; +import { + closeDatabase, + getDatabase, + initializeDatabase, +} from "../../src/database/drizzle"; +import { createChildLogger } from "../../src/logger"; import { decodeCursor, encodeCursor, + getMessageById, insertMessage, listMessages, listReviewMessages, updateMessageAsEdited, - getMessageById, } from "../../src/moderation/messageStore"; -import { - getDatabase, - initializeDatabase, - closeDatabase, -} from "../../src/database/drizzle"; -import { createChildLogger } from "../../src/logger"; import type { MessageRecord } from "../../src/moderation/types"; const logger = createChildLogger("messageStoreQueries.test"); diff --git a/vitest.config.ts b/vitest.config.ts index 5b53e74..ba75492 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -1,5 +1,5 @@ -import { defineConfig } from "vitest/config"; import { config } from "dotenv"; +import { defineConfig } from "vitest/config"; config({ path: ".env.test" });