From 15dc05ca1a2c9241efa57675b1d23f2e8311be47 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Mon, 18 Dec 2023 19:52:44 +0800 Subject: [PATCH] fix sending rss feed to inbox folder --- packages/api/src/routers/svc/rss_feed.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/api/src/routers/svc/rss_feed.ts b/packages/api/src/routers/svc/rss_feed.ts index 065a8406b..671fbebd5 100644 --- a/packages/api/src/routers/svc/rss_feed.ts +++ b/packages/api/src/routers/svc/rss_feed.ts @@ -1,6 +1,9 @@ /* eslint-disable @typescript-eslint/no-misused-promises */ import express from 'express' -import { Subscription } from '../../entity/subscription' +import { + DEFAULT_SUBSCRIPTION_FOLDER, + Subscription, +} from '../../entity/subscription' import { SubscriptionStatus, SubscriptionType } from '../../generated/graphql' import { readPushSubscription } from '../../pubsub' import { getRepository } from '../../repository' @@ -36,7 +39,7 @@ export function rssFeedRouter() { ARRAY_AGG(coalesce(scheduled_at, NOW())) AS "scheduledDates", ARRAY_AGG(last_fetched_checksum) AS checksums, ARRAY_AGG(fetch_content) AS "fetchContents", - ARRAY_AGG(folder) AS folders + ARRAY_AGG(coalesce(folder, $3)) AS folders FROM omnivore.subscriptions WHERE @@ -46,7 +49,11 @@ export function rssFeedRouter() { GROUP BY url `, - [SubscriptionType.Rss, SubscriptionStatus.Active] + [ + SubscriptionType.Rss, + SubscriptionStatus.Active, + DEFAULT_SUBSCRIPTION_FOLDER, + ] )) as RssSubscriptionGroup[] // create a cloud taks to fetch rss feed item for each subscription