From 36896a8770cef6052da31eef67b8820a7eb0a0bd Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Mon, 11 Dec 2023 13:18:43 +0800 Subject: [PATCH] max rss feed defaults to 256 --- packages/api/src/resolvers/subscriptions/index.ts | 6 +++--- packages/api/src/util.ts | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/api/src/resolvers/subscriptions/index.ts b/packages/api/src/resolvers/subscriptions/index.ts index 77464dbec..ffe9c5996 100644 --- a/packages/api/src/resolvers/subscriptions/index.ts +++ b/packages/api/src/resolvers/subscriptions/index.ts @@ -223,7 +223,7 @@ export const subscribeResolver = authorized< } // create new rss subscription - const MAX_RSS_SUBSCRIPTIONS = 150 + const MAX_RSS_SUBSCRIPTIONS = env.subscription.feed.max // validate rss feed const feed = await parseFeed(input.url) if (!feed) { @@ -232,7 +232,7 @@ export const subscribeResolver = authorized< } } - // limit number of rss subscriptions to 150 + // limit number of rss subscriptions to max const results = (await getRepository(Subscription).query( `insert into omnivore.subscriptions (name, url, description, type, user_id, icon, auto_add_to_library, is_private) select $1, $2, $3, $4, $5, $6, $7, $8 from omnivore.subscriptions @@ -263,7 +263,7 @@ export const subscribeResolver = authorized< // create a cloud task to fetch rss feed item for the new subscription await enqueueRssFeedFetch({ userIds: [uid], - url: input.url, + url: feed.url, subscriptionIds: [newSubscription.id], scheduledDates: [new Date()], // fetch immediately fetchedDates: [null], diff --git a/packages/api/src/util.ts b/packages/api/src/util.ts index 4b34f079e..c056d17cd 100755 --- a/packages/api/src/util.ts +++ b/packages/api/src/util.ts @@ -311,7 +311,9 @@ export function getEnv(): BackendEnv { const subscription = { feed: { - max: parseInt(parse('SUBSCRIPTION_FEED_MAX'), 10), + max: parse('SUBSCRIPTION_FEED_MAX') + ? parseInt(parse('SUBSCRIPTION_FEED_MAX'), 10) + : 256, // default to 256 }, }