bacakend: prefer absolute over relative imports

There are still many places where import paths with `..` are used and
maybe should use absolute paths also.

packages/backend/src/boot/index.ts

@@ -3,7 +3,7 @@ import chalk from 'chalk';
 import Xev from 'xev';
 
 import Logger from '@/services/logger.js';
-import { envOption } from '../env.js';
+import { envOption } from '@/env.js';
 
 // for typeorm
 import 'reflect-metadata';

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/queue/index.ts

@@ -5,7 +5,7 @@ import config from '@/config/index.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
 import { Webhook, webhookEventTypes } from '@/models/entities/webhook.js';
 import { IActivity } from '@/remote/activitypub/type.js';
-import { envOption } from '../env.js';
+import { envOption } from '@/env.js';
 
 import processDeliver from './processors/deliver.js';
 import processInbox from './processors/inbox.js';

packages/backend/src/queue/processors/db/delete-drive-files.ts

@@ -3,7 +3,7 @@ import { MoreThan } from 'typeorm';
 import { Users, DriveFiles } from '@/models/index.js';
 import { deleteFileSync } from '@/services/drive/delete-file.js';
 import { DbUserJobData } from '@/queue/types.js';
-import { queueLogger } from '../../logger.js';
+import { queueLogger } from '@/queue/logger.js';
 
 const logger = queueLogger.createSubLogger('delete-drive-files');
 

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

@@ -7,8 +7,8 @@ import { getFullApAccount } from '@/misc/convert-host.js';
 import { createTemp } from '@/misc/create-temp.js';
 import { Users, Blockings } from '@/models/index.js';
 import { DbUserJobData } from '@/queue/types.js';
+import { queueLogger } from '@/queue/logger.js';
 import { addFile } from '@/services/drive/add-file.js';
-import { queueLogger } from '../../logger.js';
 
 const logger = queueLogger.createSubLogger('export-blocking');
 

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

@@ -9,7 +9,7 @@ import { createTemp, createTempDir } from '@/misc/create-temp.js';
 import { downloadUrl } from '@/misc/download-url.js';
 import { Users, Emojis } from '@/models/index.js';
 import { addFile } from '@/services/drive/add-file.js';
-import { queueLogger } from '../../logger.js';
+import { queueLogger } from '@/queue/logger.js';
 
 const logger = queueLogger.createSubLogger('export-custom-emojis');
 

packages/backend/src/queue/processors/db/export-following.ts

@@ -8,8 +8,8 @@ import { createTemp } from '@/misc/create-temp.js';
 import { Following } from '@/models/entities/following.js';
 import { Users, Followings, Mutings } from '@/models/index.js';
 import { DbUserJobData } from '@/queue/types.js';
+import { queueLogger } from '@/queue/logger.js';
 import { addFile } from '@/services/drive/add-file.js';
-import { queueLogger } from '../../logger.js';
 
 const logger = queueLogger.createSubLogger('export-following');
 

packages/backend/src/queue/processors/db/export-mute.ts

@@ -7,8 +7,8 @@ import { getFullApAccount } from '@/misc/convert-host.js';
 import { createTemp } from '@/misc/create-temp.js';
 import { Users, Mutings } from '@/models/index.js';
 import { DbUserJobData } from '@/queue/types.js';
+import { queueLogger } from '@/queue/logger.js';
 import { addFile } from '@/services/drive/add-file.js';
-import { queueLogger } from '../../logger.js';
 
 const logger = queueLogger.createSubLogger('export-mute');
 

packages/backend/src/queue/processors/db/export-notes.ts

@@ -9,7 +9,7 @@ import { Poll } from '@/models/entities/poll.js';
 import { Users, Notes, Polls } from '@/models/index.js';
 import { DbUserJobData } from '@/queue/types.js';
 import { addFile } from '@/services/drive/add-file.js';
-import { queueLogger } from '../../logger.js';
+import { queueLogger } from '@/queue/logger.js';
 
 const logger = queueLogger.createSubLogger('export-notes');
 

packages/backend/src/queue/processors/db/export-user-lists.ts

@@ -7,8 +7,8 @@ import { getFullApAccount } from '@/misc/convert-host.js';
 import { createTemp } from '@/misc/create-temp.js';
 import { Users, UserLists, UserListJoinings } from '@/models/index.js';
 import { DbUserJobData } from '@/queue/types.js';
+import { queueLogger } from '@/queue/logger.js';
 import { addFile } from '@/services/drive/add-file.js';
