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 | |
| 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')
| -rw-r--r-- | src/misc/detect-url-mime.ts | 2 | ||||
| -rw-r--r-- | src/misc/download-text-file.ts | 2 | ||||
| -rw-r--r-- | src/misc/download-url.ts (renamed from src/misc/donwload-url.ts) | 0 | ||||
| -rw-r--r-- | src/server/file/send-drive-file.ts | 2 | ||||
| -rw-r--r-- | src/server/proxy/proxy-media.ts | 2 | ||||
| -rw-r--r-- | src/services/drive/upload-from-url.ts | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/src/misc/detect-url-mime.ts b/src/misc/detect-url-mime.ts index 8d71cd0137..274c291737 100644 --- a/src/misc/detect-url-mime.ts +++ b/src/misc/detect-url-mime.ts @@ -1,5 +1,5 @@ import { createTemp } from './create-temp'; -import { downloadUrl } from './donwload-url'; +import { downloadUrl } from './download-url'; import { detectType } from './get-file-info'; export async function detectUrlMime(url: string) { diff --git a/src/misc/download-text-file.ts b/src/misc/download-text-file.ts index f73286e9bb..d6fd17fc13 100644 --- a/src/misc/download-text-file.ts +++ b/src/misc/download-text-file.ts @@ -2,7 +2,7 @@ import * as fs from 'fs'; import * as util from 'util'; import Logger from '../services/logger'; import { createTemp } from './create-temp'; -import { downloadUrl } from './donwload-url'; +import { downloadUrl } from './download-url'; const logger = new Logger('download-text-file'); diff --git a/src/misc/donwload-url.ts b/src/misc/download-url.ts index 3f42fb3bef..3f42fb3bef 100644 --- a/src/misc/donwload-url.ts +++ b/src/misc/download-url.ts 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) { diff --git a/src/services/drive/upload-from-url.ts b/src/services/drive/upload-from-url.ts index ff2f9a7281..2904ebb30e 100644 --- a/src/services/drive/upload-from-url.ts +++ b/src/services/drive/upload-from-url.ts @@ -2,7 +2,7 @@ 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/donwload-url'; +import { downloadUrl } from '../../misc/download-url'; import { DriveFolder } from '../../models/entities/drive-folder'; import { DriveFile } from '../../models/entities/drive-file'; import { DriveFiles } from '../../models'; |