codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 23:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

include category in List-Id instead of topic

Browse source
This commit is contained in:
Arpit Jalan 2014-10-08 23:39:21 +05:30
parent a98b8251a6
commit c53f635b2c
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/email/sender.rb
View file

@ -70,11 +70,22 @@ module Email
@message.header['In-Reply-To'] = topic_identifier
@message.header['References'] = topic_identifier
topic = Topic.where(id: topic_id).first
# http://www.ietf.org/rfc/rfc2919.txt
list_id = "<topic.#{topic_id}.#{host}>"
if topic && topic.category && !topic.category.uncategorized?
list_id = "<#{topic.category.name.downcase}.#{host}>"
# subcategory case
if !topic.category.parent_category_id.nil?
parent_category_name = Category.find_by(id: topic.category.parent_category_id).name
list_id = "<#{topic.category.name.downcase}.#{parent_category_name.downcase}.#{host}>"
end
else
list_id = "<#{host}>"
end
@message.header['List-ID'] = list_id
topic = Topic.where(id: topic_id).first
@message.header['List-Archive'] = topic.url if topic
end

13
spec/components/email/sender_spec.rb
View file

@ -64,11 +64,14 @@ describe Email::Sender do
email_sender.send
end
# will fail since topic ID has to be present
#it "adds a List-ID header to identify the forum" do
# email_sender.send
# message.header['List-ID'].should be_present
#end
context "adds a List-ID header to identify the forum" do
before do
message.header['X-Discourse-Topic-Id'] = 5577
end
When { email_sender.send }
Then { expect(message.header['List-ID']).to be_present }
end
context 'email logs' do
let(:email_log) { EmailLog.last }