mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
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
37 lines
1.5 KiB
Ruby
37 lines
1.5 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class ActivityPub::Activity::Follow < ActivityPub::Activity
|
|
include Payloadable
|
|
|
|
def perform
|
|
target_account = account_from_uri(object_uri)
|
|
|
|
return if target_account.nil? || !target_account.local? || delete_arrived_first?(@json['id']) || @account.requested?(target_account)
|
|
|
|
if target_account.blocking?(@account) || target_account.domain_blocking?(@account.domain) || target_account.moved? || target_account.instance_actor?
|
|
reject_follow_request!(target_account)
|
|
return
|
|
end
|
|
|
|
# Fast-forward repeat follow requests
|
|
if @account.following?(target_account)
|
|
AuthorizeFollowService.new.call(@account, target_account, skip_follow_request: true, follow_request_uri: @json['id'])
|
|
return
|
|
end
|
|
|
|
follow_request = FollowRequest.create!(account: @account, target_account: target_account, uri: @json['id'])
|
|
|
|
if target_account.locked? || @account.silenced?
|
|
NotifyService.new.call(target_account, follow_request)
|
|
else
|
|
AuthorizeFollowService.new.call(@account, target_account)
|
|
NotifyService.new.call(target_account, ::Follow.find_by(account: @account, target_account: target_account))
|
|
end
|
|
end
|
|
|
|
def reject_follow_request!(target_account)
|
|
json = Oj.dump(serialize_payload(FollowRequest.new(account: @account, target_account: target_account, uri: @json['id']), ActivityPub::RejectFollowSerializer))
|
|
ActivityPub::DeliveryWorker.perform_async(json, target_account.id, @account.inbox_url)
|
|
end
|
|
end
|