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

Added In-Reply-To and References email headers. Additionally removed username from

Browse source 
email replies and new posts to keep the subjects collapsable.
This commit is contained in:
Robin Ward 2013-07-08 11:48:40 -04:00
parent 4ddd50fe17
commit 013ad0fdda
3 changed files with 51 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

35
lib/email/sender.rb
View file

@ -47,11 +47,24 @@ module Email
user_id: @user.try(:id))
@message.header['List-Id'] = Email::Sender.list_id_for(SiteSetting.title, Discourse.base_url)
host = Email::Sender.host_for(Discourse.base_url)
add_header_to_log('X-Discourse-Reply-Key', email_log, :reply_key)
add_header_to_log('X-Discourse-Post-Id', email_log, :post_id)
add_header_to_log('X-Discourse-Topic-Id', email_log, :topic_id)
@message.header['List-Id'] = Email::Sender.list_id_for(SiteSetting.title, host)
topic_id = header_value('X-Discourse-Topic-Id')
post_id = header_value('X-Discourse-Post-Id')
reply_key = header_value('X-Discourse-Reply-Key')
if topic_id.present?
email_log.topic_id = topic_id
topic_identitfier = "<topic/#{topic_id}@#{host}>"
@message.header['In-Reply-To'] = topic_identitfier
@message.header['References'] = topic_identitfier
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
@ -66,8 +79,7 @@ module Email
end
def self.list_id_for(site_name, base_url)
def self.host_for(base_url)
host = "localhost"
if base_url.present?
begin
@ -76,18 +88,19 @@ module Email
rescue URI::InvalidURIError
end
end
host
end
def self.list_id_for(site_name, host)
"\"#{site_name.gsub(/\"/, "'")}\" <discourse.forum.#{Slug.for(site_name)}.#{host}>"
end
private
def add_header_to_log(name, email_log, email_log_field)
def header_value(name)
header = @message.header[name]
return unless header
val = header.value
email_log[email_log_field] = val if val.present?
return nil unless header
header.value
end
end