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 FeedMe

Browse Source
This commit is contained in:
Athou
2023-08-28 07:49:59 +02:00
parent a402c5d7d8
commit 1a4517d6a3
1 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,6 +70,7 @@ import lombok.RequiredArgsConstructor;
@Singleton @Singleton
public class FeverREST { public class FeverREST {
private static final String PATH = "/user/{userId}{optionalTrailingFever : (/fever)?}{optionalTrailingSlash : (/)?}";
private static final int UNREAD_ITEM_IDS_BATCH_SIZE = 1000; private static final int UNREAD_ITEM_IDS_BATCH_SIZE = 1000;
private static final int SAVED_ITEM_IDS_BATCH_SIZE = 1000; private static final int SAVED_ITEM_IDS_BATCH_SIZE = 1000;
private static final int ITEMS_BATCH_SIZE = 200; private static final int ITEMS_BATCH_SIZE = 200;
@@ -82,26 +83,9 @@ 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 // expected Fever API
// e.g. Raven Reader
@Consumes(MediaType.MULTIPART_FORM_DATA)
// some readers add a trailing /fever, just ignore it
// e.g. FocusReader
@Path("/user/{userId}{fever : (/fever)?}")
@POST
@UnitOfWork
@Timed
public FeverResponse formData(@Context UriInfo uri, @PathParam("userId") Long userId, FormDataMultiPart form) {
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);
}
@Consumes(MediaType.APPLICATION_FORM_URLENCODED) @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
// some clients add a trailing /fever, just ignore it @Path(PATH)
// e.g. FocusReader
@Path("/user/{userId}{fever : (/fever)?}")
@POST @POST
@UnitOfWork @UnitOfWork
@Timed @Timed
@@ -112,6 +96,32 @@ public class FeverREST {
return handle(userId, params); return handle(userId, params);
} }
// workaround for some readers that post data without any media type, and all params in the url
// e.g. FeedMe
@Path(PATH)
@POST
@UnitOfWork
@Timed
public FeverResponse noForm(@Context UriInfo uri, @PathParam("userId") Long userId) {
Map<String, String> params = new HashMap<>();
uri.getQueryParameters().forEach((k, v) -> params.put(k, v.get(0)));
return handle(userId, params);
}
// workaround for some readers that post data using MultiPart FormData instead of the classic POST
// e.g. Raven Reader
@Consumes(MediaType.MULTIPART_FORM_DATA)
@Path(PATH)
@POST
@UnitOfWork
@Timed
public FeverResponse formData(@Context UriInfo uri, @PathParam("userId") Long userId, FormDataMultiPart form) {
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);
}
public FeverResponse handle(long userId, Map<String, String> params) { public FeverResponse handle(long userId, Map<String, String> params) {
User user = auth(userId, params.get("api_key")).orElse(null); User user = auth(userId, params.get("api_key")).orElse(null);
if (user == null) { if (user == null) {
@@ -150,7 +160,7 @@ public class FeverREST {
if (params.containsKey("items")) { if (params.containsKey("items")) {
if (params.containsKey("with_ids")) { if (params.containsKey("with_ids")) {
String withIds = params.get("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(",")).map(String::trim).collect(Collectors.toList());
resp.setItems(buildItems(user, subscriptions, entryIds)); resp.setItems(buildItems(user, subscriptions, entryIds));
} else { } else {
Long sinceId = params.containsKey("since_id") ? Long.valueOf(params.get("since_id")) : null; Long sinceId = params.containsKey("since_id") ? Long.valueOf(params.get("since_id")) : null;