github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 15:28:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: use MD5 of the email_string when there's no 'Message-Id'

Browse Source
This commit is contained in:
Régis Hanol
2016-03-14 18:18:58 +01:00
parent 1ba65765e4
commit 4a3cb4a000
5 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/email/receiver.rb
View File

@ -1,3 +1,4 @@
require "digest"
require_dependency "new_post_manager"
require_dependency "post_action_creator"
require_dependency "email/html_cleaner"
@ -9,7 +10,6 @@ module Email
class ProcessingError < StandardError; end
class EmptyEmailError < ProcessingError; end
class NoMessageIdError < ProcessingError; end
class AutoGeneratedEmailError < ProcessingError; end
class NoBodyDetectedError < ProcessingError; end
class InactiveUserError < ProcessingError; end
@ -29,7 +29,7 @@ module Email
raise EmptyEmailError if mail_string.blank?
@raw_email = mail_string
@mail = Mail.new(@raw_email)
raise NoMessageIdError if @mail.message_id.blank?
@message_id = @mail.message_id.presence || Digest::MD5.hexdigest(mail_string)
end
def process!
@ -42,7 +42,7 @@ module Email
end
def find_or_create_incoming_email
IncomingEmail.find_or_create_by(message_id: @mail.message_id) do |ie|
IncomingEmail.find_or_create_by(message_id: @message_id) do |ie|
ie.raw = @raw_email
ie.subject = subject
ie.from_address = @from_email