nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mail doesn't seem to like the name-addr spec from RFC2822

Browse source
This commit is contained in:
Dan Hansen 2011-10-10 00:35:04 -05:00
parent 71681d1bc7
commit 32f1b61719
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/mailers/notification_mailers/also_commented.rb
View file

@ -8,7 +8,7 @@ module NotificationMailers
@comment = Comment.find_by_id(comment_id) @comment = Comment.find_by_id(comment_id)
if mail? if mail?
@headers[:from] = "[#{@comment.author.name} (Diaspora*)] <#{AppConfig[:smtp_sender_address]}>" @headers[:from] = "\"#{@comment.author.name} (Diaspora*)\" <#{AppConfig[:smtp_sender_address]}>"
@headers[:subject] = truncate(@comment.parent.comment_email_subject, :length => TRUNCATION_LEN) @headers[:subject] = truncate(@comment.parent.comment_email_subject, :length => TRUNCATION_LEN)
@headers[:subject] = "Re: #{@headers[:subject]}" @headers[:subject] = "Re: #{@headers[:subject]}"
end end

2
app/mailers/notification_mailers/comment_on_post.rb
View file

@ -7,7 +7,7 @@ module NotificationMailers
def set_headers(comment_id) def set_headers(comment_id)
@comment = Comment.find(comment_id) @comment = Comment.find(comment_id)
@headers[:from] = "[#{@comment.author.name} (Diaspora*)] <#{AppConfig[:smtp_sender_address]}>" @headers[:from] = "\"#{@comment.author.name} (Diaspora*)\" <#{AppConfig[:smtp_sender_address]}>"
@headers[:subject] = truncate(@comment.parent.comment_email_subject, :length => TRUNCATION_LEN) @headers[:subject] = truncate(@comment.parent.comment_email_subject, :length => TRUNCATION_LEN)
@headers[:subject] = "Re: #{@headers[:subject]}" @headers[:subject] = "Re: #{@headers[:subject]}"
end end

2
app/mailers/notification_mailers/private_message.rb
View file

@ -7,7 +7,7 @@ module NotificationMailers
@conversation = @message.conversation @conversation = @message.conversation
@participants = @conversation.participants @participants = @conversation.participants
@headers[:from] = "[#{@message.author.name} (Diaspora*)] <#{AppConfig[:smtp_sender_address]}>" @headers[:from] = "\"#{@message.author.name} (Diaspora*)\" <#{AppConfig[:smtp_sender_address]}>"
@headers[:subject] = @conversation.subject.strip @headers[:subject] = @conversation.subject.strip
@headers[:subject] = "Re: #{@headers[:subject]}" if @conversation.messages.size > 1 @headers[:subject] = "Re: #{@headers[:subject]}" if @conversation.messages.size > 1
end end

6
spec/mailers/notifier_spec.rb
View file

@ -172,7 +172,7 @@ describe Notifier do
end end
it "FROM: contains the sender's name" do it "FROM: contains the sender's name" do
@mail["From"].to_s.should == "[#{@cnv.author.name} (Diaspora*)] <#{AppConfig[:smtp_sender_address]}>" @mail["From"].to_s.should == "\"#{@cnv.author.name} (Diaspora*)\" <#{AppConfig[:smtp_sender_address]}>"
end end
it 'SUBJECT: has a snippet of the post contents' do it 'SUBJECT: has a snippet of the post contents' do
@ -207,7 +207,7 @@ describe Notifier do
end end
it "FROM: contains the sender's name" do it "FROM: contains the sender's name" do
comment_mail["From"].to_s.should == "[#{eve.name} (Diaspora*)] <#{AppConfig[:smtp_sender_address]}>" comment_mail["From"].to_s.should == "\"#{eve.name} (Diaspora*)\" <#{AppConfig[:smtp_sender_address]}>"
end end
it 'SUBJECT: has a snippet of the post contents' do it 'SUBJECT: has a snippet of the post contents' do
@ -248,7 +248,7 @@ describe Notifier do
end end
it 'FROM: has the name of person commenting as the sender' do it 'FROM: has the name of person commenting as the sender' do
comment_mail["From"].to_s.should == "[#{eve.name} (Diaspora*)] <#{AppConfig[:smtp_sender_address]}>" comment_mail["From"].to_s.should == "\"#{eve.name} (Diaspora*)\" <#{AppConfig[:smtp_sender_address]}>"
end end
it 'SUBJECT: has a snippet of the post contents' do it 'SUBJECT: has a snippet of the post contents' do