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.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: use gomark in rss api
Stevene0290b94b40e
diff --git a/api/v1/rss.go b/api/v1/rss.goindex 32cddd581..490f3b41a 100644--- a/api/v1/rss.go+++ b/api/v1/rss.go@@ -1,7 +1,6 @@package v1import (- "bytes""context""encoding/json""fmt"@@ -12,9 +11,11 @@ import ("github.com/gorilla/feeds""github.com/labstack/echo/v4"- "github.com/yuin/goldmark""github.com/usememos/memos/internal/util"+ "github.com/usememos/memos/plugin/gomark/parser"+ "github.com/usememos/memos/plugin/gomark/parser/tokenizer"+ "github.com/usememos/memos/plugin/gomark/render/html""github.com/usememos/memos/store")@@ -117,10 +118,14 @@ func (s *APIV1Service) generateRSSFromMemoList(ctx context.Context, memoList []*if err != nil {return "", err}+ description, err := getRSSItemDescription(memoMessage.Content)+ if err != nil {+ return "", err+ }feed.Items[i] = &feeds.Item{Title: getRSSItemTitle(memoMessage.Content),Link: &feeds.Link{Href: baseURL + "/m/" + fmt.Sprintf("%d", memoMessage.ID)},- Description: getRSSItemDescription(memoMessage.Content),+ Description: description,Created: time.Unix(memoMessage.CreatedTs, 0),Enclosure: &feeds.Enclosure{Url: baseURL + "/m/" + fmt.Sprintf("%d", memoMessage.ID) + "/image"},}@@ -182,7 +187,7 @@ func getRSSItemTitle(content string) string {return title}-func getRSSItemDescription(content string) string {+func getRSSItemDescription(content string) (string, error) {var description stringif isTitleDefined(content) {var firstLineEnd = strings.Index(content, "\n")@@ -191,12 +196,13 @@ func getRSSItemDescription(content string) string {description = content}- // TODO: use our `./plugin/gomark` parser to handle markdown-like content.- var buf bytes.Buffer- if err := goldmark.Convert([]byte(description), &buf); err != nil {- panic(err)+ tokens := tokenizer.Tokenize(description)+ nodes, err := parser.Parse(tokens)+ if err != nil {+ return "", err}- return buf.String()+ result := html.NewHTMLRender().Render(nodes)+ return result, nil}func isTitleDefined(content string) bool {diff --git a/go.mod b/go.modindex 5fcb25fd3..249852172 100644--- a/go.mod+++ b/go.mod@@ -25,7 +25,6 @@ require (github.com/stretchr/testify v1.8.4github.com/swaggo/echo-swagger v1.4.1github.com/swaggo/swag v1.16.2- github.com/yuin/goldmark v1.6.0go.uber.org/zap v1.26.0golang.org/x/crypto v0.16.0golang.org/x/exp v0.0.0-20231206192017-f3f8817b8debdiff --git a/go.sum b/go.sumindex e942d03ca..7605752bd 100644--- a/go.sum+++ b/go.sum@@ -486,8 +486,6 @@ github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQgithub.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=-github.com/yuin/goldmark v1.6.0 h1:boZcn2GTjpsynOsC0iJHnBWa4Bi0qzfJjthwauItG68=-github.com/yuin/goldmark v1.6.0/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=