sunoru/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow Accept/Reject with a non-embedded object (#12199)

Browse source 
Some ActivityPub servers refuse to embed remote objects into their own
output. This is because they are not the authoritative source for these
objects, and as such embedding them is always a waste of space. The
follow request and follow models contain a URI, so this can be used to
match them.
This commit is contained in:
puckipedia 2019-10-24 20:45:43 +00:00 • committed by Eugen Rochko
parent bd684e25d9
commit d2919f7e94
3 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/lib/activitypub/activity/accept.rb
View file

@ -2,17 +2,18 @@
class ActivityPub::Activity::Accept < ActivityPub::Activity
def perform
return accept_follow_for_relay if relay_follow?
return follow_request_from_object.authorize! unless follow_request_from_object.nil?
case @object['type']
when 'Follow'
accept_follow
accept_embedded_follow
end
end
private
def accept_follow
return accept_follow_for_relay if relay_follow?
def accept_embedded_follow
target_account = account_from_uri(target_uri)
return if target_account.nil? || !target_account.local?