summary refs log tree commit diff
diff options
context:
space:
mode:
authorTheArcaneBrony <myrainbowdash949@gmail.com>2022-09-18 14:13:15 +0200
committerTheArcaneBrony <myrainbowdash949@gmail.com>2022-09-18 14:13:41 +0200
commit20b06ae5d1664905ed3aa542e27b0adb3b16e349 (patch)
treee023229b832fffb0d1abbb2b2dbfd78f133374a2
parentMessage rate limiting (diff)
downloadserver-20b06ae5d1664905ed3aa542e27b0adb3b16e349.tar.xz
Sane message rate limit
-rw-r--r--src/api/routes/channels/#channel_id/messages/index.ts6
-rw-r--r--src/util/config/types/subconfigurations/limits/GlobalRateLimits.ts2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/api/routes/channels/#channel_id/messages/index.ts b/src/api/routes/channels/#channel_id/messages/index.ts
index 4f689c2b..b2822711 100644
--- a/src/api/routes/channels/#channel_id/messages/index.ts
+++ b/src/api/routes/channels/#channel_id/messages/index.ts
@@ -15,7 +15,6 @@ import {
 	Message,
 	MessageCreateEvent,
 	MessageCreateSchema,
-	Permissions,
 	Rights,
 	Snowflake,
 	uploadFile
@@ -170,8 +169,9 @@ router.post(
 		if (
 			!(await getRights(req.user_id)).has(Rights.FLAGS.BYPASS_RATE_LIMITS) &&
 			limits.absoluteRate.register.enabled &&
-			(await await Message.count({ where: { channel_id, timestamp: MoreThan(new Date(Date.now() - limits.absoluteRate.sendMessage.window)) } })) >=
-				limits.absoluteRate.register.limit
+			(await await Message.count({
+				where: { channel_id, timestamp: MoreThan(new Date(Date.now() - limits.absoluteRate.sendMessage.window)) }
+			})) >= limits.absoluteRate.register.limit
 		) {
 			console.log(
 				yellow(
diff --git a/src/util/config/types/subconfigurations/limits/GlobalRateLimits.ts b/src/util/config/types/subconfigurations/limits/GlobalRateLimits.ts
index 85280d3a..00526fb4 100644
--- a/src/util/config/types/subconfigurations/limits/GlobalRateLimits.ts
+++ b/src/util/config/types/subconfigurations/limits/GlobalRateLimits.ts
@@ -1,6 +1,6 @@
 export class GlobalRateLimits {
 	register: GlobalRateLimit = { limit: 25, window: 60 * 60 * 1000, enabled: true };
-	sendMessage: GlobalRateLimit = { limit: 50, window: 60 * 1000, enabled: true };
+	sendMessage: GlobalRateLimit = { limit: 120, window: 60 * 1000, enabled: true };
 }
 
 export class GlobalRateLimit {