refactor: 🔥 Remove old config-manager symlink

app.ts

@@ -2,7 +2,7 @@ import { errorResponse, jsonResponse, response } from "@/response";
 import { sentry } from "@/sentry";
 import { Hono } from "@hono/hono";
 import { getLogger } from "@logtape/logtape";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { agentBans } from "./middlewares/agent-bans";
 import { bait } from "./middlewares/bait";
 import { boundaryCheck } from "./middlewares/boundary-check";

classes/functions/federation.ts

@@ -1,5 +1,5 @@
 import type { Undo } from "@lysand-org/federation/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import type { User } from "~/packages/database-interface/user";
 
 export const undoFederationRequest = (undoer: User, uri: string): Undo => {

classes/functions/like.ts

@@ -1,8 +1,8 @@
 import type { Like } from "@lysand-org/federation/types";
-import { config } from "config-manager";
 import { type InferSelectModel, and, eq } from "drizzle-orm";
 import { db } from "~/drizzle/db";
 import { Likes, Notifications } from "~/drizzle/schema";
+import { config } from "~/packages/config-manager/index";
 import type { Note } from "~/packages/database-interface/note";
 import type { User } from "~/packages/database-interface/user";
 

classes/functions/status.ts

@@ -2,7 +2,6 @@ import { mentionValidator } from "@/api";
 import { sanitizeHtml, sanitizeHtmlInline } from "@/sanitization";
 import markdownItTaskLists from "@hackmd/markdown-it-task-lists";
 import type { ContentFormat } from "@lysand-org/federation/types";
-import { config } from "config-manager";
 import {
     type InferSelectModel,
     and,
@@ -32,6 +31,7 @@ import {
     type Notes,
     Users,
 } from "~/drizzle/schema";
+import { config } from "~/packages/config-manager/index";
 import type { EmojiWithInstance } from "~/packages/database-interface/emoji";
 import { User } from "~/packages/database-interface/user";
 import type { Application } from "./application";

classes/functions/user.ts

@@ -3,7 +3,6 @@ import type {
     FollowAccept,
     FollowReject,
 } from "@lysand-org/federation/types";
-import { config } from "config-manager";
 import { type InferSelectModel, eq, sql } from "drizzle-orm";
 import { db } from "~/drizzle/db";
 import {
@@ -13,6 +12,7 @@ import {
     Tokens,
     type Users,
 } from "~/drizzle/schema";
+import { config } from "~/packages/config-manager/index";
 import type { EmojiWithInstance } from "~/packages/database-interface/emoji";
 import { User } from "~/packages/database-interface/user";
 import type { Application } from "./application";

classes/media/drivers/disk.test.ts

@@ -14,7 +14,7 @@ import {
 } from "bun:test";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
-import type { Config } from "config-manager";
+import type { Config } from "~/packages/config-manager/config.type";
 import type { MediaHasher } from "../media-hasher";
 import { DiskMediaDriver } from "./disk";
 

classes/media/drivers/disk.ts

@@ -5,7 +5,7 @@
 
 import { rm } from "node:fs/promises";
 import { join } from "node:path";
-import type { Config } from "config-manager";
+import type { Config } from "~/packages/config-manager/config.type";
 import { MediaHasher } from "../media-hasher";
 import type { UploadedFileMetadata } from "../media-manager";
 import type { MediaDriver } from "./media-driver";

classes/media/drivers/s3.test.ts

@@ -5,7 +5,7 @@
 
 import { beforeEach, describe, expect, it, mock } from "bun:test";
 import type { S3Client } from "@bradenmacdonald/s3-lite-client";
-import type { Config } from "config-manager";
+import type { Config } from "~/packages/config-manager/config.type";
 import type { MediaHasher } from "../media-hasher";
 import { S3MediaDriver } from "./s3";
 

classes/media/drivers/s3.ts

@@ -4,7 +4,7 @@
  */
 
 import { S3Client } from "@bradenmacdonald/s3-lite-client";
-import type { Config } from "config-manager";
+import type { Config } from "~/packages/config-manager/config.type";
 import { MediaHasher } from "../media-hasher";
 import type { UploadedFileMetadata } from "../media-manager";
 import type { MediaDriver } from "./media-driver";

classes/media/media-manager.test.ts

@@ -4,7 +4,7 @@
  */
 
 import { beforeEach, describe, expect, it, mock } from "bun:test";
-import type { Config } from "config-manager";
+import type { Config } from "~/packages/config-manager/config.type";
 import { MediaBackendType } from "~/packages/config-manager/config.type";
 import { DiskMediaDriver } from "./drivers/disk";
 import { S3MediaDriver } from "./drivers/s3";

classes/media/media-manager.ts

@@ -3,7 +3,7 @@
  * @module MediaManager
  */
 
-import type { Config } from "config-manager";
+import type { Config } from "~/packages/config-manager/config.type";
 import { DiskMediaDriver } from "./drivers/disk";
 import type { MediaDriver } from "./drivers/media-driver";
 import { S3MediaDriver } from "./drivers/s3";

classes/media/preprocessors/image-conversion.test.ts

@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it } from "bun:test";
-import type { Config } from "config-manager";
 import sharp from "sharp";
+import type { Config } from "~/packages/config-manager/config.type";
 import { ImageConversionPreprocessor } from "./image-conversion";
 
 describe("ImageConversionPreprocessor", () => {

classes/media/preprocessors/image-conversion.ts

@@ -3,8 +3,8 @@
  * @module MediaManager/Preprocessors
  */
 
-import type { Config } from "config-manager";
 import sharp from "sharp";
+import type { Config } from "~/packages/config-manager/config.type";
 import type { MediaPreprocessor } from "./media-preprocessor";
 
 /**

drizzle.config.ts

@@ -1,5 +1,5 @@
-import { config } from "config-manager";
 import type { Config } from "drizzle-kit";
+import { config } from "~/packages/config-manager/index";
 
 export default {
     dialect: "postgresql",

index.ts

@@ -1,8 +1,8 @@
 import { configureLoggers } from "@/loggers";
 import { sentry } from "@/sentry";
 import { createServer } from "@/server";
-import { config } from "config-manager";
 import { appFactory } from "~/app";
+import { config } from "~/packages/config-manager/index";
 import { setupDatabase } from "./drizzle/db";
 
 if (import.meta.main) {

package.json

@@ -115,7 +115,6 @@
         "chalk": "^5.3.0",
         "cli-progress": "^3.12.0",
         "cli-table": "^0.3.11",
-        "config-manager": "workspace:*",
         "drizzle-orm": "^0.33.0",
         "extract-zip": "^2.0.1",
         "hono": "npm:@jsr/hono__hono@4.5.4",

packages/config-manager/package.json

@@ -1,11 +0,0 @@
-{
-    "name": "config-manager",
-    "version": "0.0.0",
-    "main": "index.ts",
-    "type": "module",
-    "dependencies": {
-        "c12": "^1.11.1",
-        "zod": "^3.23.8",
-        "zod-validation-error": "^3.3.0"
-    }
-}

packages/database-interface/attachment.ts

@@ -4,7 +4,6 @@ import type {
     Attachment as ApiAttachment,
 } from "@lysand-org/client/types";
 import type { ContentFormat } from "@lysand-org/federation/types";
-import { config } from "config-manager";
 import { MediaBackendType } from "config-manager/config.type";
 import {
     type InferInsertModel,
@@ -16,6 +15,7 @@ import {
 } from "drizzle-orm";
 import { db } from "~/drizzle/db";
 import { Attachments } from "~/drizzle/schema";
+import { config } from "~/packages/config-manager/index";
 import { BaseInterface } from "./base";
 
 export type AttachmentType = InferSelectModel<typeof Attachments>;

packages/database-interface/instance.ts

@@ -6,7 +6,6 @@ import {
 } from "@lysand-org/federation";
 import type { ServerMetadata } from "@lysand-org/federation/types";
 import chalk from "chalk";
-import { config } from "config-manager";
 import {
     type InferInsertModel,
     type InferSelectModel,
@@ -18,6 +17,7 @@ import {
 } from "drizzle-orm";
 import { db } from "~/drizzle/db";
 import { Instances } from "~/drizzle/schema";
+import { config } from "~/packages/config-manager/index";
 import { BaseInterface } from "./base";
 import { User } from "./user";
 

packages/database-interface/role.ts

@@ -1,6 +1,5 @@
 import { proxyUrl } from "@/response";
 import type { RolePermission } from "@lysand-org/client/types";
-import { config } from "config-manager";
 import {
     type InferInsertModel,
     type InferSelectModel,
@@ -12,6 +11,7 @@ import {
 } from "drizzle-orm";
 import { db } from "~/drizzle/db";
 import { RoleToUsers, Roles } from "~/drizzle/schema";
+import { config } from "~/packages/config-manager/index";
 import { BaseInterface } from "./base";
 
 export type RoleType = InferSelectModel<typeof Roles>;

packages/glitch-server/main.ts

@@ -1,8 +1,8 @@
 import { join } from "node:path";
 import { redirect } from "@/response";
 import type { BunFile } from "bun";
-import { config } from "config-manager";
 import { retrieveUserFromToken } from "~/classes/functions/user";
+import { config } from "~/packages/config-manager/index";
 import type { User } from "~/packages/database-interface/user";
 import { languages } from "./glitch-languages";
 

server/api/api/v1/accounts/:id/block.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import type { Relationship as ApiRelationship } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./block";
 

server/api/api/v1/accounts/:id/follow.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import type { Relationship as ApiRelationship } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./follow";
 

server/api/api/v1/accounts/:id/followers.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import type { Account as ApiAccount } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./followers";
 

server/api/api/v1/accounts/:id/following.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import type { Account as ApiAccount } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./following";
 

server/api/api/v1/accounts/:id/index.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import type { Account as ApiAccount } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
 

server/api/api/v1/accounts/:id/mute.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import type { Relationship as ApiRelationship } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./mute";
 

server/api/api/v1/accounts/:id/statuses.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import type { Status as ApiStatus } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./statuses";
 

server/api/api/v1/accounts/:id/unmute.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import type { Relationship as ApiRelationship } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./unmute";
 

server/api/api/v1/accounts/id/index.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import type { Account as ApiAccount } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
 

server/api/api/v1/accounts/index.test.ts

@@ -1,9 +1,9 @@
 import { afterEach, describe, expect, test } from "bun:test";
 import { randomString } from "@/math";
-import { config } from "config-manager";
 import { eq } from "drizzle-orm";
 import { db } from "~/drizzle/db";
 import { Users } from "~/drizzle/schema";
+import { config } from "~/packages/config-manager/index";
 import { getSolvedChallenge, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
 

server/api/api/v1/accounts/lookup/index.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import type { Account as ApiAccount } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
 

server/api/api/v1/accounts/relationships/index.test.ts

@@ -1,8 +1,8 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { config } from "config-manager";
 import { eq } from "drizzle-orm";
 import { db } from "~/drizzle/db";
 import { Users } from "~/drizzle/schema";
+import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
 

server/api/api/v1/accounts/search/index.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import type { Account as ApiAccount } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
 

server/api/api/v1/accounts/update_credentials/index.ts

@@ -3,7 +3,6 @@ import { errorResponse, jsonResponse } from "@/response";
 import { sanitizedHtmlStrip } from "@/sanitization";
 import type { Hono } from "@hono/hono";
 import { zValidator } from "@hono/zod-validator";
-import { config } from "config-manager";
 import { and, eq, isNull } from "drizzle-orm";
 import ISO6391 from "iso-639-1";
 import { z } from "zod";
@@ -11,6 +10,7 @@ import { contentToHtml } from "~/classes/functions/status";
 import { MediaManager } from "~/classes/media/media-manager";
 import { db } from "~/drizzle/db";
 import { EmojiToUser, RolePermissions, Users } from "~/drizzle/schema";
+import { config } from "~/packages/config-manager/index";
 import { Attachment } from "~/packages/database-interface/attachment";
 import { Emoji } from "~/packages/database-interface/emoji";
 import { User } from "~/packages/database-interface/user";

server/api/api/v1/challenges/index.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
 

server/api/api/v1/custom_emojis/index.test.ts

@@ -1,8 +1,8 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { config } from "config-manager";
 import { inArray } from "drizzle-orm";
 import { db } from "~/drizzle/db";
 import { Emojis } from "~/drizzle/schema";
+import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
 

server/api/api/v1/emojis/:id/index.test.ts

@@ -1,8 +1,8 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { config } from "config-manager";
 import { inArray } from "drizzle-orm";
 import { db } from "~/drizzle/db";
 import { Emojis } from "~/drizzle/schema";
+import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
 

server/api/api/v1/emojis/index.test.ts

@@ -1,9 +1,9 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { config } from "config-manager";
 import { inArray } from "drizzle-orm";
 import sharp from "sharp";
 import { db } from "~/drizzle/db";
 import { Emojis } from "~/drizzle/schema";
+import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
 

server/api/api/v1/instance/extended_description.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { sendTestRequest } from "~/tests/utils";
 import { meta } from "./extended_description";
 

server/api/api/v1/instance/privacy_policy.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { sendTestRequest } from "~/tests/utils";
 import { meta } from "./privacy_policy";
 

server/api/api/v1/instance/rules.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { sendTestRequest } from "~/tests/utils";
 import { meta } from "./rules";
 

server/api/api/v1/instance/tos.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { sendTestRequest } from "~/tests/utils";
 import { meta } from "./tos";
 

server/api/api/v1/markers/index.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
 

server/api/api/v1/media/:id/index.ts

@@ -2,10 +2,10 @@ import { applyConfig, auth, handleZodError, idValidator } from "@/api";
 import { errorResponse, jsonResponse, response } from "@/response";
 import type { Hono } from "@hono/hono";
 import { zValidator } from "@hono/zod-validator";
-import { config } from "config-manager";
 import { z } from "zod";
 import { MediaManager } from "~/classes/media/media-manager";
 import { RolePermissions } from "~/drizzle/schema";
+import { config } from "~/packages/config-manager/index";
 import { Attachment } from "~/packages/database-interface/attachment";
 
 export const meta = applyConfig({

server/api/api/v1/media/index.ts

@@ -2,11 +2,11 @@ import { applyConfig, auth, handleZodError } from "@/api";
 import { errorResponse, jsonResponse } from "@/response";
 import type { Hono } from "@hono/hono";
 import { zValidator } from "@hono/zod-validator";
-import { config } from "config-manager";
 import sharp from "sharp";
 import { z } from "zod";
 import { MediaManager } from "~/classes/media/media-manager";
 import { RolePermissions } from "~/drizzle/schema";
+import { config } from "~/packages/config-manager/index";
 import { Attachment } from "~/packages/database-interface/attachment";
 
 export const meta = applyConfig({

server/api/api/v1/mutes/index.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
 

server/api/api/v1/notifications/:id/dismiss.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import type { Notification as ApiNotification } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./dismiss";
 

server/api/api/v1/notifications/:id/index.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import type { Notification as ApiNotification } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
 

server/api/api/v1/notifications/clear/index.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import type { Notification as ApiNotification } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
 

server/api/api/v1/notifications/destroy_multiple/index.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import type { Notification as ApiNotification } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
 

server/api/api/v1/notifications/index.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import type { Notification as ApiNotification } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
 

server/api/api/v1/roles/:id/index.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { config } from "config-manager";
 import { ADMIN_ROLES, DEFAULT_ROLES, RolePermissions } from "~/drizzle/schema";
+import { config } from "~/packages/config-manager/index";
 import { Role } from "~/packages/database-interface/role";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";

server/api/api/v1/roles/index.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { config } from "config-manager";
 import { ADMIN_ROLES } from "~/drizzle/schema";
+import { config } from "~/packages/config-manager/index";
 import { Role } from "~/packages/database-interface/role";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";

server/api/api/v1/statuses/:id/favourite.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import type { Status as ApiStatus } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./favourite";
 

server/api/api/v1/statuses/:id/favourited_by.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import type { Account as ApiAccount } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./favourited_by";
 

server/api/api/v1/statuses/:id/index.ts

@@ -8,11 +8,11 @@ import {
 import { errorResponse, jsonResponse } from "@/response";
 import type { Hono } from "@hono/hono";
 import { zValidator } from "@hono/zod-validator";
-import { config } from "config-manager";
 import ISO6391 from "iso-639-1";
 import { z } from "zod";
 import { undoFederationRequest } from "~/classes/functions/federation";
 import { RolePermissions } from "~/drizzle/schema";
+import { config } from "~/packages/config-manager/index";
 import { Attachment } from "~/packages/database-interface/attachment";
 import { Note } from "~/packages/database-interface/note";
 

server/api/api/v1/statuses/:id/reblogged_by.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import type { Account as ApiAccount } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./reblogged_by";
 

server/api/api/v1/statuses/:id/unfavourite.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import type { Status as ApiStatus } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./unfavourite";
 

server/api/api/v1/statuses/index.test.ts

@@ -1,9 +1,9 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import type { Status as ApiStatus } from "@lysand-org/client/types";
-import { config } from "config-manager";
 import { eq } from "drizzle-orm";
 import { db } from "~/drizzle/db";
 import { Emojis } from "~/drizzle/schema";
+import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
 

server/api/api/v1/statuses/index.ts

@@ -2,10 +2,10 @@ import { applyConfig, auth, handleZodError, jsonOrForm } from "@/api";
 import { errorResponse, jsonResponse } from "@/response";
 import type { Hono } from "@hono/hono";
 import { zValidator } from "@hono/zod-validator";
-import { config } from "config-manager";
 import ISO6391 from "iso-639-1";
 import { z } from "zod";
 import { RolePermissions } from "~/drizzle/schema";
+import { config } from "~/packages/config-manager/index";
 import { Attachment } from "~/packages/database-interface/attachment";
 import { Note } from "~/packages/database-interface/note";
 

server/api/api/v1/timelines/home.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import type { Status as ApiStatus } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./home";
 

server/api/api/v1/timelines/public.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import type { Status as ApiStatus } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./public";
 

server/api/api/v2/filters/:id/index.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
 

server/api/api/v2/filters/index.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
 

server/api/api/v2/instance/index.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
 

server/api/api/v2/media/index.ts

@@ -2,11 +2,11 @@ import { applyConfig, auth, handleZodError } from "@/api";
 import { errorResponse, jsonResponse } from "@/response";
 import type { Hono } from "@hono/hono";
 import { zValidator } from "@hono/zod-validator";
-import { config } from "config-manager";
 import sharp from "sharp";
 import { z } from "zod";
 import { MediaManager } from "~/classes/media/media-manager";
 import { RolePermissions } from "~/drizzle/schema";
+import { config } from "~/packages/config-manager/index";
 import { Attachment } from "~/packages/database-interface/attachment";
 
 export const meta = applyConfig({

setup.ts

@@ -1,8 +1,8 @@
 import { checkConfig } from "@/init";
 import { configureLoggers } from "@/loggers";
 import { getLogger } from "@logtape/logtape";
-import { config } from "config-manager";
 import { setupDatabase } from "~/drizzle/db";
+import { config } from "~/packages/config-manager/index";
 import { Note } from "~/packages/database-interface/note";
 import { searchManager } from "./classes/search/search-manager";
 

tests/api.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest, wrapRelativeUrl } from "./utils";
 
 const baseUrl = config.http.base_url;

tests/api/accounts.test.ts

@@ -6,7 +6,7 @@ import type {
     Account as ApiAccount,
     Relationship as ApiRelationship,
 } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest, wrapRelativeUrl } from "~/tests/utils";
 
 const baseUrl = config.http.base_url;

tests/api/statuses.test.ts

@@ -7,7 +7,7 @@ import type {
     Context as ApiContext,
     Status as ApiStatus,
 } from "@lysand-org/client/types";
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest, wrapRelativeUrl } from "~/tests/utils";
 
 const baseUrl = config.http.base_url;

utils/api.ts

@@ -6,7 +6,6 @@ import { validator } from "@hono/hono/validator";
 import { getLogger } from "@logtape/logtape";
 import { extractParams, verifySolution } from "altcha-lib";
 import chalk from "chalk";
-import { config } from "config-manager";
 import { eq } from "drizzle-orm";
 import {
     anyOf,
@@ -27,6 +26,7 @@ import type { Application } from "~/classes/functions/application";
 import { type AuthData, getFromHeader } from "~/classes/functions/user";
 import { db } from "~/drizzle/db";
 import { Challenges } from "~/drizzle/schema";
+import { config } from "~/packages/config-manager/index";
 import type { User } from "~/packages/database-interface/user";
 import type { ApiRouteMetadata, HttpVerb } from "~/types/api";
 

utils/constants.ts

@@ -1,4 +1,4 @@
-import { config } from "config-manager";
+import { config } from "~/packages/config-manager/index";
 
 export const oauthRedirectUri = (issuer: string) =>
     new URL(`/oauth/sso/${issuer}/callback`, config.http.base_url).toString();

utils/sentry.ts

@@ -1,6 +1,6 @@
 import * as Sentry from "@sentry/bun";
-import { config } from "config-manager";
 import pkg from "~/package.json";
+import { config } from "~/packages/config-manager/index";
 
 const sentryInstance =
     config.logging.sentry.enabled &&

utils/server.ts

@@ -1,5 +1,5 @@
 import type { Hono } from "@hono/hono";
-import type { Config } from "config-manager";
+import type { Config } from "~/packages/config-manager/config.type";
 
 export const createServer = (config: Config, app: Hono) =>
     Bun.serve({

utils/timelines.ts

@@ -1,4 +1,3 @@
-import { config } from "config-manager";
 import type {
     Notification,
     findManyNotifications,
@@ -6,6 +5,7 @@ import type {
 import type { Status, findManyNotes } from "~/classes/functions/status";
 import type { UserType, findManyUsers } from "~/classes/functions/user";
 import type { db } from "~/drizzle/db";
+import { config } from "~/packages/config-manager/index";
 
 export async function fetchTimeline<T extends UserType | Status | Notification>(
     model: