Skip to content

Commit 8e9efb7

Browse files
committed
Don't reference to a mail in another ML
because the thread page is going to be per-ML
1 parent dfc7a77 commit 8e9efb7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

app/models/message.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ def from_mail(mail, list, list_seq)
3535

3636
# mail.in_reply_to returns strange Array object in some cases (?), so let's use the raw value
3737
parent_message_id_header = extract_message_id_from_in_reply_to(mail.header[:in_reply_to]&.value)
38-
parent_message_id = Message.where(message_id_header: parent_message_id_header).pick(:id) if parent_message_id_header
38+
parent_message_id = Message.where(list_id: list.id, message_id_header: parent_message_id_header).pick(:id) if parent_message_id_header
3939
if !parent_message_id && (String === mail.references)
40-
parent_message_id = Message.where(message_id_header: mail.references).pick(:id)
40+
parent_message_id = Message.where(list_id: list.id, message_id_header: mail.references).pick(:id)
4141
end
4242
if !parent_message_id && (Array === mail.references)
4343
mail.references.compact.each do |ref|
44-
break if (parent_message_id = Message.where(message_id_header: ref).pick(:id))
44+
break if (parent_message_id = Message.where(list_id: list.id, message_id_header: ref).pick(:id))
4545
end
4646
end
4747

0 commit comments

Comments
 (0)