Improve ActivityPub representations (#3844)
* Improve webfinger templates and make tests more flexible * Clean up AS2 representation of actor * Refactor outbox * Create activities representation * Add representations of followers/following collections, do not redirect /users/:username route if format is empty * Remove unused translations * ActivityPub endpoint for single statuses, add ActivityPub::TagManager for better URL/URI generation * Add ActivityPub::TagManager#to * Represent all attachments as Document instead of Image/Video specifically (Because for remote ones we may not know for sure) Add mentions and hashtags representation to AP notes * Add AP-resolvable hashtag URIs * Use ActiveModelSerializers for ActivityPub * Clean up unused translations * Separate route for object and activity * Adjust cc/to matrices * Add to/cc to activities, ensure announce activity embeds target status and not the wrapper status, add "id" to all collections
This commit is contained in:
Eugen Rochko
GitHub
parent
3fbf1bf35a
commit
8c45cd0e36
61 changed files with 443 additions and 725 deletions
|
|
@ -1,69 +0,0 @@
|
|||
require 'rails_helper'
|
||||
|
||||
RSpec.describe Api::ActivityPub::ActivitiesController, type: :controller do
|
||||
render_views
|
||||
|
||||
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
|
||||
|
||||
describe 'GET #show' do
|
||||
describe 'normal status' do
|
||||
public_status = nil
|
||||
|
||||
before do
|
||||
public_status = Fabricate(:status, account: user.account, text: 'Hello world', visibility: :public)
|
||||
|
||||
@request.env['HTTP_ACCEPT'] = 'application/activity+json'
|
||||
get :show_status, params: { id: public_status.id }
|
||||
end
|
||||
|
||||
it 'returns http success' do
|
||||
expect(response).to have_http_status(:success)
|
||||
end
|
||||
|
||||
it 'sets Content-Type header to AS2' do
|
||||
expect(response.header['Content-Type']).to include 'application/activity+json'
|
||||
end
|
||||
|
||||
it 'returns http success' do
|
||||
json_data = JSON.parse(response.body)
|
||||
expect(json_data).to include('@context' => 'https://www.w3.org/ns/activitystreams')
|
||||
expect(json_data).to include('type' => 'Create')
|
||||
expect(json_data).to include('id' => @request.url)
|
||||
expect(json_data).to include('type' => 'Create')
|
||||
expect(json_data).to include('object' => api_activitypub_note_url(public_status))
|
||||
expect(json_data).to include('url' => TagManager.instance.url_for(public_status))
|
||||
end
|
||||
end
|
||||
|
||||
describe 'reblog' do
|
||||
original = nil
|
||||
reblog = nil
|
||||
|
||||
before do
|
||||
original = Fabricate(:status, account: user.account, text: 'Hello world', visibility: :public)
|
||||
reblog = Fabricate(:status, account: user.account, reblog_of_id: original.id, visibility: :public)
|
||||
|
||||
@request.env['HTTP_ACCEPT'] = 'application/activity+json'
|
||||
get :show_status, params: { id: reblog.id }
|
||||
end
|
||||
|
||||
it 'returns http success' do
|
||||
expect(response).to have_http_status(:success)
|
||||
end
|
||||
|
||||
it 'sets Content-Type header to AS2' do
|
||||
expect(response.header['Content-Type']).to include 'application/activity+json'
|
||||
end
|
||||
|
||||
it 'returns http success' do
|
||||
json_data = JSON.parse(response.body)
|
||||
expect(json_data).to include('@context' => 'https://www.w3.org/ns/activitystreams')
|
||||
expect(json_data).to include('type' => 'Announce')
|
||||
expect(json_data).to include('id' => @request.url)
|
||||
expect(json_data).to include('type' => 'Announce')
|
||||
expect(json_data).to include('object' => api_activitypub_status_url(original))
|
||||
expect(json_data).to include('url' => TagManager.instance.url_for(reblog))
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
require 'rails_helper'
|
||||
|
||||
RSpec.describe Api::ActivityPub::NotesController, type: :controller do
|
||||
render_views
|
||||
|
||||
let(:user_alice) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
|
||||
let(:user_bob) { Fabricate(:user, account: Fabricate(:account, username: 'bob')) }
|
||||
|
||||
describe 'GET #show' do
|
||||
describe 'normal status' do
|
||||
public_status = nil
|
||||
|
||||
before do
|
||||
public_status = Fabricate(:status, account: user_alice.account, text: 'Hello world', visibility: :public)
|
||||
|
||||
@request.env['HTTP_ACCEPT'] = 'application/activity+json'
|
||||
get :show, params: { id: public_status.id }
|
||||
end
|
||||
|
||||
it 'returns http success' do
|
||||
expect(response).to have_http_status(:success)
|
||||
end
|
||||
|
||||
it 'sets Content-Type header to AS2' do
|
||||
expect(response.header['Content-Type']).to include 'application/activity+json'
|
||||
end
|
||||
|
||||
it 'returns http success' do
|
||||
json_data = JSON.parse(response.body)
|
||||
expect(json_data).to include('@context' => 'https://www.w3.org/ns/activitystreams')
|
||||
expect(json_data).to include('type' => 'Note')
|
||||
expect(json_data).to include('id' => @request.url)
|
||||
expect(json_data).to include('name' => 'Hello world')
|
||||
expect(json_data).to include('content' => 'Hello world')
|
||||
expect(json_data).to include('published')
|
||||
expect(json_data).to include('url' => TagManager.instance.url_for(public_status))
|
||||
end
|
||||
end
|
||||
|
||||
describe 'reply' do
|
||||
original = nil
|
||||
reply = nil
|
||||
|
||||
before do
|
||||
original = Fabricate(:status, account: user_alice.account, text: 'Hello world', visibility: :public)
|
||||
reply = Fabricate(:status, account: user_bob.account, text: 'Hello world', in_reply_to_id: original.id, visibility: :public)
|
||||
|
||||
@request.env['HTTP_ACCEPT'] = 'application/activity+json'
|
||||
get :show, params: { id: reply.id }
|
||||
end
|
||||
|
||||
it 'returns http success' do
|
||||
expect(response).to have_http_status(:success)
|
||||
end
|
||||
|
||||
it 'sets Content-Type header to AS2' do
|
||||
expect(response.header['Content-Type']).to include 'application/activity+json'
|
||||
end
|
||||
|
||||
it 'returns http success' do
|
||||
json_data = JSON.parse(response.body)
|
||||
expect(json_data).to include('@context' => 'https://www.w3.org/ns/activitystreams')
|
||||
expect(json_data).to include('type' => 'Note')
|
||||
expect(json_data).to include('id' => @request.url)
|
||||
expect(json_data).to include('name' => 'Hello world')
|
||||
expect(json_data).to include('content' => 'Hello world')
|
||||
expect(json_data).to include('published')
|
||||
expect(json_data).to include('url' => TagManager.instance.url_for(reply))
|
||||
expect(json_data).to include('inReplyTo' => api_activitypub_note_url(original))
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -1,156 +0,0 @@
|
|||
require 'rails_helper'
|
||||
|
||||
RSpec.describe Api::ActivityPub::OutboxController, type: :controller do
|
||||
render_views
|
||||
|
||||
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
|
||||
|
||||
describe 'GET #show' do
|
||||
before do
|
||||
@request.headers['ACCEPT'] = 'application/activity+json'
|
||||
end
|
||||
|
||||
describe 'collection with small number of statuses' do
|
||||
public_status = nil
|
||||
|
||||
before do
|
||||
public_status = Fabricate(:status, account: user.account, text: 'Hello world', visibility: :public)
|
||||
Fabricate(:status, account: user.account, text: 'Hello world', visibility: :private)
|
||||
Fabricate(:status, account: user.account, text: 'Hello world', visibility: :unlisted)
|
||||
Fabricate(:status, account: user.account, text: 'Hello world', visibility: :direct)
|
||||
|
||||
get :show, params: { id: user.account.id }
|
||||
end
|
||||
|
||||
it 'returns http success' do
|
||||
expect(response).to have_http_status(:success)
|
||||
end
|
||||
|
||||
it 'sets Content-Type header to AS2' do
|
||||
expect(response.header['Content-Type']).to include 'application/activity+json'
|
||||
end
|
||||
|
||||
it 'returns AS2 JSON body' do
|
||||
json_data = JSON.parse(response.body)
|
||||
expect(json_data).to include('@context' => 'https://www.w3.org/ns/activitystreams')
|
||||
expect(json_data).to include('id' => @request.url)
|
||||
expect(json_data).to include('type' => 'OrderedCollection')
|
||||
expect(json_data).to include('totalItems' => 1)
|
||||
expect(json_data).to include('current')
|
||||
expect(json_data).to include('first')
|
||||
expect(json_data).to include('last')
|
||||
end
|
||||
end
|
||||
|
||||
describe 'collection with large number of statuses' do
|
||||
before do
|
||||
30.times do
|
||||
Fabricate(:status, account: user.account, text: 'Hello world', visibility: :public)
|
||||
end
|
||||
|
||||
Fabricate(:status, account: user.account, text: 'Hello world', visibility: :private)
|
||||
Fabricate(:status, account: user.account, text: 'Hello world', visibility: :unlisted)
|
||||
Fabricate(:status, account: user.account, text: 'Hello world', visibility: :direct)
|
||||
|
||||
get :show, params: { id: user.account.id }
|
||||
end
|
||||
|
||||
it 'returns http success' do
|
||||
expect(response).to have_http_status(:success)
|
||||
end
|
||||
|
||||
it 'sets Content-Type header to AS2' do
|
||||
expect(response.header['Content-Type']).to include 'application/activity+json'
|
||||
end
|
||||
|
||||
it 'returns AS2 JSON body' do
|
||||
json_data = JSON.parse(response.body)
|
||||
expect(json_data).to include('@context' => 'https://www.w3.org/ns/activitystreams')
|
||||
expect(json_data).to include('id' => @request.url)
|
||||
expect(json_data).to include('type' => 'OrderedCollection')
|
||||
expect(json_data).to include('totalItems' => 30)
|
||||
expect(json_data).to include('current')
|
||||
expect(json_data).to include('first')
|
||||
expect(json_data).to include('last')
|
||||
end
|
||||
end
|
||||
|
||||
describe 'page with small number of statuses' do
|
||||
statuses = []
|
||||
|
||||
before do
|
||||
5.times do
|
||||
statuses << Fabricate(:status, account: user.account, text: 'Hello world', visibility: :public)
|
||||
end
|
||||
|
||||
Fabricate(:status, account: user.account, text: 'Hello world', visibility: :private)
|
||||
Fabricate(:status, account: user.account, text: 'Hello world', visibility: :unlisted)
|
||||
Fabricate(:status, account: user.account, text: 'Hello world', visibility: :direct)
|
||||
|
||||
get :show, params: { id: user.account.id, max_id: statuses.last.id + 1 }
|
||||
end
|
||||
|
||||
it 'returns http success' do
|
||||
expect(response).to have_http_status(:success)
|
||||
end
|
||||
|
||||
it 'sets Content-Type header to AS2' do
|
||||
expect(response.header['Content-Type']).to include 'application/activity+json'
|
||||
end
|
||||
|
||||
it 'returns AS2 JSON body' do
|
||||
json_data = JSON.parse(response.body)
|
||||
expect(json_data).to include('@context' => 'https://www.w3.org/ns/activitystreams')
|
||||
expect(json_data).to include('id' => @request.url)
|
||||
expect(json_data).to include('type' => 'OrderedCollectionPage')
|
||||
expect(json_data).to include('partOf')
|
||||
expect(json_data).to include('items')
|
||||
expect(json_data['items'].length).to eq(5)
|
||||
expect(json_data).to include('prev')
|
||||
expect(json_data).to include('next')
|
||||
expect(json_data).to include('current')
|
||||
expect(json_data).to include('first')
|
||||
expect(json_data).to include('last')
|
||||
end
|
||||
end
|
||||
|
||||
describe 'page with large number of statuses' do
|
||||
statuses = []
|
||||
|
||||
before do
|
||||
30.times do
|
||||
statuses << Fabricate(:status, account: user.account, text: 'Hello world', visibility: :public)
|
||||
end
|
||||
|
||||
Fabricate(:status, account: user.account, text: 'Hello world', visibility: :private)
|
||||
Fabricate(:status, account: user.account, text: 'Hello world', visibility: :unlisted)
|
||||
Fabricate(:status, account: user.account, text: 'Hello world', visibility: :direct)
|
||||
|
||||
get :show, params: { id: user.account.id, max_id: statuses.last.id + 1 }
|
||||
end
|
||||
|
||||
it 'returns http success' do
|
||||
expect(response).to have_http_status(:success)
|
||||
end
|
||||
|
||||
it 'sets Content-Type header to AS2' do
|
||||
expect(response.header['Content-Type']).to include 'application/activity+json'
|
||||
end
|
||||
|
||||
it 'returns AS2 JSON body' do
|
||||
json_data = JSON.parse(response.body)
|
||||
expect(json_data).to include('@context' => 'https://www.w3.org/ns/activitystreams')
|
||||
expect(json_data).to include('id' => @request.url)
|
||||
expect(json_data).to include('type' => 'OrderedCollectionPage')
|
||||
expect(json_data).to include('partOf')
|
||||
expect(json_data).to include('items')
|
||||
expect(json_data['items'].length).to eq(20)
|
||||
expect(json_data).to include('prev')
|
||||
expect(json_data).to include('next')
|
||||
expect(json_data).to include('current')
|
||||
expect(json_data).to include('first')
|
||||
expect(json_data).to include('last')
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
Loading…
Add table
Add a link
Reference in a new issue