tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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

10
app/lib/activitypub/activity/reject.rb
View File

@ -2,17 +2,19 @@
class ActivityPub::Activity::Reject < ActivityPub::Activity
def perform
return reject_follow_for_relay if relay_follow?
return follow_request_from_object.reject! unless follow_request_from_object.nil?
return UnfollowService.new.call(follow_from_object.target_account, @account) unless follow_from_object.nil?
case @object['type']
when 'Follow'
reject_follow
reject_embedded_follow
end
end
private
def reject_follow
return reject_follow_for_relay if relay_follow?
def reject_embedded_follow
target_account = account_from_uri(target_uri)
return if target_account.nil? || !target_account.local?