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

Merge remote-tracking branch 'origin/master' into gs-master

Browse Source
This commit is contained in:
David Yip
2017-11-16 22:52:37 -06:00
parent ee560abdbe dc6e031364
commit b28b405b97
29 changed files with 136 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/batched_remove_status_service.rb
View File

@@ -26,7 +26,7 @@ class BatchedRemoveStatusService < BaseService
statuses.each(&:destroy)
# Batch by source account
statuses.group_by(&:account_id).each do |_, account_statuses|
statuses.group_by(&:account_id).each_value do |account_statuses|
account = account_statuses.first.account
unpush_from_home_timelines(account, account_statuses)

4
app/services/resolve_remote_account_service.rb
View File

@@ -124,11 +124,11 @@ class ResolveRemoteAccountService < BaseService
end
def auto_suspend?
domain_block && domain_block.suspend?
domain_block&.suspend?
end
def auto_silence?
domain_block && domain_block.silence?
domain_block&.silence?
end
def domain_block