diff options
author | ThibG <thib@sitedethib.com> | 2018-10-30 00:47:31 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-10-30 00:47:31 +0100 |
commit | 33a71e8f7cd28aad5aa690a6d77aa83fe289f69c (patch) | |
tree | 31d2a7d2ca9dd13915387b054ea4f8fbbc78a0b3 | |
parent | e84da282f6331d463678a7e3ccd37e66c0dfcab3 (diff) |
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
-rw-r--r-- | app/services/notify_service.rb | 2 | ||||
-rw-r--r-- | spec/services/notify_service_spec.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb index 49022a844e9..a8b7bb30bae 100644 --- a/app/services/notify_service.rb +++ b/app/services/notify_service.rb @@ -31,7 +31,7 @@ class NotifyService < BaseService end def blocked_reblog? - @recipient.muting_reblogs?(@notification.from_account) + false end def blocked_follow_request? diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb index d3466794314..39a681abbf7 100644 --- a/spec/services/notify_service_spec.rb +++ b/spec/services/notify_service_spec.rb @@ -104,9 +104,9 @@ RSpec.describe NotifyService, type: :service do is_expected.to change(Notification, :count) end - it 'hides reblogs when disabled' do - recipient.follow!(sender, reblogs: false) - is_expected.to_not change(Notification, :count) + it 'shows reblogs when disabled' do + recipient.follow!(sender, reblogs: true) + is_expected.to change(Notification, :count) end end |