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: create whisper post in PMs when bounces with verp and user is staged

Browse Source
This commit is contained in:
Vinoth Kannan
2018-11-28 08:24:23 +05:30
parent 654d7996ae
commit 7dbf709467
2 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/email/receiver.rb
View File

@@ -196,13 +196,13 @@ module Email
end
def is_bounce?
@mail.bounced? || verp
@mail.bounced? || bounce_key
end
def handle_bounce
@incoming_email.update_columns(is_bounce: true)
if verp && (bounce_key = verp[/\+verp-(\h{32})@/, 1]) && (email_log = EmailLog.find_by(bounce_key: bounce_key))
if bounce_key && (email_log = EmailLog.find_by(bounce_key: bounce_key))
email_log.update_columns(bounced: true)
user = email_log.user
email = user&.email.presence
@@ -229,8 +229,11 @@ module Email
Email::Receiver.reply_by_email_address_regex.match(@from_email)
end
def verp
@verp ||= all_destinations.select { |to| to[/\+verp-\h{32}@/] }.first
def bounce_key
@bounce_key ||= begin
verp = all_destinations.select { |to| to[/\+verp-\h{32}@/] }.first
verp && verp[/\+verp-(\h{32})@/, 1]
end
end
def self.update_bounce_score(email, score)
@@ -555,7 +558,7 @@ module Email
def destinations
@destinations ||= all_destinations
.map { |d| Email::Receiver.check_address(d) }
.map { |d| Email::Receiver.check_address(d, is_bounce?) }
.reject(&:blank?)
end
@@ -572,7 +575,7 @@ module Email
end
end
def self.check_address(address)
def self.check_address(address, include_verp = false)
# only check for a group/category when 'email_in' is enabled
if SiteSetting.email_in
group = Group.find_by_email(address)
@@ -583,7 +586,7 @@ module Email
end
# reply
match = Email::Receiver.reply_by_email_address_regex.match(address)
match = Email::Receiver.reply_by_email_address_regex(true, include_verp).match(address)
if match && match.captures
match.captures.each do |c|
next if c.blank?
@@ -785,10 +788,14 @@ module Email
true
end
def self.reply_by_email_address_regex(extract_reply_key = true)
def self.reply_by_email_address_regex(extract_reply_key = true, include_verp = false)
reply_addresses = [SiteSetting.reply_by_email_address]
reply_addresses << (SiteSetting.alternative_reply_by_email_addresses.presence || "").split("|")
if include_verp && SiteSetting.reply_by_email_address.present? && SiteSetting.reply_by_email_address["+"]
reply_addresses << SiteSetting.reply_by_email_address.sub("%{reply_key}", "verp-%{reply_key}")
end
reply_addresses.flatten!
reply_addresses.select!(&:present?)
reply_addresses.map! { |a| Regexp.escape(a) }
@@ -1028,7 +1035,7 @@ module Email
if result.post
@incoming_email.update_columns(topic_id: result.post.topic_id, post_id: result.post.id)
if result.post.topic && result.post.topic.private_message?
if result.post.topic&.private_message? && !is_bounce?
add_other_addresses(result.post, user)
end
end