Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-17 07:36:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify references parsing

Browse Source
This commit is contained in:
Pavel Škoda
2020-05-11 10:39:54 +02:00
committed by Pavel Škoda
parent 4a8d07d54e
commit 2639f7333e
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/imap/mailbox_message.go
View File

@ -148,7 +148,7 @@ func (im *imapMailbox) CreateMessage(flags []string, date time.Time, body imap.L
if len(referenceList) > 0 { if len(referenceList) > 0 {
lastReference := referenceList[len(referenceList)-1] lastReference := referenceList[len(referenceList)-1]
// In case we are using a mail client which corrupts headers, try "References" too. // In case we are using a mail client which corrupts headers, try "References" too.
re := regexp.MustCompile("<[a-zA-Z0-9-_=]*@protonmail.internalid>") re := regexp.MustCompile(`(?U)<.*@protonmail.internalid>`)
match := re.FindString(lastReference) match := re.FindString(lastReference)
if match != "" { if match != "" {
internalID = match[1 : len(match)-len("@protonmail.internalid>")] internalID = match[1 : len(match)-len("@protonmail.internalid>")]

4
internal/smtp/user.go
View File

@ -373,9 +373,9 @@ func (su *smtpUser) handleReferencesHeader(m *pmapi.Message) (draftID, parentID
if !strings.Contains(reference, "@protonmail.internalid") { if !strings.Contains(reference, "@protonmail.internalid") {
newReferences = append(newReferences, reference) newReferences = append(newReferences, reference)
} else { // internalid is the parentID. } else { // internalid is the parentID.
idMatch := regexp.MustCompile("[a-zA-Z0-9-_=]*@protonmail.internalid").FindString(reference) idMatch := regexp.MustCompile(`(?U)<.*@protonmail.internalid>`).FindString(reference)
if idMatch != "" { if idMatch != "" {
lastID := idMatch[0 : len(idMatch)-len("@protonmail.internalid")] lastID := idMatch[1 : len(idMatch)-len("@protonmail.internalid>")]
filter := &pmapi.MessagesFilter{ID: []string{lastID}} filter := &pmapi.MessagesFilter{ID: []string{lastID}}
if su.addressID != "" { if su.addressID != "" {
filter.AddressID = su.addressID filter.AddressID = su.addressID

4
test/features/smtp/send/html.feature
View File

@ -12,8 +12,8 @@ Feature: SMTP sending of HTML messages
Content-Disposition: inline Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable Content-Transfer-Encoding: quoted-printable
Content-Type: text/html; charset=utf-8 Content-Type: text/html; charset=utf-8
In-Reply-To: base64hashOfSomeMessage@protonmail.internalID In-Reply-To: <base64hashOfSomeMessage@protonmail.internalID>
References: base64hashOfSomeConversation@protonmail.internalID base64hashOfSomeConversation@protonmail.conversationID References: <base64hashOfSomeConversation@protonmail.internalID> <base64hashOfSomeConversation@protonmail.conversationID>
<html><body>This is body of <b>HTML mail</b> without attachment<body></html> <html><body>This is body of <b>HTML mail</b> without attachment<body></html>