chore: organize backend imports

* remove unused/duplicate imports
* replace paths like "../../../define.js" to be more readable
* add missing @types packages

packages/backend/package.json

@@ -146,6 +146,8 @@
 		"@swc/core": "1.3.78",
 		"@types/adm-zip": "^0.5.0",
 		"@types/bcryptjs": "2.4.2",
+		"@types/color-convert": "^2.0.2",
+		"@types/content-disposition": "^0.5.7",
 		"@types/escape-regexp": "0.0.1",
 		"@types/fluent-ffmpeg": "2.1.21",
 		"@types/js-yaml": "4.0.5",
@@ -167,6 +169,8 @@
 		"@types/node-fetch": "3.0.3",
 		"@types/nodemailer": "6.4.9",
 		"@types/oauth": "0.9.1",
+		"@types/opencc-js": "^1.0.2",
+		"@types/pg": "^8.10.7",
 		"@types/probe-image-size": "^7.2.0",
 		"@types/pug": "2.0.6",
 		"@types/punycode": "2.1.0",
@@ -179,6 +183,7 @@
 		"@types/sanitize-html": "2.9.0",
 		"@types/semver": "7.5.0",
 		"@types/sinonjs__fake-timers": "8.1.2",
+		"@types/syslog-pro": "^1.0.2",
 		"@types/tinycolor2": "1.4.3",
 		"@types/tmp": "0.2.3",
 		"@types/uuid": "9.0.2",

packages/backend/src/boot/master.ts

@@ -10,10 +10,9 @@ import semver from "semver";
 import Logger from "@/services/logger.js";
 import loadConfig from "@/config/load.js";
 import type { Config } from "@/config/types.js";
-import { lessThan } from "@/prelude/array.js";
+import { envOption } from "@/env.js";
-import { envOption } from "../env.js";
 import { showMachineInfo } from "@/misc/show-machine-info.js";
-import { db, initDb } from "../db/postgre.js";
+import { db, initDb } from "@/db/postgre.js";
 
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);

packages/backend/src/boot/worker.ts

@@ -1,6 +1,5 @@
 import cluster from "node:cluster";
