diff options
| author | aschmitz <aschmitz@lardbucket.org> | 2017-11-10 20:11:10 -0600 |
|---|---|---|
| committer | aschmitz <aschmitz@lardbucket.org> | 2017-11-10 22:04:54 -0600 |
| commit | b95c48748cd4e7a1181cdf3f17e23d6e526a9d95 (patch) | |
| tree | a3d69c3831ef59755609a999c8eaae23c720049f /app/services | |
| parent | 49445150202f0bdaae942b9ae1ba44802a1c22e9 (diff) | |
Per-user reblog hiding implementation/fixes/tests
Note that this will only hide/show *future* reblogs by a user, and does nothing to remove/add reblogs that are already in the timeline. I don't think that's a particularly confusing behavior, and it's a lot easier to implement (similar to mutes, I believe).
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/follow_service.rb | 2 | ||||
| -rw-r--r-- | app/services/notify_service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index 70572110d..6db591999 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -39,7 +39,7 @@ class FollowService < BaseService private def request_follow(source_account, target_account, reblogs: true) - follow_request = FollowRequest.create!(account: source_account, target_account: target_account, reblogs: reblogs) + follow_request = FollowRequest.create!(account: source_account, target_account: target_account, show_reblogs: reblogs) if target_account.local? NotifyService.new.call(target_account, follow_request) diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb index fb09df983..3fa3f152c 100644 --- a/app/services/notify_service.rb +++ b/app/services/notify_service.rb @@ -29,7 +29,7 @@ class NotifyService < BaseService end def blocked_reblog? - false + @recipient.muting_reblogs?(@notification.from_account) end def blocked_follow_request? |