From: Dessalines <dessalines@users.noreply.github.com>
Date: Mon, 28 Mar 2022 20:31:35 +0000 (+0000)
Subject: Rate limit ws joins (#2171)
X-Git-Url: http://these/git/%7B%60%24%7Bdocument.location.origin%7D/feeds/static/%7Bicon?a=commitdiff_plain;h=d49565e030741444d19a2f5735ca38bd7ca93d31;p=lemmy.git

Rate limit ws joins (#2171)

* Removing async on mutex lock fn.

* Removing redundant ip

* Don't check rate limit twice.
---

diff --git a/crates/websocket/src/chat_server.rs b/crates/websocket/src/chat_server.rs
index d9de90db..4dafafd8 100644
--- a/crates/websocket/src/chat_server.rs
+++ b/crates/websocket/src/chat_server.rs
@@ -485,7 +485,7 @@ impl ChatServer {
           UserOperationCrud::CreatePost => rate_limiter.post().check(ip),
           UserOperationCrud::CreateCommunity => rate_limiter.register().check(ip),
           UserOperationCrud::CreateComment => rate_limiter.comment().check(ip),
-          _ => rate_limiter.message().check(ip),
+          _ => true,
         };
         let fut = (message_handler_crud)(context, msg.id, user_operation_crud, data);
         (passed, fut)
@@ -493,7 +493,7 @@ impl ChatServer {
         let user_operation = UserOperation::from_str(op)?;
         let passed = match user_operation {
           UserOperation::GetCaptcha => rate_limiter.post().check(ip),
-          _ => rate_limiter.message().check(ip),
+          _ => true,
         };
         let fut = (message_handler)(context, msg.id, user_operation, data);
         (passed, fut)