diff --git a/build.ts b/build.ts index 8907eb6a..670d4b0b 100644 --- a/build.ts +++ b/build.ts @@ -1,7 +1,7 @@ import { $ } from "bun"; import chalk from "chalk"; import ora from "ora"; -import { routes } from "~routes"; +import { routes } from "~/routes"; const buildSpinner = ora("Building").start(); diff --git a/cli/base.ts b/cli/base.ts index 8269377c..3658a6bf 100644 --- a/cli/base.ts +++ b/cli/base.ts @@ -1,6 +1,6 @@ -import { consoleLogger } from "@loggers"; +import { consoleLogger } from "@/loggers"; import { Command } from "@oclif/core"; -import { setupDatabase } from "~drizzle/db"; +import { setupDatabase } from "~/drizzle/db"; export abstract class BaseCommand extends Command { protected async init(): Promise { diff --git a/cli/classes.ts b/cli/classes.ts index 55f40ae8..6b902b03 100644 --- a/cli/classes.ts +++ b/cli/classes.ts @@ -1,9 +1,9 @@ import { Args, type Command, Flags, type Interfaces } from "@oclif/core"; import chalk from "chalk"; import { and, eq, getTableColumns, like } from "drizzle-orm"; -import { db } from "~drizzle/db"; -import { Emojis, Instances, Users } from "~drizzle/schema"; -import { User } from "~packages/database-interface/user"; +import { db } from "~/drizzle/db"; +import { Emojis, Instances, Users } from "~/drizzle/schema"; +import { User } from "~/packages/database-interface/user"; import { BaseCommand } from "./base"; export type FlagsType = Interfaces.InferredFlags< diff --git a/cli/commands/emoji/add.ts b/cli/commands/emoji/add.ts index 9ca55a4e..1daef082 100644 --- a/cli/commands/emoji/add.ts +++ b/cli/commands/emoji/add.ts @@ -1,12 +1,12 @@ import { Args } from "@oclif/core"; import chalk from "chalk"; import ora from "ora"; -import { BaseCommand } from "~/cli/base"; -import { getUrl } from "~database/entities/Attachment"; -import { db } from "~drizzle/db"; -import { Emojis } from "~drizzle/schema"; -import { config } from "~packages/config-manager"; -import { MediaBackend } from "~packages/media-manager"; +import { BaseCommand } from "~//cli/base"; +import { getUrl } from "~/database/entities/Attachment"; +import { db } from "~/drizzle/db"; +import { Emojis } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; +import { MediaBackend } from "~/packages/media-manager"; export default class EmojiAdd extends BaseCommand { static override args = { diff --git a/cli/commands/emoji/delete.ts b/cli/commands/emoji/delete.ts index b6550a5c..3513a876 100644 --- a/cli/commands/emoji/delete.ts +++ b/cli/commands/emoji/delete.ts @@ -3,12 +3,12 @@ import { Args, Flags } from "@oclif/core"; import chalk from "chalk"; import { and, eq, inArray, isNull } from "drizzle-orm"; import ora from "ora"; -import { EmojiFinderCommand } from "~cli/classes"; -import { formatArray } from "~cli/utils/format"; -import { db } from "~drizzle/db"; -import { Emojis } from "~drizzle/schema"; -import { config } from "~packages/config-manager"; -import { MediaBackend } from "~packages/media-manager"; +import { EmojiFinderCommand } from "~/cli/classes"; +import { formatArray } from "~/cli/utils/format"; +import { db } from "~/drizzle/db"; +import { Emojis } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; +import { MediaBackend } from "~/packages/media-manager"; export default class EmojiDelete extends EmojiFinderCommand< typeof EmojiDelete diff --git a/cli/commands/emoji/import.ts b/cli/commands/emoji/import.ts index 231cfbe1..c16d9692 100644 --- a/cli/commands/emoji/import.ts +++ b/cli/commands/emoji/import.ts @@ -4,12 +4,12 @@ import { and, inArray, isNull } from "drizzle-orm"; import { lookup } from "mime-types"; import ora from "ora"; import { unzip } from "unzipit"; -import { BaseCommand } from "~/cli/base"; -import { getUrl } from "~database/entities/Attachment"; -import { db } from "~drizzle/db"; -import { Emojis } from "~drizzle/schema"; -import { config } from "~packages/config-manager"; -import { MediaBackend } from "~packages/media-manager"; +import { BaseCommand } from "~//cli/base"; +import { getUrl } from "~/database/entities/Attachment"; +import { db } from "~/drizzle/db"; +import { Emojis } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; +import { MediaBackend } from "~/packages/media-manager"; type MetaType = { emojis: { diff --git a/cli/commands/emoji/list.ts b/cli/commands/emoji/list.ts index fab54b70..5db040fe 100644 --- a/cli/commands/emoji/list.ts +++ b/cli/commands/emoji/list.ts @@ -1,9 +1,9 @@ import { Flags } from "@oclif/core"; import { and, eq, getTableColumns, isNotNull, isNull } from "drizzle-orm"; -import { BaseCommand } from "~cli/base"; -import { formatArray } from "~cli/utils/format"; -import { db } from "~drizzle/db"; -import { Emojis, Instances, Users } from "~drizzle/schema"; +import { BaseCommand } from "~/cli/base"; +import { formatArray } from "~/cli/utils/format"; +import { db } from "~/drizzle/db"; +import { Emojis, Instances, Users } from "~/drizzle/schema"; export default class EmojiList extends BaseCommand { static override args = {}; diff --git a/cli/commands/start.ts b/cli/commands/start.ts index 79c16f75..b62426c3 100644 --- a/cli/commands/start.ts +++ b/cli/commands/start.ts @@ -1,6 +1,6 @@ import os from "node:os"; import { Flags } from "@oclif/core"; -import { BaseCommand } from "~cli/base"; +import { BaseCommand } from "~/cli/base"; export default class Start extends BaseCommand { static override args = {}; diff --git a/cli/commands/user/create.ts b/cli/commands/user/create.ts index 1418522f..bab27e71 100644 --- a/cli/commands/user/create.ts +++ b/cli/commands/user/create.ts @@ -3,10 +3,10 @@ import { Args, Flags } from "@oclif/core"; import chalk from "chalk"; import { eq } from "drizzle-orm"; import { renderUnicodeCompact } from "uqr"; -import { BaseCommand } from "~cli/base"; -import { formatArray } from "~cli/utils/format"; -import { Users } from "~drizzle/schema"; -import { User } from "~packages/database-interface/user"; +import { BaseCommand } from "~/cli/base"; +import { formatArray } from "~/cli/utils/format"; +import { Users } from "~/drizzle/schema"; +import { User } from "~/packages/database-interface/user"; export default class UserCreate extends BaseCommand { static override args = { diff --git a/cli/commands/user/delete.ts b/cli/commands/user/delete.ts index b631c028..5373a591 100644 --- a/cli/commands/user/delete.ts +++ b/cli/commands/user/delete.ts @@ -2,8 +2,8 @@ import confirm from "@inquirer/confirm"; import { Flags } from "@oclif/core"; import chalk from "chalk"; import ora from "ora"; -import { UserFinderCommand } from "~cli/classes"; -import { formatArray } from "~cli/utils/format"; +import { UserFinderCommand } from "~/cli/classes"; +import { formatArray } from "~/cli/utils/format"; export default class UserDelete extends UserFinderCommand { static override description = "Deletes users"; diff --git a/cli/commands/user/list.ts b/cli/commands/user/list.ts index 7393e5e2..32eb9d1c 100644 --- a/cli/commands/user/list.ts +++ b/cli/commands/user/list.ts @@ -1,9 +1,9 @@ import { Flags } from "@oclif/core"; import { and, eq, isNotNull, isNull } from "drizzle-orm"; -import { BaseCommand } from "~cli/base"; -import { formatArray } from "~cli/utils/format"; -import { Users } from "~drizzle/schema"; -import { User } from "~packages/database-interface/user"; +import { BaseCommand } from "~/cli/base"; +import { formatArray } from "~/cli/utils/format"; +import { Users } from "~/drizzle/schema"; +import { User } from "~/packages/database-interface/user"; export default class UserList extends BaseCommand { static override args = {}; diff --git a/cli/commands/user/reset.ts b/cli/commands/user/reset.ts index c767929d..dc83e9fe 100644 --- a/cli/commands/user/reset.ts +++ b/cli/commands/user/reset.ts @@ -2,9 +2,9 @@ import confirm from "@inquirer/confirm"; import { Flags } from "@oclif/core"; import chalk from "chalk"; import { renderUnicodeCompact } from "uqr"; -import { UserFinderCommand } from "~cli/classes"; -import { formatArray } from "~cli/utils/format"; -import { config } from "~packages/config-manager"; +import { UserFinderCommand } from "~/cli/classes"; +import { formatArray } from "~/cli/utils/format"; +import { config } from "~/packages/config-manager"; export default class UserReset extends UserFinderCommand { static override description = "Resets users' passwords"; diff --git a/database/entities/Application.ts b/database/entities/Application.ts index 67607120..cff3817c 100644 --- a/database/entities/Application.ts +++ b/database/entities/Application.ts @@ -1,7 +1,7 @@ import type { InferSelectModel } from "drizzle-orm"; -import { db } from "~drizzle/db"; -import type { Applications } from "~drizzle/schema"; -import type { Application as APIApplication } from "~types/mastodon/application"; +import { db } from "~/drizzle/db"; +import type { Applications } from "~/drizzle/schema"; +import type { Application as APIApplication } from "~/types/mastodon/application"; export type Application = InferSelectModel; diff --git a/database/entities/Attachment.ts b/database/entities/Attachment.ts index c1d766eb..dea5b066 100644 --- a/database/entities/Attachment.ts +++ b/database/entities/Attachment.ts @@ -1,12 +1,12 @@ +import { proxyUrl } from "@/response"; import type { EntityValidator } from "@lysand-org/federation"; -import { proxyUrl } from "@response"; import type { Config } from "config-manager"; import type { InferSelectModel } from "drizzle-orm"; import { MediaBackendType } from "media-manager"; -import { db } from "~drizzle/db"; -import { Attachments } from "~drizzle/schema"; -import type { AsyncAttachment as APIAsyncAttachment } from "~types/mastodon/async_attachment"; -import type { Attachment as APIAttachment } from "~types/mastodon/attachment"; +import { db } from "~/drizzle/db"; +import { Attachments } from "~/drizzle/schema"; +import type { AsyncAttachment as APIAsyncAttachment } from "~/types/mastodon/async_attachment"; +import type { Attachment as APIAttachment } from "~/types/mastodon/attachment"; export type Attachment = InferSelectModel; diff --git a/database/entities/Emoji.ts b/database/entities/Emoji.ts index bf4d44f9..90cd6947 100644 --- a/database/entities/Emoji.ts +++ b/database/entities/Emoji.ts @@ -1,10 +1,10 @@ -import { emojiValidatorWithColons } from "@api"; +import { emojiValidatorWithColons } from "@/api"; +import { proxyUrl } from "@/response"; import type { EntityValidator } from "@lysand-org/federation"; -import { proxyUrl } from "@response"; import { type InferSelectModel, and, eq } from "drizzle-orm"; -import { db } from "~drizzle/db"; -import { Emojis, Instances } from "~drizzle/schema"; -import type { Emoji as APIEmoji } from "~types/mastodon/emoji"; +import { db } from "~/drizzle/db"; +import { Emojis, Instances } from "~/drizzle/schema"; +import type { Emoji as APIEmoji } from "~/types/mastodon/emoji"; import { addInstanceIfNotExists } from "./Instance"; export type EmojiWithInstance = InferSelectModel & { diff --git a/database/entities/Federation.ts b/database/entities/Federation.ts index 9da3c78a..c457ad25 100644 --- a/database/entities/Federation.ts +++ b/database/entities/Federation.ts @@ -1,11 +1,11 @@ -import { debugRequest } from "@api"; +import { debugRequest } from "@/api"; import { type EntityValidator, SignatureConstructor, } from "@lysand-org/federation"; import { config } from "config-manager"; -import type { User } from "~packages/database-interface/user"; -import { LogLevel, LogManager } from "~packages/log-manager"; +import type { User } from "~/packages/database-interface/user"; +import { LogLevel, LogManager } from "~/packages/log-manager"; export const localObjectURI = (id: string) => new URL(`/objects/${id}`, config.http.base_url).toString(); diff --git a/database/entities/Instance.ts b/database/entities/Instance.ts index 7532a22e..a3ee752a 100644 --- a/database/entities/Instance.ts +++ b/database/entities/Instance.ts @@ -1,6 +1,6 @@ import type { EntityValidator } from "@lysand-org/federation"; -import { db } from "~drizzle/db"; -import { Instances } from "~drizzle/schema"; +import { db } from "~/drizzle/db"; +import { Instances } from "~/drizzle/schema"; /** * Represents an instance in the database. diff --git a/database/entities/Like.ts b/database/entities/Like.ts index d810bd55..c44c440f 100644 --- a/database/entities/Like.ts +++ b/database/entities/Like.ts @@ -1,10 +1,10 @@ import type { EntityValidator } from "@lysand-org/federation"; 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 type { Note } from "~packages/database-interface/note"; -import type { User } from "~packages/database-interface/user"; +import { db } from "~/drizzle/db"; +import { Likes, Notifications } from "~/drizzle/schema"; +import type { Note } from "~/packages/database-interface/note"; +import type { User } from "~/packages/database-interface/user"; export type Like = InferSelectModel; diff --git a/database/entities/Notification.ts b/database/entities/Notification.ts index c9647274..5a4d4f53 100644 --- a/database/entities/Notification.ts +++ b/database/entities/Notification.ts @@ -1,9 +1,9 @@ import type { InferSelectModel } from "drizzle-orm"; -import { db } from "~drizzle/db"; -import type { Notifications } from "~drizzle/schema"; -import { Note } from "~packages/database-interface/note"; -import { User } from "~packages/database-interface/user"; -import type { Notification as APINotification } from "~types/mastodon/notification"; +import { db } from "~/drizzle/db"; +import type { Notifications } from "~/drizzle/schema"; +import { Note } from "~/packages/database-interface/note"; +import { User } from "~/packages/database-interface/user"; +import type { Notification as APINotification } from "~/types/mastodon/notification"; import type { StatusWithRelations } from "./Status"; import { type UserWithRelations, diff --git a/database/entities/Relationship.ts b/database/entities/Relationship.ts index bbd038d5..b42a0f25 100644 --- a/database/entities/Relationship.ts +++ b/database/entities/Relationship.ts @@ -1,8 +1,8 @@ import type { InferSelectModel } from "drizzle-orm"; -import { db } from "~drizzle/db"; -import { Relationships } from "~drizzle/schema"; -import type { User } from "~packages/database-interface/user"; -import type { Relationship as APIRelationship } from "~types/mastodon/relationship"; +import { db } from "~/drizzle/db"; +import { Relationships } from "~/drizzle/schema"; +import type { User } from "~/packages/database-interface/user"; +import type { Relationship as APIRelationship } from "~/types/mastodon/relationship"; import type { UserType } from "./User"; export type Relationship = InferSelectModel; diff --git a/database/entities/Status.ts b/database/entities/Status.ts index 43d142a5..9348416e 100644 --- a/database/entities/Status.ts +++ b/database/entities/Status.ts @@ -1,8 +1,8 @@ -import { mentionValidator } from "@api"; +import { mentionValidator } from "@/api"; +import { dualLogger } from "@/loggers"; +import { sanitizeHtml, sanitizeHtmlInline } from "@/sanitization"; import markdownItTaskLists from "@hackmd/markdown-it-task-lists"; -import { dualLogger } from "@loggers"; import type { EntityValidator } from "@lysand-org/federation"; -import { sanitizeHtml, sanitizeHtmlInline } from "@sanitization"; import { config } from "config-manager"; import { type InferSelectModel, @@ -29,12 +29,12 @@ import MarkdownIt from "markdown-it"; import markdownItAnchor from "markdown-it-anchor"; import markdownItContainer from "markdown-it-container"; import markdownItTocDoneRight from "markdown-it-toc-done-right"; -import { db } from "~drizzle/db"; -import { type Attachments, Instances, Notes, Users } from "~drizzle/schema"; -import { Note } from "~packages/database-interface/note"; -import { User } from "~packages/database-interface/user"; -import { LogLevel } from "~packages/log-manager"; -import type { Status as APIStatus } from "~types/mastodon/status"; +import { db } from "~/drizzle/db"; +import { type Attachments, Instances, Notes, Users } from "~/drizzle/schema"; +import { Note } from "~/packages/database-interface/note"; +import { User } from "~/packages/database-interface/user"; +import { LogLevel } from "~/packages/log-manager"; +import type { Status as APIStatus } from "~/types/mastodon/status"; import type { Application } from "./Application"; import { attachmentFromLysand } from "./Attachment"; import { type EmojiWithInstance, fetchEmoji } from "./Emoji"; diff --git a/database/entities/Token.ts b/database/entities/Token.ts index be7fab6f..8dd60f8e 100644 --- a/database/entities/Token.ts +++ b/database/entities/Token.ts @@ -1,5 +1,5 @@ import type { InferSelectModel } from "drizzle-orm"; -import type { Tokens } from "~drizzle/schema"; +import type { Tokens } from "~/drizzle/schema"; /** * The type of token. diff --git a/database/entities/User.ts b/database/entities/User.ts index e19de6fd..4e209428 100644 --- a/database/entities/User.ts +++ b/database/entities/User.ts @@ -1,8 +1,8 @@ -import { dualLogger } from "@loggers"; +import { dualLogger } from "@/loggers"; import type { EntityValidator } from "@lysand-org/federation"; import { config } from "config-manager"; import { type InferSelectModel, and, eq, sql } from "drizzle-orm"; -import { db } from "~drizzle/db"; +import { db } from "~/drizzle/db"; import { Applications, Instances, @@ -10,9 +10,9 @@ import { Relationships, Tokens, Users, -} from "~drizzle/schema"; -import { User } from "~packages/database-interface/user"; -import { LogLevel } from "~packages/log-manager"; +} from "~/drizzle/schema"; +import { User } from "~/packages/database-interface/user"; +import { LogLevel } from "~/packages/log-manager"; import type { Application } from "./Application"; import type { EmojiWithInstance } from "./Emoji"; import { objectToInboxRequest } from "./Federation"; diff --git a/drizzle/db.ts b/drizzle/db.ts index ec587498..8f37b861 100644 --- a/drizzle/db.ts +++ b/drizzle/db.ts @@ -2,7 +2,7 @@ import { drizzle } from "drizzle-orm/node-postgres"; import { migrate } from "drizzle-orm/postgres-js/migrator"; import { LogLevel, LogManager, type MultiLogManager } from "log-manager"; import { Client } from "pg"; -import { config } from "~/packages/config-manager"; +import { config } from "~//packages/config-manager"; import * as schema from "./schema"; export const client = new Client({ diff --git a/drizzle/schema.ts b/drizzle/schema.ts index e413f70d..aabca2ea 100644 --- a/drizzle/schema.ts +++ b/drizzle/schema.ts @@ -13,7 +13,7 @@ import { uniqueIndex, uuid, } from "drizzle-orm/pg-core"; -import type { Source as APISource } from "~types/mastodon/source"; +import type { Source as APISource } from "~/types/mastodon/source"; export const Emojis = pgTable("Emojis", { id: uuid("id").default(sql`uuid_generate_v7()`).primaryKey().notNull(), diff --git a/index.ts b/index.ts index c84e0049..07e048ec 100644 --- a/index.ts +++ b/index.ts @@ -1,22 +1,22 @@ -import { dualLogger } from "@loggers"; -import { connectMeili } from "@meilisearch"; -import { errorResponse, response } from "@response"; +import { dualLogger } from "@/loggers"; +import { connectMeili } from "@/meilisearch"; +import { errorResponse, response } from "@/response"; import chalk from "chalk"; import { config } from "config-manager"; import { Hono } from "hono"; import { LogLevel, LogManager, type MultiLogManager } from "log-manager"; -import { setupDatabase } from "~drizzle/db"; -import { agentBans } from "~middlewares/agent-bans"; -import { bait } from "~middlewares/bait"; -import { boundaryCheck } from "~middlewares/boundary-check"; -import { ipBans } from "~middlewares/ip-bans"; -import { logger } from "~middlewares/logger"; -import { urlCheck } from "~middlewares/url-check"; -import { Note } from "~packages/database-interface/note"; -import { handleGlitchRequest } from "~packages/glitch-server/main"; -import { routes } from "~routes"; -import { createServer } from "~server"; -import type { APIRouteExports } from "~types/api"; +import { setupDatabase } from "~/drizzle/db"; +import { agentBans } from "~/middlewares/agent-bans"; +import { bait } from "~/middlewares/bait"; +import { boundaryCheck } from "~/middlewares/boundary-check"; +import { ipBans } from "~/middlewares/ip-bans"; +import { logger } from "~/middlewares/logger"; +import { urlCheck } from "~/middlewares/url-check"; +import { Note } from "~/packages/database-interface/note"; +import { handleGlitchRequest } from "~/packages/glitch-server/main"; +import { routes } from "~/routes"; +import { createServer } from "~/server"; +import type { APIRouteExports } from "~/types/api"; const timeAtStart = performance.now(); diff --git a/middlewares/agent-bans.ts b/middlewares/agent-bans.ts index a48e1b0d..9e5a7a80 100644 --- a/middlewares/agent-bans.ts +++ b/middlewares/agent-bans.ts @@ -1,6 +1,6 @@ -import { errorResponse } from "@response"; +import { errorResponse } from "@/response"; import { createMiddleware } from "hono/factory"; -import { config } from "~packages/config-manager"; +import { config } from "~/packages/config-manager"; export const agentBans = createMiddleware(async (context, next) => { // Check for banned user agents (regex) diff --git a/middlewares/bait.ts b/middlewares/bait.ts index f7724be7..6b281fa7 100644 --- a/middlewares/bait.ts +++ b/middlewares/bait.ts @@ -1,10 +1,10 @@ -import { logger } from "@loggers"; -import { errorResponse, response } from "@response"; +import { logger } from "@/loggers"; +import { errorResponse, response } from "@/response"; import type { SocketAddress } from "bun"; import { createMiddleware } from "hono/factory"; import { matches } from "ip-matching"; -import { config } from "~packages/config-manager"; -import { LogLevel } from "~packages/log-manager"; +import { config } from "~/packages/config-manager"; +import { LogLevel } from "~/packages/log-manager"; export const bait = createMiddleware(async (context, next) => { const request_ip = context.env?.ip as SocketAddress | undefined | null; diff --git a/middlewares/boundary-check.ts b/middlewares/boundary-check.ts index 83eb4b5f..b8f38fce 100644 --- a/middlewares/boundary-check.ts +++ b/middlewares/boundary-check.ts @@ -1,4 +1,4 @@ -import { errorResponse } from "@response"; +import { errorResponse } from "@/response"; import { createMiddleware } from "hono/factory"; export const boundaryCheck = createMiddleware(async (context, next) => { diff --git a/middlewares/ip-bans.ts b/middlewares/ip-bans.ts index 190926a7..1b724daa 100644 --- a/middlewares/ip-bans.ts +++ b/middlewares/ip-bans.ts @@ -1,10 +1,10 @@ -import { logger } from "@loggers"; -import { errorResponse } from "@response"; +import { logger } from "@/loggers"; +import { errorResponse } from "@/response"; import type { SocketAddress } from "bun"; import { createMiddleware } from "hono/factory"; import { matches } from "ip-matching"; -import { config } from "~packages/config-manager"; -import { LogLevel } from "~packages/log-manager"; +import { config } from "~/packages/config-manager"; +import { LogLevel } from "~/packages/log-manager"; export const ipBans = createMiddleware(async (context, next) => { // Check for banned IPs diff --git a/middlewares/logger.ts b/middlewares/logger.ts index 241f1a27..9e24de2d 100644 --- a/middlewares/logger.ts +++ b/middlewares/logger.ts @@ -1,7 +1,7 @@ -import { dualLogger } from "@loggers"; +import { dualLogger } from "@/loggers"; import type { SocketAddress } from "bun"; import { createMiddleware } from "hono/factory"; -import { config } from "~packages/config-manager"; +import { config } from "~/packages/config-manager"; export const logger = createMiddleware(async (context, next) => { const request_ip = context.env?.ip as SocketAddress | undefined | null; diff --git a/middlewares/url-check.ts b/middlewares/url-check.ts index dc42512e..387a924f 100644 --- a/middlewares/url-check.ts +++ b/middlewares/url-check.ts @@ -1,6 +1,6 @@ -import { errorResponse } from "@response"; +import { errorResponse } from "@/response"; import { createMiddleware } from "hono/factory"; -import { config } from "~packages/config-manager"; +import { config } from "~/packages/config-manager"; export const urlCheck = createMiddleware(async (context, next) => { // Check that request URL matches base_url diff --git a/packages/database-interface/note.ts b/packages/database-interface/note.ts index 926fad0c..eda6b80f 100644 --- a/packages/database-interface/note.ts +++ b/packages/database-interface/note.ts @@ -1,6 +1,6 @@ +import { proxyUrl } from "@/response"; +import { sanitizedHtmlStrip } from "@/sanitization"; import type { EntityValidator } from "@lysand-org/federation"; -import { proxyUrl } from "@response"; -import { sanitizedHtmlStrip } from "@sanitization"; import { type InferInsertModel, type SQL, @@ -17,25 +17,25 @@ import { createRegExp, exactly, global } from "magic-regexp"; import { type Application, applicationToAPI, -} from "~database/entities/Application"; +} from "~/database/entities/Application"; import { attachmentToAPI, attachmentToLysand, -} from "~database/entities/Attachment"; +} from "~/database/entities/Attachment"; import { type EmojiWithInstance, emojiToAPI, emojiToLysand, parseEmojis, -} from "~database/entities/Emoji"; -import { localObjectURI } from "~database/entities/Federation"; +} from "~/database/entities/Emoji"; +import { localObjectURI } from "~/database/entities/Federation"; import { type Status, type StatusWithRelations, contentToHtml, findManyNotes, -} from "~database/entities/Status"; -import { db } from "~drizzle/db"; +} from "~/database/entities/Status"; +import { db } from "~/drizzle/db"; import { Attachments, EmojiToNote, @@ -43,10 +43,10 @@ import { Notes, Notifications, Users, -} from "~drizzle/schema"; -import { config } from "~packages/config-manager"; -import type { Attachment as APIAttachment } from "~types/mastodon/attachment"; -import type { Status as APIStatus } from "~types/mastodon/status"; +} from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; +import type { Attachment as APIAttachment } from "~/types/mastodon/attachment"; +import type { Status as APIStatus } from "~/types/mastodon/status"; import { User } from "./user"; /** diff --git a/packages/database-interface/oauth.ts b/packages/database-interface/oauth.ts index 52d3272b..baa42eaf 100644 --- a/packages/database-interface/oauth.ts +++ b/packages/database-interface/oauth.ts @@ -1,5 +1,5 @@ -import { oauthRedirectUri } from "@constants"; -import { errorResponse, response } from "@response"; +import { oauthRedirectUri } from "@/constants"; +import { errorResponse, response } from "@/response"; import type { InferInsertModel } from "drizzle-orm"; import { type AuthorizationServer, @@ -14,10 +14,10 @@ import { userInfoRequest, validateAuthResponse, } from "oauth4webapi"; -import type { Application } from "~database/entities/Application"; -import { db } from "~drizzle/db"; -import { type Applications, OpenIdAccounts } from "~drizzle/schema"; -import { config } from "~packages/config-manager"; +import type { Application } from "~/database/entities/Application"; +import { db } from "~/drizzle/db"; +import { type Applications, OpenIdAccounts } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; export class OAuthManager { public issuer: (typeof config.oidc.providers)[0]; diff --git a/packages/database-interface/timeline.ts b/packages/database-interface/timeline.ts index e6e1b3a7..29ff202e 100644 --- a/packages/database-interface/timeline.ts +++ b/packages/database-interface/timeline.ts @@ -1,6 +1,6 @@ import { type SQL, gt } from "drizzle-orm"; -import { Notes, Users } from "~drizzle/schema"; -import { config } from "~packages/config-manager"; +import { Notes, Users } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; import { Note } from "./note"; import { User } from "./user"; diff --git a/packages/database-interface/user.ts b/packages/database-interface/user.ts index b62e39fb..40e90a77 100644 --- a/packages/database-interface/user.ts +++ b/packages/database-interface/user.ts @@ -1,9 +1,9 @@ import { randomBytes } from "node:crypto"; -import { idValidator } from "@api"; -import { getBestContentType, urlToContentFormat } from "@content_types"; +import { idValidator } from "@/api"; +import { getBestContentType, urlToContentFormat } from "@/content_types"; +import { addUserToMeilisearch } from "@/meilisearch"; +import { proxyUrl } from "@/response"; import type { EntityValidator } from "@lysand-org/federation"; -import { addUserToMeilisearch } from "@meilisearch"; -import { proxyUrl } from "@response"; import { type SQL, and, @@ -20,24 +20,24 @@ import { emojiToAPI, emojiToLysand, fetchEmoji, -} from "~database/entities/Emoji"; -import { addInstanceIfNotExists } from "~database/entities/Instance"; +} from "~/database/entities/Emoji"; +import { addInstanceIfNotExists } from "~/database/entities/Instance"; import { type UserWithRelations, findFirstUser, findManyUsers, -} from "~database/entities/User"; -import { db } from "~drizzle/db"; +} from "~/database/entities/User"; +import { db } from "~/drizzle/db"; import { EmojiToUser, NoteToMentions, Notes, UserToPinnedNotes, Users, -} from "~drizzle/schema"; -import { type Config, config } from "~packages/config-manager"; -import type { Account as APIAccount } from "~types/mastodon/account"; -import type { Mention as APIMention } from "~types/mastodon/mention"; +} from "~/drizzle/schema"; +import { type Config, config } from "~/packages/config-manager"; +import type { Account as APIAccount } from "~/types/mastodon/account"; +import type { Mention as APIMention } from "~/types/mastodon/mention"; import type { Note } from "./note"; /** diff --git a/packages/glitch-server/main.ts b/packages/glitch-server/main.ts index 2fe64cb3..1c896b85 100644 --- a/packages/glitch-server/main.ts +++ b/packages/glitch-server/main.ts @@ -1,10 +1,10 @@ import { join } from "node:path"; -import { redirect } from "@response"; +import { redirect } from "@/response"; import type { BunFile } from "bun"; import { config } from "config-manager"; -import { retrieveUserFromToken } from "~database/entities/User"; -import type { User } from "~packages/database-interface/user"; -import type { LogManager, MultiLogManager } from "~packages/log-manager"; +import { retrieveUserFromToken } from "~/database/entities/User"; +import type { User } from "~/packages/database-interface/user"; +import type { LogManager, MultiLogManager } from "~/packages/log-manager"; import { languages } from "./glitch-languages"; const handleManifestRequest = async () => { diff --git a/server/api/api/_fe/config/index.ts b/server/api/api/_fe/config/index.ts index 2767e901..3b9fb59a 100644 --- a/server/api/api/_fe/config/index.ts +++ b/server/api/api/_fe/config/index.ts @@ -1,7 +1,7 @@ -import { applyConfig } from "@api"; -import { jsonResponse } from "@response"; +import { applyConfig } from "@/api"; +import { jsonResponse } from "@/response"; import type { Hono } from "hono"; -import { config } from "~packages/config-manager"; +import { config } from "~/packages/config-manager"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/auth/login/index.test.ts b/server/api/api/auth/login/index.test.ts index 4fa72de7..139df0bb 100644 --- a/server/api/api/auth/login/index.test.ts +++ b/server/api/api/auth/login/index.test.ts @@ -1,10 +1,10 @@ import { afterAll, describe, expect, test } from "bun:test"; import { randomBytes } from "node:crypto"; import { eq } from "drizzle-orm"; -import { db } from "~drizzle/db"; -import { Applications } from "~drizzle/schema"; -import { config } from "~packages/config-manager"; -import { getTestUsers, sendTestRequest } from "~tests/utils"; +import { db } from "~/drizzle/db"; +import { Applications } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; +import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; const { users, deleteUsers, passwords } = await getTestUsers(1); diff --git a/server/api/api/auth/login/index.ts b/server/api/api/auth/login/index.ts index 17f80aa4..86e2a60b 100644 --- a/server/api/api/auth/login/index.ts +++ b/server/api/api/auth/login/index.ts @@ -1,14 +1,14 @@ -import { applyConfig, handleZodError } from "@api"; +import { applyConfig, handleZodError } from "@/api"; +import { errorResponse, redirect, response } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, redirect, response } from "@response"; import { eq, or } from "drizzle-orm"; import type { Hono } from "hono"; import { SignJWT } from "jose"; import { z } from "zod"; -import { db } from "~drizzle/db"; -import { Users } from "~drizzle/schema"; -import { config } from "~packages/config-manager"; -import { User } from "~packages/database-interface/user"; +import { db } from "~/drizzle/db"; +import { Users } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/auth/mastodon-login/index.ts b/server/api/api/auth/mastodon-login/index.ts index 4d5b780e..d8ac7ddb 100644 --- a/server/api/api/auth/mastodon-login/index.ts +++ b/server/api/api/auth/mastodon-login/index.ts @@ -1,15 +1,15 @@ import { randomBytes } from "node:crypto"; -import { applyConfig, handleZodError } from "@api"; +import { applyConfig, handleZodError } from "@/api"; +import { response } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { response } from "@response"; import { eq } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { TokenType } from "~database/entities/Token"; -import { db } from "~drizzle/db"; -import { Tokens, Users } from "~drizzle/schema"; -import { config } from "~packages/config-manager"; -import { User } from "~packages/database-interface/user"; +import { TokenType } from "~/database/entities/Token"; +import { db } from "~/drizzle/db"; +import { Tokens, Users } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/auth/mastodon-logout/index.ts b/server/api/api/auth/mastodon-logout/index.ts index ddc6f3f5..1a97d59c 100644 --- a/server/api/api/auth/mastodon-logout/index.ts +++ b/server/api/api/auth/mastodon-logout/index.ts @@ -1,6 +1,6 @@ -import { applyConfig } from "@api"; +import { applyConfig } from "@/api"; import type { Hono } from "hono"; -import { config } from "~packages/config-manager"; +import { config } from "~/packages/config-manager"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/auth/redirect/index.ts b/server/api/api/auth/redirect/index.ts index 61a1f5c9..170f414c 100644 --- a/server/api/api/auth/redirect/index.ts +++ b/server/api/api/auth/redirect/index.ts @@ -1,11 +1,11 @@ -import { applyConfig, handleZodError } from "@api"; +import { applyConfig, handleZodError } from "@/api"; import { zValidator } from "@hono/zod-validator"; import { and, eq } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { db } from "~drizzle/db"; -import { Applications, Tokens } from "~drizzle/schema"; -import { config } from "~packages/config-manager"; +import { db } from "~/drizzle/db"; +import { Applications, Tokens } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/auth/reset/index.test.ts b/server/api/api/auth/reset/index.test.ts index 18e93a2c..d29a1d64 100644 --- a/server/api/api/auth/reset/index.test.ts +++ b/server/api/api/auth/reset/index.test.ts @@ -1,10 +1,10 @@ import { afterAll, describe, expect, test } from "bun:test"; import { randomBytes } from "node:crypto"; import { eq } from "drizzle-orm"; -import { db } from "~drizzle/db"; -import { Applications } from "~drizzle/schema"; -import { config } from "~packages/config-manager"; -import { getTestUsers, sendTestRequest } from "~tests/utils"; +import { db } from "~/drizzle/db"; +import { Applications } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; +import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; const { users, deleteUsers, passwords } = await getTestUsers(1); diff --git a/server/api/api/auth/reset/index.ts b/server/api/api/auth/reset/index.ts index 44f84335..0c454d9e 100644 --- a/server/api/api/auth/reset/index.ts +++ b/server/api/api/auth/reset/index.ts @@ -1,12 +1,12 @@ -import { applyConfig, handleZodError } from "@api"; +import { applyConfig, handleZodError } from "@/api"; +import { response } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { response } from "@response"; import { eq } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { Users } from "~drizzle/schema"; -import { config } from "~packages/config-manager"; -import { User } from "~packages/database-interface/user"; +import { Users } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/accounts/:id/block.test.ts b/server/api/api/v1/accounts/:id/block.test.ts index b5011b97..542d977e 100644 --- a/server/api/api/v1/accounts/:id/block.test.ts +++ b/server/api/api/v1/accounts/:id/block.test.ts @@ -1,7 +1,7 @@ import { afterAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestUsers, sendTestRequest } from "~tests/utils"; -import type { Relationship as APIRelationship } from "~types/mastodon/relationship"; +import { getTestUsers, sendTestRequest } from "~/tests/utils"; +import type { Relationship as APIRelationship } from "~/types/mastodon/relationship"; import { meta } from "./block"; const { users, tokens, deleteUsers } = await getTestUsers(2); diff --git a/server/api/api/v1/accounts/:id/block.ts b/server/api/api/v1/accounts/:id/block.ts index 5193d8db..dc0b182d 100644 --- a/server/api/api/v1/accounts/:id/block.ts +++ b/server/api/api/v1/accounts/:id/block.ts @@ -1,14 +1,14 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { eq } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { relationshipToAPI } from "~database/entities/Relationship"; -import { getRelationshipToOtherUser } from "~database/entities/User"; -import { db } from "~drizzle/db"; -import { Relationships } from "~drizzle/schema"; -import { User } from "~packages/database-interface/user"; +import { relationshipToAPI } from "~/database/entities/Relationship"; +import { getRelationshipToOtherUser } from "~/database/entities/User"; +import { db } from "~/drizzle/db"; +import { Relationships } from "~/drizzle/schema"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/accounts/:id/follow.test.ts b/server/api/api/v1/accounts/:id/follow.test.ts index 6f952a88..aeddd1e8 100644 --- a/server/api/api/v1/accounts/:id/follow.test.ts +++ b/server/api/api/v1/accounts/:id/follow.test.ts @@ -1,7 +1,7 @@ import { afterAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestUsers, sendTestRequest } from "~tests/utils"; -import type { Relationship as APIRelationship } from "~types/mastodon/relationship"; +import { getTestUsers, sendTestRequest } from "~/tests/utils"; +import type { Relationship as APIRelationship } from "~/types/mastodon/relationship"; import { meta } from "./follow"; const { users, tokens, deleteUsers } = await getTestUsers(2); diff --git a/server/api/api/v1/accounts/:id/follow.ts b/server/api/api/v1/accounts/:id/follow.ts index b179e354..9bc5caf7 100644 --- a/server/api/api/v1/accounts/:id/follow.ts +++ b/server/api/api/v1/accounts/:id/follow.ts @@ -1,15 +1,15 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import type { Hono } from "hono"; import ISO6391 from "iso-639-1"; import { z } from "zod"; -import { relationshipToAPI } from "~database/entities/Relationship"; +import { relationshipToAPI } from "~/database/entities/Relationship"; import { followRequestUser, getRelationshipToOtherUser, -} from "~database/entities/User"; -import { User } from "~packages/database-interface/user"; +} from "~/database/entities/User"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/accounts/:id/followers.test.ts b/server/api/api/v1/accounts/:id/followers.test.ts index d4fb209e..d41c72a1 100644 --- a/server/api/api/v1/accounts/:id/followers.test.ts +++ b/server/api/api/v1/accounts/:id/followers.test.ts @@ -1,7 +1,7 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestUsers, sendTestRequest } from "~tests/utils"; -import type { Account as APIAccount } from "~types/mastodon/account"; +import { getTestUsers, sendTestRequest } from "~/tests/utils"; +import type { Account as APIAccount } from "~/types/mastodon/account"; import { meta } from "./followers"; const { users, tokens, deleteUsers } = await getTestUsers(5); diff --git a/server/api/api/v1/accounts/:id/followers.ts b/server/api/api/v1/accounts/:id/followers.ts index 6b351d22..c8f46556 100644 --- a/server/api/api/v1/accounts/:id/followers.ts +++ b/server/api/api/v1/accounts/:id/followers.ts @@ -1,12 +1,12 @@ -import { applyConfig, auth, handleZodError, idValidator } from "@api"; +import { applyConfig, auth, handleZodError, idValidator } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { Users } from "~drizzle/schema"; -import { Timeline } from "~packages/database-interface/timeline"; -import { User } from "~packages/database-interface/user"; +import { Users } from "~/drizzle/schema"; +import { Timeline } from "~/packages/database-interface/timeline"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/accounts/:id/following.test.ts b/server/api/api/v1/accounts/:id/following.test.ts index 74b73721..f644170a 100644 --- a/server/api/api/v1/accounts/:id/following.test.ts +++ b/server/api/api/v1/accounts/:id/following.test.ts @@ -1,7 +1,7 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestUsers, sendTestRequest } from "~tests/utils"; -import type { Account as APIAccount } from "~types/mastodon/account"; +import { getTestUsers, sendTestRequest } from "~/tests/utils"; +import type { Account as APIAccount } from "~/types/mastodon/account"; import { meta } from "./following"; const { users, tokens, deleteUsers } = await getTestUsers(5); diff --git a/server/api/api/v1/accounts/:id/following.ts b/server/api/api/v1/accounts/:id/following.ts index d49427aa..59dab775 100644 --- a/server/api/api/v1/accounts/:id/following.ts +++ b/server/api/api/v1/accounts/:id/following.ts @@ -1,12 +1,12 @@ -import { applyConfig, auth, handleZodError, idValidator } from "@api"; +import { applyConfig, auth, handleZodError, idValidator } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { Users } from "~drizzle/schema"; -import { Timeline } from "~packages/database-interface/timeline"; -import { User } from "~packages/database-interface/user"; +import { Users } from "~/drizzle/schema"; +import { Timeline } from "~/packages/database-interface/timeline"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/accounts/:id/index.test.ts b/server/api/api/v1/accounts/:id/index.test.ts index e48777ff..a9e964ca 100644 --- a/server/api/api/v1/accounts/:id/index.test.ts +++ b/server/api/api/v1/accounts/:id/index.test.ts @@ -1,7 +1,7 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestStatuses, getTestUsers, sendTestRequest } from "~tests/utils"; -import type { Account as APIAccount } from "~types/mastodon/account"; +import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; +import type { Account as APIAccount } from "~/types/mastodon/account"; import { meta } from "./index"; const { users, tokens, deleteUsers } = await getTestUsers(5); diff --git a/server/api/api/v1/accounts/:id/index.ts b/server/api/api/v1/accounts/:id/index.ts index 24992d99..fae2c1b1 100644 --- a/server/api/api/v1/accounts/:id/index.ts +++ b/server/api/api/v1/accounts/:id/index.ts @@ -1,9 +1,9 @@ -import { applyConfig, auth, handleZodError, idValidator } from "@api"; +import { applyConfig, auth, handleZodError, idValidator } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import type { Hono } from "hono"; import { z } from "zod"; -import { User } from "~packages/database-interface/user"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/accounts/:id/mute.test.ts b/server/api/api/v1/accounts/:id/mute.test.ts index 92ebdb25..4f648c07 100644 --- a/server/api/api/v1/accounts/:id/mute.test.ts +++ b/server/api/api/v1/accounts/:id/mute.test.ts @@ -1,7 +1,7 @@ import { afterAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestUsers, sendTestRequest } from "~tests/utils"; -import type { Relationship as APIRelationship } from "~types/mastodon/relationship"; +import { getTestUsers, sendTestRequest } from "~/tests/utils"; +import type { Relationship as APIRelationship } from "~/types/mastodon/relationship"; import { meta } from "./mute"; const { users, tokens, deleteUsers } = await getTestUsers(2); diff --git a/server/api/api/v1/accounts/:id/mute.ts b/server/api/api/v1/accounts/:id/mute.ts index a2e45a8a..714825e5 100644 --- a/server/api/api/v1/accounts/:id/mute.ts +++ b/server/api/api/v1/accounts/:id/mute.ts @@ -1,14 +1,14 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { eq } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { relationshipToAPI } from "~database/entities/Relationship"; -import { getRelationshipToOtherUser } from "~database/entities/User"; -import { db } from "~drizzle/db"; -import { Relationships } from "~drizzle/schema"; -import { User } from "~packages/database-interface/user"; +import { relationshipToAPI } from "~/database/entities/Relationship"; +import { getRelationshipToOtherUser } from "~/database/entities/User"; +import { db } from "~/drizzle/db"; +import { Relationships } from "~/drizzle/schema"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/accounts/:id/note.ts b/server/api/api/v1/accounts/:id/note.ts index d3da7f09..c31f10c3 100644 --- a/server/api/api/v1/accounts/:id/note.ts +++ b/server/api/api/v1/accounts/:id/note.ts @@ -1,14 +1,14 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { eq } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { relationshipToAPI } from "~database/entities/Relationship"; -import { getRelationshipToOtherUser } from "~database/entities/User"; -import { db } from "~drizzle/db"; -import { Relationships } from "~drizzle/schema"; -import { User } from "~packages/database-interface/user"; +import { relationshipToAPI } from "~/database/entities/Relationship"; +import { getRelationshipToOtherUser } from "~/database/entities/User"; +import { db } from "~/drizzle/db"; +import { Relationships } from "~/drizzle/schema"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/accounts/:id/pin.ts b/server/api/api/v1/accounts/:id/pin.ts index da5df876..f35a2636 100644 --- a/server/api/api/v1/accounts/:id/pin.ts +++ b/server/api/api/v1/accounts/:id/pin.ts @@ -1,14 +1,14 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { eq } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { relationshipToAPI } from "~database/entities/Relationship"; -import { getRelationshipToOtherUser } from "~database/entities/User"; -import { db } from "~drizzle/db"; -import { Relationships } from "~drizzle/schema"; -import { User } from "~packages/database-interface/user"; +import { relationshipToAPI } from "~/database/entities/Relationship"; +import { getRelationshipToOtherUser } from "~/database/entities/User"; +import { db } from "~/drizzle/db"; +import { Relationships } from "~/drizzle/schema"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/accounts/:id/remove_from_followers.ts b/server/api/api/v1/accounts/:id/remove_from_followers.ts index e0fc4180..ceef39fa 100644 --- a/server/api/api/v1/accounts/:id/remove_from_followers.ts +++ b/server/api/api/v1/accounts/:id/remove_from_followers.ts @@ -1,14 +1,14 @@ -import { applyConfig, auth, handleZodError, idValidator } from "@api"; +import { applyConfig, auth, handleZodError, idValidator } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { and, eq } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { relationshipToAPI } from "~database/entities/Relationship"; -import { getRelationshipToOtherUser } from "~database/entities/User"; -import { db } from "~drizzle/db"; -import { Relationships } from "~drizzle/schema"; -import { User } from "~packages/database-interface/user"; +import { relationshipToAPI } from "~/database/entities/Relationship"; +import { getRelationshipToOtherUser } from "~/database/entities/User"; +import { db } from "~/drizzle/db"; +import { Relationships } from "~/drizzle/schema"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/accounts/:id/statuses.test.ts b/server/api/api/v1/accounts/:id/statuses.test.ts index 0acec7cd..3185bd47 100644 --- a/server/api/api/v1/accounts/:id/statuses.test.ts +++ b/server/api/api/v1/accounts/:id/statuses.test.ts @@ -1,7 +1,7 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestStatuses, getTestUsers, sendTestRequest } from "~tests/utils"; -import type { Status as APIStatus } from "~types/mastodon/status"; +import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; +import type { Status as APIStatus } from "~/types/mastodon/status"; import { meta } from "./statuses"; const { users, tokens, deleteUsers } = await getTestUsers(5); diff --git a/server/api/api/v1/accounts/:id/statuses.ts b/server/api/api/v1/accounts/:id/statuses.ts index aa8f6fbe..9a205616 100644 --- a/server/api/api/v1/accounts/:id/statuses.ts +++ b/server/api/api/v1/accounts/:id/statuses.ts @@ -1,12 +1,12 @@ -import { applyConfig, auth, handleZodError, idValidator } from "@api"; +import { applyConfig, auth, handleZodError, idValidator } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { and, eq, gt, gte, isNull, lt, sql } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { Notes } from "~drizzle/schema"; -import { Timeline } from "~packages/database-interface/timeline"; -import { User } from "~packages/database-interface/user"; +import { Notes } from "~/drizzle/schema"; +import { Timeline } from "~/packages/database-interface/timeline"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/accounts/:id/unblock.ts b/server/api/api/v1/accounts/:id/unblock.ts index a699d0c4..7b1af7e1 100644 --- a/server/api/api/v1/accounts/:id/unblock.ts +++ b/server/api/api/v1/accounts/:id/unblock.ts @@ -1,14 +1,14 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { eq } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { relationshipToAPI } from "~database/entities/Relationship"; -import { getRelationshipToOtherUser } from "~database/entities/User"; -import { db } from "~drizzle/db"; -import { Relationships } from "~drizzle/schema"; -import { User } from "~packages/database-interface/user"; +import { relationshipToAPI } from "~/database/entities/Relationship"; +import { getRelationshipToOtherUser } from "~/database/entities/User"; +import { db } from "~/drizzle/db"; +import { Relationships } from "~/drizzle/schema"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/accounts/:id/unfollow.ts b/server/api/api/v1/accounts/:id/unfollow.ts index aaa558f1..28c41b5b 100644 --- a/server/api/api/v1/accounts/:id/unfollow.ts +++ b/server/api/api/v1/accounts/:id/unfollow.ts @@ -1,14 +1,14 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { eq } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { relationshipToAPI } from "~database/entities/Relationship"; -import { getRelationshipToOtherUser } from "~database/entities/User"; -import { db } from "~drizzle/db"; -import { Relationships } from "~drizzle/schema"; -import { User } from "~packages/database-interface/user"; +import { relationshipToAPI } from "~/database/entities/Relationship"; +import { getRelationshipToOtherUser } from "~/database/entities/User"; +import { db } from "~/drizzle/db"; +import { Relationships } from "~/drizzle/schema"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/accounts/:id/unmute.test.ts b/server/api/api/v1/accounts/:id/unmute.test.ts index 91501955..c1c18903 100644 --- a/server/api/api/v1/accounts/:id/unmute.test.ts +++ b/server/api/api/v1/accounts/:id/unmute.test.ts @@ -1,7 +1,7 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestUsers, sendTestRequest } from "~tests/utils"; -import type { Relationship as APIRelationship } from "~types/mastodon/relationship"; +import { getTestUsers, sendTestRequest } from "~/tests/utils"; +import type { Relationship as APIRelationship } from "~/types/mastodon/relationship"; import { meta } from "./unmute"; const { users, tokens, deleteUsers } = await getTestUsers(2); diff --git a/server/api/api/v1/accounts/:id/unmute.ts b/server/api/api/v1/accounts/:id/unmute.ts index dd82c887..74ef44ab 100644 --- a/server/api/api/v1/accounts/:id/unmute.ts +++ b/server/api/api/v1/accounts/:id/unmute.ts @@ -1,14 +1,14 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { eq } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { relationshipToAPI } from "~database/entities/Relationship"; -import { getRelationshipToOtherUser } from "~database/entities/User"; -import { db } from "~drizzle/db"; -import { Relationships } from "~drizzle/schema"; -import { User } from "~packages/database-interface/user"; +import { relationshipToAPI } from "~/database/entities/Relationship"; +import { getRelationshipToOtherUser } from "~/database/entities/User"; +import { db } from "~/drizzle/db"; +import { Relationships } from "~/drizzle/schema"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/accounts/:id/unpin.ts b/server/api/api/v1/accounts/:id/unpin.ts index ea365fee..8bd7f41a 100644 --- a/server/api/api/v1/accounts/:id/unpin.ts +++ b/server/api/api/v1/accounts/:id/unpin.ts @@ -1,14 +1,14 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { eq } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { relationshipToAPI } from "~database/entities/Relationship"; -import { getRelationshipToOtherUser } from "~database/entities/User"; -import { db } from "~drizzle/db"; -import { Relationships } from "~drizzle/schema"; -import { User } from "~packages/database-interface/user"; +import { relationshipToAPI } from "~/database/entities/Relationship"; +import { getRelationshipToOtherUser } from "~/database/entities/User"; +import { db } from "~/drizzle/db"; +import { Relationships } from "~/drizzle/schema"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/accounts/familiar_followers/index.ts b/server/api/api/v1/accounts/familiar_followers/index.ts index 2a5249f2..663b2b6c 100644 --- a/server/api/api/v1/accounts/familiar_followers/index.ts +++ b/server/api/api/v1/accounts/familiar_followers/index.ts @@ -1,12 +1,12 @@ -import { applyConfig, auth, handleZodError, idValidator, qsQuery } from "@api"; +import { applyConfig, auth, handleZodError, idValidator, qsQuery } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { inArray } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { db } from "~drizzle/db"; -import { Users } from "~drizzle/schema"; -import { User } from "~packages/database-interface/user"; +import { db } from "~/drizzle/db"; +import { Users } from "~/drizzle/schema"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/accounts/index.test.ts b/server/api/api/v1/accounts/index.test.ts index c71fa35d..2dfd1bd5 100644 --- a/server/api/api/v1/accounts/index.test.ts +++ b/server/api/api/v1/accounts/index.test.ts @@ -9,10 +9,10 @@ import { import { randomBytes } from "node:crypto"; import { config } from "config-manager"; import { eq } from "drizzle-orm"; -import { db } from "~drizzle/db"; -import { Users } from "~drizzle/schema"; -import { getTestStatuses, getTestUsers, sendTestRequest } from "~tests/utils"; -import type { Account as APIAccount } from "~types/mastodon/account"; +import { db } from "~/drizzle/db"; +import { Users } from "~/drizzle/schema"; +import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; +import type { Account as APIAccount } from "~/types/mastodon/account"; import { meta } from "./index"; const username = randomBytes(10).toString("hex"); diff --git a/server/api/api/v1/accounts/index.ts b/server/api/api/v1/accounts/index.ts index 5562c6f5..ed9b1419 100644 --- a/server/api/api/v1/accounts/index.ts +++ b/server/api/api/v1/accounts/index.ts @@ -1,14 +1,14 @@ -import { applyConfig, auth, handleZodError, jsonOrForm } from "@api"; +import { applyConfig, auth, handleZodError, jsonOrForm } from "@/api"; +import { jsonResponse, response } from "@/response"; +import { tempmailDomains } from "@/tempmail"; import { zValidator } from "@hono/zod-validator"; -import { jsonResponse, response } from "@response"; -import { tempmailDomains } from "@tempmail"; import { eq } from "drizzle-orm"; import type { Hono } from "hono"; import ISO6391 from "iso-639-1"; import { z } from "zod"; -import { Users } from "~drizzle/schema"; -import { config } from "~packages/config-manager"; -import { User } from "~packages/database-interface/user"; +import { Users } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/accounts/lookup/index.test.ts b/server/api/api/v1/accounts/lookup/index.test.ts index 3d80647b..c98257d5 100644 --- a/server/api/api/v1/accounts/lookup/index.test.ts +++ b/server/api/api/v1/accounts/lookup/index.test.ts @@ -1,7 +1,7 @@ import { afterAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestUsers, sendTestRequest } from "~tests/utils"; -import type { Account as APIAccount } from "~types/mastodon/account"; +import { getTestUsers, sendTestRequest } from "~/tests/utils"; +import type { Account as APIAccount } from "~/types/mastodon/account"; import { meta } from "./index"; const { users, tokens, deleteUsers } = await getTestUsers(5); diff --git a/server/api/api/v1/accounts/lookup/index.ts b/server/api/api/v1/accounts/lookup/index.ts index 00e8b40d..f8883a0a 100644 --- a/server/api/api/v1/accounts/lookup/index.ts +++ b/server/api/api/v1/accounts/lookup/index.ts @@ -1,7 +1,7 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { dualLogger } from "@/loggers"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { dualLogger } from "@loggers"; -import { errorResponse, jsonResponse } from "@response"; import { eq } from "drizzle-orm"; import type { Hono } from "hono"; import { @@ -16,10 +16,10 @@ import { oneOrMore, } from "magic-regexp"; import { z } from "zod"; -import { resolveWebFinger } from "~database/entities/User"; -import { Users } from "~drizzle/schema"; -import { User } from "~packages/database-interface/user"; -import { LogLevel } from "~packages/log-manager"; +import { resolveWebFinger } from "~/database/entities/User"; +import { Users } from "~/drizzle/schema"; +import { User } from "~/packages/database-interface/user"; +import { LogLevel } from "~/packages/log-manager"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/accounts/relationships/index.ts b/server/api/api/v1/accounts/relationships/index.ts index 2062af11..288a192d 100644 --- a/server/api/api/v1/accounts/relationships/index.ts +++ b/server/api/api/v1/accounts/relationships/index.ts @@ -1,14 +1,14 @@ -import { applyConfig, auth, handleZodError, idValidator, qsQuery } from "@api"; +import { applyConfig, auth, handleZodError, idValidator, qsQuery } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import type { Hono } from "hono"; import { z } from "zod"; import { createNewRelationship, relationshipToAPI, -} from "~database/entities/Relationship"; -import { db } from "~drizzle/db"; -import { User } from "~packages/database-interface/user"; +} from "~/database/entities/Relationship"; +import { db } from "~/drizzle/db"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/accounts/search/index.test.ts b/server/api/api/v1/accounts/search/index.test.ts index 84bc6779..4f0cdfc1 100644 --- a/server/api/api/v1/accounts/search/index.test.ts +++ b/server/api/api/v1/accounts/search/index.test.ts @@ -1,7 +1,7 @@ import { afterAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestUsers, sendTestRequest } from "~tests/utils"; -import type { Account as APIAccount } from "~types/mastodon/account"; +import { getTestUsers, sendTestRequest } from "~/tests/utils"; +import type { Account as APIAccount } from "~/types/mastodon/account"; import { meta } from "./index"; const { users, tokens, deleteUsers } = await getTestUsers(5); diff --git a/server/api/api/v1/accounts/search/index.ts b/server/api/api/v1/accounts/search/index.ts index 34da5973..23770eb8 100644 --- a/server/api/api/v1/accounts/search/index.ts +++ b/server/api/api/v1/accounts/search/index.ts @@ -1,6 +1,6 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { eq, like, not, or, sql } from "drizzle-orm"; import type { Hono } from "hono"; import { @@ -16,9 +16,9 @@ import { } from "magic-regexp"; import stringComparison from "string-comparison"; import { z } from "zod"; -import { resolveWebFinger } from "~database/entities/User"; -import { Users } from "~drizzle/schema"; -import { User } from "~packages/database-interface/user"; +import { resolveWebFinger } from "~/database/entities/User"; +import { Users } from "~/drizzle/schema"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/accounts/update_credentials/index.ts b/server/api/api/v1/accounts/update_credentials/index.ts index 8b5b999e..ed7c673c 100644 --- a/server/api/api/v1/accounts/update_credentials/index.ts +++ b/server/api/api/v1/accounts/update_credentials/index.ts @@ -1,7 +1,7 @@ -import { applyConfig, auth, handleZodError, qs } from "@api"; +import { applyConfig, auth, handleZodError, qs } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; +import { sanitizedHtmlStrip } from "@/sanitization"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; -import { sanitizedHtmlStrip } from "@sanitization"; import { config } from "config-manager"; import { and, eq } from "drizzle-orm"; import type { Hono } from "hono"; @@ -10,12 +10,12 @@ import { MediaBackendType } from "media-manager"; import type { MediaBackend } from "media-manager"; import { LocalMediaBackend, S3MediaBackend } from "media-manager"; import { z } from "zod"; -import { getUrl } from "~database/entities/Attachment"; -import { type EmojiWithInstance, parseEmojis } from "~database/entities/Emoji"; -import { contentToHtml } from "~database/entities/Status"; -import { db } from "~drizzle/db"; -import { EmojiToUser, Users } from "~drizzle/schema"; -import { User } from "~packages/database-interface/user"; +import { getUrl } from "~/database/entities/Attachment"; +import { type EmojiWithInstance, parseEmojis } from "~/database/entities/Emoji"; +import { contentToHtml } from "~/database/entities/Status"; +import { db } from "~/drizzle/db"; +import { EmojiToUser, Users } from "~/drizzle/schema"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["PATCH"], diff --git a/server/api/api/v1/accounts/verify_credentials/index.ts b/server/api/api/v1/accounts/verify_credentials/index.ts index 016afaa8..f3a1864d 100644 --- a/server/api/api/v1/accounts/verify_credentials/index.ts +++ b/server/api/api/v1/accounts/verify_credentials/index.ts @@ -1,5 +1,5 @@ -import { applyConfig, auth } from "@api"; -import { errorResponse, jsonResponse } from "@response"; +import { applyConfig, auth } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import type { Hono } from "hono"; export const meta = applyConfig({ diff --git a/server/api/api/v1/apps/index.ts b/server/api/api/v1/apps/index.ts index a31aaaf2..f7ca105f 100644 --- a/server/api/api/v1/apps/index.ts +++ b/server/api/api/v1/apps/index.ts @@ -1,11 +1,11 @@ import { randomBytes } from "node:crypto"; -import { applyConfig, handleZodError, jsonOrForm } from "@api"; +import { applyConfig, handleZodError, jsonOrForm } from "@/api"; +import { jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { jsonResponse } from "@response"; import type { Hono } from "hono"; import { z } from "zod"; -import { db } from "~drizzle/db"; -import { Applications } from "~drizzle/schema"; +import { db } from "~/drizzle/db"; +import { Applications } from "~/drizzle/schema"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/apps/verify_credentials/index.ts b/server/api/api/v1/apps/verify_credentials/index.ts index 15592691..0edd3cba 100644 --- a/server/api/api/v1/apps/verify_credentials/index.ts +++ b/server/api/api/v1/apps/verify_credentials/index.ts @@ -1,7 +1,7 @@ -import { applyConfig, auth } from "@api"; -import { errorResponse, jsonResponse } from "@response"; +import { applyConfig, auth } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import type { Hono } from "hono"; -import { getFromToken } from "~database/entities/Application"; +import { getFromToken } from "~/database/entities/Application"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/blocks/index.ts b/server/api/api/v1/blocks/index.ts index eb03b8c8..1b92d4ef 100644 --- a/server/api/api/v1/blocks/index.ts +++ b/server/api/api/v1/blocks/index.ts @@ -1,11 +1,11 @@ -import { applyConfig, auth, handleZodError, idValidator } from "@api"; +import { applyConfig, auth, handleZodError, idValidator } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { Users } from "~drizzle/schema"; -import { Timeline } from "~packages/database-interface/timeline"; +import { Users } from "~/drizzle/schema"; +import { Timeline } from "~/packages/database-interface/timeline"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/custom_emojis/index.test.ts b/server/api/api/v1/custom_emojis/index.test.ts index 51f62485..db8471c4 100644 --- a/server/api/api/v1/custom_emojis/index.test.ts +++ b/server/api/api/v1/custom_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 { db } from "~drizzle/db"; -import { Emojis } from "~drizzle/schema"; -import { getTestUsers, sendTestRequest } from "~tests/utils"; +import { db } from "~/drizzle/db"; +import { Emojis } from "~/drizzle/schema"; +import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; const { users, tokens, deleteUsers } = await getTestUsers(2); diff --git a/server/api/api/v1/custom_emojis/index.ts b/server/api/api/v1/custom_emojis/index.ts index 8c10a993..f0bed04d 100644 --- a/server/api/api/v1/custom_emojis/index.ts +++ b/server/api/api/v1/custom_emojis/index.ts @@ -1,8 +1,8 @@ -import { applyConfig, auth } from "@api"; -import { jsonResponse } from "@response"; +import { applyConfig, auth } from "@/api"; +import { jsonResponse } from "@/response"; import type { Hono } from "hono"; -import { emojiToAPI } from "~database/entities/Emoji"; -import { db } from "~drizzle/db"; +import { emojiToAPI } from "~/database/entities/Emoji"; +import { db } from "~/drizzle/db"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/emojis/:id/index.test.ts b/server/api/api/v1/emojis/:id/index.test.ts index 285596c3..33f3958a 100644 --- a/server/api/api/v1/emojis/:id/index.test.ts +++ b/server/api/api/v1/emojis/:id/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 { db } from "~drizzle/db"; -import { Emojis } from "~drizzle/schema"; -import { getTestUsers, sendTestRequest } from "~tests/utils"; +import { db } from "~/drizzle/db"; +import { Emojis } from "~/drizzle/schema"; +import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; const { users, tokens, deleteUsers } = await getTestUsers(2); diff --git a/server/api/api/v1/emojis/:id/index.ts b/server/api/api/v1/emojis/:id/index.ts index 1039b6a6..264a9695 100644 --- a/server/api/api/v1/emojis/:id/index.ts +++ b/server/api/api/v1/emojis/:id/index.ts @@ -4,19 +4,19 @@ import { emojiValidator, handleZodError, jsonOrForm, -} from "@api"; -import { mimeLookup } from "@content_types"; +} from "@/api"; +import { mimeLookup } from "@/content_types"; +import { errorResponse, jsonResponse, response } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse, response } from "@response"; import { eq } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { getUrl } from "~database/entities/Attachment"; -import { emojiToAPI } from "~database/entities/Emoji"; -import { db } from "~drizzle/db"; -import { Emojis } from "~drizzle/schema"; -import { config } from "~packages/config-manager"; -import { MediaBackend } from "~packages/media-manager"; +import { getUrl } from "~/database/entities/Attachment"; +import { emojiToAPI } from "~/database/entities/Emoji"; +import { db } from "~/drizzle/db"; +import { Emojis } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; +import { MediaBackend } from "~/packages/media-manager"; export const meta = applyConfig({ allowedMethods: ["DELETE", "GET", "PATCH"], diff --git a/server/api/api/v1/emojis/index.test.ts b/server/api/api/v1/emojis/index.test.ts index 137c4d9c..ced30ee1 100644 --- a/server/api/api/v1/emojis/index.test.ts +++ b/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 { db } from "~drizzle/db"; -import { Emojis } from "~drizzle/schema"; -import { getTestUsers, sendTestRequest } from "~tests/utils"; +import { db } from "~/drizzle/db"; +import { Emojis } from "~/drizzle/schema"; +import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; const { users, tokens, deleteUsers } = await getTestUsers(3); diff --git a/server/api/api/v1/emojis/index.ts b/server/api/api/v1/emojis/index.ts index 5f639966..4c6b1e6c 100644 --- a/server/api/api/v1/emojis/index.ts +++ b/server/api/api/v1/emojis/index.ts @@ -4,18 +4,18 @@ import { emojiValidator, handleZodError, jsonOrForm, -} from "@api"; -import { mimeLookup } from "@content_types"; +} from "@/api"; +import { mimeLookup } from "@/content_types"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import type { Hono } from "hono"; import { z } from "zod"; -import { getUrl } from "~database/entities/Attachment"; -import { emojiToAPI } from "~database/entities/Emoji"; -import { db } from "~drizzle/db"; -import { Emojis } from "~drizzle/schema"; -import { config } from "~packages/config-manager"; -import { MediaBackend } from "~packages/media-manager"; +import { getUrl } from "~/database/entities/Attachment"; +import { emojiToAPI } from "~/database/entities/Emoji"; +import { db } from "~/drizzle/db"; +import { Emojis } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; +import { MediaBackend } from "~/packages/media-manager"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/favourites/index.ts b/server/api/api/v1/favourites/index.ts index fd2ca0fa..8e4cc9e3 100644 --- a/server/api/api/v1/favourites/index.ts +++ b/server/api/api/v1/favourites/index.ts @@ -1,11 +1,11 @@ -import { applyConfig, auth, handleZodError, idValidator } from "@api"; +import { applyConfig, auth, handleZodError, idValidator } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { Notes } from "~drizzle/schema"; -import { Timeline } from "~packages/database-interface/timeline"; +import { Notes } from "~/drizzle/schema"; +import { Timeline } from "~/packages/database-interface/timeline"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/follow_requests/:account_id/authorize.ts b/server/api/api/v1/follow_requests/:account_id/authorize.ts index cceebfe5..b2074b00 100644 --- a/server/api/api/v1/follow_requests/:account_id/authorize.ts +++ b/server/api/api/v1/follow_requests/:account_id/authorize.ts @@ -1,20 +1,20 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { and, eq } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; import { checkForBidirectionalRelationships, relationshipToAPI, -} from "~database/entities/Relationship"; +} from "~/database/entities/Relationship"; import { getRelationshipToOtherUser, sendFollowAccept, -} from "~database/entities/User"; -import { db } from "~drizzle/db"; -import { Relationships } from "~drizzle/schema"; -import { User } from "~packages/database-interface/user"; +} from "~/database/entities/User"; +import { db } from "~/drizzle/db"; +import { Relationships } from "~/drizzle/schema"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/follow_requests/:account_id/reject.ts b/server/api/api/v1/follow_requests/:account_id/reject.ts index 4c5386dc..d20a7ff1 100644 --- a/server/api/api/v1/follow_requests/:account_id/reject.ts +++ b/server/api/api/v1/follow_requests/:account_id/reject.ts @@ -1,20 +1,20 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { and, eq } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; import { checkForBidirectionalRelationships, relationshipToAPI, -} from "~database/entities/Relationship"; +} from "~/database/entities/Relationship"; import { getRelationshipToOtherUser, sendFollowReject, -} from "~database/entities/User"; -import { db } from "~drizzle/db"; -import { Relationships } from "~drizzle/schema"; -import { User } from "~packages/database-interface/user"; +} from "~/database/entities/User"; +import { db } from "~/drizzle/db"; +import { Relationships } from "~/drizzle/schema"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/follow_requests/index.ts b/server/api/api/v1/follow_requests/index.ts index 707a92a3..e435daa8 100644 --- a/server/api/api/v1/follow_requests/index.ts +++ b/server/api/api/v1/follow_requests/index.ts @@ -1,11 +1,11 @@ -import { applyConfig, auth, handleZodError, idValidator } from "@api"; +import { applyConfig, auth, handleZodError, idValidator } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { Users } from "~drizzle/schema"; -import { Timeline } from "~packages/database-interface/timeline"; +import { Users } from "~/drizzle/schema"; +import { Timeline } from "~/packages/database-interface/timeline"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/frontend/config/index.ts b/server/api/api/v1/frontend/config/index.ts index 9e52af8c..46297921 100644 --- a/server/api/api/v1/frontend/config/index.ts +++ b/server/api/api/v1/frontend/config/index.ts @@ -1,7 +1,7 @@ -import { applyConfig } from "@api"; -import { jsonResponse } from "@response"; +import { applyConfig } from "@/api"; +import { jsonResponse } from "@/response"; import type { Hono } from "hono"; -import { config } from "~packages/config-manager"; +import { config } from "~/packages/config-manager"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/instance/extended_description.test.ts b/server/api/api/v1/instance/extended_description.test.ts index 535a86a3..9ab09e33 100644 --- a/server/api/api/v1/instance/extended_description.test.ts +++ b/server/api/api/v1/instance/extended_description.test.ts @@ -1,6 +1,6 @@ import { describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { sendTestRequest } from "~tests/utils"; +import { sendTestRequest } from "~/tests/utils"; import { meta } from "./extended_description"; // /api/v1/instance/extended_description diff --git a/server/api/api/v1/instance/extended_description.ts b/server/api/api/v1/instance/extended_description.ts index 6c37853c..7460d6df 100644 --- a/server/api/api/v1/instance/extended_description.ts +++ b/server/api/api/v1/instance/extended_description.ts @@ -1,10 +1,10 @@ -import { applyConfig, auth } from "@api"; -import { dualLogger } from "@loggers"; -import { jsonResponse } from "@response"; +import { applyConfig, auth } from "@/api"; +import { dualLogger } from "@/loggers"; +import { jsonResponse } from "@/response"; import type { Hono } from "hono"; -import { getMarkdownRenderer } from "~database/entities/Status"; -import { config } from "~packages/config-manager"; -import { LogLevel } from "~packages/log-manager"; +import { getMarkdownRenderer } from "~/database/entities/Status"; +import { config } from "~/packages/config-manager"; +import { LogLevel } from "~/packages/log-manager"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/instance/index.ts b/server/api/api/v1/instance/index.ts index 1c1eaf49..ba3a7060 100644 --- a/server/api/api/v1/instance/index.ts +++ b/server/api/api/v1/instance/index.ts @@ -1,14 +1,14 @@ -import { applyConfig, auth } from "@api"; -import { jsonResponse, proxyUrl } from "@response"; +import { applyConfig, auth } from "@/api"; +import { jsonResponse, proxyUrl } from "@/response"; import { and, count, eq, isNull } from "drizzle-orm"; import type { Hono } from "hono"; -import { db } from "~drizzle/db"; -import { Instances, Users } from "~drizzle/schema"; -import manifest from "~package.json"; -import { config } from "~packages/config-manager"; -import { Note } from "~packages/database-interface/note"; -import { User } from "~packages/database-interface/user"; -import type { Instance as APIInstance } from "~types/mastodon/instance"; +import { db } from "~/drizzle/db"; +import { Instances, Users } from "~/drizzle/schema"; +import manifest from "~/package.json"; +import { config } from "~/packages/config-manager"; +import { Note } from "~/packages/database-interface/note"; +import { User } from "~/packages/database-interface/user"; +import type { Instance as APIInstance } from "~/types/mastodon/instance"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/instance/rules.test.ts b/server/api/api/v1/instance/rules.test.ts index 44fe2004..5f2c7c78 100644 --- a/server/api/api/v1/instance/rules.test.ts +++ b/server/api/api/v1/instance/rules.test.ts @@ -1,6 +1,6 @@ import { describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { sendTestRequest } from "~tests/utils"; +import { sendTestRequest } from "~/tests/utils"; import { meta } from "./rules"; // /api/v1/instance/rules diff --git a/server/api/api/v1/instance/rules.ts b/server/api/api/v1/instance/rules.ts index 054700b8..15341f3f 100644 --- a/server/api/api/v1/instance/rules.ts +++ b/server/api/api/v1/instance/rules.ts @@ -1,7 +1,7 @@ -import { applyConfig, auth } from "@api"; -import { jsonResponse } from "@response"; +import { applyConfig, auth } from "@/api"; +import { jsonResponse } from "@/response"; import type { Hono } from "hono"; -import { config } from "~packages/config-manager"; +import { config } from "~/packages/config-manager"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/markers/index.test.ts b/server/api/api/v1/markers/index.test.ts index 255f8e6b..cc2d37b5 100644 --- a/server/api/api/v1/markers/index.test.ts +++ b/server/api/api/v1/markers/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestStatuses, getTestUsers, sendTestRequest } from "~tests/utils"; +import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; const { users, tokens, deleteUsers } = await getTestUsers(1); diff --git a/server/api/api/v1/markers/index.ts b/server/api/api/v1/markers/index.ts index 3f9de30e..5efb5928 100644 --- a/server/api/api/v1/markers/index.ts +++ b/server/api/api/v1/markers/index.ts @@ -5,16 +5,16 @@ import { idValidator, qs, qsQuery, -} from "@api"; +} from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { and, count, eq } from "drizzle-orm"; import type { Hono } from "hono"; import { validator } from "hono/validator"; import { z } from "zod"; -import { db } from "~drizzle/db"; -import { Markers } from "~drizzle/schema"; -import type { Marker as APIMarker } from "~types/mastodon/marker"; +import { db } from "~/drizzle/db"; +import { Markers } from "~/drizzle/schema"; +import type { Marker as APIMarker } from "~/types/mastodon/marker"; export const meta = applyConfig({ allowedMethods: ["GET", "POST"], diff --git a/server/api/api/v1/media/:id/index.ts b/server/api/api/v1/media/:id/index.ts index 94527942..7f84ad0d 100644 --- a/server/api/api/v1/media/:id/index.ts +++ b/server/api/api/v1/media/:id/index.ts @@ -1,6 +1,6 @@ -import { applyConfig, auth, handleZodError, idValidator } from "@api"; +import { applyConfig, auth, handleZodError, idValidator } from "@/api"; +import { errorResponse, jsonResponse, response } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse, response } from "@response"; import { config } from "config-manager"; import { eq } from "drizzle-orm"; import type { Hono } from "hono"; @@ -8,9 +8,9 @@ import type { MediaBackend } from "media-manager"; import { MediaBackendType } from "media-manager"; import { LocalMediaBackend, S3MediaBackend } from "media-manager"; import { z } from "zod"; -import { attachmentToAPI, getUrl } from "~database/entities/Attachment"; -import { db } from "~drizzle/db"; -import { Attachments } from "~drizzle/schema"; +import { attachmentToAPI, getUrl } from "~/database/entities/Attachment"; +import { db } from "~/drizzle/db"; +import { Attachments } from "~/drizzle/schema"; export const meta = applyConfig({ allowedMethods: ["GET", "PUT"], diff --git a/server/api/api/v1/media/index.ts b/server/api/api/v1/media/index.ts index e63135b1..aad4b35f 100644 --- a/server/api/api/v1/media/index.ts +++ b/server/api/api/v1/media/index.ts @@ -1,6 +1,6 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { encode } from "blurhash"; import { config } from "config-manager"; import type { Hono } from "hono"; @@ -9,9 +9,9 @@ import type { MediaBackend } from "media-manager"; import { LocalMediaBackend, S3MediaBackend } from "media-manager"; import sharp from "sharp"; import { z } from "zod"; -import { attachmentToAPI, getUrl } from "~database/entities/Attachment"; -import { db } from "~drizzle/db"; -import { Attachments } from "~drizzle/schema"; +import { attachmentToAPI, getUrl } from "~/database/entities/Attachment"; +import { db } from "~/drizzle/db"; +import { Attachments } from "~/drizzle/schema"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/mutes/index.test.ts b/server/api/api/v1/mutes/index.test.ts index 1e781924..7ffde214 100644 --- a/server/api/api/v1/mutes/index.test.ts +++ b/server/api/api/v1/mutes/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestUsers, sendTestRequest } from "~tests/utils"; +import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; const { users, tokens, deleteUsers } = await getTestUsers(3); diff --git a/server/api/api/v1/mutes/index.ts b/server/api/api/v1/mutes/index.ts index 8fdbb009..edc0b5fb 100644 --- a/server/api/api/v1/mutes/index.ts +++ b/server/api/api/v1/mutes/index.ts @@ -1,11 +1,11 @@ -import { applyConfig, auth, handleZodError, idValidator } from "@api"; +import { applyConfig, auth, handleZodError, idValidator } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { Users } from "~drizzle/schema"; -import { Timeline } from "~packages/database-interface/timeline"; +import { Users } from "~/drizzle/schema"; +import { Timeline } from "~/packages/database-interface/timeline"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/notifications/:id/dismiss.test.ts b/server/api/api/v1/notifications/:id/dismiss.test.ts index 3409a3e5..b5b8daae 100644 --- a/server/api/api/v1/notifications/:id/dismiss.test.ts +++ b/server/api/api/v1/notifications/:id/dismiss.test.ts @@ -1,7 +1,7 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestUsers, sendTestRequest } from "~tests/utils"; -import type { Notification as APINotification } from "~types/mastodon/notification"; +import { getTestUsers, sendTestRequest } from "~/tests/utils"; +import type { Notification as APINotification } from "~/types/mastodon/notification"; import { meta } from "./dismiss"; const { users, tokens, deleteUsers } = await getTestUsers(2); diff --git a/server/api/api/v1/notifications/:id/dismiss.ts b/server/api/api/v1/notifications/:id/dismiss.ts index fc8b4504..ed1b8045 100644 --- a/server/api/api/v1/notifications/:id/dismiss.ts +++ b/server/api/api/v1/notifications/:id/dismiss.ts @@ -1,11 +1,11 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { eq } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { db } from "~drizzle/db"; -import { Notifications } from "~drizzle/schema"; +import { db } from "~/drizzle/db"; +import { Notifications } from "~/drizzle/schema"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/notifications/:id/index.test.ts b/server/api/api/v1/notifications/:id/index.test.ts index 8333a993..2f43ba6a 100644 --- a/server/api/api/v1/notifications/:id/index.test.ts +++ b/server/api/api/v1/notifications/:id/index.test.ts @@ -1,7 +1,7 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestUsers, sendTestRequest } from "~tests/utils"; -import type { Notification as APINotification } from "~types/mastodon/notification"; +import { getTestUsers, sendTestRequest } from "~/tests/utils"; +import type { Notification as APINotification } from "~/types/mastodon/notification"; import { meta } from "./index"; const { users, tokens, deleteUsers } = await getTestUsers(2); diff --git a/server/api/api/v1/notifications/:id/index.ts b/server/api/api/v1/notifications/:id/index.ts index b9387e54..5726dede 100644 --- a/server/api/api/v1/notifications/:id/index.ts +++ b/server/api/api/v1/notifications/:id/index.ts @@ -1,9 +1,9 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import type { Hono } from "hono"; import { z } from "zod"; -import { findManyNotifications } from "~database/entities/Notification"; +import { findManyNotifications } from "~/database/entities/Notification"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/notifications/clear/index.test.ts b/server/api/api/v1/notifications/clear/index.test.ts index 54957475..70d0c020 100644 --- a/server/api/api/v1/notifications/clear/index.test.ts +++ b/server/api/api/v1/notifications/clear/index.test.ts @@ -1,7 +1,7 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestUsers, sendTestRequest } from "~tests/utils"; -import type { Notification as APINotification } from "~types/mastodon/notification"; +import { getTestUsers, sendTestRequest } from "~/tests/utils"; +import type { Notification as APINotification } from "~/types/mastodon/notification"; import { meta } from "./index"; const { users, tokens, deleteUsers } = await getTestUsers(2); diff --git a/server/api/api/v1/notifications/clear/index.ts b/server/api/api/v1/notifications/clear/index.ts index 5d88a2f4..cac4999c 100644 --- a/server/api/api/v1/notifications/clear/index.ts +++ b/server/api/api/v1/notifications/clear/index.ts @@ -1,9 +1,9 @@ -import { applyConfig, auth } from "@api"; -import { errorResponse, jsonResponse } from "@response"; +import { applyConfig, auth } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { eq } from "drizzle-orm"; import type { Hono } from "hono"; -import { db } from "~drizzle/db"; -import { Notifications } from "~drizzle/schema"; +import { db } from "~/drizzle/db"; +import { Notifications } from "~/drizzle/schema"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/notifications/destroy_multiple/index.test.ts b/server/api/api/v1/notifications/destroy_multiple/index.test.ts index 600a834c..b5a9ab7c 100644 --- a/server/api/api/v1/notifications/destroy_multiple/index.test.ts +++ b/server/api/api/v1/notifications/destroy_multiple/index.test.ts @@ -1,7 +1,7 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestStatuses, getTestUsers, sendTestRequest } from "~tests/utils"; -import type { Notification as APINotification } from "~types/mastodon/notification"; +import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; +import type { Notification as APINotification } from "~/types/mastodon/notification"; import { meta } from "./index"; const { users, tokens, deleteUsers } = await getTestUsers(2); diff --git a/server/api/api/v1/notifications/destroy_multiple/index.ts b/server/api/api/v1/notifications/destroy_multiple/index.ts index 3a9c782d..7534ec1a 100644 --- a/server/api/api/v1/notifications/destroy_multiple/index.ts +++ b/server/api/api/v1/notifications/destroy_multiple/index.ts @@ -1,11 +1,11 @@ -import { applyConfig, auth, handleZodError, idValidator } from "@api"; +import { applyConfig, auth, handleZodError, idValidator } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { and, eq, inArray } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { db } from "~drizzle/db"; -import { Notifications } from "~drizzle/schema"; +import { db } from "~/drizzle/db"; +import { Notifications } from "~/drizzle/schema"; export const meta = applyConfig({ allowedMethods: ["DELETE"], diff --git a/server/api/api/v1/notifications/index.test.ts b/server/api/api/v1/notifications/index.test.ts index 4525713e..864b56c3 100644 --- a/server/api/api/v1/notifications/index.test.ts +++ b/server/api/api/v1/notifications/index.test.ts @@ -1,7 +1,7 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestStatuses, getTestUsers, sendTestRequest } from "~tests/utils"; -import type { Notification as APINotification } from "~types/mastodon/notification"; +import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; +import type { Notification as APINotification } from "~/types/mastodon/notification"; import { meta } from "./index"; const getFormData = (object: Record) => diff --git a/server/api/api/v1/notifications/index.ts b/server/api/api/v1/notifications/index.ts index 0d44511b..26ee8cfd 100644 --- a/server/api/api/v1/notifications/index.ts +++ b/server/api/api/v1/notifications/index.ts @@ -1,15 +1,15 @@ -import { applyConfig, auth, handleZodError, idValidator } from "@api"; +import { applyConfig, auth, handleZodError, idValidator } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; +import { fetchTimeline } from "@/timelines"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; -import { fetchTimeline } from "@timelines"; import { sql } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; import { findManyNotifications, notificationToAPI, -} from "~database/entities/Notification"; -import type { NotificationWithRelations } from "~database/entities/Notification"; +} from "~/database/entities/Notification"; +import type { NotificationWithRelations } from "~/database/entities/Notification"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/profile/avatar.ts b/server/api/api/v1/profile/avatar.ts index 5fb7d77a..286cf2aa 100644 --- a/server/api/api/v1/profile/avatar.ts +++ b/server/api/api/v1/profile/avatar.ts @@ -1,10 +1,10 @@ -import { applyConfig, auth } from "@api"; -import { errorResponse, jsonResponse } from "@response"; +import { applyConfig, auth } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { eq } from "drizzle-orm"; import type { Hono } from "hono"; -import { db } from "~drizzle/db"; -import { Users } from "~drizzle/schema"; -import { User } from "~packages/database-interface/user"; +import { db } from "~/drizzle/db"; +import { Users } from "~/drizzle/schema"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["DELETE"], diff --git a/server/api/api/v1/profile/header.ts b/server/api/api/v1/profile/header.ts index f5fce412..715a84d1 100644 --- a/server/api/api/v1/profile/header.ts +++ b/server/api/api/v1/profile/header.ts @@ -1,10 +1,10 @@ -import { applyConfig, auth } from "@api"; -import { errorResponse, jsonResponse } from "@response"; +import { applyConfig, auth } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { eq } from "drizzle-orm"; import type { Hono } from "hono"; -import { db } from "~drizzle/db"; -import { Users } from "~drizzle/schema"; -import { User } from "~packages/database-interface/user"; +import { db } from "~/drizzle/db"; +import { Users } from "~/drizzle/schema"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["DELETE"], diff --git a/server/api/api/v1/sso/:id/index.test.ts b/server/api/api/v1/sso/:id/index.test.ts index 8c7b652f..afc38e17 100644 --- a/server/api/api/v1/sso/:id/index.test.ts +++ b/server/api/api/v1/sso/:id/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, describe, expect, test } from "bun:test"; -import { config } from "~packages/config-manager"; -import { getTestUsers, sendTestRequest } from "~tests/utils"; +import { config } from "~/packages/config-manager"; +import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; const { deleteUsers, tokens } = await getTestUsers(1); diff --git a/server/api/api/v1/sso/:id/index.ts b/server/api/api/v1/sso/:id/index.ts index d2f2f6a8..1c7f93e9 100644 --- a/server/api/api/v1/sso/:id/index.ts +++ b/server/api/api/v1/sso/:id/index.ts @@ -1,12 +1,12 @@ -import { applyConfig, auth, handleZodError, jsonOrForm } from "@api"; +import { applyConfig, auth, handleZodError, jsonOrForm } from "@/api"; +import { errorResponse, jsonResponse, response } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse, response } from "@response"; import { eq } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { db } from "~drizzle/db"; -import { OpenIdAccounts } from "~drizzle/schema"; -import { config } from "~packages/config-manager"; +import { db } from "~/drizzle/db"; +import { OpenIdAccounts } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; export const meta = applyConfig({ allowedMethods: ["GET", "DELETE"], diff --git a/server/api/api/v1/sso/index.test.ts b/server/api/api/v1/sso/index.test.ts index 1e350f2e..50fbe62b 100644 --- a/server/api/api/v1/sso/index.test.ts +++ b/server/api/api/v1/sso/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, describe, expect, test } from "bun:test"; -import { config } from "~packages/config-manager"; -import { getTestUsers, sendTestRequest } from "~tests/utils"; +import { config } from "~/packages/config-manager"; +import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; const { deleteUsers, tokens } = await getTestUsers(1); diff --git a/server/api/api/v1/sso/index.ts b/server/api/api/v1/sso/index.ts index 52147af5..c5325c58 100644 --- a/server/api/api/v1/sso/index.ts +++ b/server/api/api/v1/sso/index.ts @@ -1,8 +1,8 @@ import { randomBytes } from "node:crypto"; -import { applyConfig, auth, handleZodError, jsonOrForm } from "@api"; -import { oauthRedirectUri } from "@constants"; +import { applyConfig, auth, handleZodError, jsonOrForm } from "@/api"; +import { oauthRedirectUri } from "@/constants"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import type { Hono } from "hono"; import { calculatePKCECodeChallenge, @@ -11,9 +11,9 @@ import { processDiscoveryResponse, } from "oauth4webapi"; import { z } from "zod"; -import { db } from "~drizzle/db"; -import { Applications, OpenIdLoginFlows } from "~drizzle/schema"; -import { config } from "~packages/config-manager"; +import { db } from "~/drizzle/db"; +import { Applications, OpenIdLoginFlows } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; export const meta = applyConfig({ allowedMethods: ["GET", "POST"], diff --git a/server/api/api/v1/statuses/:id/context.ts b/server/api/api/v1/statuses/:id/context.ts index 76189905..eecad7dd 100644 --- a/server/api/api/v1/statuses/:id/context.ts +++ b/server/api/api/v1/statuses/:id/context.ts @@ -1,9 +1,9 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import type { Hono } from "hono"; import { z } from "zod"; -import { Note } from "~packages/database-interface/note"; +import { Note } from "~/packages/database-interface/note"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/statuses/:id/favourite.ts b/server/api/api/v1/statuses/:id/favourite.ts index 1dc46247..733b5e89 100644 --- a/server/api/api/v1/statuses/:id/favourite.ts +++ b/server/api/api/v1/statuses/:id/favourite.ts @@ -1,12 +1,12 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import type { Hono } from "hono"; import { z } from "zod"; -import { createLike } from "~database/entities/Like"; -import { db } from "~drizzle/db"; -import { Note } from "~packages/database-interface/note"; -import type { Status as APIStatus } from "~types/mastodon/status"; +import { createLike } from "~/database/entities/Like"; +import { db } from "~/drizzle/db"; +import { Note } from "~/packages/database-interface/note"; +import type { Status as APIStatus } from "~/types/mastodon/status"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/statuses/:id/favourited_by.test.ts b/server/api/api/v1/statuses/:id/favourited_by.test.ts index 6ba826a0..eff92530 100644 --- a/server/api/api/v1/statuses/:id/favourited_by.test.ts +++ b/server/api/api/v1/statuses/:id/favourited_by.test.ts @@ -1,7 +1,7 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestStatuses, getTestUsers, sendTestRequest } from "~tests/utils"; -import type { Account as APIAccount } from "~types/mastodon/account"; +import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; +import type { Account as APIAccount } from "~/types/mastodon/account"; import { meta } from "./favourited_by"; const { users, tokens, deleteUsers } = await getTestUsers(5); diff --git a/server/api/api/v1/statuses/:id/favourited_by.ts b/server/api/api/v1/statuses/:id/favourited_by.ts index 04cd20b1..2d37bceb 100644 --- a/server/api/api/v1/statuses/:id/favourited_by.ts +++ b/server/api/api/v1/statuses/:id/favourited_by.ts @@ -1,12 +1,12 @@ -import { applyConfig, auth, handleZodError, idValidator } from "@api"; +import { applyConfig, auth, handleZodError, idValidator } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { Users } from "~drizzle/schema"; -import { Note } from "~packages/database-interface/note"; -import { Timeline } from "~packages/database-interface/timeline"; +import { Users } from "~/drizzle/schema"; +import { Note } from "~/packages/database-interface/note"; +import { Timeline } from "~/packages/database-interface/timeline"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/statuses/:id/index.ts b/server/api/api/v1/statuses/:id/index.ts index 50dc8ea8..f22d8ba7 100644 --- a/server/api/api/v1/statuses/:id/index.ts +++ b/server/api/api/v1/statuses/:id/index.ts @@ -4,15 +4,15 @@ import { handleZodError, idValidator, jsonOrForm, -} from "@api"; +} from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { config } from "config-manager"; import type { Hono } from "hono"; import ISO6391 from "iso-639-1"; import { z } from "zod"; -import { db } from "~drizzle/db"; -import { Note } from "~packages/database-interface/note"; +import { db } from "~/drizzle/db"; +import { Note } from "~/packages/database-interface/note"; export const meta = applyConfig({ allowedMethods: ["GET", "DELETE", "PUT"], diff --git a/server/api/api/v1/statuses/:id/pin.ts b/server/api/api/v1/statuses/:id/pin.ts index e6464fc1..3f73e1fd 100644 --- a/server/api/api/v1/statuses/:id/pin.ts +++ b/server/api/api/v1/statuses/:id/pin.ts @@ -1,10 +1,10 @@ -import { applyConfig, auth, handleZodError, idValidator } from "@api"; +import { applyConfig, auth, handleZodError, idValidator } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import type { Hono } from "hono"; import { z } from "zod"; -import { db } from "~drizzle/db"; -import { Note } from "~packages/database-interface/note"; +import { db } from "~/drizzle/db"; +import { Note } from "~/packages/database-interface/note"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/statuses/:id/reblog.ts b/server/api/api/v1/statuses/:id/reblog.ts index b01e7af7..f6f0a888 100644 --- a/server/api/api/v1/statuses/:id/reblog.ts +++ b/server/api/api/v1/statuses/:id/reblog.ts @@ -1,12 +1,12 @@ -import { applyConfig, auth, handleZodError, jsonOrForm } from "@api"; +import { applyConfig, auth, handleZodError, jsonOrForm } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { and, eq } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { db } from "~drizzle/db"; -import { Notes, Notifications } from "~drizzle/schema"; -import { Note } from "~packages/database-interface/note"; +import { db } from "~/drizzle/db"; +import { Notes, Notifications } from "~/drizzle/schema"; +import { Note } from "~/packages/database-interface/note"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/statuses/:id/reblogged_by.test.ts b/server/api/api/v1/statuses/:id/reblogged_by.test.ts index cc054638..94135db8 100644 --- a/server/api/api/v1/statuses/:id/reblogged_by.test.ts +++ b/server/api/api/v1/statuses/:id/reblogged_by.test.ts @@ -1,7 +1,7 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestStatuses, getTestUsers, sendTestRequest } from "~tests/utils"; -import type { Account as APIAccount } from "~types/mastodon/account"; +import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; +import type { Account as APIAccount } from "~/types/mastodon/account"; import { meta } from "./reblogged_by"; const { users, tokens, deleteUsers } = await getTestUsers(5); diff --git a/server/api/api/v1/statuses/:id/reblogged_by.ts b/server/api/api/v1/statuses/:id/reblogged_by.ts index beba4486..a09e098e 100644 --- a/server/api/api/v1/statuses/:id/reblogged_by.ts +++ b/server/api/api/v1/statuses/:id/reblogged_by.ts @@ -1,12 +1,12 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { Users } from "~drizzle/schema"; -import { Note } from "~packages/database-interface/note"; -import { Timeline } from "~packages/database-interface/timeline"; +import { Users } from "~/drizzle/schema"; +import { Note } from "~/packages/database-interface/note"; +import { Timeline } from "~/packages/database-interface/timeline"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/statuses/:id/source.ts b/server/api/api/v1/statuses/:id/source.ts index 8aa8edba..9ba91465 100644 --- a/server/api/api/v1/statuses/:id/source.ts +++ b/server/api/api/v1/statuses/:id/source.ts @@ -1,10 +1,10 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import type { Hono } from "hono"; import { z } from "zod"; -import { Note } from "~packages/database-interface/note"; -import type { StatusSource as APIStatusSource } from "~types/mastodon/status_source"; +import { Note } from "~/packages/database-interface/note"; +import type { StatusSource as APIStatusSource } from "~/types/mastodon/status_source"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/statuses/:id/unfavourite.ts b/server/api/api/v1/statuses/:id/unfavourite.ts index b1de85a6..0f7b5cbd 100644 --- a/server/api/api/v1/statuses/:id/unfavourite.ts +++ b/server/api/api/v1/statuses/:id/unfavourite.ts @@ -1,11 +1,11 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import type { Hono } from "hono"; import { z } from "zod"; -import { deleteLike } from "~database/entities/Like"; -import { Note } from "~packages/database-interface/note"; -import type { Status as APIStatus } from "~types/mastodon/status"; +import { deleteLike } from "~/database/entities/Like"; +import { Note } from "~/packages/database-interface/note"; +import type { Status as APIStatus } from "~/types/mastodon/status"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/statuses/:id/unpin.ts b/server/api/api/v1/statuses/:id/unpin.ts index 1fd9fc40..1361e074 100644 --- a/server/api/api/v1/statuses/:id/unpin.ts +++ b/server/api/api/v1/statuses/:id/unpin.ts @@ -1,9 +1,9 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import type { Hono } from "hono"; import { z } from "zod"; -import { Note } from "~packages/database-interface/note"; +import { Note } from "~/packages/database-interface/note"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/statuses/:id/unreblog.ts b/server/api/api/v1/statuses/:id/unreblog.ts index f125bc3f..ff86a321 100644 --- a/server/api/api/v1/statuses/:id/unreblog.ts +++ b/server/api/api/v1/statuses/:id/unreblog.ts @@ -1,12 +1,12 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { and, eq } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { Notes } from "~drizzle/schema"; -import { Note } from "~packages/database-interface/note"; -import type { Status as APIStatus } from "~types/mastodon/status"; +import { Notes } from "~/drizzle/schema"; +import { Note } from "~/packages/database-interface/note"; +import type { Status as APIStatus } from "~/types/mastodon/status"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/statuses/index.test.ts b/server/api/api/v1/statuses/index.test.ts index c9e06618..7b7d890f 100644 --- a/server/api/api/v1/statuses/index.test.ts +++ b/server/api/api/v1/statuses/index.test.ts @@ -1,10 +1,10 @@ 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 { Emojis } from "~drizzle/schema"; -import { getTestUsers, sendTestRequest } from "~tests/utils"; -import type { Status as APIStatus } from "~types/mastodon/status"; +import { db } from "~/drizzle/db"; +import { Emojis } from "~/drizzle/schema"; +import { getTestUsers, sendTestRequest } from "~/tests/utils"; +import type { Status as APIStatus } from "~/types/mastodon/status"; import { meta } from "./index"; const { users, tokens, deleteUsers } = await getTestUsers(5); diff --git a/server/api/api/v1/statuses/index.ts b/server/api/api/v1/statuses/index.ts index 38bdf2b8..5486959b 100644 --- a/server/api/api/v1/statuses/index.ts +++ b/server/api/api/v1/statuses/index.ts @@ -1,13 +1,13 @@ -import { applyConfig, auth, handleZodError, jsonOrForm, qs } from "@api"; +import { applyConfig, auth, handleZodError, jsonOrForm, qs } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { config } from "config-manager"; import type { Hono } from "hono"; import ISO6391 from "iso-639-1"; import { z } from "zod"; -import { federateNote, parseTextMentions } from "~database/entities/Status"; -import { db } from "~drizzle/db"; -import { Note } from "~packages/database-interface/note"; +import { federateNote, parseTextMentions } from "~/database/entities/Status"; +import { db } from "~/drizzle/db"; +import { Note } from "~/packages/database-interface/note"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v1/timelines/home.test.ts b/server/api/api/v1/timelines/home.test.ts index 9f447fbb..4cf5ef70 100644 --- a/server/api/api/v1/timelines/home.test.ts +++ b/server/api/api/v1/timelines/home.test.ts @@ -1,7 +1,7 @@ import { afterAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestStatuses, getTestUsers, sendTestRequest } from "~tests/utils"; -import type { Status as APIStatus } from "~types/mastodon/status"; +import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; +import type { Status as APIStatus } from "~/types/mastodon/status"; import { meta } from "./home"; const { users, tokens, deleteUsers } = await getTestUsers(5); diff --git a/server/api/api/v1/timelines/home.ts b/server/api/api/v1/timelines/home.ts index 3594b50a..bf1afce7 100644 --- a/server/api/api/v1/timelines/home.ts +++ b/server/api/api/v1/timelines/home.ts @@ -1,11 +1,11 @@ -import { applyConfig, auth, handleZodError, idValidator } from "@api"; +import { applyConfig, auth, handleZodError, idValidator } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { and, eq, gt, gte, lt, or, sql } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { Notes } from "~drizzle/schema"; -import { Timeline } from "~packages/database-interface/timeline"; +import { Notes } from "~/drizzle/schema"; +import { Timeline } from "~/packages/database-interface/timeline"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v1/timelines/public.test.ts b/server/api/api/v1/timelines/public.test.ts index 792a3fac..83b56e79 100644 --- a/server/api/api/v1/timelines/public.test.ts +++ b/server/api/api/v1/timelines/public.test.ts @@ -1,7 +1,7 @@ import { afterAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestStatuses, getTestUsers, sendTestRequest } from "~tests/utils"; -import type { Status as APIStatus } from "~types/mastodon/status"; +import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils"; +import type { Status as APIStatus } from "~/types/mastodon/status"; import { meta } from "./public"; const { users, tokens, deleteUsers } = await getTestUsers(5); diff --git a/server/api/api/v1/timelines/public.ts b/server/api/api/v1/timelines/public.ts index 35660fc6..e299b9b6 100644 --- a/server/api/api/v1/timelines/public.ts +++ b/server/api/api/v1/timelines/public.ts @@ -1,11 +1,11 @@ -import { applyConfig, auth, handleZodError, idValidator } from "@api"; +import { applyConfig, auth, handleZodError, idValidator } from "@/api"; +import { jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { jsonResponse } from "@response"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { Notes } from "~drizzle/schema"; -import { Timeline } from "~packages/database-interface/timeline"; +import { Notes } from "~/drizzle/schema"; +import { Timeline } from "~/packages/database-interface/timeline"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v2/filters/:id/index.test.ts b/server/api/api/v2/filters/:id/index.test.ts index 6c50c290..bcd4f87a 100644 --- a/server/api/api/v2/filters/:id/index.test.ts +++ b/server/api/api/v2/filters/:id/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestUsers, sendTestRequest } from "~tests/utils"; +import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; const { users, tokens, deleteUsers } = await getTestUsers(2); diff --git a/server/api/api/v2/filters/:id/index.ts b/server/api/api/v2/filters/:id/index.ts index 0b23d1e4..f9fb5f96 100644 --- a/server/api/api/v2/filters/:id/index.ts +++ b/server/api/api/v2/filters/:id/index.ts @@ -1,11 +1,11 @@ -import { applyConfig, auth, handleZodError, jsonOrForm, qs } from "@api"; +import { applyConfig, auth, handleZodError, jsonOrForm, qs } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { and, eq, inArray } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { db } from "~drizzle/db"; -import { FilterKeywords, Filters } from "~drizzle/schema"; +import { db } from "~/drizzle/db"; +import { FilterKeywords, Filters } from "~/drizzle/schema"; export const meta = applyConfig({ allowedMethods: ["GET", "PUT", "DELETE"], diff --git a/server/api/api/v2/filters/index.test.ts b/server/api/api/v2/filters/index.test.ts index bb3abbf8..370c3a0b 100644 --- a/server/api/api/v2/filters/index.test.ts +++ b/server/api/api/v2/filters/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestUsers, sendTestRequest } from "~tests/utils"; +import { getTestUsers, sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; const { users, tokens, deleteUsers } = await getTestUsers(2); diff --git a/server/api/api/v2/filters/index.ts b/server/api/api/v2/filters/index.ts index 61f279df..b09075c2 100644 --- a/server/api/api/v2/filters/index.ts +++ b/server/api/api/v2/filters/index.ts @@ -1,11 +1,11 @@ -import { applyConfig, auth, handleZodError, jsonOrForm, qs } from "@api"; +import { applyConfig, auth, handleZodError, jsonOrForm, qs } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import type { Hono } from "hono"; import { validator } from "hono/validator"; import { z } from "zod"; -import { db } from "~drizzle/db"; -import { FilterKeywords, Filters } from "~drizzle/schema"; +import { db } from "~/drizzle/db"; +import { FilterKeywords, Filters } from "~/drizzle/schema"; export const meta = applyConfig({ allowedMethods: ["GET", "POST"], route: "/api/v2/filters", diff --git a/server/api/api/v2/instance/index.test.ts b/server/api/api/v2/instance/index.test.ts index 0b9cfb2c..002e6e51 100644 --- a/server/api/api/v2/instance/index.test.ts +++ b/server/api/api/v2/instance/index.test.ts @@ -1,6 +1,6 @@ import { describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { sendTestRequest } from "~tests/utils"; +import { sendTestRequest } from "~/tests/utils"; import { meta } from "./index"; // /api/v2/instance diff --git a/server/api/api/v2/instance/index.ts b/server/api/api/v2/instance/index.ts index ab38da30..efd95aa2 100644 --- a/server/api/api/v2/instance/index.ts +++ b/server/api/api/v2/instance/index.ts @@ -1,11 +1,11 @@ -import { applyConfig } from "@api"; -import { jsonResponse, proxyUrl } from "@response"; +import { applyConfig } from "@/api"; +import { jsonResponse, proxyUrl } from "@/response"; import { and, eq, isNull } from "drizzle-orm"; import type { Hono } from "hono"; -import { Users } from "~drizzle/schema"; -import manifest from "~package.json"; -import { config } from "~packages/config-manager"; -import { User } from "~packages/database-interface/user"; +import { Users } from "~/drizzle/schema"; +import manifest from "~/package.json"; +import { config } from "~/packages/config-manager"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/api/v2/media/index.ts b/server/api/api/v2/media/index.ts index ed348edf..1962b559 100644 --- a/server/api/api/v2/media/index.ts +++ b/server/api/api/v2/media/index.ts @@ -1,6 +1,6 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { encode } from "blurhash"; import { config } from "config-manager"; import type { Hono } from "hono"; @@ -9,9 +9,9 @@ import { MediaBackendType } from "media-manager"; import { LocalMediaBackend, S3MediaBackend } from "media-manager"; import sharp from "sharp"; import { z } from "zod"; -import { attachmentToAPI, getUrl } from "~database/entities/Attachment"; -import { db } from "~drizzle/db"; -import { Attachments } from "~drizzle/schema"; +import { attachmentToAPI, getUrl } from "~/database/entities/Attachment"; +import { db } from "~/drizzle/db"; +import { Attachments } from "~/drizzle/schema"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/api/v2/search/index.ts b/server/api/api/v2/search/index.ts index 82d3c8ab..7cd4ff85 100644 --- a/server/api/api/v2/search/index.ts +++ b/server/api/api/v2/search/index.ts @@ -1,18 +1,18 @@ -import { applyConfig, auth, handleZodError } from "@api"; +import { applyConfig, auth, handleZodError } from "@/api"; +import { dualLogger } from "@/loggers"; +import { MeiliIndexType, meilisearch } from "@/meilisearch"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { dualLogger } from "@loggers"; -import { MeiliIndexType, meilisearch } from "@meilisearch"; -import { errorResponse, jsonResponse } from "@response"; import { and, eq, inArray, sql } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { resolveWebFinger } from "~database/entities/User"; -import { db } from "~drizzle/db"; -import { Instances, Notes, Users } from "~drizzle/schema"; -import { config } from "~packages/config-manager"; -import { Note } from "~packages/database-interface/note"; -import { User } from "~packages/database-interface/user"; -import { LogLevel } from "~packages/log-manager"; +import { resolveWebFinger } from "~/database/entities/User"; +import { db } from "~/drizzle/db"; +import { Instances, Notes, Users } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; +import { Note } from "~/packages/database-interface/note"; +import { User } from "~/packages/database-interface/user"; +import { LogLevel } from "~/packages/log-manager"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/media/:id/index.ts b/server/api/media/:id/index.ts index bd64f9d0..ad59ffcf 100644 --- a/server/api/media/:id/index.ts +++ b/server/api/media/:id/index.ts @@ -1,6 +1,6 @@ -import { applyConfig, handleZodError } from "@api"; +import { applyConfig, handleZodError } from "@/api"; +import { errorResponse, response } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, response } from "@response"; import type { Hono } from "hono"; import { z } from "zod"; diff --git a/server/api/media/proxy/:id.ts b/server/api/media/proxy/:id.ts index ba8054b4..24d468d9 100644 --- a/server/api/media/proxy/:id.ts +++ b/server/api/media/proxy/:id.ts @@ -1,6 +1,6 @@ -import { applyConfig, handleZodError } from "@api"; +import { applyConfig, handleZodError } from "@/api"; +import { errorResponse, response } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, response } from "@response"; import type { Hono } from "hono"; import { z } from "zod"; diff --git a/server/api/oauth/authorize/index.ts b/server/api/oauth/authorize/index.ts index 5883208b..39443877 100644 --- a/server/api/oauth/authorize/index.ts +++ b/server/api/oauth/authorize/index.ts @@ -1,15 +1,15 @@ import { randomBytes } from "node:crypto"; -import { applyConfig, handleZodError, jsonOrForm } from "@api"; +import { applyConfig, handleZodError, jsonOrForm } from "@/api"; +import { response } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { response } from "@response"; import type { Hono } from "hono"; import { SignJWT, jwtVerify } from "jose"; import { z } from "zod"; -import { TokenType } from "~database/entities/Token"; -import { db } from "~drizzle/db"; -import { Tokens } from "~drizzle/schema"; -import { config } from "~packages/config-manager"; -import { User } from "~packages/database-interface/user"; +import { TokenType } from "~/database/entities/Token"; +import { db } from "~/drizzle/db"; +import { Tokens } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/oauth/sso/:issuer/callback/index.ts b/server/api/oauth/sso/:issuer/callback/index.ts index e23fd0fc..cc4712e4 100644 --- a/server/api/oauth/sso/:issuer/callback/index.ts +++ b/server/api/oauth/sso/:issuer/callback/index.ts @@ -1,16 +1,16 @@ import { randomBytes } from "node:crypto"; -import { applyConfig, handleZodError } from "@api"; +import { applyConfig, handleZodError } from "@/api"; +import { errorResponse, response } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, response } from "@response"; import type { Hono } from "hono"; import { SignJWT } from "jose"; import { z } from "zod"; -import { TokenType } from "~database/entities/Token"; -import { db } from "~drizzle/db"; -import { Tokens } from "~drizzle/schema"; -import { config } from "~packages/config-manager"; -import { OAuthManager } from "~packages/database-interface/oauth"; -import { User } from "~packages/database-interface/user"; +import { TokenType } from "~/database/entities/Token"; +import { db } from "~/drizzle/db"; +import { Tokens } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; +import { OAuthManager } from "~/packages/database-interface/oauth"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/oauth/sso/index.ts b/server/api/oauth/sso/index.ts index fa10b3ef..eb7f462f 100644 --- a/server/api/oauth/sso/index.ts +++ b/server/api/oauth/sso/index.ts @@ -1,7 +1,7 @@ -import { applyConfig, handleZodError } from "@api"; -import { oauthRedirectUri } from "@constants"; +import { applyConfig, handleZodError } from "@/api"; +import { oauthRedirectUri } from "@/constants"; +import { redirect, response } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { redirect, response } from "@response"; import type { Hono } from "hono"; import { calculatePKCECodeChallenge, @@ -10,9 +10,9 @@ import { processDiscoveryResponse, } from "oauth4webapi"; import { z } from "zod"; -import { db } from "~drizzle/db"; -import { OpenIdLoginFlows } from "~drizzle/schema"; -import { config } from "~packages/config-manager"; +import { db } from "~/drizzle/db"; +import { OpenIdLoginFlows } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/oauth/token/index.ts b/server/api/oauth/token/index.ts index ac7f6e92..9cc7876a 100644 --- a/server/api/oauth/token/index.ts +++ b/server/api/oauth/token/index.ts @@ -1,11 +1,11 @@ -import { applyConfig, handleZodError, jsonOrForm } from "@api"; +import { applyConfig, handleZodError, jsonOrForm } from "@/api"; +import { jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { jsonResponse } from "@response"; import { eq } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { db } from "~drizzle/db"; -import { Tokens } from "~drizzle/schema"; +import { db } from "~/drizzle/db"; +import { Tokens } from "~/drizzle/schema"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/objects/:id/index.ts b/server/api/objects/:id/index.ts index e80e4b04..c1626559 100644 --- a/server/api/objects/:id/index.ts +++ b/server/api/objects/:id/index.ts @@ -1,14 +1,14 @@ -import { applyConfig, handleZodError } from "@api"; +import { applyConfig, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; import type { EntityValidator } from "@lysand-org/federation"; -import { errorResponse, jsonResponse } from "@response"; import { and, eq, inArray, sql } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { type Like, likeToLysand } from "~database/entities/Like"; -import { db } from "~drizzle/db"; -import { Notes } from "~drizzle/schema"; -import { Note } from "~packages/database-interface/note"; +import { type Like, likeToLysand } from "~/database/entities/Like"; +import { db } from "~/drizzle/db"; +import { Notes } from "~/drizzle/schema"; +import { Note } from "~/packages/database-interface/note"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/users/:uuid/inbox/index.ts b/server/api/users/:uuid/inbox/index.ts index a89ee79a..0ed6866f 100644 --- a/server/api/users/:uuid/inbox/index.ts +++ b/server/api/users/:uuid/inbox/index.ts @@ -1,28 +1,28 @@ -import { applyConfig, debugRequest, handleZodError } from "@api"; +import { applyConfig, debugRequest, handleZodError } from "@/api"; +import { dualLogger } from "@/loggers"; +import { errorResponse, jsonResponse, response } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { dualLogger } from "@loggers"; -import { errorResponse, jsonResponse, response } from "@response"; import type { SocketAddress } from "bun"; import { eq } from "drizzle-orm"; import type { Hono } from "hono"; import { matches } from "ip-matching"; import { z } from "zod"; import { type ValidationError, isValidationError } from "zod-validation-error"; -import { resolveNote } from "~database/entities/Status"; +import { resolveNote } from "~/database/entities/Status"; import { getRelationshipToOtherUser, sendFollowAccept, -} from "~database/entities/User"; -import { db } from "~drizzle/db"; -import { Notifications, Relationships } from "~drizzle/schema"; -import { config } from "~packages/config-manager"; -import { User } from "~packages/database-interface/user"; -import { LogLevel, LogManager } from "~packages/log-manager"; +} from "~/database/entities/User"; +import { db } from "~/drizzle/db"; +import { Notifications, Relationships } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; +import { User } from "~/packages/database-interface/user"; +import { LogLevel, LogManager } from "~/packages/log-manager"; import { EntityValidator, RequestParserHandler, SignatureValidator, -} from "~packages/lysand-api/federation"; +} from "~/packages/lysand-api/federation"; export const meta = applyConfig({ allowedMethods: ["POST"], diff --git a/server/api/users/:uuid/index.ts b/server/api/users/:uuid/index.ts index 489e112e..a52c0f46 100644 --- a/server/api/users/:uuid/index.ts +++ b/server/api/users/:uuid/index.ts @@ -1,9 +1,9 @@ -import { applyConfig, handleZodError } from "@api"; +import { applyConfig, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import type { Hono } from "hono"; import { z } from "zod"; -import { User } from "~packages/database-interface/user"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/users/:uuid/outbox/index.ts b/server/api/users/:uuid/outbox/index.ts index 2ec74794..e6e3ae99 100644 --- a/server/api/users/:uuid/outbox/index.ts +++ b/server/api/users/:uuid/outbox/index.ts @@ -1,14 +1,14 @@ -import { applyConfig, handleZodError } from "@api"; +import { applyConfig, handleZodError } from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { and, count, eq, inArray } from "drizzle-orm"; import type { Hono } from "hono"; import { z } from "zod"; -import { db } from "~drizzle/db"; -import { Notes } from "~drizzle/schema"; -import { config } from "~packages/config-manager"; -import { Note } from "~packages/database-interface/note"; -import { User } from "~packages/database-interface/user"; +import { db } from "~/drizzle/db"; +import { Notes } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; +import { Note } from "~/packages/database-interface/note"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/well-known/host-meta/index.ts b/server/api/well-known/host-meta/index.ts index dde2a95d..fdafabad 100644 --- a/server/api/well-known/host-meta/index.ts +++ b/server/api/well-known/host-meta/index.ts @@ -1,7 +1,7 @@ -import { applyConfig } from "@api"; -import { xmlResponse } from "@response"; +import { applyConfig } from "@/api"; +import { xmlResponse } from "@/response"; import type { Hono } from "hono"; -import { config } from "~packages/config-manager"; +import { config } from "~/packages/config-manager"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/well-known/jwks/index.ts b/server/api/well-known/jwks/index.ts index c4d1d296..5a0f0ab7 100644 --- a/server/api/well-known/jwks/index.ts +++ b/server/api/well-known/jwks/index.ts @@ -1,8 +1,8 @@ -import { applyConfig } from "@api"; -import { jsonResponse } from "@response"; +import { applyConfig } from "@/api"; +import { jsonResponse } from "@/response"; import type { Hono } from "hono"; import { exportJWK } from "jose"; -import { config } from "~packages/config-manager"; +import { config } from "~/packages/config-manager"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/well-known/lysand.ts b/server/api/well-known/lysand.ts index f726eeef..639dce98 100644 --- a/server/api/well-known/lysand.ts +++ b/server/api/well-known/lysand.ts @@ -1,10 +1,10 @@ -import { applyConfig } from "@api"; -import { urlToContentFormat } from "@content_types"; +import { applyConfig } from "@/api"; +import { urlToContentFormat } from "@/content_types"; +import { jsonResponse } from "@/response"; import type { EntityValidator } from "@lysand-org/federation"; -import { jsonResponse } from "@response"; import type { Hono } from "hono"; -import pkg from "~package.json"; -import { config } from "~packages/config-manager"; +import pkg from "~/package.json"; +import { config } from "~/packages/config-manager"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/well-known/nodeinfo/2.0/index.ts b/server/api/well-known/nodeinfo/2.0/index.ts index e1bbc91c..d2a60f53 100644 --- a/server/api/well-known/nodeinfo/2.0/index.ts +++ b/server/api/well-known/nodeinfo/2.0/index.ts @@ -1,7 +1,7 @@ -import { applyConfig } from "@api"; -import { jsonResponse } from "@response"; +import { applyConfig } from "@/api"; +import { jsonResponse } from "@/response"; import type { Hono } from "hono"; -import manifest from "~package.json"; +import manifest from "~/package.json"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/well-known/nodeinfo/index.ts b/server/api/well-known/nodeinfo/index.ts index d8990f4e..7f0dfbc1 100644 --- a/server/api/well-known/nodeinfo/index.ts +++ b/server/api/well-known/nodeinfo/index.ts @@ -1,7 +1,7 @@ -import { applyConfig } from "@api"; -import { redirect } from "@response"; +import { applyConfig } from "@/api"; +import { redirect } from "@/response"; import type { Hono } from "hono"; -import { config } from "~packages/config-manager"; +import { config } from "~/packages/config-manager"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/well-known/openid-configuration/index.ts b/server/api/well-known/openid-configuration/index.ts index 36838e44..bf4bd156 100644 --- a/server/api/well-known/openid-configuration/index.ts +++ b/server/api/well-known/openid-configuration/index.ts @@ -1,7 +1,7 @@ -import { applyConfig } from "@api"; -import { jsonResponse } from "@response"; +import { applyConfig } from "@/api"; +import { jsonResponse } from "@/response"; import type { Hono } from "hono"; -import { config } from "~packages/config-manager"; +import { config } from "~/packages/config-manager"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/server/api/well-known/webfinger/index.ts b/server/api/well-known/webfinger/index.ts index 941e62db..ebdd57b4 100644 --- a/server/api/well-known/webfinger/index.ts +++ b/server/api/well-known/webfinger/index.ts @@ -3,16 +3,16 @@ import { handleZodError, idValidator, webfingerMention, -} from "@api"; +} from "@/api"; +import { errorResponse, jsonResponse } from "@/response"; import { zValidator } from "@hono/zod-validator"; -import { errorResponse, jsonResponse } from "@response"; import { eq } from "drizzle-orm"; import type { Hono } from "hono"; import { lookup } from "mime-types"; import { z } from "zod"; -import { Users } from "~drizzle/schema"; -import { config } from "~packages/config-manager"; -import { User } from "~packages/database-interface/user"; +import { Users } from "~/drizzle/schema"; +import { config } from "~/packages/config-manager"; +import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ allowedMethods: ["GET"], diff --git a/tests/api/accounts.test.ts b/tests/api/accounts.test.ts index 2027c335..8772351f 100644 --- a/tests/api/accounts.test.ts +++ b/tests/api/accounts.test.ts @@ -3,9 +3,9 @@ */ import { afterAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestUsers, sendTestRequest, wrapRelativeUrl } from "~tests/utils"; -import type { Account as APIAccount } from "~types/mastodon/account"; -import type { Relationship as APIRelationship } from "~types/mastodon/relationship"; +import { getTestUsers, sendTestRequest, wrapRelativeUrl } from "~/tests/utils"; +import type { Account as APIAccount } from "~/types/mastodon/account"; +import type { Relationship as APIRelationship } from "~/types/mastodon/relationship"; const base_url = config.http.base_url; diff --git a/tests/api/statuses.test.ts b/tests/api/statuses.test.ts index 81fd8404..ce549f0b 100644 --- a/tests/api/statuses.test.ts +++ b/tests/api/statuses.test.ts @@ -3,10 +3,10 @@ */ import { afterAll, describe, expect, test } from "bun:test"; import { config } from "config-manager"; -import { getTestUsers, sendTestRequest, wrapRelativeUrl } from "~tests/utils"; -import type { AsyncAttachment as APIAsyncAttachment } from "~types/mastodon/async_attachment"; -import type { Context as APIContext } from "~types/mastodon/context"; -import type { Status as APIStatus } from "~types/mastodon/status"; +import { getTestUsers, sendTestRequest, wrapRelativeUrl } from "~/tests/utils"; +import type { AsyncAttachment as APIAsyncAttachment } from "~/types/mastodon/async_attachment"; +import type { Context as APIContext } from "~/types/mastodon/context"; +import type { Status as APIStatus } from "~/types/mastodon/status"; const base_url = config.http.base_url; diff --git a/tests/oauth-scopes.test.ts b/tests/oauth-scopes.test.ts index 768e9f87..728fa540 100644 --- a/tests/oauth-scopes.test.ts +++ b/tests/oauth-scopes.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from "bun:test"; -import { checkIfOauthIsValid } from "@oauth"; -import type { Application } from "~database/entities/Application"; +import { checkIfOauthIsValid } from "@/oauth"; +import type { Application } from "~/database/entities/Application"; describe("checkIfOauthIsValid", () => { it("should return true when routeScopes and application.scopes are empty", () => { diff --git a/tests/oauth.test.ts b/tests/oauth.test.ts index de5fc402..acaeeba5 100644 --- a/tests/oauth.test.ts +++ b/tests/oauth.test.ts @@ -2,9 +2,9 @@ * @deprecated */ import { afterAll, describe, expect, test } from "bun:test"; -import { config } from "~packages/config-manager"; -import type { Application as APIApplication } from "~types/mastodon/application"; -import type { Token as APIToken } from "~types/mastodon/token"; +import { config } from "~/packages/config-manager"; +import type { Application as APIApplication } from "~/types/mastodon/application"; +import type { Token as APIToken } from "~/types/mastodon/token"; import { getTestUsers, sendTestRequest, wrapRelativeUrl } from "./utils"; const base_url = config.http.base_url; diff --git a/tests/setup.ts b/tests/setup.ts index b29f7714..35a8093f 100644 --- a/tests/setup.ts +++ b/tests/setup.ts @@ -1,4 +1,4 @@ -import { setupDatabase } from "~drizzle/db"; +import { setupDatabase } from "~/drizzle/db"; import { deleteOldTestUsers } from "./utils"; await setupDatabase(); diff --git a/tests/utils.ts b/tests/utils.ts index 40d9ec11..0102d911 100644 --- a/tests/utils.ts +++ b/tests/utils.ts @@ -1,13 +1,13 @@ import { randomBytes } from "node:crypto"; -import { consoleLogger } from "@loggers"; +import { consoleLogger } from "@/loggers"; import { asc, inArray, like } from "drizzle-orm"; -import type { Status } from "~database/entities/Status"; -import { db } from "~drizzle/db"; -import { setupDatabase } from "~drizzle/db"; -import { Notes, Tokens, Users } from "~drizzle/schema"; -import { app } from "~index"; -import { Note } from "~packages/database-interface/note"; -import { User } from "~packages/database-interface/user"; +import type { Status } from "~/database/entities/Status"; +import { db } from "~/drizzle/db"; +import { setupDatabase } from "~/drizzle/db"; +import { Notes, Tokens, Users } from "~/drizzle/schema"; +import { app } from "~/index"; +import { Note } from "~/packages/database-interface/note"; +import { User } from "~/packages/database-interface/user"; await setupDatabase(consoleLogger); diff --git a/tsconfig.json b/tsconfig.json index 9aa038fd..9e4bceba 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -22,9 +22,9 @@ "experimentalDecorators": true, "verbatimModuleSyntax": true, "paths": { - "@*": ["./utils/*"], - "~*": ["./*"], - "+*": ["./server/api/*"] + "@/*": ["./utils/*"], + "~/*": ["./*"], + "+/*": ["./server/api/*"] } }, "include": [ diff --git a/utils/api.ts b/utils/api.ts index 5a0e974d..b406884a 100644 --- a/utils/api.ts +++ b/utils/api.ts @@ -1,5 +1,5 @@ -import { consoleLogger } from "@loggers"; -import { errorResponse } from "@response"; +import { consoleLogger } from "@/loggers"; +import { errorResponse } from "@/response"; import chalk from "chalk"; import { config } from "config-manager"; import type { Context } from "hono"; @@ -21,11 +21,11 @@ import { import { parse } from "qs"; import type { z } from "zod"; import { fromZodError } from "zod-validation-error"; -import type { Application } from "~database/entities/Application"; -import { getFromHeader } from "~database/entities/User"; -import type { User } from "~packages/database-interface/user"; -import { LogLevel, LogManager } from "~packages/log-manager"; -import type { APIRouteMetadata, HttpVerb } from "~types/api"; +import type { Application } from "~/database/entities/Application"; +import { getFromHeader } from "~/database/entities/User"; +import type { User } from "~/packages/database-interface/user"; +import { LogLevel, LogManager } from "~/packages/log-manager"; +import type { APIRouteMetadata, HttpVerb } from "~/types/api"; export const applyConfig = (routeMeta: APIRouteMetadata) => { const newMeta = routeMeta; diff --git a/utils/loggers.ts b/utils/loggers.ts index 4d9a5d5b..3b6c97b8 100644 --- a/utils/loggers.ts +++ b/utils/loggers.ts @@ -1,5 +1,5 @@ import { LogManager, MultiLogManager } from "log-manager"; -import { config } from "~packages/config-manager"; +import { config } from "~/packages/config-manager"; const noColors = process.env.NO_COLORS === "true"; const noFancyDates = process.env.NO_FANCY_DATES === "true"; diff --git a/utils/meilisearch.ts b/utils/meilisearch.ts index 09b6e919..ffa67e7e 100644 --- a/utils/meilisearch.ts +++ b/utils/meilisearch.ts @@ -3,9 +3,9 @@ import { config } from "config-manager"; import { count } from "drizzle-orm"; import { LogLevel, type LogManager, type MultiLogManager } from "log-manager"; import { Meilisearch } from "meilisearch"; -import { db } from "~drizzle/db"; -import { Notes, Users } from "~drizzle/schema"; -import type { User } from "~packages/database-interface/user"; +import { db } from "~/drizzle/db"; +import { Notes, Users } from "~/drizzle/schema"; +import type { User } from "~/packages/database-interface/user"; export const meilisearch = new Meilisearch({ host: `${config.meilisearch.host}:${config.meilisearch.port}`, diff --git a/utils/oauth.ts b/utils/oauth.ts index bf46088c..28b50515 100644 --- a/utils/oauth.ts +++ b/utils/oauth.ts @@ -1,4 +1,4 @@ -import type { Application } from "~database/entities/Application"; +import type { Application } from "~/database/entities/Application"; /** * Check if an OAuth application is valid for a route diff --git a/utils/redis.ts b/utils/redis.ts index 4916d360..00bde668 100644 --- a/utils/redis.ts +++ b/utils/redis.ts @@ -1,4 +1,4 @@ -/* import type { Prisma } from "@prisma/client"; +/* import type { Prisma } from "@/prisma/client"; import chalk from "chalk"; import { config } from "config-manager"; import Redis from "ioredis"; diff --git a/utils/response.ts b/utils/response.ts index a8e755c5..f3436f1c 100644 --- a/utils/response.ts +++ b/utils/response.ts @@ -1,4 +1,4 @@ -import { config } from "~packages/config-manager"; +import { config } from "~/packages/config-manager"; export const response = ( data: BodyInit | null = null, diff --git a/utils/timelines.ts b/utils/timelines.ts index 0fa143c0..ed78fd9e 100644 --- a/utils/timelines.ts +++ b/utils/timelines.ts @@ -2,10 +2,10 @@ import { config } from "config-manager"; import type { Notification, findManyNotifications, -} from "~database/entities/Notification"; -import type { Status, findManyNotes } from "~database/entities/Status"; -import type { UserType, findManyUsers } from "~database/entities/User"; -import type { db } from "~drizzle/db"; +} from "~/database/entities/Notification"; +import type { Status, findManyNotes } from "~/database/entities/Status"; +import type { UserType, findManyUsers } from "~/database/entities/User"; +import type { db } from "~/drizzle/db"; export async function fetchTimeline( model: