garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

Merge pull request #661 from Hubcapp/master

Browse Source 
Mark Read button now respects filters
This commit is contained in:
Athou
2014-11-01 11:18:50 +01:00
parent 0a2d2c3f43 4fb60a6ec6
commit e82888f8f3
5 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/app/js/controllers.js
View File

@@ -489,6 +489,7 @@ module.controller('ToolbarCtrl', [
type : $stateParams._type,
id : $stateParams._id,
olderThan : olderThan,
keywords: $location.search().q,
read : true
});
};
@@ -881,6 +882,7 @@ module.controller('FeedListCtrl', [
service.mark({
id : $scope.selectedId,
olderThan : olderThan || $scope.timestamp,
keywords: $location.search().q,
read : true
}, function() {
CategoryService.refresh(function() {

4
src/main/java/com/commafeed/backend/service/FeedEntryService.java
View File

@@ -65,8 +65,8 @@ public class FeedEntryService {
feedEntryStatusDAO.saveOrUpdate(status);
}
public void markSubscriptionEntries(User user, List<FeedSubscription> subscriptions, Date olderThan) {
List<FeedEntryStatus> statuses = feedEntryStatusDAO.findBySubscriptions(user, subscriptions, true, null, null, -1, -1, null, false,
public void markSubscriptionEntries(User user, List<FeedSubscription> subscriptions, Date olderThan, String keywords) {
List<FeedEntryStatus> statuses = feedEntryStatusDAO.findBySubscriptions(user, subscriptions, true, keywords, null, -1, -1, null, false,
false, null);
markList(statuses, olderThan);
cache.invalidateUnreadCount(subscriptions.toArray(new FeedSubscription[0]));

3
src/main/java/com/commafeed/frontend/model/request/MarkRequest.java
View File

@@ -24,6 +24,9 @@ public class MarkRequest implements Serializable {
required = false)
private Long olderThan;
@ApiModelProperty(value = "only mark read if a feed has these keywords in the title or rss content", required = false)
private String keywords;
@ApiModelProperty(value = "if marking a category or 'all', exclude those subscriptions from the marking", required = false)
private List<Long> excludedSubscriptions;

5
src/main/java/com/commafeed/frontend/resource/CategoryREST.java
View File

@@ -243,11 +243,12 @@ public class CategoryREST {
Preconditions.checkNotNull(req.getId());
Date olderThan = req.getOlderThan() == null ? null : new Date(req.getOlderThan());
String keywords = req.getKeywords();
if (ALL.equals(req.getId())) {
List<FeedSubscription> subs = feedSubscriptionDAO.findAll(user);
removeExcludedSubscriptions(subs, req.getExcludedSubscriptions());
feedEntryService.markSubscriptionEntries(user, subs, olderThan);
feedEntryService.markSubscriptionEntries(user, subs, olderThan, keywords);
} else if (STARRED.equals(req.getId())) {
feedEntryService.markStarredEntries(user, olderThan);
} else {
@@ -255,7 +256,7 @@ public class CategoryREST {
List<FeedCategory> categories = feedCategoryDAO.findAllChildrenCategories(user, parent);
List<FeedSubscription> subs = feedSubscriptionDAO.findByCategories(user, categories);
removeExcludedSubscriptions(subs, req.getExcludedSubscriptions());
feedEntryService.markSubscriptionEntries(user, subs, olderThan);
feedEntryService.markSubscriptionEntries(user, subs, olderThan, keywords);
}
return Response.ok().build();
}

3
src/main/java/com/commafeed/frontend/resource/FeedREST.java
View File

@@ -287,10 +287,11 @@ public class FeedREST {
Preconditions.checkNotNull(req.getId());
Date olderThan = req.getOlderThan() == null ? null : new Date(req.getOlderThan());
String keywords = req.getKeywords();
FeedSubscription subscription = feedSubscriptionDAO.findById(user, Long.valueOf(req.getId()));
if (subscription != null) {
feedEntryService.markSubscriptionEntries(user, Arrays.asList(subscription), olderThan);
feedEntryService.markSubscriptionEntries(user, Arrays.asList(subscription), olderThan, keywords);
}
return Response.ok().build();
}