diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2020-04-11 22:44:36 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2020-04-11 22:44:36 +0900 |
| commit | 4903eb4a4abe034791a05eeebeeb941cbeb720bf (patch) | |
| tree | c93a5224c4cf5bcaa8ecc7fa2aca56b0279779e1 /src/server | |
| parent | feat(client): Implement AiScript scratchpad (diff) | |
| parent | Fix typo (#6238) (diff) | |
| download | sharkey-4903eb4a4abe034791a05eeebeeb941cbeb720bf.tar.gz sharkey-4903eb4a4abe034791a05eeebeeb941cbeb720bf.tar.bz2 sharkey-4903eb4a4abe034791a05eeebeeb941cbeb720bf.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/file/send-drive-file.ts | 2 | ||||
| -rw-r--r-- | src/server/proxy/proxy-media.ts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/file/send-drive-file.ts b/src/server/file/send-drive-file.ts index 63b2a3db2c..9dea2df8e7 100644 --- a/src/server/file/send-drive-file.ts +++ b/src/server/file/send-drive-file.ts @@ -7,7 +7,7 @@ import { serverLogger } from '..'; import { contentDisposition } from '../../misc/content-disposition'; import { DriveFiles } from '../../models'; import { InternalStorage } from '../../services/drive/internal-storage'; -import { downloadUrl } from '../../misc/donwload-url'; +import { downloadUrl } from '../../misc/download-url'; import { detectType } from '../../misc/get-file-info'; import { convertToJpeg, convertToPngOrJpeg } from '../../services/drive/image-processor'; import { GenerateVideoThumbnail } from '../../services/drive/generate-video-thumbnail'; diff --git a/src/server/proxy/proxy-media.ts b/src/server/proxy/proxy-media.ts index 6b90e99921..d035a84d9e 100644 --- a/src/server/proxy/proxy-media.ts +++ b/src/server/proxy/proxy-media.ts @@ -3,7 +3,7 @@ import * as Koa from 'koa'; import { serverLogger } from '..'; import { IImage, convertToPng, convertToJpeg } from '../../services/drive/image-processor'; import { createTemp } from '../../misc/create-temp'; -import { downloadUrl } from '../../misc/donwload-url'; +import { downloadUrl } from '../../misc/download-url'; import { detectType } from '../../misc/get-file-info'; export async function proxyMedia(ctx: Koa.Context) { |