-import { queueLogger } from '../../logger.js';
 
 const logger = queueLogger.createSubLogger('export-user-lists');
 

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

@@ -6,9 +6,9 @@ import { isSelfHost, toPuny } from '@/misc/convert-host.js';
 import { downloadTextFile } from '@/misc/download-text-file.js';
 import { Users, DriveFiles } from '@/models/index.js';
 import { DbUserImportJobData } from '@/queue/types.js';
+import { queueLogger } from '@/queue/logger.js';
 import { resolveUser } from '@/remote/resolve-user.js';
 import block from '@/services/blocking/create.js';
-import { queueLogger } from '../../logger.js';
 
 const logger = queueLogger.createSubLogger('import-blocking');
 

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

@@ -8,8 +8,8 @@ import { downloadUrl } from '@/misc/download-url.js';
 import { genId } from '@/misc/gen-id.js';
 import { DriveFiles, Emojis } from '@/models/index.js';
 import { DbUserImportJobData } from '@/queue/types.js';
+import { queueLogger } from '@/queue/logger.js';
 import { addFile } from '@/services/drive/add-file.js';
-import { queueLogger } from '../../logger.js';
 
 const logger = queueLogger.createSubLogger('import-custom-emojis');
 

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

@@ -6,9 +6,9 @@ import { isSelfHost, toPuny } from '@/misc/convert-host.js';
 import { downloadTextFile } from '@/misc/download-text-file.js';
 import { Users, DriveFiles } from '@/models/index.js';
 import { DbUserImportJobData } from '@/queue/types.js';
+import { queueLogger } from '@/queue/logger.js';
 import { resolveUser } from '@/remote/resolve-user.js';
 import follow from '@/services/following/create.js';
-import { queueLogger } from '../../logger.js';
 
 const logger = queueLogger.createSubLogger('import-following');
 

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

@@ -8,8 +8,8 @@ import { genId } from '@/misc/gen-id.js';
 import { Users, DriveFiles, Mutings } from '@/models/index.js';
 import { User } from '@/models/entities/user.js';
 import { DbUserImportJobData } from '@/queue/types.js';
+import { queueLogger } from '@/queue/logger.js';
 import { resolveUser } from '@/remote/resolve-user.js';
-import { queueLogger } from '../../logger.js';
 
 const logger = queueLogger.createSubLogger('import-muting');
 

packages/backend/src/queue/processors/db/import-user-lists.ts

@@ -9,7 +9,7 @@ import { DriveFiles, Users, UserLists, UserListJoinings } from '@/models/index.j
 import { DbUserImportJobData } from '@/queue/types.js';
 import { resolveUser } from '@/remote/resolve-user.js';
 import { pushUserToUserList } from '@/services/user-list/push.js';
-import { queueLogger } from '../../logger.js';
+import { queueLogger } from '@/queue/logger.js';
 
 const logger = queueLogger.createSubLogger('import-user-lists');
 

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

@@ -11,7 +11,7 @@ import { toPuny } from '@/misc/convert-host.js';
 import { Cache } from '@/misc/cache.js';
 import { Instance } from '@/models/entities/instance.js';
 import { StatusError } from '@/misc/fetch.js';
-import { DeliverJobData } from '../types.js';
+import { DeliverJobData } from '@/queue/types.js';
 
 const logger = new Logger('deliver');
 

packages/backend/src/queue/processors/inbox.ts

@@ -16,7 +16,7 @@ import { LdSignature } from '@/remote/activitypub/misc/ld-signature.js';
 import { StatusError } from '@/misc/fetch.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
 import { UserPublickey } from '@/models/entities/user-publickey.js';
-import { InboxJobData } from '../types.js';
+import { InboxJobData } from '@/queue/types.js';
 
 const logger = new Logger('inbox');
 

packages/backend/src/queue/processors/object-storage/clean-remote-files.ts

@@ -3,7 +3,7 @@ import { MoreThan, Not, IsNull } from 'typeorm';
 
 import { DriveFiles } from '@/models/index.js';
 import { deleteFileSync } from '@/services/drive/delete-file.js';
-import { queueLogger } from '../../logger.js';
+import { queueLogger } from '@/queue/logger.js';
 
 const logger = queueLogger.createSubLogger('clean-remote-files');
 

packages/backend/src/queue/processors/system/check-expired-mutings.ts

@@ -2,7 +2,7 @@ import Bull from 'bull';
 import { In } from 'typeorm';
 import { Mutings } from '@/models/index.js';
 import { publishUserEvent } from '@/services/stream.js';
