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.

fix: tag regexp (#409)

boojack8e2844e0c51f
diff --git a/server/tag.go b/server/tag.go
index 48b026793..493b80574 100644
--- a/server/tag.go
+++ b/server/tag.go
@@ -12,7 +12,7 @@ import (
"github.com/labstack/echo/v4"
)
-var tagRegexp = regexp.MustCompile(`[^\s]?#([^\s#]+?) `)
+var tagRegexpList = []*regexp.Regexp{regexp.MustCompile(`^#([^\s#]+?) `), regexp.MustCompile(`\s#([^\s#]+?) `)}
func (s *Server) registerTagRoutes(g *echo.Group) {
g.GET("/tag", func(c echo.Context) error {
@@ -50,9 +50,11 @@ func (s *Server) registerTagRoutes(g *echo.Group) {
tagMapSet := make(map[string]bool)
for _, memo := range memoList {
- for _, rawTag := range tagRegexp.FindAllString(memo.Content, -1) {
- tag := tagRegexp.ReplaceAllString(rawTag, "$1")
- tagMapSet[tag] = true
+ for _, tagRegexp := range tagRegexpList {
+ for _, rawTag := range tagRegexp.FindAllString(memo.Content, -1) {
+ tag := tagRegexp.ReplaceAllString(rawTag, "$1")
+ tagMapSet[tag] = true
+ }
}
}