From 1ba1e466f77a4d97bd29d658894f5772ae18218d Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Tue, 17 Nov 2020 18:05:25 +0100 Subject: [PATCH] For community_name API parameters, only search locally (fixes #1271) --- docs/src/contributing_websocket_http_api.md | 7 +++++++ lemmy_db/src/comment_view.rs | 4 +++- lemmy_db/src/post_view.rs | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/src/contributing_websocket_http_api.md b/docs/src/contributing_websocket_http_api.md index 8a6df622..73ed5c9c 100644 --- a/docs/src/contributing_websocket_http_api.md +++ b/docs/src/contributing_websocket_http_api.md @@ -491,6 +491,9 @@ These expire after 10 minutes. `GET /user/get_captcha` #### Get User Details + +`username` can only be used for local users. To get details for a federated user, pass `user_id` instead. + ##### Request ```rust { @@ -1549,6 +1552,8 @@ The main / frontpage community is `community_id: 0`. Post listing types are `All, Subscribed, Community` +`community_name` can only be used for local communities. To get posts for a federated community, pass `community_id` instead. + ##### Request ```rust { @@ -1916,6 +1921,8 @@ Only a mod or admin can remove the comment. Comment listing types are `All, Subscribed, Community` +`community_name` can only be used for local communities. To get posts for a federated community, pass `community_id` instead. + ##### Request ```rust { diff --git a/lemmy_db/src/comment_view.rs b/lemmy_db/src/comment_view.rs index e1299cb1..4b6dc192 100644 --- a/lemmy_db/src/comment_view.rs +++ b/lemmy_db/src/comment_view.rs @@ -239,7 +239,9 @@ impl<'a> CommentQueryBuilder<'a> { } if let Some(for_community_name) = self.for_community_name { - query = query.filter(community_name.eq(for_community_name)); + query = query + .filter(community_name.eq(for_community_name)) + .filter(local.eq(true)); } if let Some(for_post_id) = self.for_post_id { diff --git a/lemmy_db/src/post_view.rs b/lemmy_db/src/post_view.rs index 38d9a021..0ec4a979 100644 --- a/lemmy_db/src/post_view.rs +++ b/lemmy_db/src/post_view.rs @@ -280,6 +280,7 @@ impl<'a> PostQueryBuilder<'a> { if let Some(for_community_name) = self.for_community_name { query = query .filter(community_name.eq(for_community_name)) + .filter(local.eq(true)) .then_order_by(stickied.desc()); } -- 2.44.1