hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not hide boost notifications from followed people with hidden boosts (#9147) 

* Do not hide boost notifications from followed people with hidden boosts

Not displaying boosts from a followed user in the Home timeline and not
having notifications when they reblog your own content are two very
separate concerns, tying them together seem counter-intuitive and unwanted.

* Update specs accordingly
signup-info-prompt
ThibG 2018-10-30 00:47:31 +01:00 committed by Eugen Rochko
parent e84da282f6
commit 33a71e8f7c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/notify_service.rb
View File

@ -31,7 +31,7 @@ class NotifyService < BaseService
end end
def blocked_reblog? def blocked_reblog?
@recipient.muting_reblogs?(@notification.from_account) false
end end
def blocked_follow_request? def blocked_follow_request?

6
spec/services/notify_service_spec.rb
View File

@ -104,9 +104,9 @@ RSpec.describe NotifyService, type: :service do
is_expected.to change(Notification, :count) is_expected.to change(Notification, :count)
end end
it 'hides reblogs when disabled' do it 'shows reblogs when disabled' do
recipient.follow!(sender, reblogs: false) recipient.follow!(sender, reblogs: true)
is_expected.to_not change(Notification, :count) is_expected.to change(Notification, :count)
end end
end end