300 comment limit. (#3306)

* 300 comment limit.

* Another fix.

diff --git a/crates/api_common/src/utils.rs b/crates/api_common/src/utils.rs
index f400cc9a84fa311670ecff5b86aa16cd68a0ba20..fd143ed90ca2d7df5285e6a03599dbc6667b1d36 100644 (file)
--- a/crates/api_common/src/utils.rs
+++ b/crates/api_common/src/utils.rs
@@ -670,7 +670,6 @@ pub async fn remove_user_data_in_community(
     .pool(pool)
     .creator_id(Some(banned_person_id))
     .community_id(Some(community_id))
-    .limit(Some(i64::MAX))
     .build()
     .list()
     .await?;

diff --git a/crates/db_views/src/comment_view.rs b/crates/db_views/src/comment_view.rs
index 7c33158d6e03e174192ce89cdf812f52297248d0..f3b1f83a87e4a7d3b9cc3666879fcc4a9e82d610 100644 (file)
--- a/crates/db_views/src/comment_view.rs
+++ b/crates/db_views/src/comment_view.rs
@@ -36,7 +36,7 @@ use lemmy_db_schema::{
     post::Post,
   },
   traits::JoinView,
-  utils::{fuzzy_search, get_conn, limit_and_offset_unlimited, DbPool},
+  utils::{fuzzy_search, get_conn, limit_and_offset, DbPool},
   CommentSortType,
   ListingType,
 };
@@ -340,9 +340,12 @@ impl<'a> CommentQuery<'a> {
       // This does not work for comment trees, and the limit should be manually set to a high number
       //
       // If a max depth is given, then you know its a tree fetch, and limits should be ignored
-      (i64::MAX, 0)
+      // TODO a kludge to prevent attacks. Limit comments to 300 for now.
+      // (i64::MAX, 0)
+      (300, 0)
     } else {
-      limit_and_offset_unlimited(self.page, self.limit)
+      // limit_and_offset_unlimited(self.page, self.limit)
+      limit_and_offset(self.page, self.limit)?
     };
 
     query = match self.sort.unwrap_or(CommentSortType::Hot) {