go/mailpit
1
0
Fork 0
mirror of https://github.com/axllent/mailpit.git synced 2025-06-25 00:37:17 +02:00
Code Issues Releases Activity

Chore: Allow setting of multiple message tags via plus addresses (#253)

Browse Source
This commit is contained in:
Ralph Slooten
2024-03-10 08:05:11 +13:00
parent d1d0ce4737
commit e660d6bedd
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/storage/tags.go
View File

@ -13,7 +13,7 @@ import (
) )
var ( var (
addressPlusRe = regexp.MustCompile(`^(.*){1,}\+(.*)@`) addressPlusRe = regexp.MustCompile(`(?U)^(.*){1,}\+(.*)@`)
) )
// SetMessageTags will set the tags for a given database ID // SetMessageTags will set the tags for a given database ID
@ -246,25 +246,25 @@ func (d DBMailSummary) tagsFromPlusAddresses() string {
tags := []string{} tags := []string{}
for _, c := range d.To { for _, c := range d.To {
matches := addressPlusRe.FindAllStringSubmatch(c.String(), 1) matches := addressPlusRe.FindAllStringSubmatch(c.String(), 1)
if len(matches) == 1 && config.ValidTagRegexp.MatchString(matches[0][2]) { if len(matches) == 1 {
tags = append(tags, matches[0][2]) tags = append(tags, strings.Split(matches[0][2], "+")...)
} }
} }
for _, c := range d.Cc { for _, c := range d.Cc {
matches := addressPlusRe.FindAllStringSubmatch(c.String(), 1) matches := addressPlusRe.FindAllStringSubmatch(c.String(), 1)
if len(matches) == 1 && config.ValidTagRegexp.MatchString(matches[0][2]) { if len(matches) == 1 {
tags = append(tags, matches[0][2]) tags = append(tags, strings.Split(matches[0][2], "+")...)
} }
} }
for _, c := range d.Bcc { for _, c := range d.Bcc {
matches := addressPlusRe.FindAllStringSubmatch(c.String(), 1) matches := addressPlusRe.FindAllStringSubmatch(c.String(), 1)
if len(matches) == 1 && config.ValidTagRegexp.MatchString(matches[0][2]) { if len(matches) == 1 {
tags = append(tags, matches[0][2]) tags = append(tags, strings.Split(matches[0][2], "+")...)
} }
} }
matches := addressPlusRe.FindAllStringSubmatch(d.From.String(), 1) matches := addressPlusRe.FindAllStringSubmatch(d.From.String(), 1)
if len(matches) == 1 && config.ValidTagRegexp.MatchString(matches[0][2]) { if len(matches) == 1 {
tags = append(tags, matches[0][2]) tags = append(tags, strings.Split(matches[0][2], "+")...)
} }
return strings.Join(tags, ",") return strings.Join(tags, ",")