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 collectionslocal
parent
3fbf1bf35a
commit
8c45cd0e36
61 changed files with 443 additions and 725 deletions
@ -0,0 +1,28 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class ActivityPub::OutboxesController < Api::BaseController |
||||
before_action :set_account |
||||
|
||||
def show |
||||
@statuses = @account.statuses.permitted_for(@account, current_account).paginate_by_max_id(20, params[:max_id], params[:since_id]) |
||||
@statuses = cache_collection(@statuses, Status) |
||||
|
||||
render json: outbox_presenter, serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter |
||||
end |
||||
|
||||
private |
||||
|
||||
def set_account |
||||
@account = Account.find_local!(params[:account_username]) |
||||
end |
||||
|
||||
def outbox_presenter |
||||
ActivityPub::CollectionPresenter.new( |
||||
id: account_outbox_url(@account), |
||||
type: :ordered, |
||||
current: account_outbox_url(@account), |
||||
size: @account.statuses_count, |
||||
items: @statuses |
||||
) |
||||
end |
||||
end |
@ -1,27 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class Api::ActivityPub::ActivitiesController < Api::BaseController |
||||
include Authorization |
||||
|
||||
# before_action :set_follow, only: [:show_follow] |
||||
before_action :set_status, only: [:show_status] |
||||
|
||||
respond_to :activitystreams2 |
||||
|
||||
# Show a status in AS2 format, as either an Announce (reblog) or a Create (post) activity. |
||||
def show_status |
||||
authorize @status, :show? |
||||
|
||||
if @status.reblog? |
||||
render :show_status_announce |
||||
else |
||||
render :show_status_create |
||||
end |
||||
end |
||||
|
||||
private |
||||
|
||||
def set_status |
||||
@status = Status.find(params[:id]) |
||||
end |
||||
end |
@ -1,19 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class Api::ActivityPub::NotesController < Api::BaseController |
||||
include Authorization |
||||
|
||||
before_action :set_status |
||||
|
||||
respond_to :activitystreams2 |
||||
|
||||
def show |
||||
authorize @status, :show? |
||||
end |
||||
|
||||
private |
||||
|
||||
def set_status |
||||
@status = Status.find(params[:id]) |
||||
end |
||||
end |
@ -1,69 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class Api::ActivityPub::OutboxController < Api::BaseController |
||||
before_action :set_account |
||||
|
||||
respond_to :activitystreams2 |
||||
|
||||
def show |
||||
if params[:max_id] || params[:since_id] |
||||
show_outbox_page |
||||
else |
||||
show_base_outbox |
||||
end |
||||
end |
||||
|
||||
private |
||||
|
||||
def show_base_outbox |
||||
@statuses = Status.as_outbox_timeline(@account) |
||||
@statuses = cache_collection(@statuses) |
||||
|
||||
set_maps(@statuses) |
||||
|
||||
set_first_last_page(@statuses) |
||||
|
||||
render :show |
||||
end |
||||
|
||||
def show_outbox_page |
||||
all_statuses = Status.as_outbox_timeline(@account) |
||||
@statuses = all_statuses.paginate_by_max_id(limit_param(DEFAULT_STATUSES_LIMIT), params[:max_id], params[:since_id]) |
||||
|
||||
all_statuses = cache_collection(all_statuses) |
||||
@statuses = cache_collection(@statuses) |
||||
|
||||
set_maps(@statuses) |
||||
|
||||
set_first_last_page(all_statuses) |
||||
|
||||
@next_page_url = api_activitypub_outbox_url(pagination_params(max_id: @statuses.last.id)) unless @statuses.empty? |
||||
@prev_page_url = api_activitypub_outbox_url(pagination_params(since_id: @statuses.first.id)) unless @statuses.empty? |
||||
|
||||
@paginated = @next_page_url || @prev_page_url |
||||
@part_of_url = api_activitypub_outbox_url |
||||
|
||||
set_pagination_headers(@next_page_url, @prev_page_url) |
||||
|
||||
render :show_page |
||||
end |
||||
|
||||
def cache_collection(raw) |
||||
super(raw, Status) |
||||
end |
||||
|
||||
def set_account |
||||
@account = Account.find(params[:id]) |
||||
end |
||||
|
||||
def set_first_last_page(statuses) # rubocop:disable Style/AccessorMethodName |
||||
return if statuses.empty? |
||||
|
||||
@first_page_url = api_activitypub_outbox_url(max_id: statuses.first.id + 1) |
||||
@last_page_url = api_activitypub_outbox_url(since_id: statuses.last.id - 1) |
||||
end |
||||
|
||||
def pagination_params(core_params) |
||||
params.permit(:local, :limit).merge(core_params) |
||||
end |
||||
end |
@ -1,8 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
module Activitystreams2BuilderHelper |
||||
# Gets a usable name for an account, using display name or username. |
||||
def account_name(account) |
||||
account.display_name.presence || account.username |
||||
end |
||||
end |
@ -0,0 +1,13 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base |
||||
def self.default_key_transform |
||||
:camel_lower |
||||
end |
||||
|
||||
def serializable_hash(options = nil) |
||||
options = serialization_options(options) |
||||
serialized_hash = { '@context': 'https://www.w3.org/ns/activitystreams' }.merge(ActiveModelSerializers::Adapter::Attributes.new(serializer, instance_options).serializable_hash(options)) |
||||
self.class.transform_key_casing!(serialized_hash, instance_options) |
||||
end |
||||
end |
@ -0,0 +1,69 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
require 'singleton' |
||||
|
||||
class ActivityPub::TagManager |
||||
include Singleton |
||||
include RoutingHelper |
||||
|
||||
COLLECTIONS = { |
||||
public: 'https://www.w3.org/ns/activitystreams#Public', |
||||
}.freeze |
||||
|
||||
def url_for(target) |
||||
return target.url if target.respond_to?(:local?) && !target.local? |
||||
|
||||
case target.object_type |
||||
when :person |
||||
short_account_url(target) |
||||
when :note, :comment, :activity |
||||
short_account_status_url(target.account, target) |
||||
end |
||||
end |
||||
|
||||
def uri_for(target) |
||||
return target.uri if target.respond_to?(:local?) && !target.local? |
||||
|
||||
case target.object_type |
||||
when :person |
||||
account_url(target) |
||||
when :note, :comment, :activity |
||||
account_status_url(target.account, target) |
||||
end |
||||
end |
||||
|
||||
# Primary audience of a status |
||||
# Public statuses go out to primarily the public collection |
||||
# Unlisted and private statuses go out primarily to the followers collection |
||||
# Others go out only to the people they mention |
||||
def to(status) |
||||
case status.visibility |
||||
when 'public' |
||||
[COLLECTIONS[:public]] |
||||
when 'unlisted', 'private' |
||||
[account_followers_url(status.account)] |
||||
when 'direct' |
||||
status.mentions.map { |mention| uri_for(mention.account) } |
||||
end |
||||
end |
||||
|
||||
# Secondary audience of a status |
||||
# Public statuses go out to followers as well |
||||
# Unlisted statuses go to the public as well |
||||
# Both of those and private statuses also go to the people mentioned in them |
||||
# Direct ones don't have a secondary audience |
||||
def cc(status) |
||||
cc = [] |
||||
|
||||
case status.visibility |
||||
when 'public' |
||||
cc << account_followers_url(status.account) |
||||
when 'unlisted' |
||||
cc << COLLECTIONS[:public] |
||||
end |
||||
|
||||
cc.concat(status.mentions.map { |mention| uri_for(mention.account) }) unless status.direct_visibility? |
||||
|
||||
cc |
||||
end |
||||
end |
@ -0,0 +1,5 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class ActivityPub::CollectionPresenter < ActiveModelSerializers::Model |
||||
attributes :id, :type, :current, :size, :items |
||||
end |
@ -0,0 +1,27 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class ActivityPub::ActivitySerializer < ActiveModel::Serializer |
||||
attributes :id, :type, :actor, :to, :cc |
||||
|
||||
has_one :proper, key: :object, serializer: ActivityPub::NoteSerializer |
||||
|
||||
def id |
||||
[ActivityPub::TagManager.instance.uri_for(object), '/activity'].join |
||||
end |
||||
|
||||
def type |
||||
object.reblog? ? 'Announce' : 'Create' |
||||
end |
||||
|
||||
def actor |
||||
ActivityPub::TagManager.instance.uri_for(object.account) |
||||
end |
||||
|
||||
def to |
||||
ActivityPub::TagManager.instance.to(object) |
||||
end |
||||
|
||||
def cc |
||||
ActivityPub::TagManager.instance.cc(object) |
||||
end |
||||
end |
@ -0,0 +1,53 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class ActivityPub::ActorSerializer < ActiveModel::Serializer |
||||
include RoutingHelper |
||||
|
||||
attributes :id, :type, :following, :followers, |
||||
:inbox, :outbox, :preferred_username, |
||||
:name, :summary, :icon, :image |
||||
|
||||
def id |
||||
account_url(object) |
||||
end |
||||
|
||||
def type |
||||
'Person' |
||||
end |
||||
|
||||
def following |
||||
account_following_index_url(object) |
||||
end |
||||
|
||||
def followers |
||||
account_followers_url(object) |
||||
end |
||||
|
||||
def inbox |
||||
nil |
||||
end |
||||
|
||||
def outbox |
||||
account_outbox_url(object) |
||||
end |
||||
|
||||
def preferred_username |
||||
object.username |
||||
end |
||||
|
||||
def name |
||||
object.display_name |
||||
end |
||||
|
||||
def summary |
||||
Formatter.instance.simplified_format(object) |
||||
end |
||||
|
||||
def icon |
||||
full_asset_url(object.avatar.url(:original)) |
||||
end |
||||
|
||||
def image |
||||
full_asset_url(object.header.url(:original)) |
||||
end |
||||
end |
@ -0,0 +1,26 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class ActivityPub::CollectionSerializer < ActiveModel::Serializer |
||||
def self.serializer_for(model, options) |
||||
return ActivityPub::ActivitySerializer if model.class.name == 'Status' |
||||
super |
||||
end |
||||
|
||||
attributes :id, :type, :total_items, |
||||
:current |
||||
|
||||
has_many :items, key: :ordered_items |
||||
|
||||
def type |
||||
case object.type |
||||
when :ordered |
||||
'OrderedCollection' |
||||
else |
||||
'Collection' |
||||
end |
||||
end |
||||
|
||||
def total_items |
||||
object.size |
||||
end |
||||
end |
@ -0,0 +1,106 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class ActivityPub::NoteSerializer < ActiveModel::Serializer |
||||
attributes :id, :type, :summary, :content, |
||||
:in_reply_to, :published, :url, |
||||
:actor, :to, :cc, :sensitive |
||||
|
||||
has_many :media_attachments, key: :attachment |
||||
has_many :virtual_tags, key: :tag |
||||
|
||||
def id |
||||
ActivityPub::TagManager.instance.uri_for(object) |
||||
end |
||||
|
||||
def type |
||||
'Note' |
||||
end |
||||
|
||||
def summary |
||||
object.spoiler_text.presence |
||||
end |
||||
|
||||
def content |
||||
Formatter.instance.format(object) |
||||
end |
||||
|
||||
def in_reply_to |
||||
ActivityPub::TagManager.instance.uri_for(object.thread) if object.reply? |
||||
end |
||||
|
||||
def published |
||||
object.created_at.iso8601 |
||||
end |
||||
|
||||
def url |
||||
ActivityPub::TagManager.instance.url_for(object) |
||||
end |
||||
|
||||
def actor |
||||
ActivityPub::TagManager.instance.uri_for(object.account) |
||||
end |
||||
|
||||
def to |
||||
ActivityPub::TagManager.instance.to(object) |
||||
end |
||||
|
||||
def cc |
||||
ActivityPub::TagManager.instance.cc(object) |
||||
end |
||||
|
||||
def virtual_tags |
||||
object.mentions + object.tags |
||||
end |
||||
|
||||
class MediaAttachmentSerializer < ActiveModel::Serializer |
||||
include RoutingHelper |
||||
|
||||
attributes :type, :media_type, :url |
||||
|
||||
def type |
||||
'Document' |
||||
end |
||||
|
||||
def media_type |
||||
object.file_content_type |
||||
end |
||||
|
||||
def url |
||||
object.local? ? full_asset_url(object.file.url(:original, false)) : object.remote_url |
||||
end |
||||
end |
||||
|
||||
class MentionSerializer < ActiveModel::Serializer |
||||
attributes :type, :href, :name |
||||
|
||||
def type |
||||
'Mention' |
||||
end |
||||
|
||||
def href |
||||
ActivityPub::TagManager.instance.uri_for(object.account) |
||||
end |
||||
|
||||
def name |
||||
"@#{object.account.acct}" |
||||
end |
||||
end |
||||
|
||||
class TagSerializer < ActiveModel::Serializer |
||||
include RoutingHelper |
||||
|
||||
attributes :type, :href, :name |
||||
|
||||
def type |
||||
'Hashtag' |
||||
end |
||||
|
||||
def href |
||||
tag_url(object) |
||||
end |
||||
|
||||
def name |
||||
"##{object.name}" |
||||
end |
||||
end |
||||
end |
@ -1,9 +0,0 @@ |
||||
extends 'activitypub/types/person.activitystreams2.rabl' |
||||
|
||||
object @account |
||||
|
||||
attributes display_name: :name, username: :preferredUsername, note: :summary |
||||
|
||||
node(:icon) { |account| full_asset_url(account.avatar.url(:original)) } |
||||
node(:image) { |account| full_asset_url(account.header.url(:original)) } |
||||
node(:outbox) { |account| api_activitypub_outbox_url(account.id) } |
@ -1 +0,0 @@ |
||||
node(:'@context') { 'https://www.w3.org/ns/activitystreams' } |
@ -1,3 +0,0 @@ |
||||
extends 'activitypub/base.activitystreams2.rabl' |
||||
|
||||
node(:id) { request.original_url } |
@ -1,3 +0,0 @@ |
||||
extends 'activitypub/intransient.activitystreams2.rabl' |
||||
|
||||
node(:type) { 'Announce' } |
@ -1,3 +0,0 @@ |
||||
extends 'activitypub/intransient.activitystreams2.rabl' |
||||
|
||||
node(:type) { 'Collection' } |
@ -1,3 +0,0 @@ |
||||
extends 'activitypub/intransient.activitystreams2.rabl' |
||||
|
||||
node(:type) { 'Create' } |
@ -1,3 +0,0 @@ |
||||
extends 'activitypub/intransient.activitystreams2.rabl' |
||||
|
||||
node(:type) { 'Note' } |
@ -1,3 +0,0 @@ |
||||
extends 'activitypub/types/collection.activitystreams2.rabl' |
||||
|
||||
node(:type) { 'OrderedCollection' } |
@ -1,3 +0,0 @@ |
||||
extends 'activitypub/types/ordered_collection.activitystreams2.rabl' |
||||
|
||||
node(:type) { 'OrderedCollectionPage' } |
@ -1,3 +0,0 @@ |
||||
extends 'activitypub/intransient.activitystreams2.rabl' |
||||
|
||||
node(:type) { 'Person' } |
@ -1,4 +0,0 @@ |
||||
object @status |
||||
|
||||
node(:actor) { |status| TagManager.instance.url_for(status.account) } |
||||
node(:published) { |status| status.created_at.to_time.xmlschema } |
@ -1,8 +0,0 @@ |
||||
extends 'activitypub/types/announce.activitystreams2.rabl' |
||||
extends 'api/activitypub/activities/_show_status.activitystreams2.rabl' |
||||
|
||||
object @status |
||||
|
||||
node(:name) { |status| t('activitypub.activity.announce.name', account_name: account_name(status.account)) } |
||||
node(:url) { |status| TagManager.instance.url_for(status) } |
||||
node(:object) { |status| api_activitypub_status_url(status.reblog_of_id) } |
@ -1,8 +0,0 @@ |
||||
extends 'activitypub/types/create.activitystreams2.rabl' |
||||
extends 'api/activitypub/activities/_show_status.activitystreams2.rabl' |
||||
|
||||
object @status |
||||
|
||||
node(:name) { |status| t('activitypub.activity.create.name', account_name: account_name(status.account)) } |
||||
node(:url) { |status| TagManager.instance.url_for(status) } |
||||
node(:object) { |status| api_activitypub_note_url(status) } |
@ -1,11 +0,0 @@ |
||||
extends 'activitypub/types/note.activitystreams2.rabl' |
||||
|
||||
object @status |
||||
|
||||
attributes :content |
||||
|
||||
node(:name) { |status| status.content } |
||||
node(:url) { |status| TagManager.instance.url_for(status) } |
||||
node(:attributedTo) { |status| TagManager.instance.url_for(status.account) } |
||||
node(:inReplyTo) { |status| api_activitypub_note_url(status.thread) } if @status.thread |
||||
node(:published) { |status| status.created_at.to_time.xmlschema } |
@ -1,12 +0,0 @@ |
||||
extends 'activitypub/types/ordered_collection.activitystreams2.rabl' |
||||
|
||||
object @account |
||||
|
||||
node(:totalItems) { @statuses.count } |
||||
node(:current) { @first_page_url } if @first_page_url |
||||
node(:first) { @first_page_url } if @first_page_url |
||||
node(:last) { @last_page_url } if @last_page_url |
||||
|
||||
node(:name) { |account| t('activitypub.outbox.name', account_name: account_name(account)) } |
||||
node(:summary) { |account| t('activitypub.outbox.summary', account_name: account_name(account)) } |
||||
node(:updated) { |account| (@statuses.empty? ? account.created_at.to_time : @statuses.first.updated_at.to_time).xmlschema } |
@ -1,16 +0,0 @@ |
||||
extends 'activitypub/types/ordered_collection_page.activitystreams2.rabl' |
||||
|
||||
object @account |
||||
|
||||
node(:items) do |
||||
@statuses.map { |status| api_activitypub_status_url(status) } |
||||
end |
||||
|
||||
node(:next) { @next_page_url } if @next_page_url |
||||
node(:prev) { @prev_page_url } if @prev_page_url |
||||
node(:current) { @first_page_url } if @first_page_url |
||||
node(:first) { @first_page_url } if @first_page_url |
||||
node(:last) { @last_page_url } if @last_page_url |
||||
node(:partOf) { @part_of_url } if @part_of_url |
||||
|
||||
node(:updated) { |account| (@statuses.empty? ? account.created_at.to_time : @statuses.first.updated_at.to_time).xmlschema } |
@ -1,5 +1,4 @@ |
||||
# Be sure to restart your server when you modify this file. |
||||
|
||||
Mime::Type.register "application/json", :json, %w( text/x-json application/jsonrequest application/jrd+json ) |
||||
Mime::Type.register "text/xml", :xml, %w( application/xml application/atom+xml application/xrd+xml ) |
||||
Mime::Type.register "application/activity+json", :activitystreams2 |
||||
Mime::Type.register 'application/json', :json, %w(text/x-json application/jsonrequest application/jrd+json application/activity+json) |
||||
Mime::Type.register 'text/xml', :xml, %w(application/xml application/atom+xml application/xrd+xml) |
||||
|
@ -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 |
@ -1,15 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
require 'rails_helper' |
||||
|
||||
describe Activitystreams2BuilderHelper, type: :helper do |
||||
it 'returns display name if present' do |
||||
account = Fabricate(:account, display_name: 'display name', username: 'username') |
||||
expect(account_name(account)).to eq 'display name' |
||||
end |
||||
|
||||
it 'returns username if display name is not present' do |
||||
account = Fabricate(:account, display_name: '', username: 'username') |
||||
expect(account_name(account)).to eq 'username' |
||||
end |
||||
end |
Loading…
Reference in new issue