mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-23 15:48:43 -05:00
FEATURE: include topic context in topic invite
This commit is contained in:
parent
6b45b635f8
commit
223bbc3da3
4 changed files with 73 additions and 10 deletions
|
@ -1,5 +1,5 @@
|
|||
module UserNotificationsHelper
|
||||
|
||||
|
||||
def self.sanitize_options
|
||||
return @sanitize_options if @sanitize_options
|
||||
@sanitize_options = Sanitize::Config::RELAXED.deep_dup
|
||||
|
|
|
@ -9,11 +9,24 @@ class InviteMailer < ActionMailer::Base
|
|||
|
||||
# If they were invited to a topic
|
||||
if first_topic.present?
|
||||
# get invitee name (based on site setting)
|
||||
invitee_name = invite.invited_by.username
|
||||
if (SiteSetting.enable_names)
|
||||
invitee_name = "#{invite.invited_by.name} (#{invite.invited_by.username})"
|
||||
end
|
||||
|
||||
# get topic excerpt
|
||||
topic_excerpt = ""
|
||||
if first_topic.excerpt
|
||||
topic_excerpt = first_topic.excerpt.gsub("\n", " ")
|
||||
end
|
||||
|
||||
build_email(invite.email,
|
||||
template: 'invite_mailer',
|
||||
invitee_name: invite.invited_by.username,
|
||||
invitee_name: invitee_name,
|
||||
invite_link: "#{Discourse.base_url}/invites/#{invite.invite_key}",
|
||||
topic_title: first_topic.try(:title),
|
||||
topic_excerpt: topic_excerpt,
|
||||
site_description: SiteSetting.site_description,
|
||||
site_title: SiteSetting.title)
|
||||
else
|
||||
|
|
|
@ -1051,7 +1051,9 @@ en:
|
|||
text_body_template: |
|
||||
%{invitee_name} invited you to a discussion
|
||||
|
||||
> %{topic_title}
|
||||
> **%{topic_title}**
|
||||
>
|
||||
> %{topic_excerpt}
|
||||
|
||||
at
|
||||
|
||||
|
|
|
@ -3,14 +3,62 @@ require "spec_helper"
|
|||
describe InviteMailer do
|
||||
|
||||
describe "send_invite" do
|
||||
let(:invite) { Fabricate(:invite) }
|
||||
subject { InviteMailer.send_invite(invite) }
|
||||
|
||||
its(:to) { should == [invite.email] }
|
||||
its(:subject) { should be_present }
|
||||
its(:body) { should be_present }
|
||||
its(:from) { should == [SiteSetting.notification_email] }
|
||||
context "invite to site" do
|
||||
let(:invite) { Fabricate(:invite) }
|
||||
let(:invite_mail) { InviteMailer.send_invite(invite) }
|
||||
|
||||
it 'renders the invitee email' do
|
||||
expect(invite_mail.to).to eql([invite.email])
|
||||
end
|
||||
|
||||
it 'renders the subject' do
|
||||
expect(invite_mail.subject).to be_present
|
||||
end
|
||||
|
||||
it 'renders the body' do
|
||||
expect(invite_mail.body).to be_present
|
||||
end
|
||||
|
||||
it 'renders the inviter email' do
|
||||
expect(invite_mail.from).to eql([SiteSetting.notification_email])
|
||||
end
|
||||
|
||||
it 'renders invite link' do
|
||||
expect(invite_mail.body.encoded).to match("#{Discourse.base_url}/invites/#{invite.invite_key}")
|
||||
end
|
||||
end
|
||||
|
||||
context "invite to topic" do
|
||||
let(:topic) { Fabricate(:topic, excerpt: "Topic invite support is now available in Discourse!") }
|
||||
let(:invite) { topic.invite(topic.user, 'name@example.com') }
|
||||
let(:invite_mail) { InviteMailer.send_invite(invite) }
|
||||
|
||||
it 'renders the invitee email' do
|
||||
expect(invite_mail.to).to eql(['name@example.com'])
|
||||
end
|
||||
|
||||
it 'renders the subject' do
|
||||
expect(invite_mail.subject).to be_present
|
||||
end
|
||||
|
||||
it 'renders the body' do
|
||||
expect(invite_mail.body).to be_present
|
||||
end
|
||||
|
||||
it 'renders the inviter email' do
|
||||
expect(invite_mail.from).to eql([SiteSetting.notification_email])
|
||||
end
|
||||
|
||||
it 'renders invite link' do
|
||||
expect(invite_mail.body.encoded).to match("#{Discourse.base_url}/invites/#{invite.invite_key}")
|
||||
end
|
||||
|
||||
it 'renders topic title' do
|
||||
expect(invite_mail.body.encoded).to match(topic.title)
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue