Revert "Upstream 20240517"

This commit is contained in:
KMY(雪あすか) 2024-05-24 08:15:12 +09:00 committed by GitHub
parent 9c006fd893
commit f6dec44e95
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2347 changed files with 26470 additions and 87494 deletions

View file

@ -1,51 +0,0 @@
# frozen_string_literal: true
require 'rails_helper'
describe ActivityPub::NoteForMisskeySerializer do
subject { JSON.parse(serialization.to_json) }
let(:serialization) { ActiveModelSerializers::SerializableResource.new(parent, serializer: described_class, adapter: ActivityPub::Adapter) }
let!(:account) { Fabricate(:account) }
let!(:other) { Fabricate(:account) }
let!(:parent) { Fabricate(:status, account: account, visibility: :unlisted, searchability: :private) }
let!(:reply_by_account_first) { Fabricate(:status, account: account, thread: parent, visibility: :public) }
let!(:reply_by_account_next) { Fabricate(:status, account: account, thread: parent, visibility: :public) }
let!(:reply_by_other_first) { Fabricate(:status, account: other, thread: parent, visibility: :public) }
let!(:reply_by_account_third) { Fabricate(:status, account: account, thread: parent, visibility: :public) }
let!(:reply_by_account_visibility_direct) { Fabricate(:status, account: account, thread: parent, visibility: :direct) }
before do
account.user.settings.update(reject_unlisted_subscription: 'true')
end
it 'has a Note type' do
expect(subject['type']).to eql('Note')
end
it 'has a replies collection' do
expect(subject['replies']['type']).to eql('Collection')
end
it 'has a replies collection with a first Page' do
expect(subject['replies']['first']['type']).to eql('CollectionPage')
end
it 'includes public self-replies in its replies collection' do
expect(subject['replies']['first']['items']).to include(reply_by_account_first.uri, reply_by_account_next.uri, reply_by_account_third.uri)
end
it 'does not include replies from others in its replies collection' do
expect(subject['replies']['first']['items']).to_not include(reply_by_other_first.uri)
end
it 'does not include replies with direct visibility in its replies collection' do
expect(subject['replies']['first']['items']).to_not include(reply_by_account_visibility_direct.uri)
end
it 'has private visibility' do
expect(subject['to']).to_not include('https://www.w3.org/ns/activitystreams#Public')
expect(subject['to'].any? { |to| to.end_with?("#{account.username}/followers") }).to be true
expect(subject['cc']).to_not include('https://www.w3.org/ns/activitystreams#Public')
end
end

View file

@ -5,26 +5,14 @@ require 'rails_helper'
describe ActivityPub::NoteSerializer do
subject { serialized_record_json(parent, described_class, adapter: ActivityPub::Adapter) }
let(:visibility) { :public }
let(:searchability) { :public }
let!(:account) { Fabricate(:account) }
let!(:other) { Fabricate(:account) }
let!(:parent) { Fabricate(:status, account: account, visibility: visibility, searchability: searchability, language: 'zh-TW') }
let!(:parent) { Fabricate(:status, account: account, visibility: :public, language: 'zh-TW') }
let!(:reply_by_account_first) { Fabricate(:status, account: account, thread: parent, visibility: :public) }
let!(:reply_by_account_next) { Fabricate(:status, account: account, thread: parent, visibility: :public) }
let!(:reply_by_other_first) { Fabricate(:status, account: other, thread: parent, visibility: :public) }
let!(:reply_by_account_third) { Fabricate(:status, account: account, thread: parent, visibility: :public) }
let!(:reply_by_account_visibility_direct) { Fabricate(:status, account: account, thread: parent, visibility: :direct) }
let!(:referred) { nil }
let!(:quote) { nil }
before do
parent.references << referred if referred.present?
if quote.present?
parent.references << quote
parent.quote = quote
end
end
it 'has the expected shape' do
expect(subject).to include({
@ -56,60 +44,4 @@ describe ActivityPub::NoteSerializer do
it 'does not include replies with direct visibility in its replies collection' do
expect(subject['replies']['first']['items']).to_not include(reply_by_account_visibility_direct.uri)
end
it 'send as public visibility' do
expect(subject['to']).to include 'https://www.w3.org/ns/activitystreams#Public'
end
context 'when public_unlisted visibility' do
let(:visibility) { :public_unlisted }
it 'send as unlisted visibility' do
expect(subject['to']).to_not include 'https://www.w3.org/ns/activitystreams#Public'
end
end
it 'send as public searchability' do
expect(subject['searchableBy']).to include 'https://www.w3.org/ns/activitystreams#Public'
end
context 'when public_unlisted searchability' do
let(:searchability) { :public_unlisted }
it 'send as private searchability' do
expect(subject['searchableBy']).to_not include 'https://www.w3.org/ns/activitystreams#Public'
end
end
context 'when has a reference' do
let(:referred) { Fabricate(:status) }
it 'has a references collection' do
expect(subject['references']['type']).to eql('Collection')
end
it 'has a references collection with a first Page' do
expect(subject['references']['first']['type']).to eql('CollectionPage')
end
it 'has as reference' do
expect(subject['quoteUri']).to be_nil
expect(subject['references']['first']['items']).to include referred.uri
end
end
context 'when has a quote' do
let(:quote) { Fabricate(:status) }
it 'has a quote as transitional type' do
expect(subject['quoteUri']).to eq ActivityPub::TagManager.instance.uri_for(quote)
end
it 'has a quote as feb-e232 object link' do
tag = subject['tag'].detect { |t| t['type'] == 'Link' }
expect(tag).to_not be_nil
expect(tag['mediaType']).to eq 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
expect(tag['href']).to eq ActivityPub::TagManager.instance.uri_for(quote)
end
end
end