IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: incoming email matches the wrong user if null bounce key available in db

Browse Source
This commit is contained in:
Vinoth Kannan
2018-11-30 12:29:51 +05:30
parent c6adf7f032
commit fc0b7c9e26
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/email/receiver.rb
View File

@@ -69,7 +69,7 @@ module Email
begin
return if IncomingEmail.exists?(message_id: @message_id)
ensure_valid_address_lists
@from_email, @from_display_name = parse_from_field(@mail)
@from_email, @from_display_name = parse_from_field
@from_user = User.find_by_email(@from_email)
@incoming_email = create_incoming_email
process_internal
@@ -249,6 +249,7 @@ module Email
end
def email_log
return nil if bounce_key.blank?
@email_log ||= EmailLog.find_by(bounce_key: bounce_key)
end
@@ -472,7 +473,9 @@ module Email
reply.split(previous_replies_regex)[0]
end
def parse_from_field(mail)
def parse_from_field(mail = nil)
mail ||= @mail
if mail.bounced?
Array.wrap(mail.final_recipient).each do |from|
return extract_from_address_and_name(from)