From 8e2844e0c51f59acb7d174eeb9ef72baa4465871 Mon Sep 17 00:00:00 2001 From: boojack Date: Fri, 4 Nov 2022 08:28:29 +0800 Subject: [PATCH] fix: tag regexp (#409) * chore: enable `no-unused-vars` * fix: tag regexp --- server/tag.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 + } } }