jazzymc/homarr
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

🐛 RSS empty feed stuck on loading

Browse Source
This commit is contained in:
Tagaishi
2023-08-27 03:07:23 +02:00
parent fa0d525aeb
commit 06a0f30ae7
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/api/routers/rss.ts
View File

@@ -62,13 +62,17 @@ export const rssRouter = createTRPCRouter({
| IRssWidget | IRssWidget
| undefined; | undefined;
if (!rssWidget || input.feedUrls.length === 0) { if (!rssWidget) {
throw new TRPCError({ throw new TRPCError({
code: 'NOT_FOUND', code: 'NOT_FOUND',
message: 'required widget does not exist', message: 'required widget does not exist',
}); });
} }
if (input.feedUrls.length === 0) {
return [{ feed: undefined, success: false }]
}
const result = await Promise.all( const result = await Promise.all(
input.feedUrls.map(async (feedUrl) => input.feedUrls.map(async (feedUrl) =>
getFeedUrl(feedUrl, rssWidget.properties.dangerousAllowSanitizedItemContent) getFeedUrl(feedUrl, rssWidget.properties.dangerousAllowSanitizedItemContent)

4
src/widgets/rss/RssWidgetTile.tsx
View File

@@ -100,7 +100,7 @@ function RssTile({ widget }: RssTileProps) {
); );
} }
if (data.length < 1 || !data[0].feed || isError) { if (data.length === 1 && !data[0].feed || isError) {
return ( return (
<Center h="100%"> <Center h="100%">
<Stack align="center"> <Stack align="center">
@@ -200,7 +200,7 @@ export const useGetRssFeeds = (
// Cache the results for 24 hours // Cache the results for 24 hours
cacheTime: 1000 * 60 * 60 * 24, cacheTime: 1000 * 60 * 60 * 24,
staleTime: 1000 * 60 * refreshInterval, staleTime: 1000 * 60 * refreshInterval,
enabled: !!configName, enabled: !!configName || !!feedUrls,
} }
); );