Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-05 08:59:27 +08:00
Code Packages Activity Actions 11

FIX: only create 1 email_log when an email is sent

Browse source
This commit is contained in:
Régis Hanol 2016-01-29 16:49:49 +01:00
parent 73f2bc9354
commit 96380bfd38
3 changed files with 47 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

44
lib/email/sender.rb
View file

@ -59,10 +59,7 @@ module Email
@message.text_part.content_type = 'text/plain; charset=UTF-8'
# Set up the email log
email_log = EmailLog.new(email_type: @email_type,
to_address: to_address,
user_id: @user.try(:id))
email_log = EmailLog.new(email_type: @email_type, to_address: to_address, user_id: @user.try(:id))
host = Email::Sender.host_for(Discourse.base_url)
@ -97,32 +94,30 @@ module Email
else
list_id = "<#{host}>"
end
@message.header['List-ID'] = list_id
@message.header['List-Archive'] = topic.url if topic
# http://www.ietf.org/rfc/rfc3834.txt
@message.header['Precedence'] = 'list'
@message.header['Precedence'] = 'list'
@message.header['List-ID'] = list_id
@message.header['List-Archive'] = topic.url if topic
end
if reply_key.present?
if @message.header['Reply-To'] =~ /\<([^\>]+)\>/
email = Regexp.last_match[1]
@message.header['List-Post'] = "<mailto:#{email}>"
end
if reply_key.present? && @message.header['Reply-To'] =~ /\<([^\>]+)\>/
email = Regexp.last_match[1]
@message.header['List-Post'] = "<mailto:#{email}>"
end
email_log.post_id = post_id if post_id.present?
email_log.reply_key = reply_key if reply_key.present?
# Remove headers we don't need anymore
@message.header['X-Discourse-Topic-Id'] = nil if topic_id.present?
@message.header['X-Discourse-Post-Id'] = nil if post_id.present?
@message.header['X-Discourse-Topic-Id'] = nil if topic_id.present?
@message.header['X-Discourse-Post-Id'] = nil if post_id.present?
@message.header['X-Discourse-Reply-Key'] = nil if reply_key.present?
# Suppress images from short emails
if SiteSetting.strip_images_from_short_emails && @message.html_part.body.to_s.bytesize <= SiteSetting.short_email_length && @message.html_part.body =~ /<img[^>]+>/
if SiteSetting.strip_images_from_short_emails &&
@message.html_part.body.to_s.bytesize <= SiteSetting.short_email_length &&
@message.html_part.body =~ /<img[^>]+>/
style = Email::Styles.new(@message.html_part.body.to_s)
@message.html_part.body = style.strip_avatars_and_emojis
end
@ -141,7 +136,8 @@ module Email
def to_address
@to_address ||= begin
to = @message ? @message.to : nil
to.is_a?(Array) ? to.first : to
to = to.first if Array === to
to.presence || "no_email_found"
end
end
@ -166,11 +162,13 @@ module Email
end
def skip(reason)
EmailLog.create(email_type: @email_type,
to_address: to_address,
user_id: @user.try(:id),
skipped: true,
skipped_reason: reason)
EmailLog.create!(
email_type: @email_type,
to_address: to_address,
user_id: @user.try(:id),
skipped: true,
skipped_reason: reason
)
end
end