Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
Hongbo Wu
2023-11-09 22:39:51 +08:00
parent 98cc0e2b82
commit 69dc1ba47a
8 changed files with 53 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
packages/api/src/resolvers/subscriptions/index.ts
View File

@ -228,35 +228,37 @@ export const subscribeResolver = authorized<
const feed = await parser.parseURL(input.url)
const results = await authTrx(async (t) => {
await t.getRepository(Feed).upsert(
{
url: feed.feedUrl,
title: feed.title,
description: feed.description,
image: feed.image?.url,
},
{
conflictPaths: ['url'],
skipUpdateIfNoValuesChanged: true,
}
)
if (!input.isPrivate) {
await t.getRepository(Feed).upsert(
{
url: feed.feedUrl,
title: feed.title,
description: feed.description,
image: feed.image?.url,
},
{
conflictPaths: ['url'],
skipUpdateIfNoValuesChanged: true,
}
)
}
// limit number of rss subscriptions to 150
const results = (await t.getRepository(Subscription).query(
`insert into omnivore.subscriptions (name, url, description, type, user_id, icon, auto_add_to_library, is_public)
`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
where user_id = $5 and type = 'RSS' and status = 'ACTIVE'
having count(*) < $9
returning *;`,
[
feed.title,
input.url,
feed.feedUrl,
feed.description || null,
SubscriptionType.Rss,
uid,
feed.image?.url || null,
input.autoAddToLibrary ?? null,
input.isPublic ?? null,
input.isPrivate ?? null,
MAX_RSS_SUBSCRIPTIONS,
]
)) as Subscription[]
@ -335,7 +337,7 @@ export const updateSubscriptionResolver = authorized<
? new Date(input.scheduledAt)
: undefined,
autoAddToLibrary: input.autoAddToLibrary ?? undefined,
isPublic: input.isPublic ?? undefined,
isPrivate: input.isPrivate ?? undefined,
})
return repo.findOneByOrFail({