Expect relays to answer with accept/reject (#8179)

This commit is contained in:
Eugen Rochko 2018-08-12 18:16:26 +02:00 committed by GitHub
parent 2aeeffc3ec
commit 39e361a56d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 57 additions and 7 deletions

View file

@ -11,6 +11,8 @@ class ActivityPub::Activity::Accept < ActivityPub::Activity
private
def accept_follow
return accept_follow_for_relay if relay_follow?
target_account = account_from_uri(target_uri)
return if target_account.nil? || !target_account.local?
@ -19,6 +21,18 @@ class ActivityPub::Activity::Accept < ActivityPub::Activity
follow_request&.authorize!
end
def accept_follow_for_relay
relay.update!(state: :accepted)
end
def relay
@relay ||= Relay.find_by(follow_activity_id: object_uri)
end
def relay_follow?
relay.present?
end
def target_uri
@target_uri ||= value_or_id(@object['actor'])
end

View file

@ -11,6 +11,8 @@ class ActivityPub::Activity::Reject < ActivityPub::Activity
private
def reject_follow
return reject_follow_for_relay if relay_follow?
target_account = account_from_uri(target_uri)
return if target_account.nil? || !target_account.local?
@ -21,6 +23,18 @@ class ActivityPub::Activity::Reject < ActivityPub::Activity
UnfollowService.new.call(target_account, @account) if target_account.following?(@account)
end
def reject_follow_for_relay
relay.update!(state: :rejected)
end
def relay
@relay ||= Relay.find_by(follow_activity_id: object_uri)
end
def relay_follow?
relay.present?
end
def target_uri
@target_uri ||= value_or_id(@object['actor'])
end