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/drive | |
| 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/drive')
| -rw-r--r-- | src/services/drive/add-file.ts | 10 | ||||
| -rw-r--r-- | src/services/drive/delete-file.ts | 4 | ||||
| -rw-r--r-- | src/services/drive/internal-storage.ts | 2 | ||||
| -rw-r--r-- | src/services/drive/s3.ts | 2 | ||||
| -rw-r--r-- | src/services/drive/upload-from-url.ts | 4 |
5 files changed, 11 insertions, 11 deletions
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'; |