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

GODT-1556: If no references, use the in-reply-to header as ParentID.

Browse Source
This commit is contained in:
Romain LE JEUNE
2023-01-20 11:01:17 +01:00
parent ee4da8a89c
commit f1404cd3ee
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/bridge/send_test.go
View File

@ -101,7 +101,7 @@ func TestBridge_Send(t *testing.T) {
defer recipientIMAPClient.Logout() //nolint:errcheck defer recipientIMAPClient.Logout() //nolint:errcheck
// Sender should have 10 messages in the sent folder. // Sender should have 10 messages in the sent folder.
// Recipient should have 0 messages in inbox. // Recipient should have 10 messages in inbox.
require.Eventually(t, func() bool { require.Eventually(t, func() bool {
sent, err := senderIMAPClient.Status(`Sent`, []imap.StatusItem{imap.StatusMessages}) sent, err := senderIMAPClient.Status(`Sent`, []imap.StatusItem{imap.StatusMessages})
require.NoError(t, err) require.NoError(t, err)

6
internal/user/smtp.go
View File

@ -174,7 +174,11 @@ func sendWithKey( //nolint:funlen
to []string, to []string,
message message.Message, message message.Message,
) (proton.Message, error) { ) (proton.Message, error) {
parentID, err := getParentID(ctx, client, authAddrID, addrMode, message.References) references := message.References
if message.InReplyTo != "" {
references = append(references, message.InReplyTo)
}
parentID, err := getParentID(ctx, client, authAddrID, addrMode, references)
if err != nil { if err != nil {
return proton.Message{}, fmt.Errorf("failed to get parent ID: %w", err) return proton.Message{}, fmt.Errorf("failed to get parent ID: %w", err)
} }