From 4ccda2b77eb2a46c1217d40e4a16ff97acba3a48 Mon Sep 17 00:00:00 2001
From: Aleksandr Nogikh <nogikh@google.com>
Date: Wed, 12 Apr 2023 11:20:59 +0200
Subject: pkg/email: recognize patches sent as replies to reports

It seems to be a common pattern in LKML: bug fixes are sent as replies
to syzbot reports. Recognize such replies as separate discussions.
---
 pkg/email/action.go      |  6 ++++++
 pkg/email/action_test.go | 11 +++++++++++
 2 files changed, 17 insertions(+)

(limited to 'pkg/email')

diff --git a/pkg/email/action.go b/pkg/email/action.go
index 1d9fb22ff..0b5103fc7 100644
--- a/pkg/email/action.go
+++ b/pkg/email/action.go
@@ -23,6 +23,12 @@ func NewMessageAction(msg *Email, msgType dashapi.DiscussionType, oldThread *Old
 		return ActionNewThread
 	}
 	if oldThread != nil {
+		// Sometimes patches are sent as replies to the bug report.
+		// In this case, we'd better report it as a new discussion.
+		if msgType == dashapi.DiscussionPatch &&
+			msgType != oldThread.ThreadType {
+			return ActionNewThread
+		}
 		// Otherwise just append the message.
 		return ActionAppend
 	}
diff --git a/pkg/email/action_test.go b/pkg/email/action_test.go
index 51b0505f8..c1ef8507b 100644
--- a/pkg/email/action_test.go
+++ b/pkg/email/action_test.go
@@ -65,6 +65,17 @@ func TestMessageActions(t *testing.T) {
 			oldThread: nil,
 			result:    ActionNewThread,
 		},
+		{
+			name: "patch reply to report",
+			msg: &Email{
+				InReplyTo: "<abcd>",
+			},
+			msgType: dashapi.DiscussionPatch,
+			oldThread: &OldThreadInfo{
+				ThreadType: dashapi.DiscussionReport,
+			},
+			result: ActionNewThread,
+		},
 	}
 	for _, _test := range tests {
 		test := _test
-- 
cgit mrf-deployment