Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add support for dereferencing objects through bearcaps (#14683)

Browse source
This commit is contained in:
Eugen Rochko 2020-08-30 12:34:20 +02:00 • committed by GitHub
parent ce8f33dd2f
commit 52157fdcba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 166 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/lib/activitypub/activity.rb
View file

@ -71,7 +71,15 @@ class ActivityPub::Activity
end
def object_uri
@object_uri ||= value_or_id(@object)
@object_uri ||= begin
str = value_or_id(@object)
if str.start_with?('bear:')
Addressable::URI.parse(str).query_values['u']
else
str
end
end
end
def unsupported_object_type?
@ -159,12 +167,10 @@ class ActivityPub::Activity
def dereference_object!
return unless @object.is_a?(String)
return if invalid_origin?(@object)
object = fetch_resource(@object, true, signed_fetch_account)
return unless object.present? && object.is_a?(Hash) && supported_context?(object)
dereferencer = ActivityPub::Dereferencer.new(@object, permitted_origin: @account.uri, signature_account: signed_fetch_account)
@object = object
@object = dereferencer.object unless dereferencer.object.nil?
end
def signed_fetch_account