Fix username/hashtag regexp

masa-finance · Dec 18, 2020 · 5d02321 · 5d02321
1 parent 0ad2a27
commit 5d02321
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/util.go b/util.go
@@ -11,9 +11,9 @@ import (
 )
 
 var (
-	reHashtag    = regexp.MustCompile(`\B(\#[a-zA-Z]+\b)`)
+	reHashtag    = regexp.MustCompile(`\B(\#\w+\b)`)
 	reTwitterURL = regexp.MustCompile(`https:(\/\/t\.co\/([A-Za-z0-9]|[A-Za-z]){10})`)
-	reUsername   = regexp.MustCompile(`\B(\@[a-zA-Z]+\b)`)
+	reUsername   = regexp.MustCompile(`\B(\@\S{1,15}\b)`)
 )
 
 func (s *Scraper) newRequest(method string, url string) (*http.Request, error) {