Defect #17096 » 17096-fix-emails-threading.patch
| app/models/mailer.rb | ||
|---|---|---|
|
redmine_headers 'Project' => document.project.identifier
|
||
|
@author = author
|
||
|
@document = document
|
||
|
@user = user
|
||
|
@document_url = url_for(:controller => 'documents', :action => 'show', :id => document)
|
||
|
mail :to => user,
|
||
|
:subject => "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}"
|
||
| ... | ... | |
|
end
|
||
|
redmine_headers 'Project' => container.project.identifier
|
||
|
@attachments = attachments
|
||
|
@user = user
|
||
|
@added_to = added_to
|
||
|
@added_to_url = added_to_url
|
||
|
mail :to => user,
|
||
| ... | ... | |
|
message_id news
|
||
|
references news
|
||
|
@news = news
|
||
|
@user = user
|
||
|
@news_url = url_for(:controller => 'news', :action => 'show', :id => news)
|
||
|
mail :to => user,
|
||
|
:subject => "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
|
||
| ... | ... | |
|
references news
|
||
|
@news = news
|
||
|
@comment = comment
|
||
|
@user = user
|
||
|
@news_url = url_for(:controller => 'news', :action => 'show', :id => news)
|
||
|
mail :to => user,
|
||
|
:subject => "Re: [#{news.project.name}] #{l(:label_news)}: #{news.title}"
|
||
| ... | ... | |
|
message_id message
|
||
|
references message.root
|
||
|
@message = message
|
||
|
@user = user
|
||
|
@message_url = url_for(message.event_url)
|
||
|
mail :to => user,
|
||
|
:subject => "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}"
|
||
| ... | ... | |
|
@author = wiki_content.author
|
||
|
message_id wiki_content
|
||
|
@wiki_content = wiki_content
|
||
|
@user = user
|
||
|
@wiki_content_url = url_for(:controller => 'wiki', :action => 'show',
|
||
|
:project_id => wiki_content.project,
|
||
|
:id => wiki_content.page.title)
|
||
| ... | ... | |
|
@author = wiki_content.author
|
||
|
message_id wiki_content
|
||
|
@wiki_content = wiki_content
|
||
|
@user = user
|
||
|
@wiki_content_url = url_for(:controller => 'wiki', :action => 'show',
|
||
|
:project_id => wiki_content.project,
|
||
|
:id => wiki_content.page.title)
|
||
| ... | ... | |
|
end
|
||
|
if @message_id_object
|
||
|
headers[:message_id] = "<#{self.class.message_id_for(@message_id_object)}>"
|
||
|
headers[:message_id] = "<#{self.class.message_id_for(@message_id_object, @user)}>"
|
||
|
end
|
||
|
if @references_objects
|
||
|
headers[:references] = @references_objects.collect {|o| "<#{self.class.references_for(o)}>"}.join(' ')
|
||
|
headers[:references] = @references_objects.collect {|o| "<#{self.class.references_for(o, @user)}>"}.join(' ')
|
||
|
end
|
||
|
if block_given?
|
||
| ... | ... | |
|
h.each { |k,v| headers["X-Redmine-#{k}"] = v.to_s }
|
||
|
end
|
||
|
def self.token_for(object, rand=true)
|
||
|
def self.token_for(object, user)
|
||
|
timestamp = object.send(object.respond_to?(:created_on) ? :created_on : :updated_on)
|
||
|
hash = [
|
||
|
"redmine",
|
||
|
"#{object.class.name.demodulize.underscore}-#{object.id}",
|
||
|
timestamp.strftime("%Y%m%d%H%M%S")
|
||
|
]
|
||
|
if rand
|
||
|
hash << Redmine::Utils.random_hex(8)
|
||
|
end
|
||
|
hash << user.id if user
|
||
|
host = Setting.mail_from.to_s.strip.gsub(%r{^.*@|>}, '')
|
||
|
host = "#{::Socket.gethostname}.redmine" if host.empty?
|
||
|
"#{hash.join('.')}@#{host}"
|
||
|
end
|
||
|
# Returns a Message-Id for the given object
|
||
|
def self.message_id_for(object)
|
||
|
token_for(object, true)
|
||
|
def self.message_id_for(object, user)
|
||
|
token_for(object, user)
|
||
|
end
|
||
|
# Returns a uniq token for a given object referenced by all notifications
|
||
|
# related to this object
|
||
|
def self.references_for(object)
|
||
|
token_for(object, false)
|
||
|
def self.references_for(object, user)
|
||
|
token_for(object, user)
|
||
|
end
|
||
|
def message_id(object)
|
||
| ... | ... | |
|
@references_objects << object
|
||
|
end
|
||
|
end
|
||
| test/unit/mailer_test.rb | ||
|---|---|---|
|
issue = Issue.find(2)
|
||
|
Mailer.deliver_issue_add(issue)
|
||
|
mail = last_email
|
||
|
assert_match /^redmine\.issue-2\.20060719190421\.[a-f0-9]+@example\.net/, mail.message_id
|
||
|
assert_include "redmine.issue-2.20060719190421@example.net", mail.references
|
||
|
uid = destination_user(mail).id
|
||
|
assert_include "redmine.issue-2.20060719190421.#{uid}@example.net", mail.message_id
|
||
|
assert_include "redmine.issue-2.20060719190421.#{uid}@example.net", mail.references
|
||
|
end
|
||
|
def test_issue_edit_message_id
|
||
| ... | ... | |
|
Mailer.deliver_issue_edit(journal)
|
||
|
mail = last_email
|
||
|
assert_match /^redmine\.journal-3\.\d+\.[a-f0-9]+@example\.net/, mail.message_id
|
||
|
assert_include "redmine.issue-2.20060719190421@example.net", mail.references
|
||
|
uid = destination_user(mail).id
|
||
|
assert_match /^redmine\.journal-3\.\d+\.#{uid}@example\.net/, mail.message_id
|
||
|
assert_include "redmine.issue-2.20060719190421.#{uid}@example.net", mail.references
|
||
|
assert_select_email do
|
||
|
# link to the update
|
||
|
assert_select "a[href=?]",
|
||
| ... | ... | |
|
message = Message.find(1)
|
||
|
Mailer.deliver_message_posted(message)
|
||
|
mail = last_email
|
||
|
assert_match /^redmine\.message-1\.\d+\.[a-f0-9]+@example\.net/, mail.message_id
|
||
|
assert_include "redmine.message-1.20070512151532@example.net", mail.references
|
||
|
uid = destination_user(mail).id
|
||
|
assert_include "redmine.message-1.20070512151532.#{uid}@example.net", mail.message_id
|
||
|
assert_include "redmine.message-1.20070512151532.#{uid}@example.net", mail.references
|
||
|
assert_select_email do
|
||
|
# link to the message
|
||
|
assert_select "a[href=?]",
|
||
| ... | ... | |
|
message = Message.find(3)
|
||
|
Mailer.deliver_message_posted(message)
|
||
|
mail = last_email
|
||
|
assert_match /^redmine\.message-3\.\d+\.[a-f0-9]+@example\.net/, mail.message_id
|
||
|
assert_include "redmine.message-1.20070512151532@example.net", mail.references
|
||
|
uid = destination_user(mail).id
|
||
|
assert_include "redmine.message-3.20070512151802.#{uid}@example.net", mail.message_id
|
||
|
assert_include "redmine.message-1.20070512151532.#{uid}@example.net", mail.references
|
||
|
assert_select_email do
|
||
|
# link to the reply
|
||
|
assert_select "a[href=?]",
|
||
| ... | ... | |
|
def test_token_for_should_strip_trailing_gt_from_address_with_full_name
|
||
|
with_settings :mail_from => "Redmine Mailer<no-reply@redmine.org>" do
|
||
|
assert_match /\Aredmine.issue-\d+\.\d+\.[0-9a-f]+@redmine.org\z/, Mailer.token_for(Issue.generate!)
|
||
|
assert_match /\Aredmine.issue-\d+\.\d+\.3@redmine.org\z/,
|
||
|
Mailer.token_for(Issue.generate!, User.find(3))
|
||
|
end
|
||
|
end
|
||
| ... | ... | |
|
def html_part
|
||
|
last_email.parts.detect {|part| part.content_type.include?('text/html')}
|
||
|
end
|
||
|
def destination_user(mail)
|
||
|
EmailAddress.where(:address => [mail.to, mail.cc, mail.bcc].flatten).map(&:user).first
|
||
|
end
|
||
|
end
|
||