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

fix: tag regexp (#409)

Browse Source 
* chore: enable `no-unused-vars`

* fix: tag regexp
This commit is contained in:
boojack
2022-11-04 08:28:29 +08:00
committed by GitHub
parent c27e38b11c
commit 8e2844e0c5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/tag.go
View File

@@ -12,7 +12,7 @@ import (
"github.com/labstack/echo/v4" "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) { func (s *Server) registerTagRoutes(g *echo.Group) {
g.GET("/tag", func(c echo.Context) error { g.GET("/tag", func(c echo.Context) error {
@@ -50,9 +50,11 @@ func (s *Server) registerTagRoutes(g *echo.Group) {
tagMapSet := make(map[string]bool) tagMapSet := make(map[string]bool)
for _, memo := range memoList { for _, memo := range memoList {
for _, rawTag := range tagRegexp.FindAllString(memo.Content, -1) { for _, tagRegexp := range tagRegexpList {
tag := tagRegexp.ReplaceAllString(rawTag, "$1") for _, rawTag := range tagRegexp.FindAllString(memo.Content, -1) {
tagMapSet[tag] = true tag := tagRegexp.ReplaceAllString(rawTag, "$1")
tagMapSet[tag] = true
}
} }
} }