github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-22 14:47:54 +08:00
Code Issues Actions1 Packages Projects Releases Wiki Activity

FIX: always update bounce_score even when email was not auto_generated

Browse Source
This commit is contained in:
Régis Hanol 2016-07-15 18:00:40 +02:00
parent 8d2c878b34
commit 6ed03bf3d9
1 changed files with 9 additions and 15 deletions

24
lib/email/receiver.rb

@ -144,23 +144,17 @@ module Email
@incoming_email.update_columns(is_bounce: true)
if verp
bounce_key = verp[/\+verp-(\h{32})@/, 1]
if bounce_key && (email_log = EmailLog.find_by(bounce_key: bounce_key))
email_log.update_columns(bounced: true)
email = email_log.user.try(:email) || @from_email
if email.present? && @mail.error_status.present?
if @mail.error_status.start_with?("4.")
Email::Receiver.update_bounce_score(email, SOFT_BOUNCE_SCORE)
else @mail.error_status.start_with?("5.")
Email::Receiver.update_bounce_score(email, HARD_BOUNCE_SCORE)
end
end
end
if verp && (bounce_key = verp[/\+verp-(\h{32})@/, 1]) && (email_log = EmailLog.find_by(bounce_key: bounce_key))
email_log.update_columns(bounced: true)
email = email_log.user.try(:email).presence
end
if is_auto_generated?
Email::Receiver.update_bounce_score(@from_email, SOFT_BOUNCE_SCORE)
email ||= @from_email
if @mail.error_status.present? && @mail.error_status.start_with?("4.")
Email::Receiver.update_bounce_score(email, SOFT_BOUNCE_SCORE)
else
Email::Receiver.update_bounce_score(email, HARD_BOUNCE_SCORE)
end
true