18b451c0e6
* Change silenced accounts to require approval on follow * Also require approval for follows by people explicitly muted by target accounts * Do not auto-accept silenced or muted accounts when switching from locked to unlocked * Add `follow_requests_count` to verify_credentials * Show “Follow requests” menu item if needed even if account is locked * Add tests * Correctly reflect that follow requests weren't auto-accepted when local account is silenced * Accept follow requests from user-muted accounts to avoid leaking mutes
38 lines
1 KiB
Ruby
38 lines
1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class UpdateAccountService < BaseService
|
|
def call(account, params, raise_error: false)
|
|
was_locked = account.locked
|
|
update_method = raise_error ? :update! : :update
|
|
|
|
account.send(update_method, params).tap do |ret|
|
|
next unless ret
|
|
|
|
authorize_all_follow_requests(account) if was_locked && !account.locked
|
|
check_links(account)
|
|
process_hashtags(account)
|
|
end
|
|
rescue Mastodon::DimensionsValidationError => de
|
|
account.errors.add(:avatar, de.message)
|
|
false
|
|
end
|
|
|
|
private
|
|
|
|
def authorize_all_follow_requests(account)
|
|
follow_requests = FollowRequest.where(target_account: account)
|
|
follow_requests = follow_requests.select { |req| !req.account.silenced? }
|
|
AuthorizeFollowWorker.push_bulk(follow_requests) do |req|
|
|
[req.account_id, req.target_account_id]
|
|
end
|
|
end
|
|
|
|
def check_links(account)
|
|
VerifyAccountLinksWorker.perform_async(account.id)
|
|
end
|
|
|
|
def process_hashtags(account)
|
|
account.tags_as_strings = Extractor.extract_hashtags(account.note)
|
|
end
|
|
end
|