-import { queueLogger } from '../../logger.js';
+import { queueLogger } from '@/queue/logger.js';
 
 const logger = queueLogger.createSubLogger('check-expired-mutings');
 

packages/backend/src/queue/processors/system/clean-charts.ts

@@ -1,7 +1,7 @@
 import Bull from 'bull';
 
 import { activeUsersChart, driveChart, federationChart, hashtagChart, instanceChart, notesChart, perUserDriveChart, perUserFollowingChart, perUserNotesChart, perUserReactionsChart, usersChart, apRequestChart } from '@/services/chart/index.js';
-import { queueLogger } from '../../logger.js';
+import { queueLogger } from '@/queue/logger.js';
 
 const logger = queueLogger.createSubLogger('clean-charts');
 

packages/backend/src/queue/processors/system/resync-charts.ts

@@ -1,7 +1,7 @@
 import Bull from 'bull';
 
 import { driveChart, notesChart, usersChart } from '@/services/chart/index.js';
-import { queueLogger } from '../../logger.js';
+import { queueLogger } from '@/queue/logger.js';
 
 const logger = queueLogger.createSubLogger('resync-charts');
 

packages/backend/src/queue/processors/system/tick-charts.ts

@@ -1,7 +1,7 @@
 import Bull from 'bull';
 
 import { activeUsersChart, driveChart, federationChart, hashtagChart, instanceChart, notesChart, perUserDriveChart, perUserFollowingChart, perUserNotesChart, perUserReactionsChart, usersChart, apRequestChart } from '@/services/chart/index.js';
-import { queueLogger } from '../../logger.js';
+import { queueLogger } from '@/queue/logger.js';
 
 const logger = queueLogger.createSubLogger('tick-charts');
 

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

@@ -3,7 +3,7 @@ import config from '@/config/index.js';
 import { getResponse, StatusError } from '@/misc/fetch.js';
 import { Webhooks } from '@/models/index.js';
 import Logger from '@/services/logger.js';
-import { WebhookDeliverJobData } from '../types.js';
+import { WebhookDeliverJobData } from '@/queue/types.js';
 
 const logger = new Logger('webhook');
 

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

@@ -1,8 +1,8 @@
 import { CacheableRemoteUser } from '@/models/entities/user.js';
 import accept from '@/services/following/requests/accept.js';
 import { relayAccepted } from '@/services/relay.js';
