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

add support for Raven Reader

Browse Source
This commit is contained in:
Athou
2023-08-19 18:52:57 +02:00
parent d7b0d572c1
commit 408809787e
1 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
commafeed-server/src/main/java/com/commafeed/frontend/resource/fever/FeverREST.java
View File

@@ -6,6 +6,7 @@ import java.util.Base64;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
@@ -25,6 +26,8 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.UriInfo; import javax.ws.rs.core.UriInfo;
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import com.codahale.metrics.annotation.Timed; import com.codahale.metrics.annotation.Timed;
import com.commafeed.backend.dao.FeedCategoryDAO; import com.commafeed.backend.dao.FeedCategoryDAO;
import com.commafeed.backend.dao.FeedEntryDAO; import com.commafeed.backend.dao.FeedEntryDAO;
@@ -63,7 +66,6 @@ import lombok.RequiredArgsConstructor;
*/ */
@Path("/fever") @Path("/fever")
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@RequiredArgsConstructor(onConstructor = @__({ @Inject })) @RequiredArgsConstructor(onConstructor = @__({ @Inject }))
@Singleton @Singleton
public class FeverREST { public class FeverREST {
@@ -80,14 +82,34 @@ public class FeverREST {
private final FeedCategoryDAO feedCategoryDAO; private final FeedCategoryDAO feedCategoryDAO;
private final FeedEntryStatusDAO feedEntryStatusDAO; private final FeedEntryStatusDAO feedEntryStatusDAO;
// some readers post data using MultiPart FormData instead of the classic POST
// e.g. Raven Reader
@Consumes(MediaType.MULTIPART_FORM_DATA)
@Path("/user/{userId}") @Path("/user/{userId}")
@POST @POST
@UnitOfWork @UnitOfWork
@Timed @Timed
public FeverResponse handle(@Context UriInfo uri, @PathParam("userId") Long userId, MultivaluedMap<String, String> form) { public FeverResponse formData(@Context UriInfo uri, @PathParam("userId") Long userId, FormDataMultiPart form) {
MultivaluedMap<String, String> query = uri.getQueryParameters(); Map<String, String> params = new HashMap<>();
uri.getQueryParameters().forEach((k, v) -> params.put(k, v.get(0)));
form.getFields().forEach((k, v) -> params.put(k, v.get(0).getValue()));
return handle(userId, params);
}
User user = auth(userId, form.getFirst("api_key")).orElse(null); @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@Path("/user/{userId}")
@POST
@UnitOfWork
@Timed
public FeverResponse formUrlencoded(@Context UriInfo uri, @PathParam("userId") Long userId, MultivaluedMap<String, String> form) {
Map<String, String> params = new HashMap<>();
uri.getQueryParameters().forEach((k, v) -> params.put(k, v.get(0)));
form.forEach((k, v) -> params.put(k, v.get(0)));
return handle(userId, params);
}
public FeverResponse handle(long userId, Map<String, String> params) {
User user = auth(userId, params.get("api_key")).orElse(null);
if (user == null) { if (user == null) {
FeverResponse resp = new FeverResponse(); FeverResponse resp = new FeverResponse();
resp.setAuth(false); resp.setAuth(false);
@@ -100,52 +122,52 @@ public class FeverREST {
List<FeedSubscription> subscriptions = feedSubscriptionDAO.findAll(user); List<FeedSubscription> subscriptions = feedSubscriptionDAO.findAll(user);
resp.setLastRefreshedOnTime(buildLastRefreshedOnTime(subscriptions)); resp.setLastRefreshedOnTime(buildLastRefreshedOnTime(subscriptions));
if (query.containsKey("groups") || query.containsKey("feeds")) { if (params.containsKey("groups") || params.containsKey("feeds")) {
resp.setFeedsGroups(buildFeedsGroups(subscriptions)); resp.setFeedsGroups(buildFeedsGroups(subscriptions));
if (query.containsKey("groups")) { if (params.containsKey("groups")) {
List<FeedCategory> categories = feedCategoryDAO.findAll(user); List<FeedCategory> categories = feedCategoryDAO.findAll(user);
resp.setGroups(buildGroups(categories)); resp.setGroups(buildGroups(categories));
} }
if (query.containsKey("feeds")) { if (params.containsKey("feeds")) {
resp.setFeeds(buildFeeds(subscriptions)); resp.setFeeds(buildFeeds(subscriptions));
} }
} }
if (query.containsKey("unread_item_ids")) { if (params.containsKey("unread_item_ids")) {
resp.setUnreadItemIds(buildUnreadItemIds(user, subscriptions)); resp.setUnreadItemIds(buildUnreadItemIds(user, subscriptions));
} }
if (query.containsKey("saved_item_ids")) { if (params.containsKey("saved_item_ids")) {
resp.setSavedItemIds(buildSavedItemIds(user)); resp.setSavedItemIds(buildSavedItemIds(user));
} }
if (query.containsKey("items")) { if (params.containsKey("items")) {
if (query.containsKey("with_ids")) { if (params.containsKey("with_ids")) {
String withIds = query.getFirst("with_ids"); String withIds = params.get("with_ids");
List<String> entryIds = Stream.of(withIds.split(",")).collect(Collectors.toList()); List<String> entryIds = Stream.of(withIds.split(",")).collect(Collectors.toList());
resp.setItems(buildItems(user, subscriptions, entryIds)); resp.setItems(buildItems(user, subscriptions, entryIds));
} else { } else {
Long sinceId = query.containsKey("since_id") ? Long.valueOf(query.getFirst("since_id")) : null; Long sinceId = params.containsKey("since_id") ? Long.valueOf(params.get("since_id")) : null;
Long maxId = query.containsKey("max_id") ? Long.valueOf(query.getFirst("max_id")) : null; Long maxId = params.containsKey("max_id") ? Long.valueOf(params.get("max_id")) : null;
resp.setItems(buildItems(user, subscriptions, sinceId, maxId)); resp.setItems(buildItems(user, subscriptions, sinceId, maxId));
} }
} }
if (query.containsKey("favicons")) { if (params.containsKey("favicons")) {
resp.setFavicons(buildFavicons(subscriptions)); resp.setFavicons(buildFavicons(subscriptions));
} }
if (query.containsKey("links")) { if (params.containsKey("links")) {
resp.setLinks(Collections.emptyList()); resp.setLinks(Collections.emptyList());
} }
if (form.containsKey("mark") && form.containsKey("id") && form.containsKey("as")) { if (params.containsKey("mark") && params.containsKey("id") && params.containsKey("as")) {
long id = Long.parseLong(form.getFirst("id")); long id = Long.parseLong(params.get("id"));
String before = form.getFirst("before"); String before = params.get("before");
Date olderThan = before == null ? null : Date.from(Instant.ofEpochSecond(Long.parseLong(before))); Date olderThan = before == null ? null : Date.from(Instant.ofEpochSecond(Long.parseLong(before)));
mark(user, form.getFirst("mark"), id, form.getFirst("as"), olderThan); mark(user, params.get("mark"), id, params.get("as"), olderThan);
} }
return resp; return resp;
@@ -242,7 +264,7 @@ public class FeverREST {
i.setFeedId(s.getSubscription().getId()); i.setFeedId(s.getSubscription().getId());
i.setTitle(s.getEntry().getContent().getTitle()); i.setTitle(s.getEntry().getContent().getTitle());
i.setAuthor(s.getEntry().getContent().getAuthor()); i.setAuthor(s.getEntry().getContent().getAuthor());
i.setHtml(s.getEntry().getContent().getContent()); i.setHtml(Optional.ofNullable(s.getEntry().getContent().getContent()).orElse(""));
i.setUrl(s.getEntry().getUrl()); i.setUrl(s.getEntry().getUrl());
i.setSaved(s.isStarred()); i.setSaved(s.isStarred());
i.setRead(s.isRead()); i.setRead(s.isRead());