Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#5133 Fix broken email threading for draft messages #5874

Merged
merged 9 commits into from
Dec 4, 2024
+11 −5
Merged

#5133 Fix broken email threading for draft messages #5874

Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
32d4efc
initial commit
martgil Nov 27, 2024
e740933
remove console.log()
martgil Nov 28, 2024
5c843f7
fix broken threading issue
martgil Nov 28, 2024
5d7f052
revert previous changes
martgil Nov 29, 2024
66384e2
fix missing references value
martgil Nov 29, 2024
e59f3b8
Merge remote-tracking branch 'origin/master' into issue-5133-fix-brok…
martgil Nov 30, 2024
0c1633b
pr reviews: correctly set references header
martgil Nov 30, 2024
e917133
Merge remote-tracking branch 'origin/master' into issue-5133-fix-brok…
martgil Dec 4, 2024
f3f017b
fix check redundancy
martgil Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions extension/chrome/elements/compose-modules/compose-render-module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,11 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
const thread = await this.view.emailProvider.threadGet(this.view.threadId, 'metadata');
const inReplyToMessage = thread.messages?.find(message => message.id === this.view.replyMsgId);
if (inReplyToMessage) {
this.view.replyParams.inReplyTo = inReplyToMessage.payload?.headers?.find(
header => header.name === 'Message-Id' || header.name === 'Message-ID'
)?.value;
const msgId = inReplyToMessage.payload?.headers?.find(header => header.name === 'Message-Id' || header.name === 'Message-ID')?.value;
const references = inReplyToMessage.payload?.headers?.find(header => header.name === 'References')?.value;
if (msgId && references) {
this.setReplyHeaders(msgId, references);
}
martgil marked this conversation as resolved.
Show resolved Hide resolved
}
this.view.replyParams.subject = `${this.responseMethod === 'reply' ? 'Re' : 'Fwd'}: ${this.view.replyParams.subject}`;
if (this.view.useFullScreenSecureCompose) {
Expand All @@ -117,8 +119,7 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
);
if (this.view.quoteModule.messageToReplyOrForward) {
const msgId = this.view.quoteModule.messageToReplyOrForward.headers['message-id'];
this.view.sendBtnModule.additionalMsgHeaders['In-Reply-To'] = msgId;
this.view.sendBtnModule.additionalMsgHeaders.References = this.view.quoteModule.messageToReplyOrForward.headers.references + ' ' + msgId;
this.setReplyHeaders(msgId, this.view.quoteModule.messageToReplyOrForward.headers.references);
if (this.view.replyPubkeyMismatch) {
await this.renderReplyMsgAsReplyPubkeyMismatch();
} else if (this.view.quoteModule.messageToReplyOrForward.isOnlySigned) {
Expand Down Expand Up @@ -273,6 +274,13 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
}
};

private setReplyHeaders = (msgId?: string, references?: string) => {
if (msgId) {
this.view.sendBtnModule.additionalMsgHeaders['In-Reply-To'] = msgId;
this.view.sendBtnModule.additionalMsgHeaders.References = [references, msgId].filter(Boolean).join(' ');
}
};

private initComposeBoxStyles = () => {
if (this.view.isReplyBox) {
this.view.S.cached('body').addClass('reply_box');
Expand Down