tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into merge-upstream

Browse Source
This commit is contained in:
David Yip
2017-11-17 17:40:00 -06:00
parent 6f8ccbfcdf 24cafd73a2
commit 1ab12ba38e
67 changed files with 851 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/services/batched_remove_status_service.rb
View File

@@ -30,6 +30,7 @@ class BatchedRemoveStatusService < BaseService
account = account_statuses.first.account
unpush_from_home_timelines(account, account_statuses)
unpush_from_list_timelines(account, account_statuses)
if account.local?
batch_stream_entries(account, account_statuses)
@@ -80,7 +81,15 @@ class BatchedRemoveStatusService < BaseService
recipients.each do |follower|
statuses.each do |status|
FeedManager.instance.unpush(:home, follower, status)
FeedManager.instance.unpush_from_home(follower, status)
end
end
end
def unpush_from_list_timelines(account, statuses)
account.lists.select(:id, :account_id).each do |list|
statuses.each do |status|
FeedManager.instance.unpush_from_list(list, status)
end
end
end