Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

display favicon

Browse Source
This commit is contained in:
Athou
2013-04-03 15:53:57 +02:00
parent 8b9c1786b3
commit 81cbb541b8
11 changed files with 162 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/commafeed/frontend/rest/resources/SubscriptionsREST.java
View File

@@ -59,13 +59,12 @@ public class SubscriptionsREST extends AbstractREST {
Feed fetchedFeed = fetchFeed(req.getUrl());
Feed feed = feedService.findByUrl(fetchedFeed.getUrl());
if (feed == null) {
feed = new Feed();
feed.setUrl(fetchedFeed.getUrl());
feed = fetchedFeed;
feedService.save(feed);
}
FeedSubscription sub = new FeedSubscription();
sub.setCategory("all".equals(req.getCategoryId()) ? null
sub.setCategory(EntriesREST.ALL.equals(req.getCategoryId()) ? null
: feedCategoryService.findById(Long.valueOf(req.getCategoryId())));
sub.setFeed(feed);
sub.setTitle(req.getTitle());
@@ -206,6 +205,7 @@ public class SubscriptionsREST extends AbstractREST {
sub.setId(subscription.getId());
sub.setName(subscription.getTitle());
sub.setMessage(subscription.getFeed().getMessage());
sub.setFeedUrl(subscription.getFeed().getLink());
int size = feedEntryService.getEntries(subscription.getFeed(),
getUser(), true).size();
sub.setUnread(size);
@@ -220,5 +220,4 @@ public class SubscriptionsREST extends AbstractREST {
});
return category;
}
}