-import { initDb } from "../db/postgre.js";
+import { initDb } from "@/db/postgre.js";
-import config from "@/config/index.js";
 import os from "node:os";
 
 /**

packages/backend/src/daemons/queue-stats.ts

@@ -1,5 +1,5 @@
 import Xev from "xev";
-import { deliverQueue, inboxQueue } from "../queue/queues.js";
+import { deliverQueue, inboxQueue } from "@/queue/queues.js";
 
 const ev = new Xev();
 

packages/backend/src/daemons/server-stats.ts

@@ -2,7 +2,7 @@ import si from "systeminformation";
 import Xev from "xev";
 import * as osUtils from "os-utils";
 import { fetchMeta } from "@/misc/fetch-meta.js";
-import meilisearch from "../db/meilisearch.js";
+import meilisearch from "@/db/meilisearch.js";
 
 const ev = new Xev();
 

packages/backend/src/db/postgre.ts

@@ -74,9 +74,10 @@ import { UserIp } from "@/models/entities/user-ip.js";
 import { NoteEdit } from "@/models/entities/note-edit.js";
 
 import { entities as charts } from "@/services/chart/entities.js";
-import { envOption } from "../env.js";
 import { dbLogger } from "./logger.js";
 import { redisClient } from "./redis.js";
+
+// TODO?: should we avoid importing things from built directory?
 import { nativeInitDatabase } from "native-utils/built/index.js";
 
 const sqlLogger = dbLogger.createSubLogger("sql", "gray", false);

packages/backend/src/misc/app-lock.ts

@@ -1,4 +1,4 @@
-import { redisClient } from "../db/redis.js";
+import { redisClient } from "@/db/redis.js";
 import { Mutex } from "redis-semaphore";
 
 /**

packages/backend/src/misc/captcha.ts

@@ -1,6 +1,6 @@
 import fetch from "node-fetch";
 import { URLSearchParams } from "node:url";
-import { getAgentByUrl } from "./fetch.js";
+import { getAgentByUrl } from "@/misc/fetch.js";
 import config from "@/config/index.js";
 
 export async function verifyRecaptcha(secret: string, response: string) {

packages/backend/src/misc/check-hit-antenna.ts

@@ -2,11 +2,11 @@ import type { Antenna } from "@/models/entities/antenna.js";
 import type { Note } from "@/models/entities/note.js";
 import type { User } from "@/models/entities/user.js";
 import { Blockings, UserProfiles } from "@/models/index.js";
-import { getFullApAccount } from "./convert-host.js";
+import { getFullApAccount } from "@/misc/convert-host.js";
 import * as Acct from "@/misc/acct.js";
-import type { Packed } from "./schema.js";
+import type { Packed } from "@/misc/schema.js";
-import { Cache } from "./cache.js";
+import { Cache } from "@/misc/cache.js";
-import { getWordHardMute } from "./check-word-mute.js";
+import { getWordHardMute } from "@/misc/check-word-mute.js";
 
 const blockingCache = new Cache<User["id"][]>("blocking", 60 * 5);
 const mutedWordsCache = new Cache<string[][] | undefined>("mutedWords", 60 * 5);

packages/backend/src/models/entities/note-thread-muting.ts

@@ -7,7 +7,6 @@ import {
 	ManyToOne,
 } from "typeorm";
 import { User } from "./user.js";
-import { Note } from "./note.js";
 import { id } from "../id.js";
 
 @Entity()

packages/backend/src/models/entities/user-ip.ts

@@ -1,14 +1,5 @@
-import {
+import { Entity, Index, Column, PrimaryGeneratedColumn } from "typeorm";
-	PrimaryColumn,
-	Entity,
-	Index,
-	JoinColumn,
-	Column,
-	ManyToOne,
-	PrimaryGeneratedColumn,
-} from "typeorm";
 import { id } from "../id.js";
-import { Note } from "./note.js";
 import type { User } from "./user.js";
 
 @Entity()

packages/backend/src/models/index.ts

@@ -1,9 +1,7 @@
-import {} from "typeorm";
 import { db } from "@/db/postgre.js";
 
 import { Announcement } from "./entities/announcement.js";
 import { AnnouncementRead } from "./entities/announcement-read.js";
-import { Instance } from "./entities/instance.js";
 import { Poll } from "./entities/poll.js";
 import { PollVote } from "./entities/poll-vote.js";
 import { Meta } from "./entities/meta.js";

packages/backend/src/models/repositories/drive-file.ts

@@ -2,12 +2,10 @@ import { db } from "@/db/postgre.js";
 import { DriveFile } from "@/models/entities/drive-file.js";
 import type { User } from "@/models/entities/user.js";
 import { toPuny } from "@/misc/convert-host.js";
-import { awaitAll, Promiseable } from "@/prelude/await-all.js";
+import { awaitAll } from "@/prelude/await-all.js";
 import type { Packed } from "@/misc/schema.js";
 import config from "@/config/index.js";
 import { query, appendQuery } from "@/prelude/url.js";
-import { Meta } from "@/models/entities/meta.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
 import { Users, DriveFolders } from "../index.js";
 import { deepClone } from "@/misc/clone.js";
 

packages/backend/src/models/repositories/notification.ts

@@ -1,4 +1,4 @@
-import { In, Repository } from "typeorm";
+import { In } from "typeorm";
 import { Notification } from "@/models/entities/notification.js";
 import { awaitAll } from "@/prelude/await-all.js";
 import type { Packed } from "@/misc/schema.js";
@@ -6,7 +6,6 @@ import type { Note } from "@/models/entities/note.js";
 import type { NoteReaction } from "@/models/entities/note-reaction.js";
 import type { User } from "@/models/entities/user.js";
 import { aggregateNoteEmojis, prefetchEmojis } from "@/misc/populate-emojis.js";
-import { notificationTypes } from "@/types.js";
 import { db } from "@/db/postgre.js";
 import {
 	Users,

packages/backend/src/models/repositories/user.ts

@@ -7,7 +7,6 @@ import type { Packed } from "@/misc/schema.js";
 import type { Promiseable } from "@/prelude/await-all.js";
 import { awaitAll } from "@/prelude/await-all.js";
 import { populateEmojis } from "@/misc/populate-emojis.js";
-import { getAntennas } from "@/misc/antenna-cache.js";
 import { USER_ACTIVE_THRESHOLD, USER_ONLINE_THRESHOLD } from "@/const.js";
 import { Cache } from "@/misc/cache.js";
 import { db } from "@/db/postgre.js";

packages/backend/src/queue/processors/background/index-all-notes.ts

@@ -6,7 +6,7 @@ import { Notes } from "@/models/index.js";
 import { MoreThan } from "typeorm";
 import { index } from "@/services/note/create.js";
 import { Note } from "@/models/entities/note.js";
-import meilisearch from "../../../db/meilisearch.js";
+import meilisearch from "@/db/meilisearch.js";
 
 const logger = queueLogger.createSubLogger("index-all-notes");
 

packages/backend/src/queue/processors/db/export-custom-emojis.ts

@@ -1,14 +1,12 @@
 import type Bull from "bull";
 import * as fs from "node:fs";
 
-import { ulid } from "ulid";
 import mime from "mime-types";
 import archiver from "archiver";
 import { queueLogger } from "../../logger.js";
 import { addFile } from "@/services/drive/add-file.js";
 import { format as dateFormat } from "date-fns";
 import { Users, Emojis } from "@/models/index.js";
-import {} from "@/queue/types.js";
 import { createTemp, createTempDir } from "@/misc/create-temp.js";
 import { downloadUrl } from "@/misc/download-url.js";
 import config from "@/config/index.js";

packages/backend/src/queue/processors/db/import-blocking.ts

@@ -5,7 +5,7 @@ import * as Acct from "@/misc/acct.js";
 import { resolveUser } from "@/remote/resolve-user.js";
 import { downloadTextFile } from "@/misc/download-text-file.js";
 import { isSelfHost, toPuny } from "@/misc/convert-host.js";
-import { Users, DriveFiles, Blockings } from "@/models/index.js";
+import { Users, DriveFiles } from "@/models/index.js";
 import type { DbUserImportJobData } from "@/queue/types.js";
 import block from "@/services/blocking/create.js";
 import { IsNull } from "typeorm";

packages/backend/src/queue/processors/db/import-masto-post.ts

@@ -5,7 +5,6 @@ import { queueLogger } from "../../logger.js";
 import type Bull from "bull";
 import { htmlToMfm } from "@/remote/activitypub/misc/html-to-mfm.js";
 import { resolveNote } from "@/remote/activitypub/models/note.js";
-import { Note } from "@/models/entities/note.js";
 import { uploadFromUrl } from "@/services/drive/upload-from-url.js";
 import type { DriveFile } from "@/models/entities/drive-file.js";
 import { Notes, NoteEdits } from "@/models/index.js";

packages/backend/src/queue/processors/ended-poll-notification.ts

@@ -1,11 +1,12 @@
 import type Bull from "bull";
 import { Notes, PollVotes } from "@/models/index.js";
-import { queueLogger } from "../logger.js";
+// import { queueLogger } from "../logger.js";
 import type { EndedPollNotificationJobData } from "@/queue/types.js";
 import { createNotification } from "@/services/create-notification.js";
 import { deliverQuestionUpdate } from "@/services/note/polls/update.js";
 
-const logger = queueLogger.createSubLogger("ended-poll-notification");
+// unused
+// const logger = queueLogger.createSubLogger("ended-poll-notification");
 
 export async function endedPollNotification(
 	job: Bull.Job<EndedPollNotificationJobData>,

packages/backend/src/queue/processors/system/verify-links.ts

@@ -4,7 +4,6 @@ import { UserProfiles } from "@/models/index.js";
 import { Not } from "typeorm";
 import { queueLogger } from "../../logger.js";
 import { verifyLink } from "@/services/fetch-rel-me.js";
-import config from "@/config/index.js";
 
 const logger = queueLogger.createSubLogger("verify-links");
 

packages/backend/src/queue/processors/webhook-deliver.ts

@@ -1,4 +1,3 @@
-import { URL } from "node:url";
 import type Bull from "bull";
 import Logger from "@/services/logger.js";
 import type { WebhookDeliverJobData } from "../types.js";

packages/backend/src/remote/activitypub/audience.ts

@@ -8,7 +8,6 @@ import type {
 	CacheableRemoteUser,
 	CacheableUser,
 } from "@/models/entities/user.js";
-import { User } from "@/models/entities/user.js";
 
 type Visibility = "public" | "home" | "followers" | "specified";
 

packages/backend/src/remote/activitypub/kernel/read.ts

@@ -3,7 +3,7 @@ import type { IRead } from "../type.js";
 import { getApId } from "../type.js";
 import { isSelfHost, extractDbHost } from "@/misc/convert-host.js";
 import { MessagingMessages } from "@/models/index.js";
-import { readUserMessagingMessage } from "../../../server/api/common/read-messaging-message.js";
+import { readUserMessagingMessage } from "@/server/api/common/read-messaging-message.js";
 
 export const performReadActivity = async (
 	actor: CacheableRemoteUser,

packages/backend/src/remote/activitypub/kernel/undo/accept.ts

@@ -1,5 +1,4 @@
 import unfollow from "@/services/following/delete.js";
-import cancelRequest from "@/services/following/requests/cancel.js";
 import type { IAccept } from "../../type.js";
 import type { CacheableRemoteUser } from "@/models/entities/user.js";
 import { Followings } from "@/models/index.js";

packages/backend/src/remote/activitypub/misc/get-note-html.ts

@@ -1,6 +1,6 @@
 import * as mfm from "mfm-js";
 import type { Note } from "@/models/entities/note.js";
-import { toHtml } from "../../../mfm/to-html.js";
+import { toHtml } from "@/mfm/to-html.js";
 
 export default function (note: Note) {
 	if (!note.text) return "";

packages/backend/src/remote/activitypub/misc/html-to-mfm.ts

@@ -1,6 +1,6 @@
 import type { IObject } from "../type.js";
 import { extractApHashtagObjects } from "../models/tag.js";
-import { fromHtml } from "../../../mfm/from-html.js";
+import { fromHtml } from "@/mfm/from-html.js";
 
 export function htmlToMfm(html: string, tag?: IObject | IObject[]) {
 	const hashtagNames = extractApHashtagObjects(tag)

packages/backend/src/remote/activitypub/models/image.ts

@@ -1,11 +1,10 @@
 import { uploadFromUrl } from "@/services/drive/upload-from-url.js";
 import type { CacheableRemoteUser } from "@/models/entities/user.js";
-import { IRemoteUser } from "@/models/entities/user.js";
 import Resolver from "../resolver.js";
 import { fetchMeta } from "@/misc/fetch-meta.js";
 import { apLogger } from "../logger.js";
 import type { DriveFile } from "@/models/entities/drive-file.js";
-import { DriveFiles, Users } from "@/models/index.js";
+import { DriveFiles } from "@/models/index.js";
 import { truncate } from "@/misc/truncate.js";
 import { DB_MAX_IMAGE_COMMENT_LENGTH } from "@/misc/hard-limits.js";
 

packages/backend/src/remote/activitypub/models/mention.ts

@@ -1,7 +1,6 @@
 import promiseLimit from "promise-limit";
 import { toArray, unique } from "@/prelude/array.js";
 import type { CacheableUser } from "@/models/entities/user.js";
-import { User } from "@/models/entities/user.js";
 import type { IObject, IApMention } from "../type.js";
 import { isMention } from "../type.js";
 import Resolver from "../resolver.js";

packages/backend/src/remote/activitypub/models/note.ts

@@ -6,10 +6,7 @@ import post from "@/services/note/create.js";
 import { extractMentionedUsers } from "@/services/note/create.js";
 import { resolvePerson } from "./person.js";
 import { resolveImage } from "./image.js";
-import type {
+import type { CacheableRemoteUser } from "@/models/entities/user.js";
-	ILocalUser,
-	CacheableRemoteUser,
-} from "@/models/entities/user.js";
 import { htmlToMfm } from "../misc/html-to-mfm.js";
 import { extractApHashtags } from "./tag.js";
 import { unique, toArray, toSingle } from "@/prelude/array.js";
@@ -52,7 +49,6 @@ import { In } from "typeorm";
 import { DB_MAX_IMAGE_COMMENT_LENGTH } from "@/misc/hard-limits.js";
 import { truncate } from "@/misc/truncate.js";
 import { type Size, getEmojiSize } from "@/misc/emoji-meta.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
 import { langmap } from "@/misc/langmap.js";
 
 const logger = apLogger;

packages/backend/src/remote/activitypub/models/person.ts

@@ -8,7 +8,6 @@ import { updateUsertags } from "@/services/update-hashtag.js";
 import {
 	Users,
 	Instances,
-	DriveFiles,
 	Followings,
 	UserProfiles,
 	UserPublickeys,
@@ -33,8 +32,8 @@ import { publishInternalEvent } from "@/services/stream.js";
 import { db } from "@/db/postgre.js";
 import { apLogger } from "../logger.js";
 import { htmlToMfm } from "../misc/html-to-mfm.js";
-import { fromHtml } from "../../../mfm/from-html.js";
+import { fromHtml } from "@/mfm/from-html.js";
-import type { IActor, IObject, IApPropertyValue } from "../type.js";
+import type { IActor, IObject } from "../type.js";
 import {
 	isCollectionOrOrderedCollection,
 	isCollection,

packages/backend/src/remote/activitypub/renderer/flag.ts

@@ -1,8 +1,5 @@
 import config from "@/config/index.js";
-import { IObject, IActivity } from "@/remote/activitypub/type.js";
 import type { ILocalUser } from "@/models/entities/user.js";
-import { IRemoteUser } from "@/models/entities/user.js";
-import { getInstanceActor } from "@/services/instance-actor.js";
 
 // to anonymise reporters, the reporting actor must be a system user
 // object has to be a uri or array of uris

packages/backend/src/remote/activitypub/renderer/undo.ts

@@ -1,6 +1,5 @@
 import config from "@/config/index.js";
 import type { User } from "@/models/entities/user.js";
-import { ILocalUser } from "@/models/entities/user.js";
 
 export default (object: any, user: { id: User["id"] }) => {
 	if (object == null) return null;

packages/backend/src/remote/activitypub/resolver.ts

@@ -7,13 +7,7 @@ import { extractDbHost, isSelfHost } from "@/misc/convert-host.js";
 import { signedGet } from "./request.js";
 import type { IObject, ICollection, IOrderedCollection } from "./type.js";
 import { isCollectionOrOrderedCollection, getApId } from "./type.js";
-import {
+import { Notes, NoteReactions, Polls, Users } from "@/models/index.js";
-	FollowRequests,
-	Notes,
-	NoteReactions,
-	Polls,
-	Users,
-} from "@/models/index.js";
 import { parseUri } from "./db-resolver.js";
 import renderNote from "@/remote/activitypub/renderer/note.js";
 import { renderLike } from "@/remote/activitypub/renderer/like.js";

packages/backend/src/server/activitypub.ts

@@ -9,7 +9,7 @@ import renderKey from "@/remote/activitypub/renderer/key.js";
 import { renderPerson } from "@/remote/activitypub/renderer/person.js";
 import renderEmoji from "@/remote/activitypub/renderer/emoji.js";
 import { inbox as processInbox } from "@/queue/index.js";
-import { isSelfHost, toPuny } from "@/misc/convert-host.js";
+import { isSelfHost } from "@/misc/convert-host.js";
 import {
 	Notes,
 	Users,
@@ -22,7 +22,6 @@ import { renderLike } from "@/remote/activitypub/renderer/like.js";
 import { getUserKeypair } from "@/misc/keypair-store.js";
 import {
 	checkFetch,
-	hasSignature,
 	getSignatureUser,
 } from "@/remote/activitypub/check-fetch.js";
 import { getInstanceActor } from "@/services/instance-actor.js";

packages/backend/src/server/api/call.ts

@@ -1,7 +1,6 @@
 import { performance } from "perf_hooks";
 import type Koa from "koa";
 import type { CacheableLocalUser } from "@/models/entities/user.js";
-import { User } from "@/models/entities/user.js";
 import type { AccessToken } from "@/models/entities/access-token.js";
 import { getIpHash } from "@/misc/get-ip-hash.js";
 import { limiter } from "./limiter.js";
@@ -10,7 +9,6 @@ import endpoints from "./endpoints.js";
 import compatibility from "./compatibility.js";
 import { ApiError } from "./error.js";
 import { apiLogger } from "./logger.js";
-import type { AccessToken } from "@/models/entities/access-token.js";
 import { fetchMeta } from "@/misc/fetch-meta.js";
 
 const accessDenied = {

packages/backend/src/server/api/define.ts

@@ -1,7 +1,6 @@
 import * as fs from "node:fs";
 import Ajv from "ajv";
 import type { CacheableLocalUser } from "@/models/entities/user.js";
-import { ILocalUser } from "@/models/entities/user.js";
 import type { Schema, SchemaType } from "@/misc/schema.js";
 import type { AccessToken } from "@/models/entities/access-token.js";
 import type { IEndpointMeta } from "./endpoints.js";

packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts

@@ -1,6 +1,6 @@
-import define from "../../define.js";
+import define from "@/server/api/define.js";
 import { AbuseUserReports } from "@/models/index.js";
-import { makePaginationQuery } from "../../common/make-pagination-query.js";
+import { makePaginationQuery } from "@/server/api/common/make-pagination-query.js";
 
 export const meta = {
 	tags: ["admin"],

packages/backend/src/server/api/endpoints/admin/accounts/create.ts

@@ -1,6 +1,6 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Users } from "@/models/index.js";
-import { signup } from "../../../common/signup.js";
+import { signup } from "@/server/api/common/signup.js";
 import { IsNull } from "typeorm";
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/accounts/delete.ts

@@ -1,4 +1,4 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Users } from "@/models/index.js";
 import { doPostSuspend } from "@/services/suspend-user.js";
 import { publishUserEvent } from "@/services/stream.js";

packages/backend/src/server/api/endpoints/admin/accounts/hosted.ts

@@ -2,7 +2,7 @@ import config from "@/config/index.js";
 import { Meta } from "@/models/entities/meta.js";
 import { insertModerationLog } from "@/services/insert-moderation-log.js";
 import { db } from "@/db/postgre.js";
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 
 export const meta = {
 	tags: ["admin"],

packages/backend/src/server/api/endpoints/admin/ad/create.ts

@@ -1,4 +1,4 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Ads } from "@/models/index.js";
 import { genId } from "@/misc/gen-id.js";
 

packages/backend/src/server/api/endpoints/admin/ad/delete.ts

@@ -1,6 +1,6 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Ads } from "@/models/index.js";
-import { ApiError } from "../../../error.js";
+import { ApiError } from "@/server/api/error.js";
 
 export const meta = {
 	tags: ["admin"],

packages/backend/src/server/api/endpoints/admin/ad/list.ts

@@ -1,6 +1,6 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Ads } from "@/models/index.js";
-import { makePaginationQuery } from "../../../common/make-pagination-query.js";
+import { makePaginationQuery } from "@/server/api/common/make-pagination-query.js";
 
 export const meta = {
 	tags: ["admin"],

packages/backend/src/server/api/endpoints/admin/ad/update.ts

@@ -1,6 +1,6 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Ads } from "@/models/index.js";
-import { ApiError } from "../../../error.js";
+import { ApiError } from "@/server/api/error.js";
 
 export const meta = {
 	tags: ["admin"],

packages/backend/src/server/api/endpoints/admin/announcements/create.ts

@@ -1,4 +1,4 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Announcements } from "@/models/index.js";
 import { genId } from "@/misc/gen-id.js";
 

packages/backend/src/server/api/endpoints/admin/announcements/delete.ts

@@ -1,6 +1,6 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Announcements } from "@/models/index.js";
-import { ApiError } from "../../../error.js";
+import { ApiError } from "@/server/api/error.js";
 
 export const meta = {
 	tags: ["admin"],

packages/backend/src/server/api/endpoints/admin/announcements/list.ts

@@ -1,7 +1,7 @@
 import { Announcements, AnnouncementReads } from "@/models/index.js";
 import type { Announcement } from "@/models/entities/announcement.js";
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
-import { makePaginationQuery } from "../../../common/make-pagination-query.js";
+import { makePaginationQuery } from "@/server/api/common/make-pagination-query.js";
 
 export const meta = {
 	tags: ["admin"],

packages/backend/src/server/api/endpoints/admin/announcements/update.ts

@@ -1,6 +1,6 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Announcements } from "@/models/index.js";
-import { ApiError } from "../../../error.js";
+import { ApiError } from "@/server/api/error.js";
 
 export const meta = {
 	tags: ["admin"],

packages/backend/src/server/api/endpoints/admin/delete-2fa.ts

@@ -1,6 +1,6 @@
 import { Users, UserProfiles } from "@/models/index.js";
 import { publishMainStream } from "@/services/stream.js";
-import define from "../../define.js";
+import define from "@/server/api/define.js";
 
 export const meta = {
 	tags: ["admin"],

packages/backend/src/server/api/endpoints/admin/delete-account.ts

@@ -1,6 +1,6 @@
 import { Users } from "@/models/index.js";
 import { deleteAccount } from "@/services/delete-account.js";
-import define from "../../define.js";
+import define from "@/server/api/define.js";
 
 export const meta = {
 	tags: ["admin"],

packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts

@@ -1,4 +1,4 @@
-import define from "../../define.js";
+import define from "@/server/api/define.js";
 import { deleteFile } from "@/services/drive/delete-file.js";
 import { DriveFiles } from "@/models/index.js";
 

packages/backend/src/server/api/endpoints/admin/delete-passkeys.ts

@@ -1,6 +1,6 @@
 import { Users, UserProfiles, UserSecurityKeys } from "@/models/index.js";
 import { publishMainStream } from "@/services/stream.js";
-import define from "../../define.js";
+import define from "@/server/api/define.js";
 
 export const meta = {
 	tags: ["admin"],

packages/backend/src/server/api/endpoints/admin/drive-capacity-override.ts

@@ -1,4 +1,4 @@
-import define from "../../define.js";
+import define from "@/server/api/define.js";
 import { Users } from "@/models/index.js";
 import { insertModerationLog } from "@/services/insert-moderation-log.js";
 import { publishInternalEvent } from "@/services/stream.js";

packages/backend/src/server/api/endpoints/admin/drive/clean-remote-files.ts

@@ -1,4 +1,4 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { createCleanRemoteFilesJob } from "@/queue/index.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts

@@ -1,5 +1,5 @@
 import { IsNull } from "typeorm";
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { deleteFile } from "@/services/drive/delete-file.js";
 import { DriveFiles } from "@/models/index.js";
 

packages/backend/src/server/api/endpoints/admin/drive/files.ts

@@ -1,6 +1,6 @@
 import { DriveFiles } from "@/models/index.js";
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
-import { makePaginationQuery } from "../../../common/make-pagination-query.js";
+import { makePaginationQuery } from "@/server/api/common/make-pagination-query.js";
 
 export const meta = {
 	tags: ["admin"],

packages/backend/src/server/api/endpoints/admin/drive/show-file.ts

@@ -1,6 +1,6 @@
 import { DriveFiles } from "@/models/index.js";
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
-import { ApiError } from "../../../error.js";
+import { ApiError } from "@/server/api/error.js";
 
 export const meta = {
 	tags: ["admin"],

packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts

@@ -1,7 +1,6 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Emojis } from "@/models/index.js";
 import { In } from "typeorm";
-import { ApiError } from "../../../error.js";
 import { db } from "@/db/postgre.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/emoji/add.ts

@@ -1,8 +1,8 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Emojis, DriveFiles } from "@/models/index.js";
 import { genId } from "@/misc/gen-id.js";
 import { insertModerationLog } from "@/services/insert-moderation-log.js";
-import { ApiError } from "../../../error.js";
+import { ApiError } from "@/server/api/error.js";
 import rndstr from "rndstr";
 import { publishBroadcastStream } from "@/services/stream.js";
 import { db } from "@/db/postgre.js";

packages/backend/src/server/api/endpoints/admin/emoji/copy.ts

@@ -1,7 +1,7 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Emojis } from "@/models/index.js";
 import { genId } from "@/misc/gen-id.js";
-import { ApiError } from "../../../error.js";
+import { ApiError } from "@/server/api/error.js";
 import type { DriveFile } from "@/models/entities/drive-file.js";
 import { uploadFromUrl } from "@/services/drive/upload-from-url.js";
 import { publishBroadcastStream } from "@/services/stream.js";

packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts

@@ -1,8 +1,7 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Emojis } from "@/models/index.js";
 import { In } from "typeorm";
 import { insertModerationLog } from "@/services/insert-moderation-log.js";
-import { ApiError } from "../../../error.js";
 import { db } from "@/db/postgre.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/emoji/delete.ts

@@ -1,7 +1,7 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Emojis } from "@/models/index.js";
 import { insertModerationLog } from "@/services/insert-moderation-log.js";
-import { ApiError } from "../../../error.js";
+import { ApiError } from "@/server/api/error.js";
 import { db } from "@/db/postgre.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/emoji/import-zip.ts

@@ -1,4 +1,4 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { createImportCustomEmojisJob } from "@/queue/index.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts

@@ -1,7 +1,7 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Emojis } from "@/models/index.js";
 import { toPuny } from "@/misc/convert-host.js";
-import { makePaginationQuery } from "../../../common/make-pagination-query.js";
+import { makePaginationQuery } from "@/server/api/common/make-pagination-query.js";
 import { sqlLikeEscape } from "@/misc/sql-like-escape.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/emoji/list.ts

@@ -1,4 +1,4 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Emojis } from "@/models/index.js";
 import { makePaginationQuery } from "../../../common/make-pagination-query.js";
 import type { Emoji } from "@/models/entities/emoji.js";

packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts

@@ -1,7 +1,6 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Emojis } from "@/models/index.js";
 import { In } from "typeorm";
-import { ApiError } from "../../../error.js";
 import { db } from "@/db/postgre.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts

@@ -1,7 +1,6 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Emojis } from "@/models/index.js";
 import { In } from "typeorm";
-import { ApiError } from "../../../error.js";
 import { db } from "@/db/postgre.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts

@@ -1,7 +1,6 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Emojis } from "@/models/index.js";
 import { In } from "typeorm";
-import { ApiError } from "../../../error.js";
 import { db } from "@/db/postgre.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/emoji/set-license-bulk.ts

@@ -1,7 +1,6 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Emojis } from "@/models/index.js";
 import { In } from "typeorm";
-import { ApiError } from "../../../error.js";
 import { db } from "@/db/postgre.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/emoji/update.ts

@@ -1,6 +1,6 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Emojis } from "@/models/index.js";
-import { ApiError } from "../../../error.js";
+import { ApiError } from "@/server/api/error.js";
 import { db } from "@/db/postgre.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts

@@ -1,4 +1,4 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { deleteFile } from "@/services/drive/delete-file.js";
 import { DriveFiles } from "@/models/index.js";
 

packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts

@@ -1,4 +1,4 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Instances } from "@/models/index.js";
 import { toPuny } from "@/misc/convert-host.js";
 import { fetchInstanceMetadata } from "@/services/fetch-instance-metadata.js";

packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts

@@ -1,4 +1,4 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import deleteFollowing from "@/services/following/delete.js";
 import { Followings, Users } from "@/models/index.js";
 

packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts

@@ -1,4 +1,4 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Instances } from "@/models/index.js";
 import { toPuny } from "@/misc/convert-host.js";
 

packages/backend/src/server/api/endpoints/admin/get-index-stats.ts

@@ -1,4 +1,4 @@
-import define from "../../define.js";
+import define from "@/server/api/define.js";
 import { db } from "@/db/postgre.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/get-table-stats.ts

@@ -1,5 +1,5 @@
 import { db } from "@/db/postgre.js";
-import define from "../../define.js";
+import define from "@/server/api/define.js";
 
 export const meta = {
 	requireCredential: true,

packages/backend/src/server/api/endpoints/admin/get-user-ips.ts

@@ -1,5 +1,5 @@
 import { UserIps } from "@/models/index.js";
-import define from "../../define.js";
+import define from "@/server/api/define.js";
 
 export const meta = {
 	tags: ["admin"],

packages/backend/src/server/api/endpoints/admin/invite.ts

@@ -1,5 +1,5 @@
 import rndstr from "rndstr";
-import define from "../../define.js";
+import define from "@/server/api/define.js";
 import { RegistrationTickets } from "@/models/index.js";
 import { genId } from "@/misc/gen-id.js";
 

packages/backend/src/server/api/endpoints/admin/meta.ts

@@ -1,8 +1,7 @@
 import config from "@/config/index.js";
 import { fetchMeta } from "@/misc/fetch-meta.js";
 import { MAX_NOTE_TEXT_LENGTH, MAX_CAPTION_TEXT_LENGTH } from "@/const.js";
-import define from "../../define.js";
+import define from "@/server/api/define.js";
-import { Exp } from "@tensorflow/tfjs";
 
 export const meta = {
 	tags: ["meta"],

packages/backend/src/server/api/endpoints/admin/moderators/add.ts

@@ -1,4 +1,4 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Users } from "@/models/index.js";
 import { publishInternalEvent } from "@/services/stream.js";
 

packages/backend/src/server/api/endpoints/admin/moderators/remove.ts

@@ -1,4 +1,4 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { Users } from "@/models/index.js";
 import { publishInternalEvent } from "@/services/stream.js";
 

packages/backend/src/server/api/endpoints/admin/promo/create.ts

@@ -1,6 +1,6 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
-import { ApiError } from "../../../error.js";
+import { ApiError } from "@/server/api/error.js";
-import { getNote } from "../../../common/getters.js";
+import { getNote } from "@/server/api/common/getters.js";
 import { PromoNotes } from "@/models/index.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/queue/clear.ts

@@ -1,4 +1,4 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { destroy } from "@/queue/index.js";
 import { insertModerationLog } from "@/services/insert-moderation-log.js";
 

packages/backend/src/server/api/endpoints/admin/queue/deliver-delayed.ts

@@ -1,6 +1,6 @@
 import { deliverQueue } from "@/queue/queues.js";
 import { URL } from "node:url";
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 
 export const meta = {
 	tags: ["admin"],

packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts

@@ -1,5 +1,5 @@
 import { URL } from "node:url";
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { inboxQueue } from "@/queue/queues.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/queue/stats.ts

@@ -5,7 +5,7 @@ import {
 	objectStorageQueue,
 	backgroundQueue,
 } from "@/queue/queues.js";
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 
 export const meta = {
 	tags: ["admin"],

packages/backend/src/server/api/endpoints/admin/relays/add.ts

@@ -1,7 +1,7 @@
 import { URL } from "node:url";
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { addRelay } from "@/services/relay.js";
-import { ApiError } from "../../../error.js";
+import { ApiError } from "@/server/api/error.js";
 
 export const meta = {
 	tags: ["admin"],

packages/backend/src/server/api/endpoints/admin/relays/list.ts

@@ -1,4 +1,4 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { listRelay } from "@/services/relay.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/relays/remove.ts

@@ -1,4 +1,4 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { removeRelay } from "@/services/relay.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/reset-password.ts

@@ -1,4 +1,4 @@
-import define from "../../define.js";
+import define from "@/server/api/define.js";
 // import bcrypt from "bcryptjs";
 import rndstr from "rndstr";
 import { Users, UserProfiles } from "@/models/index.js";

packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts

@@ -1,4 +1,4 @@
-import define from "../../define.js";
+import define from "@/server/api/define.js";
 import { AbuseUserReports, Users } from "@/models/index.js";
 import { getInstanceActor } from "@/services/instance-actor.js";
 import { deliver } from "@/queue/index.js";

packages/backend/src/server/api/endpoints/admin/search/index-all.ts

@@ -1,4 +1,4 @@
-import define from "../../../define.js";
+import define from "@/server/api/define.js";
 import { createIndexAllNotesJob } from "@/queue/index.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/send-email.ts

@@ -1,4 +1,4 @@
-import define from "../../define.js";
+import define from "@/server/api/define.js";
 import { sendEmail } from "@/services/send-email.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/send-mod-mail.ts

@@ -1,7 +1,7 @@
 import sanitizeHtml from "sanitize-html";
-import define from "../../define.js";
+import define from "@/server/api/define.js";
 import { Users, UserProfiles } from "@/models/index.js";
-import { ApiError } from "../../error.js";
+import { ApiError } from "@/server/api/error.js";
 import { sendEmail } from "@/services/send-email.js";
 import { createNotification } from "@/services/create-notification.js";
 

packages/backend/src/server/api/endpoints/admin/server-info.ts

@@ -1,7 +1,7 @@
 import * as os from "node:os";
 import si from "systeminformation";
-import define from "../../define.js";
+import define from "@/server/api/define.js";
-import { redisClient } from "../../../../db/redis.js";
+import { redisClient } from "@/db/redis.js";
 import { db } from "@/db/postgre.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts

@@ -1,6 +1,6 @@
-import define from "../../define.js";
+import define from "@/server/api/define.js";
 import { ModerationLogs } from "@/models/index.js";
-import { makePaginationQuery } from "../../common/make-pagination-query.js";
+import { makePaginationQuery } from "@/server/api/common/make-pagination-query.js";
 
 export const meta = {
 	tags: ["admin"],

packages/backend/src/server/api/endpoints/admin/show-user.ts

@@ -1,5 +1,5 @@
 import { Signins, UserProfiles, Users } from "@/models/index.js";
-import define from "../../define.js";
+import define from "@/server/api/define.js";
 
 export const meta = {
 	tags: ["admin"],

packages/backend/src/server/api/endpoints/admin/show-users.ts

@@ -1,5 +1,5 @@
 import { Users } from "@/models/index.js";
-import define from "../../define.js";
+import define from "@/server/api/define.js";
 import { sqlLikeEscape } from "@/misc/sql-like-escape.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/silence-user.ts

@@ -1,4 +1,4 @@
-import define from "../../define.js";
+import define from "@/server/api/define.js";
 import { Users } from "@/models/index.js";
 import { insertModerationLog } from "@/services/insert-moderation-log.js";
 import { publishInternalEvent } from "@/services/stream.js";