diff --git a/server/rss.go b/server/rss.go index 1d04436a..f034634c 100644 --- a/server/rss.go +++ b/server/rss.go @@ -14,10 +14,6 @@ import ( ) func generateRSSFromMemoList(memoList []*api.Memo, baseURL string, profile *api.CustomizedProfile) (string, error) { - if len(memoList) == 0 { - return "", nil - } - feed := &feeds.Feed{ Title: profile.Name, Link: &feeds.Link{Href: baseURL}, @@ -56,10 +52,7 @@ func generateRSSFromMemoList(memoList []*api.Memo, baseURL string, profile *api. if err != nil { return "", err } - - rssPrefix := `` - - return rss[len(rssPrefix):], nil + return rss, nil } func (s *Server) registerRSSRoutes(g *echo.Group) { @@ -84,13 +77,13 @@ func (s *Server) registerRSSRoutes(g *echo.Group) { } baseURL := c.Scheme() + "://" + c.Request().Host - rss, err := generateRSSFromMemoList(memoList, baseURL, &systemCustomizedProfile) if err != nil { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to generate rss").SetInternal(err) } - return c.XMLBlob(http.StatusOK, []byte(rss)) + c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationXMLCharsetUTF8) + return c.String(http.StatusOK, rss) }) g.GET("/u/:id/rss.xml", func(c echo.Context) error { @@ -125,8 +118,8 @@ func (s *Server) registerRSSRoutes(g *echo.Group) { if err != nil { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to generate rss").SetInternal(err) } - - return c.XMLBlob(http.StatusOK, []byte(rss)) + c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationXMLCharsetUTF8) + return c.String(http.StatusOK, rss) }) } diff --git a/web/src/less/memos-header.less b/web/src/less/memos-header.less index eb8a6165..66b61844 100644 --- a/web/src/less/memos-header.less +++ b/web/src/less/memos-header.less @@ -13,7 +13,7 @@ } > .title-text { - @apply font-bold text-lg leading-10 mr-2 text-ellipsis shrink-0 cursor-pointer overflow-hidden text-gray-700 dark:text-gray-200; + @apply font-bold text-lg leading-10 mr-1 text-ellipsis shrink-0 cursor-pointer overflow-hidden text-gray-700 dark:text-gray-200; } }