From f21f2fd7b0474eeb906dacc755fb1026ed2a9ef8 Mon Sep 17 00:00:00 2001 From: Nutomic Date: Mon, 28 Mar 2022 18:29:11 +0000 Subject: [PATCH 1/2] Delete unused diesel.toml file (#2166) --- diesel.toml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 diesel.toml diff --git a/diesel.toml b/diesel.toml deleted file mode 100644 index 1644558f1..000000000 --- a/diesel.toml +++ /dev/null @@ -1,5 +0,0 @@ -# For documentation on how to configure this file, -# see diesel.rs/guides/configuring-diesel-cli - -[print_schema] -file = "lemmy_db/src/schema.rs" From d49565e030741444d19a2f5735ca38bd7ca93d31 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 28 Mar 2022 20:31:35 +0000 Subject: [PATCH 2/2] Rate limit ws joins (#2171) * Removing async on mutex lock fn. * Removing redundant ip * Don't check rate limit twice. --- crates/websocket/src/chat_server.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/websocket/src/chat_server.rs b/crates/websocket/src/chat_server.rs index d9de90dbe..4dafafd8e 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)