diff options
author | David Yip <yipdw@member.fsf.org> | 2017-11-17 17:40:00 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-11-17 17:40:00 -0600 |
commit | 1ab12ba38ebd42be93b63b7cf0d3c6a81060b741 (patch) | |
tree | 3899389c63c16e33dd48fadb270d3259a7c15b67 /app/services/remove_status_service.rb | |
parent | 6f8ccbfcdf7fd8ca651d1583a608e96b25a09e25 (diff) | |
parent | 24cafd73a2b644025e9aeaadf4fed46dd3ecea4d (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream
Diffstat (limited to 'app/services/remove_status_service.rb')
-rw-r--r-- | app/services/remove_status_service.rb | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb index 8eef3e57e..9617081fd 100644 --- a/app/services/remove_status_service.rb +++ b/app/services/remove_status_service.rb @@ -14,6 +14,7 @@ class RemoveStatusService < BaseService remove_from_self if status.account.local? remove_from_followers + remove_from_lists remove_from_affected remove_reblogs remove_from_hashtags @@ -31,12 +32,18 @@ class RemoveStatusService < BaseService private def remove_from_self - unpush(:home, @account, @status) + FeedManager.instance.unpush_from_home(@account, @status) end def remove_from_followers @account.followers.local.find_each do |follower| - unpush(:home, follower, @status) + FeedManager.instance.unpush_from_home(follower, @status) + end + end + + def remove_from_lists + @account.lists.select(:id, :account_id).find_each do |list| + FeedManager.instance.unpush_from_list(list, @status) end end @@ -102,10 +109,6 @@ class RemoveStatusService < BaseService end end - def unpush(type, receiver, status) - FeedManager.instance.unpush(type, receiver, status) - end - def remove_from_hashtags return unless @status.public_visibility? |