Skip to content

Commit 2ca6486

Browse files
elliotBraemitexpert120coderabbitai[bot]
authored
Upgrade staging (#214)
* add feed conflicts and lowercase id * Adds "my feeds" on profile (#204) * feat: update my feeds tab on profile page * feat: update tabs to be routes * fix: double scrollbar * comment unused files in overview tab * fix: revert rsbuild * fmt * fix: add routegen to prettier ignore * clean up, server side --------- Co-authored-by: Elliot Braem <elliot@ejlbraem.com> * Resolve shot's comments (#205) * feat: add name and tag validation to create * feat: add no activity data in activity tab * add coming soon sections for profile page * feat: clicking on leaderboard feed hashtag will redirect to that feed * fix: keeps name on start when disable feed names collapse * fix: rsbuild * fix: add routegen to prettier ignore * fix: add ability to navigate to collapsed feeds in leaderboard * add ability to expand or collapse all * fix: rsbuild * adjustments * nitpicks --------- Co-authored-by: Elliot Braem <elliot@ejlbraem.com> * feat: new feed edit (#198) * feat: update the feed editor * feat: improve performance, and fix bugs * feat: revert local development change * add routegen to pretttier ignore * fix: resolve code rabbit comments * fix some nitpick comments * fix prettier and build config * formats * merge --------- Co-authored-by: Elliot Braem <elliot@ejlbraem.com> * debounce * nitpicks * adds processing step plan * fix auth * Feat: recent content (#208) * Feat: add recent feeds * feat: add recent content to the main feed page * fmt * Update apps/app/src/hooks/use-rss-feed.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * nitpicks --------- Co-authored-by: Elliot Braem <elliot@everything.dev> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Elliot Braem <elliot@ejlbraem.com> * atuh flow * delete old requests * feat: Distributor badges link to relevant source (#210) * add _tabs * init with a rss feed * xml * fmt * append * add service url * adjustments * fix --------- Co-authored-by: Zeeshan Ahmad <itexpert120@outlook.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
1 parent 71026d5 commit 2ca6486

File tree

4 files changed

+5
-17
lines changed

4 files changed

+5
-17
lines changed

apps/api/src/routes/api/feeds.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ feedsRoutes.get(
132132
}),
133133
);
134134
} catch (error) {
135-
c.var.sp.getLogger().error({ error }, `Error fetching feed`);
136135
if (error instanceof NotFoundError) {
137136
return c.json(
138137
ApiErrorResponseSchema.parse({
@@ -143,6 +142,7 @@ feedsRoutes.get(
143142
404,
144143
);
145144
}
145+
c.var.sp.getLogger().error({ error }, `Error fetching feed`);
146146
return c.json(
147147
ApiErrorResponseSchema.parse({
148148
statusCode: 500,

apps/app/src/hooks/use-rss-feed.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export function useRssFeed(feedId: string) {
100100
);
101101

102102
const hasRssFeed = Boolean(rssFeed);
103-
const serviceUrl = rssFeed?.config?.serviceUrl;
103+
const serviceUrl = rssFeed?.config?.serviceUrl ? `${rssFeed.config.serviceUrl}/rss.xml` : undefined;
104104

105105
const {
106106
data: rssData,

apps/app/src/routes/_layout/create/feed/_tabs/index.tsx

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -82,20 +82,8 @@ function BasicInformationComponent() {
8282
type: "manual",
8383
message: "This hashtag is already taken.",
8484
});
85-
} catch (error) {
86-
if (
87-
error &&
88-
typeof error === "object" &&
89-
"response" in error &&
90-
(error.response as { status: number })?.status === 404
91-
) {
92-
form.clearErrors("id");
93-
} else {
94-
form.setError("id", {
95-
type: "manual",
96-
message: "Network error. Please check your connection.",
97-
});
98-
}
85+
} catch {
86+
form.clearErrors("id");
9987
} finally {
10088
setIsValidatingId(false);
10189
}

apps/app/src/store/feed-creation-store.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ const feedCreationStateCreator: StateCreator<
135135
}
136136
rssDistributor.config.feedConfig.title = values.name ?? "";
137137
rssDistributor.config.feedConfig.description = values.description ?? "";
138-
rssDistributor.config.serviceUrl = `https://rss.curate.fun/${values.id}/rss.xml`;
138+
rssDistributor.config.serviceUrl = `https://rss.curate.fun/${values.id}`;
139139
const objectTransform = rssDistributor.transform?.find(
140140
(t) => t.plugin === "@curatedotfun/object-transform",
141141
);

0 commit comments

Comments
 (0)