-import { IFollow } from '../../type.js';
-import DbResolver from '../../db-resolver.js';
+import { IFollow } from '@/remote/activitypub/type.js';
+import DbResolver from '@/remote/activitypub/db-resolver.js';
 
 export default async (actor: CacheableRemoteUser, activity: IFollow): Promise<string> => {
 	// ※ activityはこっちから投げたフォローリクエストなので、activity.actorは存在するローカルユーザーである必要がある

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

@@ -1,7 +1,7 @@
 import { CacheableRemoteUser } from '@/models/entities/user.js';
-import { apLogger } from '../../logger.js';
-import Resolver from '../../resolver.js';
-import { IAccept, isFollow, getApType } from '../../type.js';
+import { apLogger } from '@/remote/activitypub/logger.js';
+import Resolver from '@/remote/activitypub/resolver.js';
+import { IAccept, isFollow, getApType } from '@/remote/activitypub/type.js';
 import acceptFollow from './follow.js';
 
 const logger = apLogger;

packages/backend/src/remote/activitypub/kernel/add/index.ts

@@ -1,7 +1,7 @@
 import { CacheableRemoteUser } from '@/models/entities/user.js';
 import { addPinned } from '@/services/i/pin.js';
-import { resolveNote } from '../../models/note.js';
-import { IAdd } from '../../type.js';
+import { resolveNote } from '@/remote/activitypub/models/note.js';
+import { IAdd } from '@/remote/activitypub/type.js';
 
 export default async (actor: CacheableRemoteUser, activity: IAdd): Promise<void> => {
 	if ('actor' in activity && actor.uri !== activity.actor) {

packages/backend/src/remote/activitypub/kernel/announce/index.ts

@@ -1,7 +1,7 @@
 import { CacheableRemoteUser } from '@/models/entities/user.js';
-import { apLogger } from '../../logger.js';
-import Resolver from '../../resolver.js';
-import { IAnnounce, getApId } from '../../type.js';
+import { apLogger } from '@/remote/activitypub/logger.js';
+import Resolver from '@/remote/activitypub/resolver.js';
+import { IAnnounce, getApId } from '@/remote/activitypub/type.js';
 import announceNote from './note.js';
 
 const logger = apLogger;

packages/backend/src/remote/activitypub/kernel/announce/note.ts

@@ -5,11 +5,11 @@ import { fetchMeta } from '@/misc/fetch-meta.js';
 import { getApLock } from '@/misc/app-lock.js';
 import { StatusError } from '@/misc/fetch.js';
 import { Notes } from '@/models/index.js';
-import { parseAudience } from '../../audience.js';
-import { apLogger } from '../../logger.js';
-import { fetchNote, resolveNote } from '../../models/note.js';
-import Resolver from '../../resolver.js';
-import { IAnnounce, getApId } from '../../type.js';
+import { parseAudience } from '@/remote/activitypub/audience.js';
+import { apLogger } from '@/remote/activitypub/logger.js';
+import { fetchNote, resolveNote } from '@/remote/activitypub/models/note.js';
+import Resolver from '@/remote/activitypub/resolver.js';
+import { IAnnounce, getApId } from '@/remote/activitypub/type.js';
 
 const logger = apLogger;
 

packages/backend/src/remote/activitypub/kernel/block/index.ts

@@ -1,8 +1,8 @@
 import block from '@/services/blocking/create.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
 import { Users } from '@/models/index.js';
-import DbResolver from '../../db-resolver.js';
-import { IBlock } from '../../type.js';
+import DbResolver from '@/remote/activitypub/db-resolver.js';
+import { IBlock } from '@/remote/activitypub/type.js';
 
 export default async (actor: CacheableRemoteUser, activity: IBlock): Promise<string> => {
 	// ※ activity.objectにブロック対象があり、それは存在するローカルユーザーのはず

packages/backend/src/remote/activitypub/kernel/create/note.ts

@@ -2,9 +2,9 @@ import { CacheableRemoteUser } from '@/models/entities/user.js';
 import { getApLock } from '@/misc/app-lock.js';
 import { extractDbHost } from '@/misc/convert-host.js';
 import { StatusError } from '@/misc/fetch.js';
-import Resolver from '../../resolver.js';
-import { createNote, fetchNote } from '../../models/note.js';
-import { getApId, IObject, ICreate } from '../../type.js';
+import Resolver from '@/remote/activitypub/resolver.js';
+import { createNote, fetchNote } from '@/remote/activitypub/models/note.js';
+import { getApId, IObject, ICreate } from '@/remote/activitypub/type.js';
 
 /**
  * 投稿作成アクティビティを捌きます

packages/backend/src/remote/activitypub/kernel/delete/actor.ts

@@ -1,7 +1,7 @@
 import { createDeleteAccountJob } from '@/queue/index.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
 import { Users } from '@/models/index.js';
-import { apLogger } from '../../logger.js';
+import { apLogger } from '@/remote/activitypub/logger.js';
 
 const logger = apLogger;
 

packages/backend/src/remote/activitypub/kernel/delete/index.ts

@@ -1,6 +1,6 @@
 import { CacheableRemoteUser } from '@/models/entities/user.js';
 import { toSingle } from '@/prelude/array.js';
-import { IDelete, getApId, isTombstone, IObject, validPost, validActor } from '../../type.js';
+import { IDelete, getApId, isTombstone, IObject, validPost, validActor } from '@/remote/activitypub/type.js';
 import { deleteActor } from './actor.js';
 import deleteNote from './note.js';
 

packages/backend/src/remote/activitypub/kernel/delete/note.ts

@@ -2,8 +2,8 @@ import { CacheableRemoteUser } from '@/models/entities/user.js';
 import deleteNode from '@/services/note/delete.js';
 import { getApLock } from '@/misc/app-lock.js';
 import { deleteMessage } from '@/services/messages/delete.js';
-import DbResolver from '../../db-resolver.js';
-import { apLogger } from '../../logger.js';
+import DbResolver from '@/remote/activitypub/db-resolver.js';
+import { apLogger } from '@/remote/activitypub/logger.js';
 
 const logger = apLogger;
 

packages/backend/src/remote/activitypub/kernel/flag/index.ts

@@ -3,7 +3,7 @@ import config from '@/config/index.js';
 import { genId } from '@/misc/gen-id.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
 import { AbuseUserReports, Users } from '@/models/index.js';
-import { IFlag, getApIds } from '../../type.js';
+import { IFlag, getApIds } from '@/remote/activitypub/type.js';
 
 export default async (actor: CacheableRemoteUser, activity: IFlag): Promise<string> => {
 	// objectは `(User|Note) | (User|Note)[]` だけど、全パターンDBスキーマと対応させられないので

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

@@ -1,8 +1,8 @@
 import unfollow from '@/services/following/delete.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
 import { Followings } from '@/models/index.js';
-import DbResolver from '../../db-resolver.js';
-import { IAccept } from '../../type.js';
+import DbResolver from '@/remote/activitypub/db-resolver.js';
+import { IAccept } from '@/remote/activitypub/type.js';
 
 export default async (actor: CacheableRemoteUser, activity: IAccept): Promise<string> => {
 	const dbResolver = new DbResolver();

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

@@ -1,7 +1,7 @@
 import { Notes } from '@/models/index.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
 import deleteNote from '@/services/note/delete.js';
-import { IAnnounce, getApId } from '../../type.js';
+import { IAnnounce, getApId } from '@/remote/activitypub/type.js';
 
 export const undoAnnounce = async (actor: CacheableRemoteUser, activity: IAnnounce): Promise<string> => {
 	const uri = getApId(activity);

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

@@ -1,8 +1,8 @@
 import unblock from '@/services/blocking/delete.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
 import { Users } from '@/models/index.js';
-import { IBlock } from '../../type.js';
-import DbResolver from '../../db-resolver.js';
+import { IBlock } from '@/remote/activitypub/type.js';
+import DbResolver from '@/remote/activitypub/db-resolver.js';
 
 export default async (actor: CacheableRemoteUser, activity: IBlock): Promise<string> => {
 	const dbResolver = new DbResolver();

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

@@ -2,8 +2,8 @@ import unfollow from '@/services/following/delete.js';
 import cancelRequest from '@/services/following/requests/cancel.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
 import { FollowRequests, Followings } from '@/models/index.js';
-import { IFollow } from '../../type.js';
-import DbResolver from '../../db-resolver.js';
+import { IFollow } from '@/remote/activitypub/type.js';
+import DbResolver from '@/remote/activitypub/db-resolver.js';
 
 export default async (actor: CacheableRemoteUser, activity: IFollow): Promise<string> => {
 	const dbResolver = new DbResolver();

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

@@ -1,7 +1,7 @@
 import { CacheableRemoteUser } from '@/models/entities/user.js';
-import { apLogger } from '../../logger.js';
-import Resolver from '../../resolver.js';
-import { IUndo, isFollow, isBlock, isLike, isAnnounce, getApType, isAccept } from '../../type.js';
+import { apLogger } from '@/remote/activitypub/logger.js';
+import Resolver from '@/remote/activitypub/resolver.js';
+import { IUndo, isFollow, isBlock, isLike, isAnnounce, getApType, isAccept } from '@/remote/activitypub/type.js';
 import unfollow from './follow.js';
 import unblock from './block.js';
 import undoLike from './like.js';

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

@@ -1,7 +1,7 @@
 import { CacheableRemoteUser } from '@/models/entities/user.js';
 import deleteReaction from '@/services/note/reaction/delete.js';
-import { ILike, getApId } from '../../type.js';
-import { fetchNote } from '../../models/note.js';
+import { ILike, getApId } from '@/remote/activitypub/type.js';
+import { fetchNote } from '@/remote/activitypub/models/note.js';
 
 /**
  * Process Undo.Like activity

packages/backend/src/remote/activitypub/kernel/update/index.ts

@@ -1,9 +1,9 @@
 import { CacheableRemoteUser } from '@/models/entities/user.js';
-import { getApType, IUpdate, isActor } from '../../type.js';
-import { apLogger } from '../../logger.js';
-import { updateQuestion } from '../../models/question.js';
-import Resolver from '../../resolver.js';
-import { updatePerson } from '../../models/person.js';
+import { getApType, IUpdate, isActor } from '@/remote/activitypub/type.js';
+import { apLogger } from '@/remote/activitypub/logger.js';
+import { updateQuestion } from '@/remote/activitypub/models/question.js';
+import Resolver from '@/remote/activitypub/resolver.js';
+import { updatePerson } from '@/remote/activitypub/models/person.js';
 
 /**
  * Updateアクティビティを捌きます

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

@@ -1,6 +1,6 @@
 import { 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).map(x => x.name).filter((x): x is string => x != null);

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

@@ -25,7 +25,7 @@ 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 { isCollectionOrOrderedCollection, isCollection, IActor, getApId, getOneApHrefNullable, IObject, isPropertyValue, IApPropertyValue, getApType, isActor } from '../type.js';
 import Resolver from '../resolver.js';
 import { extractApHashtags } from './tag.js';

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

@@ -1,7 +1,7 @@
 import config from '@/config/index.js';
 import { getUserKeypair } from '@/misc/keypair-store.js';
 import { User } from '@/models/entities/user.js';
-import { getResponse } from '../../misc/fetch.js';
+import { getResponse } from '@/misc/fetch.js';
 import { createSignedPost, createSignedGet } from './ap-request.js';
 
 export default async (user: { id: User['id'] }, url: string, object: any) => {

packages/backend/src/server/index.ts

@@ -19,7 +19,7 @@ import { genIdenticon } from '@/misc/gen-identicon.js';
 import { createTemp } from '@/misc/create-temp.js';
 import { publishMainStream } from '@/services/stream.js';
 import * as Acct from '@/misc/acct.js';
-import { envOption } from '../env.js';
+import { envOption } from '@/env.js';
 import activityPub from './activitypub.js';
 import nodeinfo from './nodeinfo.js';
 import wellKnown from './well-known.js';

packages/backend/src/services/create-system-user.ts

@@ -8,7 +8,7 @@ import { genId } from '@/misc/gen-id.js';
 import { UserKeypair } from '@/models/entities/user-keypair.js';
 import { UsedUsername } from '@/models/entities/used-username.js';
 import { db } from '@/db/postgre.js';
-import generateNativeUserToken from '../server/api/common/generate-native-user-token.js';
+import generateNativeUserToken from '@/server/api/common/generate-native-user-token.js';
 
 export async function createSystemUser(username: string): Promise<User> {
 	const password = uuid();

packages/backend/src/services/following/requests/create.ts

@@ -5,7 +5,7 @@ import { deliver } from '@/queue/index.js';
 import { User } from '@/models/entities/user.js';
 import { Blockings, FollowRequests, Users } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
-import { createNotification } from '../../create-notification.js';
+import { createNotification } from '@/services/create-notification.js';
 
 export default async function(follower: { id: User['id']; host: User['host']; uri: User['host']; inbox: User['inbox']; sharedInbox: User['sharedInbox']; }, followee: { id: User['id']; host: User['host']; uri: User['host']; inbox: User['inbox']; sharedInbox: User['sharedInbox']; }, requestId?: string) {
 	if (follower.id === followee.id) return;

packages/backend/src/services/logger.ts

@@ -4,7 +4,7 @@ import { default as convertColor } from 'color-convert';
 import { format as dateFormat } from 'date-fns';
 import * as SyslogPro from 'syslog-pro';
 import config from '@/config/index.js';
-import { envOption } from '../env.js';
+import { envOption } from '@/env.js';
 
 type Domain = {
 	name: string;

packages/backend/src/services/note/polls/update.ts

@@ -4,7 +4,7 @@ import renderNote from '@/remote/activitypub/renderer/note.js';
 import { Users, Notes } from '@/models/index.js';
 import { Note } from '@/models/entities/note.js';
 import { deliverToFollowers } from '@/remote/activitypub/deliver-manager.js';
-import { deliverToRelays } from '../../relay.js';
+import { deliverToRelays } from '@/services/relay.js';
 
 export async function deliverQuestionUpdate(noteId: Note['id']): Promise<void> {
 	const note = await Notes.findOneBy({ id: noteId });

packages/backend/src/services/note/polls/vote.ts

@@ -4,7 +4,7 @@ import { CacheableUser } from '@/models/entities/user.js';
 import { Note } from '@/models/entities/note.js';
 import { PollVotes, NoteWatchings, Polls, Blockings, NoteThreadMutings } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
-import { createNotification } from '../../create-notification.js';
+import { createNotification } from '@/services/create-notification.js';
 
 export default async function(user: CacheableUser, note: Note, choice: number) {
 	const poll = await Polls.findOneBy({ noteId: note.id });

packages/backend/src/services/note/reaction/create.ts

@@ -12,7 +12,7 @@ import { genId } from '@/misc/gen-id.js';
 import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error.js';
 import { NoteReaction } from '@/models/entities/note-reaction.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
-import { createNotification } from '../../create-notification.js';
+import { createNotification } from '@/services/create-notification.js';
 import deleteReaction from './delete.js';
 
 export default async (user: { id: User['id']; host: User['host']; }, note: Note, reaction?: string) => {