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.

revert: fix: exclude all punctuation chars except underscore in tags (#2033)

boojack56c321aeaa75
diff --git a/api/v1/tag.go b/api/v1/tag.go
index 3bf6e39f7..acd8407b4 100644
--- a/api/v1/tag.go
+++ b/api/v1/tag.go
@@ -176,7 +176,7 @@ func convertTagFromStore(tag *store.Tag) *Tag {
}
}
-var tagRegexp = regexp.MustCompile(`#((?:[^\s\p{P}]|_)+)`)
+var tagRegexp = regexp.MustCompile(`#([^\s#,]+)`)
func findTagListFromMemoContent(memoContent string) []string {
tagMapSet := make(map[string]bool)
diff --git a/api/v1/tag_test.go b/api/v1/tag_test.go
index 791d83db4..10578aab3 100644
--- a/api/v1/tag_test.go
+++ b/api/v1/tag_test.go
@@ -2,8 +2,6 @@ package v1
import (
"testing"
-
- "golang.org/x/exp/slices"
)
func TestFindTagListFromMemoContent(t *testing.T) {
@@ -37,16 +35,12 @@ func TestFindTagListFromMemoContent(t *testing.T) {
},
{
memoContent: "#tag1 http://123123.com?123123#tag2 \n#tag3 #tag4 http://123123.com?123123#tag2) ",
- want: []string{"tag1", "tag2", "tag3", "tag4"},
- },
- {
- memoContent: "#tag1,#tag2! #tag3.. #tag_4",
- want: []string{"tag1", "tag2", "tag3", "tag_4"},
+ want: []string{"tag1", "tag2", "tag2)", "tag3", "tag4"},
},
}
for _, test := range tests {
result := findTagListFromMemoContent(test.memoContent)
- if !slices.Equal(result, test.want) {
+ if len(result) != len(test.want) {
t.Errorf("Find tag list %s: got result %v, want %v.", test.memoContent, result, test.want)
}
}
diff --git a/web/src/labs/marked/parser/Tag.tsx b/web/src/labs/marked/parser/Tag.tsx
index d7f2b967d..95e197a8a 100644
--- a/web/src/labs/marked/parser/Tag.tsx
+++ b/web/src/labs/marked/parser/Tag.tsx
@@ -1,6 +1,6 @@
import { matcher } from "../matcher";
-export const TAG_REG = /#((?:[^\s\p{P}]|_)+)/u;
+export const TAG_REG = /#([^\s#,]+)/;
const renderer = (rawStr: string) => {
const matchResult = matcher(rawStr, TAG_REG);