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

Fallback to title if the reshare root was deleted

Browse source 
closes #7284
This commit is contained in:
Benjamin Neff 2017-01-17 20:28:30 +01:00
parent e7d6831900
commit 4e6a9aeb1e
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/notifier_helper.rb
View file

@ -5,7 +5,7 @@ module NotifierHelper
# @return [String] The formatted post. # @return [String] The formatted post.
def post_message(post, opts={}) def post_message(post, opts={})
if post.respond_to? :message if post.respond_to? :message
post.message.plain_text_without_markdown post.message.try(:plain_text_without_markdown) || post_page_title(post)
else else
I18n.translate 'notifier.a_post_you_shared' I18n.translate 'notifier.a_post_you_shared'
end end

7
spec/helpers/notifier_helper_spec.rb
View file

@ -14,6 +14,13 @@ describe NotifierHelper, :type => :helper do
it 'strip markdown in the post' do it 'strip markdown in the post' do
expect(post_message(@markdown_post)).to eq(@striped_markdown_post) expect(post_message(@markdown_post)).to eq(@striped_markdown_post)
end end
it "falls back to the title, if the root post was deleted" do
reshare = FactoryGirl.create(:reshare)
reshare.root.destroy
expect(helper.post_message(Reshare.find(reshare.id)))
.to eq(I18n.t("posts.show.reshare_by", author: reshare.author_name))
end
end end
describe '#comment_message' do describe '#comment_message' do