diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-03-23 17:43:07 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2021-03-23 17:43:07 +0900 |
| commit | c74fe3c6e2aae3df4624b9b3a55b45293223ebf5 (patch) | |
| tree | 53ed8d31143b15b6621e59002006e318789e36a4 /src/services | |
| parent | refactor: Tweak path alias of client (diff) | |
| download | sharkey-c74fe3c6e2aae3df4624b9b3a55b45293223ebf5.tar.gz sharkey-c74fe3c6e2aae3df4624b9b3a55b45293223ebf5.tar.bz2 sharkey-c74fe3c6e2aae3df4624b9b3a55b45293223ebf5.zip | |
refactor: Use path alias
Diffstat (limited to 'src/services')
55 files changed, 92 insertions, 92 deletions
diff --git a/src/services/add-note-to-antenna.ts b/src/services/add-note-to-antenna.ts index 3ba3d1eef5..108957a899 100644 --- a/src/services/add-note-to-antenna.ts +++ b/src/services/add-note-to-antenna.ts @@ -1,8 +1,8 @@ import { Antenna } from '../models/entities/antenna'; import { Note } from '../models/entities/note'; import { AntennaNotes, Mutings, Notes } from '../models'; -import { genId } from '../misc/gen-id'; -import { isMutedUserRelated } from '../misc/is-muted-user-related'; +import { genId } from '@/misc/gen-id'; +import { isMutedUserRelated } from '@/misc/is-muted-user-related'; import { publishAntennaStream, publishMainStream } from './stream'; import { User } from '../models/entities/user'; diff --git a/src/services/blocking/create.ts b/src/services/blocking/create.ts index dec48d26de..be2a62692b 100644 --- a/src/services/blocking/create.ts +++ b/src/services/blocking/create.ts @@ -8,7 +8,7 @@ import renderReject from '../../remote/activitypub/renderer/reject'; import { User } from '../../models/entities/user'; import { Blockings, Users, FollowRequests, Followings } from '../../models'; import { perUserFollowingChart } from '../chart'; -import { genId } from '../../misc/gen-id'; +import { genId } from '@/misc/gen-id'; export default async function(blocker: User, blockee: User) { await Promise.all([ diff --git a/src/services/chart/charts/classes/active-users.ts b/src/services/chart/charts/classes/active-users.ts index 4820f8281b..95ed23a55b 100644 --- a/src/services/chart/charts/classes/active-users.ts +++ b/src/services/chart/charts/classes/active-users.ts @@ -1,7 +1,7 @@ import autobind from 'autobind-decorator'; import Chart, { Obj, DeepPartial } from '../../core'; import { User } from '../../../../models/entities/user'; -import { SchemaType } from '../../../../misc/schema'; +import { SchemaType } from '@/misc/schema'; import { Users } from '../../../../models'; import { name, schema } from '../schemas/active-users'; diff --git a/src/services/chart/charts/classes/drive.ts b/src/services/chart/charts/classes/drive.ts index 46399a34d8..18537918f0 100644 --- a/src/services/chart/charts/classes/drive.ts +++ b/src/services/chart/charts/classes/drive.ts @@ -1,6 +1,6 @@ import autobind from 'autobind-decorator'; import Chart, { Obj, DeepPartial } from '../../core'; -import { SchemaType } from '../../../../misc/schema'; +import { SchemaType } from '@/misc/schema'; import { DriveFiles } from '../../../../models'; import { Not, IsNull } from 'typeorm'; import { DriveFile } from '../../../../models/entities/drive-file'; diff --git a/src/services/chart/charts/classes/federation.ts b/src/services/chart/charts/classes/federation.ts index ab6ec2d4dd..e593a53cf1 100644 --- a/src/services/chart/charts/classes/federation.ts +++ b/src/services/chart/charts/classes/federation.ts @@ -1,6 +1,6 @@ import autobind from 'autobind-decorator'; import Chart, { Obj, DeepPartial } from '../../core'; -import { SchemaType } from '../../../../misc/schema'; +import { SchemaType } from '@/misc/schema'; import { Instances } from '../../../../models'; import { name, schema } from '../schemas/federation'; diff --git a/src/services/chart/charts/classes/hashtag.ts b/src/services/chart/charts/classes/hashtag.ts index 43db5b0a83..c3eb42497c 100644 --- a/src/services/chart/charts/classes/hashtag.ts +++ b/src/services/chart/charts/classes/hashtag.ts @@ -1,7 +1,7 @@ import autobind from 'autobind-decorator'; import Chart, { Obj, DeepPartial } from '../../core'; import { User } from '../../../../models/entities/user'; -import { SchemaType } from '../../../../misc/schema'; +import { SchemaType } from '@/misc/schema'; import { Users } from '../../../../models'; import { name, schema } from '../schemas/hashtag'; diff --git a/src/services/chart/charts/classes/instance.ts b/src/services/chart/charts/classes/instance.ts index c32b864d87..f93da58d61 100644 --- a/src/services/chart/charts/classes/instance.ts +++ b/src/services/chart/charts/classes/instance.ts @@ -1,11 +1,11 @@ import autobind from 'autobind-decorator'; import Chart, { Obj, DeepPartial } from '../../core'; -import { SchemaType } from '../../../../misc/schema'; +import { SchemaType } from '@/misc/schema'; import { DriveFiles, Followings, Users, Notes } from '../../../../models'; import { DriveFile } from '../../../../models/entities/drive-file'; import { name, schema } from '../schemas/instance'; import { Note } from '../../../../models/entities/note'; -import { toPuny } from '../../../../misc/convert-host'; +import { toPuny } from '@/misc/convert-host'; type InstanceLog = SchemaType<typeof schema>; diff --git a/src/services/chart/charts/classes/network.ts b/src/services/chart/charts/classes/network.ts index 693af48f73..2ce75e0b34 100644 --- a/src/services/chart/charts/classes/network.ts +++ b/src/services/chart/charts/classes/network.ts @@ -1,6 +1,6 @@ import autobind from 'autobind-decorator'; import Chart, { DeepPartial } from '../../core'; -import { SchemaType } from '../../../../misc/schema'; +import { SchemaType } from '@/misc/schema'; import { name, schema } from '../schemas/network'; type NetworkLog = SchemaType<typeof schema>; diff --git a/src/services/chart/charts/classes/notes.ts b/src/services/chart/charts/classes/notes.ts index 965087bc08..a6eb653b70 100644 --- a/src/services/chart/charts/classes/notes.ts +++ b/src/services/chart/charts/classes/notes.ts @@ -1,6 +1,6 @@ import autobind from 'autobind-decorator'; import Chart, { Obj, DeepPartial } from '../../core'; -import { SchemaType } from '../../../../misc/schema'; +import { SchemaType } from '@/misc/schema'; import { Notes } from '../../../../models'; import { Not, IsNull } from 'typeorm'; import { Note } from '../../../../models/entities/note'; diff --git a/src/services/chart/charts/classes/per-user-drive.ts b/src/services/chart/charts/classes/per-user-drive.ts index e778f7bf61..182e5927e8 100644 --- a/src/services/chart/charts/classes/per-user-drive.ts +++ b/src/services/chart/charts/classes/per-user-drive.ts @@ -1,6 +1,6 @@ import autobind from 'autobind-decorator'; import Chart, { Obj, DeepPartial } from '../../core'; -import { SchemaType } from '../../../../misc/schema'; +import { SchemaType } from '@/misc/schema'; import { DriveFiles } from '../../../../models'; import { DriveFile } from '../../../../models/entities/drive-file'; import { name, schema } from '../schemas/per-user-drive'; diff --git a/src/services/chart/charts/classes/per-user-following.ts b/src/services/chart/charts/classes/per-user-following.ts index 8b536009c8..6e069fb0d9 100644 --- a/src/services/chart/charts/classes/per-user-following.ts +++ b/src/services/chart/charts/classes/per-user-following.ts @@ -1,6 +1,6 @@ import autobind from 'autobind-decorator'; import Chart, { Obj, DeepPartial } from '../../core'; -import { SchemaType } from '../../../../misc/schema'; +import { SchemaType } from '@/misc/schema'; import { Followings, Users } from '../../../../models'; import { Not, IsNull } from 'typeorm'; import { User } from '../../../../models/entities/user'; diff --git a/src/services/chart/charts/classes/per-user-notes.ts b/src/services/chart/charts/classes/per-user-notes.ts index 8d1fb8d2b0..f29a750192 100644 --- a/src/services/chart/charts/classes/per-user-notes.ts +++ b/src/services/chart/charts/classes/per-user-notes.ts @@ -1,7 +1,7 @@ import autobind from 'autobind-decorator'; import Chart, { Obj, DeepPartial } from '../../core'; import { User } from '../../../../models/entities/user'; -import { SchemaType } from '../../../../misc/schema'; +import { SchemaType } from '@/misc/schema'; import { Notes } from '../../../../models'; import { Note } from '../../../../models/entities/note'; import { name, schema } from '../schemas/per-user-notes'; diff --git a/src/services/chart/charts/classes/per-user-reactions.ts b/src/services/chart/charts/classes/per-user-reactions.ts index b4cdced40c..d2d6b42e58 100644 --- a/src/services/chart/charts/classes/per-user-reactions.ts +++ b/src/services/chart/charts/classes/per-user-reactions.ts @@ -2,7 +2,7 @@ import autobind from 'autobind-decorator'; import Chart, { DeepPartial } from '../../core'; import { User } from '../../../../models/entities/user'; import { Note } from '../../../../models/entities/note'; -import { SchemaType } from '../../../../misc/schema'; +import { SchemaType } from '@/misc/schema'; import { Users } from '../../../../models'; import { name, schema } from '../schemas/per-user-reactions'; diff --git a/src/services/chart/charts/classes/test-grouped.ts b/src/services/chart/charts/classes/test-grouped.ts index 92c8df636e..84e6d5e33f 100644 --- a/src/services/chart/charts/classes/test-grouped.ts +++ b/src/services/chart/charts/classes/test-grouped.ts @@ -1,6 +1,6 @@ import autobind from 'autobind-decorator'; import Chart, { Obj, DeepPartial } from '../../core'; -import { SchemaType } from '../../../../misc/schema'; +import { SchemaType } from '@/misc/schema'; import { name, schema } from '../schemas/test-grouped'; type TestGroupedLog = SchemaType<typeof schema>; diff --git a/src/services/chart/charts/classes/test-unique.ts b/src/services/chart/charts/classes/test-unique.ts index 5680d713ec..559fda13c9 100644 --- a/src/services/chart/charts/classes/test-unique.ts +++ b/src/services/chart/charts/classes/test-unique.ts @@ -1,6 +1,6 @@ import autobind from 'autobind-decorator'; import Chart, { DeepPartial } from '../../core'; -import { SchemaType } from '../../../../misc/schema'; +import { SchemaType } from '@/misc/schema'; import { name, schema } from '../schemas/test-unique'; type TestUniqueLog = SchemaType<typeof schema>; diff --git a/src/services/chart/charts/classes/test.ts b/src/services/chart/charts/classes/test.ts index d37d298de7..a91d5e1895 100644 --- a/src/services/chart/charts/classes/test.ts +++ b/src/services/chart/charts/classes/test.ts @@ -1,6 +1,6 @@ import autobind from 'autobind-decorator'; import Chart, { Obj, DeepPartial } from '../../core'; -import { SchemaType } from '../../../../misc/schema'; +import { SchemaType } from '@/misc/schema'; import { name, schema } from '../schemas/test'; type TestLog = SchemaType<typeof schema>; diff --git a/src/services/chart/charts/classes/users.ts b/src/services/chart/charts/classes/users.ts index 87b19d88f9..d50db17039 100644 --- a/src/services/chart/charts/classes/users.ts +++ b/src/services/chart/charts/classes/users.ts @@ -1,6 +1,6 @@ import autobind from 'autobind-decorator'; import Chart, { Obj, DeepPartial } from '../../core'; -import { SchemaType } from '../../../../misc/schema'; +import { SchemaType } from '@/misc/schema'; import { Users } from '../../../../models'; import { Not, IsNull } from 'typeorm'; import { User } from '../../../../models/entities/user'; diff --git a/src/services/chart/core.ts b/src/services/chart/core.ts index 10621be073..d956d33bd7 100644 --- a/src/services/chart/core.ts +++ b/src/services/chart/core.ts @@ -7,10 +7,10 @@ import * as nestedProperty from 'nested-property'; import autobind from 'autobind-decorator'; import Logger from '../logger'; -import { Schema } from '../../misc/schema'; +import { Schema } from '@/misc/schema'; import { EntitySchema, getRepository, Repository, LessThan, Between } from 'typeorm'; import { dateUTC, isTimeSame, isTimeBefore, subtractTime, addTime } from '../../prelude/time'; -import { getChartInsertLock } from '../../misc/app-lock'; +import { getChartInsertLock } from '@/misc/app-lock'; const logger = new Logger('chart', 'white', process.env.NODE_ENV !== 'test'); diff --git a/src/services/chart/index.ts b/src/services/chart/index.ts index dde02bd64d..61eb431ea3 100644 --- a/src/services/chart/index.ts +++ b/src/services/chart/index.ts @@ -10,7 +10,7 @@ import PerUserReactionsChart from './charts/classes/per-user-reactions'; import HashtagChart from './charts/classes/hashtag'; import PerUserFollowingChart from './charts/classes/per-user-following'; import PerUserDriveChart from './charts/classes/per-user-drive'; -import { beforeShutdown } from '../../misc/before-shutdown'; +import { beforeShutdown } from '@/misc/before-shutdown'; export const federationChart = new FederationChart(); export const notesChart = new NotesChart(); diff --git a/src/services/create-notification.ts b/src/services/create-notification.ts index dedb8eac8d..261b36814c 100644 --- a/src/services/create-notification.ts +++ b/src/services/create-notification.ts @@ -1,7 +1,7 @@ import { publishMainStream } from './stream'; import pushSw from './push-notification'; import { Notifications, Mutings, UserProfiles } from '../models'; -import { genId } from '../misc/gen-id'; +import { genId } from '@/misc/gen-id'; import { User } from '../models/entities/user'; import { Notification } from '../models/entities/notification'; import { sendEmailNotification } from './send-email-notification'; diff --git a/src/services/create-system-user.ts b/src/services/create-system-user.ts index 39ddc92abd..052ceb6c99 100644 --- a/src/services/create-system-user.ts +++ b/src/services/create-system-user.ts @@ -1,11 +1,11 @@ import * as bcrypt from 'bcryptjs'; import { v4 as uuid } from 'uuid'; import generateNativeUserToken from '../server/api/common/generate-native-user-token'; -import { genRsaKeyPair } from '../misc/gen-key-pair'; +import { genRsaKeyPair } from '@/misc/gen-key-pair'; import { User } from '../models/entities/user'; import { UserProfile } from '../models/entities/user-profile'; import { getConnection } from 'typeorm'; -import { genId } from '../misc/gen-id'; +import { genId } from '@/misc/gen-id'; import { UserKeypair } from '../models/entities/user-keypair'; import { UsedUsername } from '../models/entities/used-username'; diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts index b5085ec8e3..f502c63157 100644 --- a/src/services/drive/add-file.ts +++ b/src/services/drive/add-file.ts @@ -4,19 +4,19 @@ import { v4 as uuid } from 'uuid'; import { publishMainStream, publishDriveStream } from '../stream'; import { deleteFile } from './delete-file'; -import { fetchMeta } from '../../misc/fetch-meta'; +import { fetchMeta } from '@/misc/fetch-meta'; import { GenerateVideoThumbnail } from './generate-video-thumbnail'; import { driveLogger } from './logger'; import { IImage, convertSharpToJpeg, convertSharpToWebp, convertSharpToPng, convertSharpToPngOrJpeg } from './image-processor'; -import { contentDisposition } from '../../misc/content-disposition'; -import { getFileInfo } from '../../misc/get-file-info'; +import { contentDisposition } from '@/misc/content-disposition'; +import { getFileInfo } from '@/misc/get-file-info'; import { DriveFiles, DriveFolders, Users, Instances, UserProfiles } from '../../models'; import { InternalStorage } from './internal-storage'; import { DriveFile } from '../../models/entities/drive-file'; import { IRemoteUser, User } from '../../models/entities/user'; import { driveChart, perUserDriveChart, instanceChart } from '../chart'; -import { genId } from '../../misc/gen-id'; -import { isDuplicateKeyValueError } from '../../misc/is-duplicate-key-value-error'; +import { genId } from '@/misc/gen-id'; +import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error'; import * as S3 from 'aws-sdk/clients/s3'; import { getS3 } from './s3'; import * as sharp from 'sharp'; diff --git a/src/services/drive/delete-file.ts b/src/services/drive/delete-file.ts index f9141ebaac..bb9c0ae2c3 100644 --- a/src/services/drive/delete-file.ts +++ b/src/services/drive/delete-file.ts @@ -3,14 +3,14 @@ import { InternalStorage } from './internal-storage'; import { DriveFiles, Instances, Notes, Users } from '../../models'; import { driveChart, perUserDriveChart, instanceChart } from '../chart'; import { createDeleteObjectStorageFileJob } from '../../queue'; -import { fetchMeta } from '../../misc/fetch-meta'; +import { fetchMeta } from '@/misc/fetch-meta'; import { getS3 } from './s3'; import { v4 as uuid } from 'uuid'; import { Note } from '../../models/entities/note'; import { renderActivity } from '../../remote/activitypub/renderer'; import renderDelete from '../../remote/activitypub/renderer/delete'; import renderTombstone from '../../remote/activitypub/renderer/tombstone'; -import config from '../../config'; +import config from '@/config'; import { deliverToFollowers } from '../../remote/activitypub/deliver-manager'; import { Brackets } from 'typeorm'; import { deliverToRelays } from '../relay'; diff --git a/src/services/drive/internal-storage.ts b/src/services/drive/internal-storage.ts index f8d7489a22..5ec563584f 100644 --- a/src/services/drive/internal-storage.ts +++ b/src/services/drive/internal-storage.ts @@ -1,6 +1,6 @@ import * as fs from 'fs'; import * as Path from 'path'; -import config from '../../config'; +import config from '@/config'; export class InternalStorage { private static readonly path = Path.resolve(__dirname, '../../../files'); diff --git a/src/services/drive/s3.ts b/src/services/drive/s3.ts index f419f09377..8bd51ce027 100644 --- a/src/services/drive/s3.ts +++ b/src/services/drive/s3.ts @@ -1,6 +1,6 @@ import * as S3 from 'aws-sdk/clients/s3'; import { Meta } from '../../models/entities/meta'; -import { getAgentByUrl } from '../../misc/fetch'; +import { getAgentByUrl } from '@/misc/fetch'; export function getS3(meta: Meta) { const u = meta.objectStorageEndpoint != null diff --git a/src/services/drive/upload-from-url.ts b/src/services/drive/upload-from-url.ts index 96550f7121..db2c20b3a4 100644 --- a/src/services/drive/upload-from-url.ts +++ b/src/services/drive/upload-from-url.ts @@ -1,8 +1,8 @@ import create from './add-file'; import { User } from '../../models/entities/user'; import { driveLogger } from './logger'; -import { createTemp } from '../../misc/create-temp'; -import { downloadUrl } from '../../misc/download-url'; +import { createTemp } from '@/misc/create-temp'; +import { downloadUrl } from '@/misc/download-url'; import { DriveFolder } from '../../models/entities/drive-folder'; import { DriveFile } from '../../models/entities/drive-file'; import { DriveFiles } from '../../models'; diff --git a/src/services/fetch-instance-metadata.ts b/src/services/fetch-instance-metadata.ts index c1caeef6e3..e016e73a60 100644 --- a/src/services/fetch-instance-metadata.ts +++ b/src/services/fetch-instance-metadata.ts @@ -1,9 +1,9 @@ import { DOMWindow, JSDOM } from 'jsdom'; import fetch from 'node-fetch'; -import { getJson, getHtml, getAgentByUrl } from '../misc/fetch'; +import { getJson, getHtml, getAgentByUrl } from '@/misc/fetch'; import { Instance } from '../models/entities/instance'; import { Instances } from '../models'; -import { getFetchInstanceMetadataLock } from '../misc/app-lock'; +import { getFetchInstanceMetadataLock } from '@/misc/app-lock'; import Logger from './logger'; import { URL } from 'url'; diff --git a/src/services/following/create.ts b/src/services/following/create.ts index 1ce75caca0..a759bef0f9 100644 --- a/src/services/following/create.ts +++ b/src/services/following/create.ts @@ -7,13 +7,13 @@ import { deliver } from '../../queue'; import createFollowRequest from './requests/create'; import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc'; import Logger from '../logger'; -import { IdentifiableError } from '../../misc/identifiable-error'; +import { IdentifiableError } from '@/misc/identifiable-error'; import { User } from '../../models/entities/user'; import { Followings, Users, FollowRequests, Blockings, Instances, UserProfiles } from '../../models'; import { instanceChart, perUserFollowingChart } from '../chart'; -import { genId } from '../../misc/gen-id'; +import { genId } from '@/misc/gen-id'; import { createNotification } from '../create-notification'; -import { isDuplicateKeyValueError } from '../../misc/is-duplicate-key-value-error'; +import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error'; const logger = new Logger('following/create'); diff --git a/src/services/following/requests/accept.ts b/src/services/following/requests/accept.ts index 6a072126b5..470458d5d4 100644 --- a/src/services/following/requests/accept.ts +++ b/src/services/following/requests/accept.ts @@ -6,7 +6,7 @@ import { publishMainStream } from '../../stream'; import { insertFollowingDoc } from '../create'; import { User, ILocalUser } from '../../../models/entities/user'; import { FollowRequests, Users } from '../../../models'; -import { IdentifiableError } from '../../../misc/identifiable-error'; +import { IdentifiableError } from '@/misc/identifiable-error'; export default async function(followee: User, follower: User) { const request = await FollowRequests.findOne({ diff --git a/src/services/following/requests/cancel.ts b/src/services/following/requests/cancel.ts index 98fec5d331..82f6efc40f 100644 --- a/src/services/following/requests/cancel.ts +++ b/src/services/following/requests/cancel.ts @@ -3,7 +3,7 @@ import renderFollow from '../../../remote/activitypub/renderer/follow'; import renderUndo from '../../../remote/activitypub/renderer/undo'; import { deliver } from '../../../queue'; import { publishMainStream } from '../../stream'; -import { IdentifiableError } from '../../../misc/identifiable-error'; +import { IdentifiableError } from '@/misc/identifiable-error'; import { User, ILocalUser } from '../../../models/entities/user'; import { Users, FollowRequests } from '../../../models'; diff --git a/src/services/following/requests/create.ts b/src/services/following/requests/create.ts index deaeedb9a8..bab47caaa8 100644 --- a/src/services/following/requests/create.ts +++ b/src/services/following/requests/create.ts @@ -4,7 +4,7 @@ import renderFollow from '../../../remote/activitypub/renderer/follow'; import { deliver } from '../../../queue'; import { User } from '../../../models/entities/user'; import { Blockings, FollowRequests, Users } from '../../../models'; -import { genId } from '../../../misc/gen-id'; +import { genId } from '@/misc/gen-id'; import { createNotification } from '../../create-notification'; export default async function(follower: User, followee: User, requestId?: string) { diff --git a/src/services/i/pin.ts b/src/services/i/pin.ts index f727a10fb6..98e9c22df8 100644 --- a/src/services/i/pin.ts +++ b/src/services/i/pin.ts @@ -1,13 +1,13 @@ -import config from '../../config'; +import config from '@/config'; import renderAdd from '../../remote/activitypub/renderer/add'; import renderRemove from '../../remote/activitypub/renderer/remove'; import { renderActivity } from '../../remote/activitypub/renderer'; -import { IdentifiableError } from '../../misc/identifiable-error'; +import { IdentifiableError } from '@/misc/identifiable-error'; import { User } from '../../models/entities/user'; import { Note } from '../../models/entities/note'; import { Notes, UserNotePinings, Users } from '../../models'; import { UserNotePining } from '../../models/entities/user-note-pining'; -import { genId } from '../../misc/gen-id'; +import { genId } from '@/misc/gen-id'; import { deliverToFollowers } from '../../remote/activitypub/deliver-manager'; import { deliverToRelays } from '../relay'; diff --git a/src/services/insert-moderation-log.ts b/src/services/insert-moderation-log.ts index 87587d3bed..1e04ddf545 100644 --- a/src/services/insert-moderation-log.ts +++ b/src/services/insert-moderation-log.ts @@ -1,6 +1,6 @@ import { ILocalUser } from '../models/entities/user'; import { ModerationLogs } from '../models'; -import { genId } from '../misc/gen-id'; +import { genId } from '@/misc/gen-id'; export async function insertModerationLog(moderator: ILocalUser, type: string, info?: Record<string, any>) { await ModerationLogs.insert({ diff --git a/src/services/instance-actor.ts b/src/services/instance-actor.ts index a6dadb0cd6..9b9c746061 100644 --- a/src/services/instance-actor.ts +++ b/src/services/instance-actor.ts @@ -1,7 +1,7 @@ import { createSystemUser } from './create-system-user'; import { ILocalUser } from '../models/entities/user'; import { Users } from '../models'; -import { Cache } from '../misc/cache'; +import { Cache } from '@/misc/cache'; const ACTOR_USERNAME = 'instance.actor' as const; diff --git a/src/services/logger.ts b/src/services/logger.ts index c7483d3faa..de62b3aca9 100644 --- a/src/services/logger.ts +++ b/src/services/logger.ts @@ -5,8 +5,8 @@ import * as dateformat from 'dateformat'; import { program } from '../argv'; import { getRepository } from 'typeorm'; import { Log } from '../models/entities/log'; -import { genId } from '../misc/gen-id'; -import config from '../config'; +import { genId } from '@/misc/gen-id'; +import config from '@/config'; const SyslogPro = require('syslog-pro'); diff --git a/src/services/messages/create.ts b/src/services/messages/create.ts index 413266d029..3a5e7a7c97 100644 --- a/src/services/messages/create.ts +++ b/src/services/messages/create.ts @@ -2,7 +2,7 @@ import { User } from '../../models/entities/user'; import { UserGroup } from '../../models/entities/user-group'; import { DriveFile } from '../../models/entities/drive-file'; import { MessagingMessages, UserGroupJoinings, Mutings, Users } from '../../models'; -import { genId } from '../../misc/gen-id'; +import { genId } from '@/misc/gen-id'; import { MessagingMessage } from '../../models/entities/messaging-message'; import { publishMessagingStream, publishMessagingIndexStream, publishMainStream, publishGroupMessagingStream } from '../stream'; import pushNotification from '../push-notification'; diff --git a/src/services/messages/delete.ts b/src/services/messages/delete.ts index c94a7b67db..522815e554 100644 --- a/src/services/messages/delete.ts +++ b/src/services/messages/delete.ts @@ -1,4 +1,4 @@ -import config from '../../config'; +import config from '@/config'; import { MessagingMessages, Users } from '../../models'; import { MessagingMessage } from '../../models/entities/messaging-message'; import { publishGroupMessagingStream, publishMessagingStream } from '../stream'; diff --git a/src/services/note/create.ts b/src/services/note/create.ts index b9c1676c58..c5065b3ba4 100644 --- a/src/services/note/create.ts +++ b/src/services/note/create.ts @@ -7,33 +7,33 @@ import renderAnnounce from '../../remote/activitypub/renderer/announce'; import { renderActivity } from '../../remote/activitypub/renderer'; import { parse } from '../../mfm/parse'; import { resolveUser } from '../../remote/resolve-user'; -import config from '../../config'; +import config from '@/config'; import { updateHashtags } from '../update-hashtag'; import { concat } from '../../prelude/array'; import insertNoteUnread from './unread'; import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc'; -import extractMentions from '../../misc/extract-mentions'; -import extractEmojis from '../../misc/extract-emojis'; -import extractHashtags from '../../misc/extract-hashtags'; +import extractMentions from '@/misc/extract-mentions'; +import extractEmojis from '@/misc/extract-emojis'; +import extractHashtags from '@/misc/extract-hashtags'; import { Note, IMentionedRemoteUsers } from '../../models/entities/note'; import { Mutings, Users, NoteWatchings, Notes, Instances, UserProfiles, Antennas, Followings, MutedNotes, Channels, ChannelFollowings } from '../../models'; import { DriveFile } from '../../models/entities/drive-file'; import { App } from '../../models/entities/app'; import { Not, getConnection, In } from 'typeorm'; import { User, ILocalUser, IRemoteUser } from '../../models/entities/user'; -import { genId } from '../../misc/gen-id'; +import { genId } from '@/misc/gen-id'; import { notesChart, perUserNotesChart, activeUsersChart, instanceChart } from '../chart'; import { Poll, IPoll } from '../../models/entities/poll'; import { createNotification } from '../create-notification'; -import { isDuplicateKeyValueError } from '../../misc/is-duplicate-key-value-error'; -import { checkHitAntenna } from '../../misc/check-hit-antenna'; -import { checkWordMute } from '../../misc/check-word-mute'; +import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error'; +import { checkHitAntenna } from '@/misc/check-hit-antenna'; +import { checkWordMute } from '@/misc/check-word-mute'; import { addNoteToAntenna } from '../add-note-to-antenna'; -import { countSameRenotes } from '../../misc/count-same-renotes'; +import { countSameRenotes } from '@/misc/count-same-renotes'; import { deliverToRelays } from '../relay'; import { Channel } from '../../models/entities/channel'; -import { normalizeForSearch } from '../../misc/normalize-for-search'; -import { getAntennas } from '../../misc/antenna-cache'; +import { normalizeForSearch } from '@/misc/normalize-for-search'; +import { getAntennas } from '@/misc/antenna-cache'; type NotificationType = 'reply' | 'renote' | 'quote' | 'mention'; diff --git a/src/services/note/delete.ts b/src/services/note/delete.ts index 5526302602..3f4f8b404c 100644 --- a/src/services/note/delete.ts +++ b/src/services/note/delete.ts @@ -4,14 +4,14 @@ import renderAnnounce from '../../remote/activitypub/renderer/announce'; import renderUndo from '../../remote/activitypub/renderer/undo'; import { renderActivity } from '../../remote/activitypub/renderer'; import renderTombstone from '../../remote/activitypub/renderer/tombstone'; -import config from '../../config'; +import config from '@/config'; import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc'; import { User, ILocalUser, IRemoteUser } from '../../models/entities/user'; import { Note, IMentionedRemoteUsers } from '../../models/entities/note'; import { Notes, Users, Instances } from '../../models'; import { notesChart, perUserNotesChart, instanceChart } from '../chart'; import { deliverToFollowers, deliverToUser } from '../../remote/activitypub/deliver-manager'; -import { countSameRenotes } from '../../misc/count-same-renotes'; +import { countSameRenotes } from '@/misc/count-same-renotes'; import { deliverToRelays } from '../relay'; import { Brackets, In } from 'typeorm'; diff --git a/src/services/note/polls/vote.ts b/src/services/note/polls/vote.ts index b4ce03ab60..aea157e558 100644 --- a/src/services/note/polls/vote.ts +++ b/src/services/note/polls/vote.ts @@ -3,7 +3,7 @@ import { User } from '../../../models/entities/user'; import { Note } from '../../../models/entities/note'; import { PollVotes, NoteWatchings, Polls } from '../../../models'; import { Not } from 'typeorm'; -import { genId } from '../../../misc/gen-id'; +import { genId } from '@/misc/gen-id'; import { createNotification } from '../../create-notification'; export default async function(user: User, note: Note, choice: number) { diff --git a/src/services/note/reaction/create.ts b/src/services/note/reaction/create.ts index 181099cc2d..952927f192 100644 --- a/src/services/note/reaction/create.ts +++ b/src/services/note/reaction/create.ts @@ -2,16 +2,16 @@ import { publishNoteStream } from '../../stream'; import { renderLike } from '../../../remote/activitypub/renderer/like'; import DeliverManager from '../../../remote/activitypub/deliver-manager'; import { renderActivity } from '../../../remote/activitypub/renderer'; -import { toDbReaction, decodeReaction } from '../../../misc/reaction-lib'; +import { toDbReaction, decodeReaction } from '@/misc/reaction-lib'; import { User, IRemoteUser } from '../../../models/entities/user'; import { Note } from '../../../models/entities/note'; import { NoteReactions, Users, NoteWatchings, Notes, Emojis } from '../../../models'; import { Not } from 'typeorm'; import { perUserReactionsChart } from '../../chart'; -import { genId } from '../../../misc/gen-id'; +import { genId } from '@/misc/gen-id'; import { createNotification } from '../../create-notification'; import deleteReaction from './delete'; -import { isDuplicateKeyValueError } from '../../../misc/is-duplicate-key-value-error'; +import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error'; import { NoteReaction } from '../../../models/entities/note-reaction'; export default async (user: User, note: Note, reaction?: string) => { diff --git a/src/services/note/reaction/delete.ts b/src/services/note/reaction/delete.ts index 8d2f0682ca..c0787eee70 100644 --- a/src/services/note/reaction/delete.ts +++ b/src/services/note/reaction/delete.ts @@ -3,11 +3,11 @@ import { renderLike } from '../../../remote/activitypub/renderer/like'; import renderUndo from '../../../remote/activitypub/renderer/undo'; import { renderActivity } from '../../../remote/activitypub/renderer'; import DeliverManager from '../../../remote/activitypub/deliver-manager'; -import { IdentifiableError } from '../../../misc/identifiable-error'; +import { IdentifiableError } from '@/misc/identifiable-error'; import { User, IRemoteUser } from '../../../models/entities/user'; import { Note } from '../../../models/entities/note'; import { NoteReactions, Users, Notes } from '../../../models'; -import { decodeReaction } from '../../../misc/reaction-lib'; +import { decodeReaction } from '@/misc/reaction-lib'; export default async (user: User, note: Note) => { // if already unreacted diff --git a/src/services/note/read.ts b/src/services/note/read.ts index 4e8c76cbee..2bdb859476 100644 --- a/src/services/note/read.ts +++ b/src/services/note/read.ts @@ -4,8 +4,8 @@ import { User } from '../../models/entities/user'; import { NoteUnreads, AntennaNotes, Users, Followings, ChannelFollowings } from '../../models'; import { Not, IsNull, In } from 'typeorm'; import { Channel } from '../../models/entities/channel'; -import { checkHitAntenna } from '../../misc/check-hit-antenna'; -import { getAntennas } from '../../misc/antenna-cache'; +import { checkHitAntenna } from '@/misc/check-hit-antenna'; +import { getAntennas } from '@/misc/antenna-cache'; import { PackedNote } from '../../models/repositories/note'; /** diff --git a/src/services/note/unread.ts b/src/services/note/unread.ts index 8e6fb4abe8..5cfba0f342 100644 --- a/src/services/note/unread.ts +++ b/src/services/note/unread.ts @@ -2,7 +2,7 @@ import { Note } from '../../models/entities/note'; import { publishMainStream } from '../stream'; import { User } from '../../models/entities/user'; import { Mutings, NoteUnreads } from '../../models'; -import { genId } from '../../misc/gen-id'; +import { genId } from '@/misc/gen-id'; export default async function(userId: User['id'], note: Note, params: { // NOTE: isSpecifiedがtrueならisMentionedは必ずfalse diff --git a/src/services/note/watch.ts b/src/services/note/watch.ts index 966b7f0054..e333f04286 100644 --- a/src/services/note/watch.ts +++ b/src/services/note/watch.ts @@ -1,7 +1,7 @@ import { User } from '../../models/entities/user'; import { Note } from '../../models/entities/note'; import { NoteWatchings } from '../../models'; -import { genId } from '../../misc/gen-id'; +import { genId } from '@/misc/gen-id'; import { NoteWatching } from '../../models/entities/note-watching'; export default async (me: User['id'], note: Note) => { diff --git a/src/services/push-notification.ts b/src/services/push-notification.ts index d0a0c04d62..6c0b77c31f 100644 --- a/src/services/push-notification.ts +++ b/src/services/push-notification.ts @@ -1,7 +1,7 @@ import * as push from 'web-push'; -import config from '../config'; +import config from '@/config'; import { SwSubscriptions } from '../models'; -import { fetchMeta } from '../misc/fetch-meta'; +import { fetchMeta } from '@/misc/fetch-meta'; import { PackedNotification } from '../models/repositories/notification'; import { PackedMessagingMessage } from '../models/repositories/messaging-message'; diff --git a/src/services/register-or-fetch-instance-doc.ts b/src/services/register-or-fetch-instance-doc.ts index 2c39502288..2edf85fd9f 100644 --- a/src/services/register-or-fetch-instance-doc.ts +++ b/src/services/register-or-fetch-instance-doc.ts @@ -1,9 +1,9 @@ import { Instance } from '../models/entities/instance'; import { Instances } from '../models'; import { federationChart } from './chart'; -import { genId } from '../misc/gen-id'; -import { toPuny } from '../misc/convert-host'; -import { Cache } from '../misc/cache'; +import { genId } from '@/misc/gen-id'; +import { toPuny } from '@/misc/convert-host'; +import { Cache } from '@/misc/cache'; const cache = new Cache<Instance>(1000 * 60 * 60); diff --git a/src/services/relay.ts b/src/services/relay.ts index 0eb3bb41a1..5b1d1c8474 100644 --- a/src/services/relay.ts +++ b/src/services/relay.ts @@ -5,7 +5,7 @@ import renderUndo from '../remote/activitypub/renderer/undo'; import { deliver } from '../queue'; import { ILocalUser } from '../models/entities/user'; import { Users, Relays } from '../models'; -import { genId } from '../misc/gen-id'; +import { genId } from '@/misc/gen-id'; const ACTOR_USERNAME = 'relay.actor' as const; diff --git a/src/services/send-email-notification.ts b/src/services/send-email-notification.ts index 7579d5b674..08cd04289b 100644 --- a/src/services/send-email-notification.ts +++ b/src/services/send-email-notification.ts @@ -2,7 +2,7 @@ import { UserProfiles } from '../models'; import { User } from '../models/entities/user'; import { sendEmail } from './send-email'; import * as locales from '../../locales/'; -import { I18n } from '../misc/i18n'; +import { I18n } from '@/misc/i18n'; // TODO: locale ファイルをクライアント用とサーバー用で分けたい diff --git a/src/services/send-email.ts b/src/services/send-email.ts index 4814808392..4784ba5510 100644 --- a/src/services/send-email.ts +++ b/src/services/send-email.ts @@ -1,7 +1,7 @@ import * as nodemailer from 'nodemailer'; -import { fetchMeta } from '../misc/fetch-meta'; +import { fetchMeta } from '@/misc/fetch-meta'; import Logger from './logger'; -import config from '../config'; +import config from '@/config'; export const logger = new Logger('email'); diff --git a/src/services/stream.ts b/src/services/stream.ts index 6d7c2c4922..6258dc5a7d 100644 --- a/src/services/stream.ts +++ b/src/services/stream.ts @@ -4,7 +4,7 @@ import { Note } from '../models/entities/note'; import { UserList } from '../models/entities/user-list'; import { ReversiGame } from '../models/entities/games/reversi/game'; import { UserGroup } from '../models/entities/user-group'; -import config from '../config'; +import config from '@/config'; import { Antenna } from '../models/entities/antenna'; import { Channel } from '../models/entities/channel'; diff --git a/src/services/suspend-user.ts b/src/services/suspend-user.ts index a85188acbe..597433d6de 100644 --- a/src/services/suspend-user.ts +++ b/src/services/suspend-user.ts @@ -1,7 +1,7 @@ import renderDelete from '../remote/activitypub/renderer/delete'; import { renderActivity } from '../remote/activitypub/renderer'; import { deliver } from '../queue'; -import config from '../config'; +import config from '@/config'; import { User } from '../models/entities/user'; import { Users, Followings } from '../models'; import { Not, IsNull } from 'typeorm'; diff --git a/src/services/unsuspend-user.ts b/src/services/unsuspend-user.ts index 6cab375821..5bc4bba423 100644 --- a/src/services/unsuspend-user.ts +++ b/src/services/unsuspend-user.ts @@ -2,7 +2,7 @@ import renderDelete from '../remote/activitypub/renderer/delete'; import renderUndo from '../remote/activitypub/renderer/undo'; import { renderActivity } from '../remote/activitypub/renderer'; import { deliver } from '../queue'; -import config from '../config'; +import config from '@/config'; import { User } from '../models/entities/user'; import { Users, Followings } from '../models'; import { Not, IsNull } from 'typeorm'; diff --git a/src/services/update-hashtag.ts b/src/services/update-hashtag.ts index 3e22846731..e9508be336 100644 --- a/src/services/update-hashtag.ts +++ b/src/services/update-hashtag.ts @@ -1,9 +1,9 @@ import { User } from '../models/entities/user'; import { Hashtags, Users } from '../models'; import { hashtagChart } from './chart'; -import { genId } from '../misc/gen-id'; +import { genId } from '@/misc/gen-id'; import { Hashtag } from '../models/entities/hashtag'; -import { normalizeForSearch } from '../misc/normalize-for-search'; +import { normalizeForSearch } from '@/misc/normalize-for-search'; export async function updateHashtags(user: User, tags: string[]) { for (const tag of tags) { diff --git a/src/services/user-list/push.ts b/src/services/user-list/push.ts index ba54c04475..3dd9a8576b 100644 --- a/src/services/user-list/push.ts +++ b/src/services/user-list/push.ts @@ -3,8 +3,8 @@ import { User } from '../../models/entities/user'; import { UserList } from '../../models/entities/user-list'; import { UserListJoinings, Users } from '../../models'; import { UserListJoining } from '../../models/entities/user-list-joining'; -import { genId } from '../../misc/gen-id'; -import { fetchProxyAccount } from '../../misc/fetch-proxy-account'; +import { genId } from '@/misc/gen-id'; +import { fetchProxyAccount } from '@/misc/fetch-proxy-account'; import createFollowing from '../following/create'; export async function pushUserToUserList(target: User, list: UserList) { |