diff --git a/commafeed-client/src/app/types.ts b/commafeed-client/src/app/types.ts index f27c944c..d4ea0ff1 100644 --- a/commafeed-client/src/app/types.ts +++ b/commafeed-client/src/app/types.ts @@ -117,7 +117,6 @@ export interface GetEntriesRequest { newerThan?: number order?: ReadingOrder keywords?: string - onlyIds?: boolean excludedSubscriptionIds?: string tag?: string } diff --git a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java index 359e7e13..70945fa2 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java @@ -120,7 +120,7 @@ public class FeedEntryStatusDAO extends GenericDAO { public List findBySubscriptions(User user, List subs, boolean unreadOnly, List keywords, Instant newerThan, int offset, int limit, ReadingOrder order, boolean includeContent, - boolean onlyIds, String tag, Long minEntryId, Long maxEntryId) { + String tag, Long minEntryId, Long maxEntryId) { JPAQuery query = query().select(entry, subscription, status).from(entry); query.join(entry.feed, feed); diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryService.java index a526c8eb..399989e3 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryService.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedEntryService.java @@ -121,7 +121,7 @@ public class FeedEntryService { public void markSubscriptionEntries(User user, List subscriptions, Instant olderThan, Instant insertedBefore, List keywords) { List statuses = feedEntryStatusDAO.findBySubscriptions(user, subscriptions, true, keywords, null, -1, -1, null, - false, false, null, null, null); + false, null, null, null); markList(statuses, olderThan, insertedBefore); cache.invalidateUnreadCount(subscriptions.toArray(new FeedSubscription[0])); cache.invalidateUserRootCategory(user); diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/CategoryREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/CategoryREST.java index b9868ef8..374f03a4 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/CategoryREST.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/resource/CategoryREST.java @@ -109,7 +109,6 @@ public class CategoryREST { @Parameter(description = "ordering") @QueryParam("order") @DefaultValue("desc") ReadingOrder order, @Parameter( description = "search for keywords in either the title or the content of the entries, separated by spaces, 3 characters minimum") @QueryParam("keywords") String keywords, - @Parameter(description = "return only entry ids") @DefaultValue("false") @QueryParam("onlyIds") boolean onlyIds, @Parameter( description = "comma-separated list of excluded subscription ids") @QueryParam("excludedSubscriptionIds") String excludedSubscriptionIds, @Parameter(description = "keep only entries tagged with this tag") @QueryParam("tag") String tag) { @@ -143,7 +142,7 @@ public class CategoryREST { List subs = feedSubscriptionDAO.findAll(user); removeExcludedSubscriptions(subs, excludedIds); List list = feedEntryStatusDAO.findBySubscriptions(user, subs, unreadOnly, entryKeywords, newerThanDate, - offset, limit + 1, order, true, onlyIds, tag, null, null); + offset, limit + 1, order, true, tag, null, null); for (FeedEntryStatus status : list) { entries.getEntries().add(Entry.build(status, config.getApplicationSettings().getImageProxyEnabled())); @@ -151,7 +150,7 @@ public class CategoryREST { } else if (STARRED.equals(id)) { entries.setName("Starred"); - List starred = feedEntryStatusDAO.findStarred(user, newerThanDate, offset, limit + 1, order, !onlyIds); + List starred = feedEntryStatusDAO.findStarred(user, newerThanDate, offset, limit + 1, order, true); for (FeedEntryStatus status : starred) { entries.getEntries().add(Entry.build(status, config.getApplicationSettings().getImageProxyEnabled())); } @@ -162,7 +161,7 @@ public class CategoryREST { List subs = feedSubscriptionDAO.findByCategories(user, categories); removeExcludedSubscriptions(subs, excludedIds); List list = feedEntryStatusDAO.findBySubscriptions(user, subs, unreadOnly, entryKeywords, newerThanDate, - offset, limit + 1, order, true, onlyIds, tag, null, null); + offset, limit + 1, order, true, tag, null, null); for (FeedEntryStatus status : list) { entries.getEntries().add(Entry.build(status, config.getApplicationSettings().getImageProxyEnabled())); @@ -202,13 +201,11 @@ public class CategoryREST { @Parameter(description = "date ordering") @QueryParam("order") @DefaultValue("desc") ReadingOrder order, @Parameter( description = "search for keywords in either the title or the content of the entries, separated by spaces, 3 characters minimum") @QueryParam("keywords") String keywords, - @Parameter(description = "return only entry ids") @DefaultValue("false") @QueryParam("onlyIds") boolean onlyIds, @Parameter( description = "comma-separated list of excluded subscription ids") @QueryParam("excludedSubscriptionIds") String excludedSubscriptionIds, @Parameter(description = "keep only entries tagged with this tag") @QueryParam("tag") String tag) { - Response response = getCategoryEntries(user, id, readType, newerThan, offset, limit, order, keywords, onlyIds, - excludedSubscriptionIds, tag); + Response response = getCategoryEntries(user, id, readType, newerThan, offset, limit, order, keywords, excludedSubscriptionIds, tag); if (response.getStatus() != Status.OK.getStatusCode()) { return response; } diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java index bc600bb4..0d25fa42 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java @@ -143,10 +143,8 @@ public class FeedREST { @Parameter(description = "only entries newer than this") @QueryParam("newerThan") Long newerThan, @Parameter(description = "offset for paging") @DefaultValue("0") @QueryParam("offset") int offset, @Parameter(description = "limit for paging, default 20, maximum 1000") @DefaultValue("20") @QueryParam("limit") int limit, - @Parameter(description = "ordering") @QueryParam("order") @DefaultValue("desc") ReadingOrder order, - @Parameter( - description = "search for keywords in either the title or the content of the entries, separated by spaces, 3 characters minimum") @QueryParam("keywords") String keywords, - @Parameter(description = "return only entry ids") @DefaultValue("false") @QueryParam("onlyIds") boolean onlyIds) { + @Parameter(description = "ordering") @QueryParam("order") @DefaultValue("desc") ReadingOrder order, @Parameter( + description = "search for keywords in either the title or the content of the entries, separated by spaces, 3 characters minimum") @QueryParam("keywords") String keywords) { Preconditions.checkNotNull(id); Preconditions.checkNotNull(readType); @@ -174,7 +172,7 @@ public class FeedREST { entries.setFeedLink(subscription.getFeed().getLink()); List list = feedEntryStatusDAO.findBySubscriptions(user, Collections.singletonList(subscription), unreadOnly, - entryKeywords, newerThanDate, offset, limit + 1, order, true, onlyIds, null, null, null); + entryKeywords, newerThanDate, offset, limit + 1, order, true, null, null, null); for (FeedEntryStatus status : list) { entries.getEntries().add(Entry.build(status, config.getApplicationSettings().getImageProxyEnabled())); @@ -209,12 +207,10 @@ public class FeedREST { @Parameter(description = "only entries newer than this") @QueryParam("newerThan") Long newerThan, @Parameter(description = "offset for paging") @DefaultValue("0") @QueryParam("offset") int offset, @Parameter(description = "limit for paging, default 20, maximum 1000") @DefaultValue("20") @QueryParam("limit") int limit, - @Parameter(description = "date ordering") @QueryParam("order") @DefaultValue("desc") ReadingOrder order, - @Parameter( - description = "search for keywords in either the title or the content of the entries, separated by spaces, 3 characters minimum") @QueryParam("keywords") String keywords, - @Parameter(description = "return only entry ids") @DefaultValue("false") @QueryParam("onlyIds") boolean onlyIds) { + @Parameter(description = "date ordering") @QueryParam("order") @DefaultValue("desc") ReadingOrder order, @Parameter( + description = "search for keywords in either the title or the content of the entries, separated by spaces, 3 characters minimum") @QueryParam("keywords") String keywords) { - Response response = getFeedEntries(user, id, readType, newerThan, offset, limit, order, keywords, onlyIds); + Response response = getFeedEntries(user, id, readType, newerThan, offset, limit, order, keywords); if (response.getStatus() != Status.OK.getStatusCode()) { return response; } diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/fever/FeverREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/fever/FeverREST.java index b81159f3..84a31b41 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/fever/FeverREST.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/resource/fever/FeverREST.java @@ -253,7 +253,7 @@ public class FeverREST { private List buildUnreadItemIds(User user, List subscriptions) { List statuses = feedEntryStatusDAO.findBySubscriptions(user, subscriptions, true, null, null, 0, - UNREAD_ITEM_IDS_BATCH_SIZE, ReadingOrder.desc, false, true, null, null, null); + UNREAD_ITEM_IDS_BATCH_SIZE, ReadingOrder.desc, false, null, null, null); return statuses.stream().map(s -> s.getEntry().getId()).toList(); } @@ -281,7 +281,7 @@ public class FeverREST { private List buildItems(User user, List subscriptions, Long sinceId, Long maxId) { List statuses = feedEntryStatusDAO.findBySubscriptions(user, subscriptions, false, null, null, 0, ITEMS_BATCH_SIZE, - ReadingOrder.desc, false, false, null, sinceId, maxId); + ReadingOrder.desc, false, null, sinceId, maxId); return statuses.stream().map(this::mapStatus).toList(); } diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java b/commafeed-server/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java index 13355bd7..dabda582 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/servlet/NextUnreadServlet.java @@ -68,7 +68,7 @@ public class NextUnreadServlet extends HttpServlet { if (StringUtils.isBlank(categoryId) || CategoryREST.ALL.equals(categoryId)) { List subs = feedSubscriptionDAO.findAll(user.get()); List statuses = feedEntryStatusDAO.findBySubscriptions(user.get(), subs, true, null, null, 0, 1, order, - true, false, null, null, null); + true, null, null, null); s = Iterables.getFirst(statuses, null); } else { FeedCategory category = feedCategoryDAO.findById(user.get(), Long.valueOf(categoryId)); @@ -76,7 +76,7 @@ public class NextUnreadServlet extends HttpServlet { List children = feedCategoryDAO.findAllChildrenCategories(user.get(), category); List subscriptions = feedSubscriptionDAO.findByCategories(user.get(), children); List statuses = feedEntryStatusDAO.findBySubscriptions(user.get(), subscriptions, true, null, null, 0, - 1, order, true, false, null, null, null); + 1, order, true, null, null, null); s = Iterables.getFirst(statuses, null); } }