Merge branch 'develop' of https://github.com/syuilo/misskey into develop

7 files changed, 81 insertions, 1 deletions

diff --git a/src/@types/const.json.d.ts b/src/@types/const.json.d.ts
new file mode 100644
index 0000000000..40a96f2a2a
--- /dev/null
+++ b/src/@types/const.json.d.ts
@@ -0,0 +1,3 @@
+declare module '*/const.json' {
+	const copyright: string;
+}
diff --git a/src/@types/deepcopy.d.ts b/src/@types/deepcopy.d.ts
index afeee51913..3eb08d5772 100644
--- a/src/@types/deepcopy.d.ts
+++ b/src/@types/deepcopy.d.ts
@@ -8,7 +8,7 @@ declare namespace deepcopy {
 		valueType: DeepcopyCustomizerValueType) => T;
 
 	interface DeepcopyOptions<T> {
-		customizer: DeepcopyCustomizer<T>
+		customizer: DeepcopyCustomizer<T>;
 	}
 
 	export function deepcopy<T>(
diff --git a/src/@types/escape-regexp.d.ts b/src/@types/escape-regexp.d.ts
new file mode 100644
index 0000000000..d68e6048a1
--- /dev/null
+++ b/src/@types/escape-regexp.d.ts
@@ -0,0 +1,7 @@
+declare module 'escape-regexp' {
+	function escapeRegExp(str: string): string;
+
+	namespace escapeRegExp {} // Hack
+
+	export = escapeRegExp;
+}
diff --git a/src/@types/koa-slow.d.ts b/src/@types/koa-slow.d.ts
new file mode 100644
index 0000000000..a7908d8607
--- /dev/null
+++ b/src/@types/koa-slow.d.ts
@@ -0,0 +1,14 @@
+declare module 'koa-slow' {
+	import { Middleware } from 'koa';
+
+	interface ISlowOptions {
+		url?: RegExp;
+		delay?: number;
+	}
+
+	function slow(options?: ISlowOptions): Middleware;
+
+	namespace slow { } // Hack
+
+	export = slow;
+}
diff --git a/src/@types/langmap.d.ts b/src/@types/langmap.d.ts
new file mode 100644
index 0000000000..a0f99028ab
--- /dev/null
+++ b/src/@types/langmap.d.ts
@@ -0,0 +1,10 @@
+declare module 'langmap' {
+	type Lang = {
+		nativeName: string;
+		englishName: string;
+	};
+
+	const langmap: { [lang: string]: Lang };
+
+	export = langmap;
+}
diff --git a/src/@types/os-utils.d.ts b/src/@types/os-utils.d.ts
new file mode 100644
index 0000000000..390df17d39
--- /dev/null
+++ b/src/@types/os-utils.d.ts
@@ -0,0 +1,30 @@
+declare module 'os-utils' {
+	type FreeCommandCallback = (usedmem: number) => void;
+
+	type HarddriveCallback = (total: number, free: number, used: number) => void;
+
+	type GetProcessesCallback = (result: string) => void;
+
+	type CPUCallback = (perc: number) => void;
+
+	export function platform(): NodeJS.Platform;
+	export function cpuCount(): number;
+	export function sysUptime(): number;
+	export function processUptime(): number;
+
+	export function freemem(): number;
+	export function totalmem(): number;
+	export function freememPercentage(): number;
+	export function freeCommand(callback: FreeCommandCallback): void;
+
+	export function harddrive(callback: HarddriveCallback): void;
+
+	export function getProcesses(callback: GetProcessesCallback): void;
+	export function getProcesses(nProcess: number, callback: GetProcessesCallback): void;
+
+	export function allLoadavg(): string;
+	export function loadavg(_time?: number): number;
+
+	export function cpuFree(callback: CPUCallback): void;
+	export function cpuUsage(callback: CPUCallback): void;
+}
diff --git a/src/@types/recaptcha-promise.d.ts b/src/@types/recaptcha-promise.d.ts
new file mode 100644
index 0000000000..cfbd5eebf2
--- /dev/null
+++ b/src/@types/recaptcha-promise.d.ts
@@ -0,0 +1,16 @@
+declare module 'recaptcha-promise' {
+	interface IVerifyOptions {
+		secret_key?: string;
+	}
+
+	interface IVerify {
+		(response: string, remoteAddress?: string): Promise<boolean>;
+		init(options: IVerifyOptions): IVerify;
+	}
+
+	namespace recaptchaPromise {} // Hack
+
+	const verify: IVerify;
+
+	export = verify;
+}