Adjust MentionPattern to not match users mid-sentence (or email addresses)

Fix link to user profile, update based on adjusted MentionPattern

diff --git a/modules/base/markdown.go b/modules/base/markdown.go
index b2f94c480b1e9bcd7f720d370aaa6e15c3594344..f18d459ff6689b12accaeebc0de19e2bd789c436 100644 (file)
--- a/modules/base/markdown.go
+++ b/modules/base/markdown.go
@@ -100,7 +100,7 @@ func (options *CustomRender) Image(out *bytes.Buffer, link []byte, title []byte,
 }
 
 var (
-       MentionPattern     = regexp.MustCompile(`@[0-9a-zA-Z_]{1,}`)
+       MentionPattern     = regexp.MustCompile(`(\s@)[0-9a-zA-Z_]{1,}`)
        commitPattern      = regexp.MustCompile(`(\s|^)https?.*commit/[0-9a-zA-Z]+(#+[0-9a-zA-Z-]*)?`)
        issueFullPattern   = regexp.MustCompile(`(\s|^)https?.*issues/[0-9]+(#+[0-9a-zA-Z-]*)?`)
        issueIndexPattern  = regexp.MustCompile(`#[0-9]+`)
@@ -123,7 +123,7 @@ func RenderSpecialLink(rawBytes []byte, urlPrefix string) []byte {
                        ms := MentionPattern.FindAll(line, -1)
                        for _, m := range ms {
                                line = bytes.Replace(line, m,
-                                       []byte(fmt.Sprintf(`<a href="%s/user/%s">%s</a>`, setting.AppSubUrl, m[1:], m)), -1)
+                                       []byte(fmt.Sprintf(`<a href="%s/%s">%s</a>`, setting.AppSubUrl, m[2:], m)), -1)
                        }
                }