From fa03c172f211f84dd9747fcf312ec41a92d1102b Mon Sep 17 00:00:00 2001
From: "Acid Chicken (硫酸鶏)" <root@acid-chicken.com>
Date: Tue, 25 Dec 2018 20:02:37 +0900
Subject: Fix typo

---
 src/server/api/call.ts     |  4 +--
 src/server/api/limiter.ts  | 89 ++++++++++++++++++++++++++++++++++++++++++++++
 src/server/api/limitter.ts | 89 ----------------------------------------------
 3 files changed, 91 insertions(+), 91 deletions(-)
 create mode 100644 src/server/api/limiter.ts
 delete mode 100644 src/server/api/limitter.ts

(limited to 'src')

diff --git a/src/server/api/call.ts b/src/server/api/call.ts
index a3953d0439..c19e045cd5 100644
--- a/src/server/api/call.ts
+++ b/src/server/api/call.ts
@@ -1,5 +1,5 @@
 import { performance } from 'perf_hooks';
-import limitter from './limitter';
+import limiter from './limiter';
 import { IUser } from '../../models/user';
 import { IApp } from '../../models/app';
 import endpoints from './endpoints';
@@ -39,7 +39,7 @@ export default (endpoint: string, user: IUser, app: IApp, data: any, file?: any)
 
 	if (ep.meta.requireCredential && ep.meta.limit) {
 		try {
-			await limitter(ep, user); // Rate limit
+			await limiter(ep, user); // Rate limit
 		} catch (e) {
 			// drop request if limit exceeded
 			return rej('RATE_LIMIT_EXCEEDED');
diff --git a/src/server/api/limiter.ts b/src/server/api/limiter.ts
new file mode 100644
index 0000000000..192aa19770
--- /dev/null
+++ b/src/server/api/limiter.ts
@@ -0,0 +1,89 @@
+import * as Limiter from 'ratelimiter';
+import * as debug from 'debug';
+import limiterDB from '../../db/redis';
+import { IEndpoint } from './endpoints';
+import getAcct from '../../misc/acct/render';
+import { IUser } from '../../models/user';
+
+const log = debug('misskey:limiter');
+
+export default (endpoint: IEndpoint, user: IUser) => new Promise((ok, reject) => {
+	// Redisがインストールされてない場合は常に許可
+	if (limiterDB == null) {
+		ok();
+		return;
+	}
+
+	const limitation = endpoint.meta.limit;
+
+	const key = limitation.hasOwnProperty('key')
+		? limitation.key
+		: endpoint.name;
+
+	const hasShortTermLimit =
+		limitation.hasOwnProperty('minInterval');
+
+	const hasLongTermLimit =
+		limitation.hasOwnProperty('duration') &&
+		limitation.hasOwnProperty('max');
+
+	if (hasShortTermLimit) {
+		min();
+	} else if (hasLongTermLimit) {
+		max();
+	} else {
+		ok();
+	}
+
+	// Short-term limit
+	function min() {
+		const minIntervalLimiter = new Limiter({
+			id: `${user._id}:${key}:min`,
+			duration: limitation.minInterval,
+			max: 1,
+			db: limiterDB
+		});
+
+		minIntervalLimiter.get((err, info) => {
+			if (err) {
+				return reject('ERR');
+			}
+
+			log(`@${getAcct(user)} ${endpoint.name} min remaining: ${info.remaining}`);
+
+			if (info.remaining === 0) {
+				reject('BRIEF_REQUEST_INTERVAL');
+			} else {
+				if (hasLongTermLimit) {
+					max();
+				} else {
+					ok();
+				}
+			}
+		});
+	}
+
+	// Long term limit
+	function max() {
+		const limiter = new Limiter({
+			id: `${user._id}:${key}`,
+			duration: limitation.duration,
+			max: limitation.max,
+			db: limiterDB
+		});
+
+		limiter.get((err, info) => {
+			if (err) {
+				return reject('ERR');
+			}
+
+			log(`@${getAcct(user)} ${endpoint.name} max remaining: ${info.remaining}`);
+
+			if (info.remaining === 0) {
+				reject('RATE_LIMIT_EXCEEDED');
+			} else {
+				ok();
+			}
+		});
+	}
+});
diff --git a/src/server/api/limitter.ts b/src/server/api/limitter.ts
deleted file mode 100644
index abf7627ab8..0000000000
--- a/src/server/api/limitter.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import * as Limiter from 'ratelimiter';
-import * as debug from 'debug';
-import limiterDB from '../../db/redis';
-import { IEndpoint } from './endpoints';
-import getAcct from '../../misc/acct/render';
-import { IUser } from '../../models/user';
-
-const log = debug('misskey:limitter');
-
-export default (endpoint: IEndpoint, user: IUser) => new Promise((ok, reject) => {
-	// Redisがインストールされてない場合は常に許可
-	if (limiterDB == null) {
-		ok();
-		return;
-	}
-
-	const limitation = endpoint.meta.limit;
-
-	const key = limitation.hasOwnProperty('key')
-		? limitation.key
-		: endpoint.name;
-
-	const hasShortTermLimit =
-		limitation.hasOwnProperty('minInterval');
-
-	const hasLongTermLimit =
-		limitation.hasOwnProperty('duration') &&
-		limitation.hasOwnProperty('max');
-
-	if (hasShortTermLimit) {
-		min();
-	} else if (hasLongTermLimit) {
-		max();
-	} else {
-		ok();
-	}
-
-	// Short-term limit
-	function min() {
-		const minIntervalLimiter = new Limiter({
-			id: `${user._id}:${key}:min`,
-			duration: limitation.minInterval,
-			max: 1,
-			db: limiterDB
-		});
-
-		minIntervalLimiter.get((err, info) => {
-			if (err) {
-				return reject('ERR');
-			}
-
-			log(`@${getAcct(user)} ${endpoint.name} min remaining: ${info.remaining}`);
-
-			if (info.remaining === 0) {
-				reject('BRIEF_REQUEST_INTERVAL');
-			} else {
-				if (hasLongTermLimit) {
-					max();
-				} else {
-					ok();
-				}
-			}
-		});
-	}
-
-	// Long term limit
-	function max() {
-		const limiter = new Limiter({
-			id: `${user._id}:${key}`,
-			duration: limitation.duration,
-			max: limitation.max,
-			db: limiterDB
-		});
-
-		limiter.get((err, info) => {
-			if (err) {
-				return reject('ERR');
-			}
-
-			log(`@${getAcct(user)} ${endpoint.name} max remaining: ${info.remaining}`);
-
-			if (info.remaining === 0) {
-				reject('RATE_LIMIT_EXCEEDED');
-			} else {
-				ok();
-			}
-		});
-	}
-});
-- 
cgit v1.2.3-freya