Merge pull request #3262 from omnivore-app/fix/feed-folder

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