Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

chore: fix rss route (#2010)

boojack28203bbaf958
diff --git a/api/v1/rss.go b/api/v1/rss.go
index 3e6e711e4..7d130cf24 100644
--- a/api/v1/rss.go
+++ b/api/v1/rss.go
@@ -78,42 +78,6 @@ func (s *APIV1Service) registerRSSRoutes(g *echo.Group) {
c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationXMLCharsetUTF8)
return c.String(http.StatusOK, rss)
})
-
- g.GET("/u/:username/rss.xml", func(c echo.Context) error {
- ctx := c.Request().Context()
- username := c.Param("username")
- user, err := s.Store.GetUser(ctx, &store.FindUser{Username: &username})
- if err != nil {
- return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find user").SetInternal(err)
- }
- if user == nil {
- return echo.NewHTTPError(http.StatusNotFound, "User not found")
- }
-
- systemCustomizedProfile, err := s.getSystemCustomizedProfile(ctx)
- if err != nil {
- return echo.NewHTTPError(http.StatusInternalServerError, "Failed to get system customized profile").SetInternal(err)
- }
-
- normalStatus := store.Normal
- memoFind := store.FindMemo{
- CreatorID: &user.ID,
- RowStatus: &normalStatus,
- VisibilityList: []store.Visibility{store.Public},
- }
- memoList, err := s.Store.ListMemos(ctx, &memoFind)
- if err != nil {
- return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find memo list").SetInternal(err)
- }
-
- baseURL := c.Scheme() + "://" + c.Request().Host
- rss, err := s.generateRSSFromMemoList(ctx, memoList, baseURL, systemCustomizedProfile)
- if err != nil {
- return echo.NewHTTPError(http.StatusInternalServerError, "Failed to generate rss").SetInternal(err)
- }
- c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationXMLCharsetUTF8)
- return c.String(http.StatusOK, rss)
- })
}
func (s *APIV1Service) generateRSSFromMemoList(ctx context.Context, memoList []*store.Memo, baseURL string, profile *CustomizedProfile) (string, error) {
diff --git a/web/src/components/UserBanner.tsx b/web/src/components/UserBanner.tsx
index 909f03e75..cdf1b8de3 100644
--- a/web/src/components/UserBanner.tsx
+++ b/web/src/components/UserBanner.tsx
@@ -64,7 +64,7 @@ const UserBanner = () => {
</button>
<a
className="w-full px-3 truncate text-left leading-10 cursor-pointer rounded flex flex-row justify-start items-center dark:text-gray-200 hover:bg-gray-100 dark:hover:bg-zinc-800"
- href={`/u/${user?.username}/rss.xml`}
+ href={`/u/${user?.id}/rss.xml`}
target="_blank"
>
<Icon.Rss className="w-5 h-auto mr-2 opacity-80" /> RSS