From 00e1dbfdfb00a5983cf4a6ae7e8504d1d438178c Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Sat, 11 Apr 2020 19:49:25 +0900
Subject: Fix typo (#6238)

---
 src/misc/detect-url-mime.ts           |  2 +-
 src/misc/donwload-url.ts              | 39 -----------------------------------
 src/misc/download-text-file.ts        |  2 +-
 src/misc/download-url.ts              | 39 +++++++++++++++++++++++++++++++++++
 src/server/file/send-drive-file.ts    |  2 +-
 src/server/proxy/proxy-media.ts       |  2 +-
 src/services/drive/upload-from-url.ts |  2 +-
 7 files changed, 44 insertions(+), 44 deletions(-)
 delete mode 100644 src/misc/donwload-url.ts
 create mode 100644 src/misc/download-url.ts

(limited to 'src')

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/donwload-url.ts b/src/misc/donwload-url.ts
deleted file mode 100644
index 3f42fb3bef..0000000000
--- a/src/misc/donwload-url.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import * as fs from 'fs';
-import * as stream from 'stream';
-import * as util from 'util';
-import fetch from 'node-fetch';
-import { httpAgent, httpsAgent } from './fetch';
-import { AbortController } from 'abort-controller';
-import config from '../config';
-import * as chalk from 'chalk';
-import Logger from '../services/logger';
-
-const pipeline = util.promisify(stream.pipeline);
-
-export async function downloadUrl(url: string, path: string) {
-	const logger = new Logger('download');
-
-	logger.info(`Downloading ${chalk.cyan(url)} ...`);
-	const controller = new AbortController();
-	setTimeout(() => {
-		controller.abort();
-	}, 11 * 1000);
-
-	const response = await fetch(new URL(url).href, {
-		headers: {
-			'User-Agent': config.userAgent
-		},
-		timeout: 10 * 1000,
-		signal: controller.signal,
-		agent: u => u.protocol == 'http:' ? httpAgent : httpsAgent,
-	});
-
-	if (!response.ok) {
-		logger.error(`Got ${response.status} (${url})`);
-		throw response.status;
-	}
-
-	await pipeline(response.body, fs.createWriteStream(path));
-
-	logger.succ(`Download finished: ${chalk.cyan(url)}`);
-}
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/download-url.ts b/src/misc/download-url.ts
new file mode 100644
index 0000000000..3f42fb3bef
--- /dev/null
+++ b/src/misc/download-url.ts
@@ -0,0 +1,39 @@
+import * as fs from 'fs';
+import * as stream from 'stream';
+import * as util from 'util';
+import fetch from 'node-fetch';
+import { httpAgent, httpsAgent } from './fetch';
+import { AbortController } from 'abort-controller';
+import config from '../config';
+import * as chalk from 'chalk';
+import Logger from '../services/logger';
+
+const pipeline = util.promisify(stream.pipeline);
+
+export async function downloadUrl(url: string, path: string) {
+	const logger = new Logger('download');
+
+	logger.info(`Downloading ${chalk.cyan(url)} ...`);
+	const controller = new AbortController();
+	setTimeout(() => {
+		controller.abort();
+	}, 11 * 1000);
+
+	const response = await fetch(new URL(url).href, {
+		headers: {
+			'User-Agent': config.userAgent
+		},
+		timeout: 10 * 1000,
+		signal: controller.signal,
+		agent: u => u.protocol == 'http:' ? httpAgent : httpsAgent,
+	});
+
+	if (!response.ok) {
+		logger.error(`Got ${response.status} (${url})`);
+		throw response.status;
+	}
+
+	await pipeline(response.body, fs.createWriteStream(path));
+
+	logger.succ(`Download finished: ${chalk.cyan(url)}`);
+}
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';
-- 
cgit v1.2.3-freya