Merge pull request 'For community_name API parameters, only search locally (fixes #1271)' (#134) from community-name-local into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/134
This commit is contained in:
dessalines 2020-11-17 21:07:00 +00:00
commit f0e3303aeb
3 changed files with 11 additions and 1 deletions

View File

@ -491,6 +491,9 @@ These expire after 10 minutes.
`GET /user/get_captcha` `GET /user/get_captcha`
#### Get User Details #### Get User Details
`username` can only be used for local users. To get details for a federated user, pass `user_id` instead.
##### Request ##### Request
```rust ```rust
{ {
@ -1549,6 +1552,8 @@ The main / frontpage community is `community_id: 0`.
Post listing types are `All, Subscribed, Community` 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 ##### Request
```rust ```rust
{ {
@ -1916,6 +1921,8 @@ Only a mod or admin can remove the comment.
Comment listing types are `All, Subscribed, Community` 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 ##### Request
```rust ```rust
{ {

View File

@ -239,7 +239,9 @@ impl<'a> CommentQueryBuilder<'a> {
} }
if let Some(for_community_name) = self.for_community_name { 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 { if let Some(for_post_id) = self.for_post_id {

View File

@ -280,6 +280,7 @@ impl<'a> PostQueryBuilder<'a> {
if let Some(for_community_name) = self.for_community_name { if let Some(for_community_name) = self.for_community_name {
query = query query = query
.filter(community_name.eq(for_community_name)) .filter(community_name.eq(for_community_name))
.filter(local.eq(true))
.then_order_by(stickied.desc()); .then_order_by(stickied.desc());
} }