YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix tag regex

Browse Source
This commit is contained in:
Steven
2022-09-05 20:15:34 +08:00
parent 987bb80770
commit d68891d91d
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/tag.go
View File

@@ -12,6 +12,8 @@ import (
"github.com/labstack/echo/v4" "github.com/labstack/echo/v4"
) )
var tagRegexp = regexp.MustCompile(`#([^\s#]+?) `)
func (s *Server) registerTagRoutes(g *echo.Group) { func (s *Server) registerTagRoutes(g *echo.Group) {
g.GET("/tag", func(c echo.Context) error { g.GET("/tag", func(c echo.Context) error {
ctx := c.Request().Context() ctx := c.Request().Context()
@@ -47,13 +49,9 @@ func (s *Server) registerTagRoutes(g *echo.Group) {
tagMapSet := make(map[string]bool) tagMapSet := make(map[string]bool)
r := regexp.MustCompile(`#([^\s#]+?) `)
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to compile regexp").SetInternal(err)
}
for _, memo := range memoList { for _, memo := range memoList {
for _, rawTag := range r.FindAllString(memo.Content, -1) { for _, rawTag := range tagRegexp.FindAllString(memo.Content, -1) {
tag := r.ReplaceAllString(rawTag, "$1") tag := tagRegexp.ReplaceAllString(rawTag, "$1")
tagMapSet[tag] = true tagMapSet[tag] = true
} }
} }

2
web/src/helpers/marked.ts
View File

@@ -18,8 +18,6 @@ export const MEMO_LINK_REG = /@\[(.+?)\]\((.+?)\)/g;
const parseMarkedToHtml = (markedStr: string): string => { const parseMarkedToHtml = (markedStr: string): string => {
const htmlText = markedStr const htmlText = markedStr
.replace(/([\u4e00-\u9fa5])([A-Za-z0-9?.,;[\]]+)/g, "$1 $2")
.replace(/([A-Za-z0-9?.,;[\]]+)([\u4e00-\u9fa5])/g, "$1 $2")
.replace(CODE_BLOCK_REG, "<pre lang=''>$1</pre>") .replace(CODE_BLOCK_REG, "<pre lang=''>$1</pre>")
.replace(TODO_BLOCK_REG, "<span class='todo-block todo' data-value='TODO'></span>") .replace(TODO_BLOCK_REG, "<span class='todo-block todo' data-value='TODO'></span>")
.replace(DONE_BLOCK_REG, "<span class='todo-block done' data-value='DONE'>✓</span>") .replace(DONE_BLOCK_REG, "<span class='todo-block done' data-value='DONE'>✓</span>")