autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change account domain block to clear out notifications and follows (#11393)

Browse Source
This commit is contained in:
Eugen Rochko
2019-08-09 21:34:23 +02:00
parent 4e4f73b231
commit ed27803822
7 changed files with 51 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/services/follow_service.rb
+1 -1
View File
@@ -13,7 +13,7 @@ class FollowService < BaseService
target_account = ResolveAccountService.new.call(target_account, skip_webfinger: true)
raise ActiveRecord::RecordNotFound if target_account.nil? || target_account.id == source_account.id || target_account.suspended?
raise Mastodon::NotPermittedError if target_account.blocking?(source_account) || source_account.blocking?(target_account) || target_account.moved?
raise Mastodon::NotPermittedError if target_account.blocking?(source_account) || source_account.blocking?(target_account) || target_account.moved? || source_account.domain_blocking?(target_account.domain)
if source_account.following?(target_account)
# We're already following this account, but we'll call follow! again to