From 1bcc34a199e7d93e9a2010a2cf404b5ed73cb241 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Thu, 19 Sep 2024 14:06:09 +0200
Subject: [PATCH] Ignore zero values when setting rate limits (fixes #4280)

Havent bothered to add an error message for such an uncommon case.
---
 crates/api_crud/src/site/create.rs | 14 ++++++++------
 crates/api_crud/src/site/mod.rs    |  7 +++++++
 crates/api_crud/src/site/update.rs | 14 ++++++++------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/crates/api_crud/src/site/create.rs b/crates/api_crud/src/site/create.rs
index 30321d8dda..2cca5f5e4f 100644
--- a/crates/api_crud/src/site/create.rs
+++ b/crates/api_crud/src/site/create.rs
@@ -41,6 +41,8 @@ use lemmy_utils::{
 };
 use url::Url;
 
+use super::not_zero;
+
 #[tracing::instrument(skip(context))]
 pub async fn create_site(
   data: Json<CreateSite>,
@@ -117,17 +119,17 @@ pub async fn create_site(
 
   let local_site_rate_limit_form = LocalSiteRateLimitUpdateForm {
     message: data.rate_limit_message,
-    message_per_second: data.rate_limit_message_per_second,
+    message_per_second: not_zero(data.rate_limit_message_per_second),
     post: data.rate_limit_post,
-    post_per_second: data.rate_limit_post_per_second,
+    post_per_second: not_zero(data.rate_limit_post_per_second),
     register: data.rate_limit_register,
-    register_per_second: data.rate_limit_register_per_second,
+    register_per_second: not_zero(data.rate_limit_register_per_second),
     image: data.rate_limit_image,
-    image_per_second: data.rate_limit_image_per_second,
+    image_per_second: not_zero(data.rate_limit_image_per_second),
     comment: data.rate_limit_comment,
-    comment_per_second: data.rate_limit_comment_per_second,
+    comment_per_second: not_zero(data.rate_limit_comment_per_second),
     search: data.rate_limit_search,
-    search_per_second: data.rate_limit_search_per_second,
+    search_per_second: not_zero(data.rate_limit_search_per_second),
     ..Default::default()
   };
 
diff --git a/crates/api_crud/src/site/mod.rs b/crates/api_crud/src/site/mod.rs
index 0bf7cc2797..fd6f573e44 100644
--- a/crates/api_crud/src/site/mod.rs
+++ b/crates/api_crud/src/site/mod.rs
@@ -94,3 +94,10 @@ mod tests {
     );
   }
 }
+
+fn not_zero(val: Option<i32>) -> Option<i32> {
+  match val {
+    Some(0) => None,
+    v => v
+  }
+}
\ No newline at end of file
diff --git a/crates/api_crud/src/site/update.rs b/crates/api_crud/src/site/update.rs
index a6046b4235..b06b6babd8 100644
--- a/crates/api_crud/src/site/update.rs
+++ b/crates/api_crud/src/site/update.rs
@@ -46,6 +46,8 @@ use lemmy_utils::{
   },
 };
 
+use super::not_zero;
+
 #[tracing::instrument(skip(context))]
 pub async fn update_site(
   data: Json<EditSite>,
@@ -130,17 +132,17 @@ pub async fn update_site(
 
   let local_site_rate_limit_form = LocalSiteRateLimitUpdateForm {
     message: data.rate_limit_message,
-    message_per_second: data.rate_limit_message_per_second,
+    message_per_second: not_zero(data.rate_limit_message_per_second),
     post: data.rate_limit_post,
-    post_per_second: data.rate_limit_post_per_second,
+    post_per_second: not_zero(data.rate_limit_post_per_second),
     register: data.rate_limit_register,
-    register_per_second: data.rate_limit_register_per_second,
+    register_per_second: not_zero(data.rate_limit_register_per_second),
     image: data.rate_limit_image,
-    image_per_second: data.rate_limit_image_per_second,
+    image_per_second: not_zero(data.rate_limit_image_per_second),
     comment: data.rate_limit_comment,
-    comment_per_second: data.rate_limit_comment_per_second,
+    comment_per_second: not_zero(data.rate_limit_comment_per_second),
     search: data.rate_limit_search,
-    search_per_second: data.rate_limit_search_per_second,
+    search_per_second: not_zero(data.rate_limit_search_per_second),
     ..Default::default()
   };