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

FIX: Email logs not finding attached incoming email (#16446)

Browse Source
This commit is contained in:
Blake Erickson
2022-04-11 21:22:15 -06:00
committed by GitHub
parent 264c8f5fd7
commit 4c0a9fd4c3
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/admin/email_controller.rb
View File

@ -209,6 +209,14 @@ class Admin::EmailController < Admin::AdminController
incoming_email = IncomingEmail.find_by(to_addresses: bounced_to_address)
end
# Temporary fix until all old format of emails has been purged via lib/email/cleaner.rb
if incoming_email.nil?
email_local_part, email_domain = SiteSetting.reply_by_email_address.split('@')
subdomain, root_domain, extension = email_domain&.split('.')
bounced_to_address = "#{subdomain}+verp-#{email_log.bounce_key}@#{root_domain}.#{extension}"
incoming_email = IncomingEmail.find_by(to_addresses: bounced_to_address)
end
raise Discourse::NotFound if incoming_email.nil?
serializer = IncomingEmailDetailsSerializer.new(incoming_email, root: false)