diff options
author | FChannel <> | 2021-07-22 16:08:51 -0700 |
---|---|---|
committer | FChannel <> | 2021-07-22 16:08:51 -0700 |
commit | 213683bf7245a05aa734ac2bb26fba60705ba5ee (patch) | |
tree | f0dd36d0274c274d996c8fc56726fdc49caeeec7 | |
parent | bef846b77490b6f4eb06dcec70aa684490ea0fd7 (diff) |
regex escape hyphens in regex for quote and replies
-rw-r--r-- | client.go | 4 | ||||
-rw-r--r-- | main.go | 2 |
2 files changed, 2 insertions, 4 deletions
@@ -10,7 +10,6 @@ import ( "sort" "regexp" "time" - "fmt" ) var Key *string = new(string) @@ -635,7 +634,6 @@ func MediaProxy(url string) string { return url } - fmt.Println("") MediaHashs[HashMedia(url)] = url return "/api/media?hash=" + HashMedia(url) } @@ -643,7 +641,7 @@ func MediaProxy(url string) string { func ParseContent(db *sql.DB, board Actor, op string, content string, thread ObjectBase) template.HTML { var nContent = content - re := regexp.MustCompile(`(>>https?:\/\/[A-Za-z0-9_.-~]+\/[A-Za-z0-9_.-~]+\/\w+)`) + re := regexp.MustCompile(`(>>https?://[A-Za-z0-9_.\-~]+\/[A-Za-z0-9_.\-~]+\/\w+)`) match := re.FindAllStringSubmatch(nContent, -1) //add url to each matched reply @@ -1649,7 +1649,7 @@ func CreateAttachmentObject(file multipart.File, header *multipart.FileHeader) ( func ParseCommentForReplies(comment string) []ObjectBase { - re := regexp.MustCompile(`(>>https?:\/\/[A-z.:0-9]+\/[A-z0-9]+\/\w+)`) + re := regexp.MustCompile(`(>>https?://[A-Za-z0-9_.\-~]+\/[A-Za-z0-9_.\-~]+\/\w+)`) match := re.FindAllStringSubmatch(comment, -1) var links []string |