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

Include PostsHelper in NotifierHelper

Browse source 
Fixes #7852

closes #7853
This commit is contained in:
Dennis Schubert 2018-09-06 01:35:12 +02:00 committed by Benjamin Neff
parent f130ec414e
commit 65a2b8da12
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Changelog.md
View file

@ -4,7 +4,7 @@
## Bug fixes ## Bug fixes
* Add compatibility with macOS to `script/configure_bundler` [#7830](https://github.com/diaspora/diaspora/pull/7830) * Add compatibility with macOS to `script/configure_bundler` [#7830](https://github.com/diaspora/diaspora/pull/7830)
* Fix comment notifications for comments on posts without text [#7857](https://github.com/diaspora/diaspora/pull/7857) * Fix comment and like notifications on posts without text [#7857](https://github.com/diaspora/diaspora/pull/7857) [#7853](https://github.com/diaspora/diaspora/pull/7853)
## Features ## Features
* Add `web+diaspora://` link handler [#7826](https://github.com/diaspora/diaspora/pull/7826) * Add `web+diaspora://` link handler [#7826](https://github.com/diaspora/diaspora/pull/7826)

5
app/helpers/notifier_helper.rb
View file

@ -1,6 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
module NotifierHelper module NotifierHelper
include PostsHelper
# @param post [Post] The post object. # @param post [Post] The post object.
# @param opts [Hash] Optional hash. Accepts :length parameters. # @param opts [Hash] Optional hash. Accepts :length parameters.
@ -9,7 +10,7 @@ module NotifierHelper
if post.respond_to? :message if post.respond_to? :message
post.message.try(:plain_text_without_markdown).presence || post_page_title(post) post.message.try(:plain_text_without_markdown).presence || post_page_title(post)
else else
I18n.translate 'notifier.a_post_you_shared' I18n.translate "notifier.a_post_you_shared"
end end
end end
@ -19,7 +20,7 @@ module NotifierHelper
if comment.post.public? if comment.post.public?
comment.message.plain_text_without_markdown comment.message.plain_text_without_markdown
else else
I18n.translate 'notifier.a_limited_post_comment' I18n.translate "notifier.a_limited_post_comment"
end end
end end
end end

8
spec/mailers/notifier_spec.rb
View file

@ -214,6 +214,14 @@ describe Notifier, type: :mailer do
like = reshare.likes.create!(author: bob.person) like = reshare.likes.create!(author: bob.person)
Notifier.send_notification("liked", alice.id, like.author.id, like.id) Notifier.send_notification("liked", alice.id, like.author.id, like.id)
end end
it "can handle status_messages without text" do
photo = FactoryGirl.create(:photo, public: true)
status = FactoryGirl.create(:status_message, author: alice.person, text: nil, photos: [photo], public: true)
like = status.likes.create!(author: bob.person)
mail = Notifier.send_notification("liked", alice.id, like.author.id, like.id)
expect(mail.body.encoded).to include(I18n.t("posts.show.photos_by", count: 1, author: alice.name))
end
end end
describe ".reshared" do describe ".reshared" do