Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Store URIs of follows, follow requests and blocks for ActivityPub (#7160)

Browse source 
Same URI passed between follow request and follow, since they are
the same thing in ActivityPub. Local URIs are generated during
creation using UUIDs and are passed to serializers.
This commit is contained in:
Eugen Rochko 2018-05-04 21:14:34 +02:00 • committed by GitHub
parent d1aef17f9a
commit 6793bec4c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 64 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spec/models/follow_request_spec.rb
View file

@ -7,7 +7,7 @@ RSpec.describe FollowRequest, type: :model do
let(:target_account) { Fabricate(:account) }
it 'calls Account#follow!, MergeWorker.perform_async, and #destroy!' do
expect(account).to receive(:follow!).with(target_account, reblogs: true)
expect(account).to receive(:follow!).with(target_account, reblogs: true, uri: follow_request.uri)
expect(MergeWorker).to receive(:perform_async).with(target_account.id, account.id)
expect(follow_request).to receive(:destroy!)
follow_request.authorize!