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

new alternative reply by email addresses

Browse source
This commit is contained in:
Régis Hanol 2016-06-10 16:14:42 +02:00
parent 9e75b14535
commit dffe50a2e6
7 changed files with 42 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/email/receiver.rb
View file

@ -327,15 +327,26 @@ module Email
# reply
match = reply_by_email_address_regex.match(address)
if match && match[1].present?
email_log = EmailLog.for(match[1])
return { type: :reply, obj: email_log } if email_log
if match && match.captures
match.captures.each do |c|
next if c.blank?
email_log = EmailLog.for(c)
return { type: :reply, obj: email_log } if email_log
end
end
end
def reply_by_email_address_regex
@reply_by_email_address_regex ||= Regexp.new Regexp.escape(SiteSetting.reply_by_email_address)
.gsub(Regexp.escape("%{reply_key}"), "([[:xdigit:]]{32})")
@reply_by_email_address_regex ||= begin
reply_addresses = [
SiteSetting.reply_by_email_address,
*SiteSetting.alternative_reply_by_email_addresses.split("|")
]
escaped_reply_addresses = reply_addresses.select { |a| a.present? }
.map { |a| Regexp.escape(a) }
.map { |a| a.gsub(Regexp.escape("%{reply_key}"), "([[:xdigit:]]{32})") }
Regexp.new(escaped_reply_addresses.join("|"))
end
end
def group_incoming_emails_regex