diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-08-19 21:55:45 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2021-08-19 21:55:45 +0900 |
| commit | 42cc93dd0f189995f29fc87d2734fc809105a7cf (patch) | |
| tree | 7a74658a76d71d4c07bf89a7028fa1786af0e13e /src/services/drive | |
| parent | Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff) | |
| download | misskey-42cc93dd0f189995f29fc87d2734fc809105a7cf.tar.gz misskey-42cc93dd0f189995f29fc87d2734fc809105a7cf.tar.bz2 misskey-42cc93dd0f189995f29fc87d2734fc809105a7cf.zip | |
fix: mochaが動かないため拡張子なしに戻した
Diffstat (limited to 'src/services/drive')
| -rw-r--r-- | src/services/drive/add-file.ts | 32 | ||||
| -rw-r--r-- | src/services/drive/delete-file.ts | 28 | ||||
| -rw-r--r-- | src/services/drive/generate-video-thumbnail.ts | 2 | ||||
| -rw-r--r-- | src/services/drive/internal-storage.ts | 2 | ||||
| -rw-r--r-- | src/services/drive/logger.ts | 2 | ||||
| -rw-r--r-- | src/services/drive/s3.ts | 4 | ||||
| -rw-r--r-- | src/services/drive/upload-from-url.ts | 16 |
7 files changed, 43 insertions, 43 deletions
diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts index e1092d068d..6c5fefd4ad 100644 --- a/src/services/drive/add-file.ts +++ b/src/services/drive/add-file.ts @@ -2,23 +2,23 @@ import * as fs from 'fs'; import { v4 as uuid } from 'uuid'; -import { publishMainStream, publishDriveStream } from '@/services/stream.js'; -import { deleteFile } from './delete-file.js'; -import { fetchMeta } from '@/misc/fetch-meta.js'; -import { GenerateVideoThumbnail } from './generate-video-thumbnail.js'; -import { driveLogger } from './logger.js'; -import { IImage, convertSharpToJpeg, convertSharpToWebp, convertSharpToPng, convertSharpToPngOrJpeg } from './image-processor.js'; -import { contentDisposition } from '@/misc/content-disposition.js'; -import { getFileInfo } from '@/misc/get-file-info.js'; -import { DriveFiles, DriveFolders, Users, Instances, UserProfiles } from '@/models/index.js'; -import { InternalStorage } from './internal-storage.js'; -import { DriveFile } from '@/models/entities/drive-file.js'; -import { IRemoteUser, User } from '@/models/entities/user.js'; -import { driveChart, perUserDriveChart, instanceChart } from '@/services/chart/index.js'; -import { genId } from '@/misc/gen-id.js'; -import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error.js'; +import { publishMainStream, publishDriveStream } from '@/services/stream'; +import { deleteFile } from './delete-file'; +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 { DriveFiles, DriveFolders, Users, Instances, UserProfiles } from '@/models/index'; +import { InternalStorage } from './internal-storage'; +import { DriveFile } from '@/models/entities/drive-file'; +import { IRemoteUser, User } from '@/models/entities/user'; +import { driveChart, perUserDriveChart, instanceChart } from '@/services/chart/index'; +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.js'; +import { getS3 } from './s3'; import * as sharp from 'sharp'; const logger = driveLogger.createSubLogger('register', 'yellow'); diff --git a/src/services/drive/delete-file.ts b/src/services/drive/delete-file.ts index 9deb1768b6..2eab17ac1c 100644 --- a/src/services/drive/delete-file.ts +++ b/src/services/drive/delete-file.ts @@ -1,19 +1,19 @@ -import { DriveFile } from '@/models/entities/drive-file.js'; -import { InternalStorage } from './internal-storage.js'; -import { DriveFiles, Instances, Notes, Users } from '@/models/index.js'; -import { driveChart, perUserDriveChart, instanceChart } from '@/services/chart/index.js'; -import { createDeleteObjectStorageFileJob } from '@/queue/index.js'; -import { fetchMeta } from '@/misc/fetch-meta.js'; -import { getS3 } from './s3.js'; +import { DriveFile } from '@/models/entities/drive-file'; +import { InternalStorage } from './internal-storage'; +import { DriveFiles, Instances, Notes, Users } from '@/models/index'; +import { driveChart, perUserDriveChart, instanceChart } from '@/services/chart/index'; +import { createDeleteObjectStorageFileJob } from '@/queue/index'; +import { fetchMeta } from '@/misc/fetch-meta'; +import { getS3 } from './s3'; import { v4 as uuid } from 'uuid'; -import { Note } from '@/models/entities/note.js'; -import { renderActivity } from '@/remote/activitypub/renderer/index.js'; -import renderDelete from '@/remote/activitypub/renderer/delete.js'; -import renderTombstone from '@/remote/activitypub/renderer/tombstone.js'; -import config from '@/config/index.js'; -import { deliverToFollowers } from '@/remote/activitypub/deliver-manager.js'; +import { Note } from '@/models/entities/note'; +import { renderActivity } from '@/remote/activitypub/renderer/index'; +import renderDelete from '@/remote/activitypub/renderer/delete'; +import renderTombstone from '@/remote/activitypub/renderer/tombstone'; +import config from '@/config/index'; +import { deliverToFollowers } from '@/remote/activitypub/deliver-manager'; import { Brackets } from 'typeorm'; -import { deliverToRelays } from '../relay.js'; +import { deliverToRelays } from '../relay'; export async function deleteFile(file: DriveFile, isExpired = false) { if (file.storedInternal) { diff --git a/src/services/drive/generate-video-thumbnail.ts b/src/services/drive/generate-video-thumbnail.ts index e5cb243d4d..f0adc7c338 100644 --- a/src/services/drive/generate-video-thumbnail.ts +++ b/src/services/drive/generate-video-thumbnail.ts @@ -1,6 +1,6 @@ import * as fs from 'fs'; import * as tmp from 'tmp'; -import { IImage, convertToJpeg } from './image-processor.js'; +import { IImage, convertToJpeg } from './image-processor'; import * as FFmpeg from 'fluent-ffmpeg'; export async function GenerateVideoThumbnail(path: string): Promise<IImage> { diff --git a/src/services/drive/internal-storage.ts b/src/services/drive/internal-storage.ts index e857f942cc..deaf3dc831 100644 --- a/src/services/drive/internal-storage.ts +++ b/src/services/drive/internal-storage.ts @@ -2,7 +2,7 @@ import * as fs from 'fs'; import * as Path from 'path'; import { fileURLToPath } from 'url'; import { dirname } from 'path'; -import config from '@/config/index.js'; +import config from '@/config/index'; //const _filename = fileURLToPath(import.meta.url); const _filename = __filename; diff --git a/src/services/drive/logger.ts b/src/services/drive/logger.ts index 917a8317e2..655d074d6e 100644 --- a/src/services/drive/logger.ts +++ b/src/services/drive/logger.ts @@ -1,3 +1,3 @@ -import Logger from '../logger.js'; +import Logger from '../logger'; export const driveLogger = new Logger('drive', 'blue'); diff --git a/src/services/drive/s3.ts b/src/services/drive/s3.ts index 89fad70dc5..f473c4a203 100644 --- a/src/services/drive/s3.ts +++ b/src/services/drive/s3.ts @@ -1,7 +1,7 @@ import { URL } from 'url'; import * as S3 from 'aws-sdk/clients/s3'; -import { Meta } from '@/models/entities/meta.js'; -import { getAgentByUrl } from '@/misc/fetch.js'; +import { Meta } from '@/models/entities/meta'; +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 21b294142b..29788c4af4 100644 --- a/src/services/drive/upload-from-url.ts +++ b/src/services/drive/upload-from-url.ts @@ -1,12 +1,12 @@ import { URL } from 'url'; -import create from './add-file.js'; -import { User } from '@/models/entities/user.js'; -import { driveLogger } from './logger.js'; -import { createTemp } from '@/misc/create-temp.js'; -import { downloadUrl } from '@/misc/download-url.js'; -import { DriveFolder } from '@/models/entities/drive-folder.js'; -import { DriveFile } from '@/models/entities/drive-file.js'; -import { DriveFiles } from '@/models/index.js'; +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 { DriveFolder } from '@/models/entities/drive-folder'; +import { DriveFile } from '@/models/entities/drive-file'; +import { DriveFiles } from '@/models/index'; const logger = driveLogger.createSubLogger('downloader'); |