Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implemented Listingtype #79

Merged
merged 6 commits into from
Dec 13, 2023
Merged

Implemented Listingtype #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c90f287
Implemented Listingtype
Pdzly Dec 11, 2023
be51645
Removed default
Pdzly Dec 11, 2023
6203daf
Removed todo
Pdzly Dec 11, 2023
6e945d0
Merge branch 'main' into feature/use_site_config_listingtype
Pdzly Dec 12, 2023
a77204b
Refactor ListingType import in multiple files
Pdzly Dec 12, 2023
5e67064
Merge remote-tracking branch 'origin/feature/use_site_config_listingt…
Pdzly Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/main/java/com/sublinks/sublinksapi/api/lemmy/v3/post/controllers/PostController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.sublinks.sublinksapi.api.lemmy.v3.community.models.CommunityModeratorView;
import com.sublinks.sublinksapi.api.lemmy.v3.community.models.CommunityView;
import com.sublinks.sublinksapi.api.lemmy.v3.community.services.LemmyCommunityService;
import com.sublinks.sublinksapi.api.lemmy.v3.enums.ListingType;
import com.sublinks.sublinksapi.api.lemmy.v3.errorhandler.ApiError;
import com.sublinks.sublinksapi.api.lemmy.v3.post.models.CreatePostLike;
import com.sublinks.sublinksapi.api.lemmy.v3.post.models.CreatePostReport;
Expand All @@ -24,10 +25,11 @@
import com.sublinks.sublinksapi.api.lemmy.v3.site.models.SiteMetadata;
import com.sublinks.sublinksapi.community.dto.Community;
import com.sublinks.sublinksapi.community.repositories.CommunityRepository;
import com.sublinks.sublinksapi.instance.dto.InstanceConfig;
import com.sublinks.sublinksapi.instance.models.LocalInstanceContext;
import com.sublinks.sublinksapi.person.dto.LinkPersonCommunity;
import com.sublinks.sublinksapi.person.dto.Person;
import com.sublinks.sublinksapi.person.enums.LinkPersonCommunityType;
import com.sublinks.sublinksapi.person.enums.ListingType;
import com.sublinks.sublinksapi.person.enums.SortType;
import com.sublinks.sublinksapi.post.dto.Post;
import com.sublinks.sublinksapi.post.dto.PostReport;
Expand Down Expand Up @@ -86,7 +88,7 @@ public class PostController extends AbstractLemmyApiController {
private final SiteMetadataUtil siteMetadataUtil;
private final PostReportService postReportService;
private final LemmyPostReportService lemmyPostReportService;

private final LocalInstanceContext localInstanceContext;

@Operation(summary = "Get / fetch a post.")
@ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK", content = {
Expand Down Expand Up @@ -190,17 +192,19 @@ public GetPostsResponse index(@Valid final GetPosts getPostsForm, final JwtPerso
}
}

InstanceConfig config = localInstanceContext.instance().getInstanceConfig();

SortType sortType = null; // @todo set to site default
if (getPostsForm.sort() != null) {
sortType = conversionService.convert(getPostsForm.sort(), SortType.class);
}
ListingType listingType = null; // @todo set to site default
ListingType listingType = config != null ? localInstanceContext.instance().getInstanceConfig().getDefaultPostListingType() : null;
Pdzly marked this conversation as resolved.
Show resolved Hide resolved
if (getPostsForm.type_() != null) {
listingType = conversionService.convert(getPostsForm.type_(), ListingType.class);
}

final PostSearchCriteria postSearchCriteria = PostSearchCriteria.builder().page(1)
.listingType(listingType).perPage(20)
.listingType(conversionService.convert(listingType, com.sublinks.sublinksapi.person.enums.ListingType.class)).perPage(20)
.isSavedOnly(getPostsForm.saved_only() != null && getPostsForm.saved_only())
.isDislikedOnly(getPostsForm.disliked_only() != null && getPostsForm.disliked_only())
.sortType(sortType).person(person.orElse(null)).communityIds(communityIds).build();
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/sublinks/sublinksapi/api/lemmy/v3/post/services/LemmyPostService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ public class LemmyPostService {
private final LinkPersonCommunityService linkPersonCommunityService;

public PostView postViewFromPost(final Post post) {
// @todo: what the fuck is this
return postViewBuilder(post).saved(false).read(false).creator_blocked(false).my_vote(0)
.unread_comments(0).build();
}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/sublinks/sublinksapi/post/models/PostSearchCriteria.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.sublinks.sublinksapi.post.models;

import com.sublinks.sublinksapi.person.dto.Person;

import com.sublinks.sublinksapi.person.enums.ListingType;
Pdzly marked this conversation as resolved.
Show resolved Hide resolved
import com.sublinks.sublinksapi.person.enums.SortType;
import java.util.List;
Expand Down