620d0d8029
* Add <ostatus:conversation /> tag to Atom input/output Only uses ref attribute (not href) because href would be the alternate link that's always included also. Creates new conversation for every non-reply status. Carries over conversation for every reply. Keeps remote URIs verbatim, generates local URIs on the fly like the rest of them. * Conversation muting - prevents notifications that reference a conversation (including replies, favourites, reblogs) from being created. API endpoints /api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute Currently no way to tell when a status/conversation is muted, so the web UI only has a "disable notifications" button, doesn't work as a toggle * Display "Dismiss notifications" on all statuses in notifications column, not just own * Add "muted" as a boolean attribute on statuses JSON For now always false on contained reblogs, since it's only relevant for statuses returned from the notifications endpoint, which are not nested Remove "Disable notifications" from detailed status view, since it's only relevant in the notifications column * Up max class length * Remove pending test for conversation mute * Add tests, clean up * Rename to "mute conversation" and "unmute conversation" * Raise validation error when trying to mute/unmute status without conversation * Adding account domain blocks that filter notifications and public timelines * Add tests for domain blocks in notifications, public timelines Filter reblogs of blocked domains from home * Add API for listing and creating account domain blocks * API for creating/deleting domain blocks, tests for Status#ancestors and Status#descendants, filter domain blocks from them * Filter domains in streaming API * Update account_domain_block_spec.rb
600 lines
19 KiB
Ruby
600 lines
19 KiB
Ruby
require 'rails_helper'
|
|
|
|
RSpec.describe Status, type: :model do
|
|
let(:alice) { Fabricate(:account, username: 'alice') }
|
|
let(:bob) { Fabricate(:account, username: 'bob') }
|
|
let(:other) { Fabricate(:status, account: bob, text: 'Skulls for the skull god! The enemy\'s gates are sideways!')}
|
|
|
|
subject { Fabricate(:status, account: alice) }
|
|
|
|
describe '#local?' do
|
|
it 'returns true when no remote URI is set' do
|
|
expect(subject.local?).to be true
|
|
end
|
|
|
|
it 'returns false if a remote URI is set' do
|
|
subject.uri = 'a'
|
|
expect(subject.local?).to be false
|
|
end
|
|
end
|
|
|
|
describe '#reblog?' do
|
|
it 'returns true when the status reblogs another status' do
|
|
subject.reblog = other
|
|
expect(subject.reblog?).to be true
|
|
end
|
|
|
|
it 'returns false if the status is self-contained' do
|
|
expect(subject.reblog?).to be false
|
|
end
|
|
end
|
|
|
|
describe '#reply?' do
|
|
it 'returns true if the status references another' do
|
|
subject.thread = other
|
|
expect(subject.reply?).to be true
|
|
end
|
|
|
|
it 'returns false if the status is self-contained' do
|
|
expect(subject.reply?).to be false
|
|
end
|
|
end
|
|
|
|
describe '#verb' do
|
|
it 'is always post' do
|
|
expect(subject.verb).to be :post
|
|
end
|
|
end
|
|
|
|
describe '#object_type' do
|
|
it 'is note when the status is self-contained' do
|
|
expect(subject.object_type).to be :note
|
|
end
|
|
|
|
it 'is comment when the status replies to another' do
|
|
subject.thread = other
|
|
expect(subject.object_type).to be :comment
|
|
end
|
|
end
|
|
|
|
describe '#title' do
|
|
it 'is a shorter version of the content' do
|
|
expect(subject.title).to be_a String
|
|
end
|
|
end
|
|
|
|
describe '#content' do
|
|
it 'returns the text of the status if it is not a reblog' do
|
|
expect(subject.content).to eql subject.text
|
|
end
|
|
|
|
it 'returns the text of the reblogged status' do
|
|
subject.reblog = other
|
|
expect(subject.content).to eql other.text
|
|
end
|
|
end
|
|
|
|
describe '#target' do
|
|
it 'returns nil if the status is self-contained' do
|
|
expect(subject.target).to be_nil
|
|
end
|
|
|
|
it 'returns nil if the status is a reply' do
|
|
subject.thread = other
|
|
expect(subject.target).to be_nil
|
|
end
|
|
|
|
it 'returns the reblogged status' do
|
|
subject.reblog = other
|
|
expect(subject.target).to eq other
|
|
end
|
|
end
|
|
|
|
describe '#reblogs_count' do
|
|
it 'is the number of reblogs' do
|
|
Fabricate(:status, account: bob, reblog: subject)
|
|
Fabricate(:status, account: alice, reblog: subject)
|
|
|
|
expect(subject.reblogs_count).to eq 2
|
|
end
|
|
end
|
|
|
|
describe '#favourites_count' do
|
|
it 'is the number of favorites' do
|
|
Fabricate(:favourite, account: bob, status: subject)
|
|
Fabricate(:favourite, account: alice, status: subject)
|
|
|
|
expect(subject.favourites_count).to eq 2
|
|
end
|
|
end
|
|
|
|
describe '#proper' do
|
|
it 'is itself for original statuses' do
|
|
expect(subject.proper).to eq subject
|
|
end
|
|
|
|
it 'is the source status for reblogs' do
|
|
subject.reblog = other
|
|
expect(subject.proper).to eq other
|
|
end
|
|
end
|
|
|
|
describe '#permitted?' do
|
|
it 'returns true when direct and account is viewer' do
|
|
subject.visibility = :direct
|
|
expect(subject.permitted?(subject.account)).to be true
|
|
end
|
|
|
|
it 'returns true when direct and viewer is mentioned' do
|
|
subject.visibility = :direct
|
|
subject.mentions = [Fabricate(:mention, account: alice)]
|
|
|
|
expect(subject.permitted?(alice)).to be true
|
|
end
|
|
|
|
it 'returns false when direct and viewer is not mentioned' do
|
|
viewer = Fabricate(:account)
|
|
subject.visibility = :direct
|
|
|
|
expect(subject.permitted?(viewer)).to be false
|
|
end
|
|
|
|
it 'returns true when private and account is viewer' do
|
|
subject.visibility = :direct
|
|
expect(subject.permitted?(subject.account)).to be true
|
|
end
|
|
|
|
it 'returns true when private and account is following viewer' do
|
|
follow = Fabricate(:follow)
|
|
subject.visibility = :private
|
|
subject.account = follow.target_account
|
|
|
|
expect(subject.permitted?(follow.account)).to be true
|
|
end
|
|
|
|
it 'returns true when private and viewer is mentioned' do
|
|
subject.visibility = :private
|
|
subject.mentions = [Fabricate(:mention, account: alice)]
|
|
|
|
expect(subject.permitted?(alice)).to be true
|
|
end
|
|
|
|
it 'returns false when private and viewer is not mentioned or followed' do
|
|
viewer = Fabricate(:account)
|
|
subject.visibility = :private
|
|
|
|
expect(subject.permitted?(viewer)).to be false
|
|
end
|
|
|
|
it 'returns true when no viewer' do
|
|
expect(subject.permitted?).to be true
|
|
end
|
|
|
|
it 'returns false when viewer is blocked' do
|
|
block = Fabricate(:block)
|
|
subject.visibility = :private
|
|
subject.account = block.target_account
|
|
|
|
expect(subject.permitted?(block.account)).to be false
|
|
end
|
|
end
|
|
|
|
describe '#ancestors' do
|
|
let!(:alice) { Fabricate(:account, username: 'alice') }
|
|
let!(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com') }
|
|
let!(:jeff) { Fabricate(:account, username: 'jeff') }
|
|
let!(:status) { Fabricate(:status, account: alice) }
|
|
let!(:reply1) { Fabricate(:status, thread: status, account: jeff) }
|
|
let!(:reply2) { Fabricate(:status, thread: reply1, account: bob) }
|
|
let!(:reply3) { Fabricate(:status, thread: reply2, account: alice) }
|
|
let!(:viewer) { Fabricate(:account, username: 'viewer') }
|
|
|
|
it 'returns conversation history' do
|
|
expect(reply3.ancestors).to include(status, reply1, reply2)
|
|
end
|
|
|
|
it 'does not return conversation history user is not allowed to see' do
|
|
reply1.update(visibility: :private)
|
|
status.update(visibility: :direct)
|
|
|
|
expect(reply3.ancestors(viewer)).to_not include(reply1, status)
|
|
end
|
|
|
|
it 'does not return conversation history from blocked users' do
|
|
viewer.block!(jeff)
|
|
expect(reply3.ancestors(viewer)).to_not include(reply1)
|
|
end
|
|
|
|
it 'does not return conversation history from muted users' do
|
|
viewer.mute!(jeff)
|
|
expect(reply3.ancestors(viewer)).to_not include(reply1)
|
|
end
|
|
|
|
it 'does not return conversation history from silenced and not followed users' do
|
|
jeff.update(silenced: true)
|
|
expect(reply3.ancestors(viewer)).to_not include(reply1)
|
|
end
|
|
|
|
it 'does not return conversation history from blocked domains' do
|
|
viewer.block_domain!('example.com')
|
|
expect(reply3.ancestors(viewer)).to_not include(reply2)
|
|
end
|
|
|
|
it 'ignores deleted records' do
|
|
first_status = Fabricate(:status, account: bob)
|
|
second_status = Fabricate(:status, thread: first_status, account: alice)
|
|
|
|
# Create cache and delete cached record
|
|
second_status.ancestors
|
|
first_status.destroy
|
|
|
|
expect(second_status.ancestors).to eq([])
|
|
end
|
|
end
|
|
|
|
describe '#descendants' do
|
|
let!(:alice) { Fabricate(:account, username: 'alice') }
|
|
let!(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com') }
|
|
let!(:jeff) { Fabricate(:account, username: 'jeff') }
|
|
let!(:status) { Fabricate(:status, account: alice) }
|
|
let!(:reply1) { Fabricate(:status, thread: status, account: alice) }
|
|
let!(:reply2) { Fabricate(:status, thread: status, account: bob) }
|
|
let!(:reply3) { Fabricate(:status, thread: reply1, account: jeff) }
|
|
let!(:viewer) { Fabricate(:account, username: 'viewer') }
|
|
|
|
it 'returns replies' do
|
|
expect(status.descendants).to include(reply1, reply2, reply3)
|
|
end
|
|
|
|
it 'does not return replies user is not allowed to see' do
|
|
reply1.update(visibility: :private)
|
|
reply3.update(visibility: :direct)
|
|
|
|
expect(status.descendants(viewer)).to_not include(reply1, reply3)
|
|
end
|
|
|
|
it 'does not return replies from blocked users' do
|
|
viewer.block!(jeff)
|
|
expect(status.descendants(viewer)).to_not include(reply3)
|
|
end
|
|
|
|
it 'does not return replies from muted users' do
|
|
viewer.mute!(jeff)
|
|
expect(status.descendants(viewer)).to_not include(reply3)
|
|
end
|
|
|
|
it 'does not return replies from silenced and not followed users' do
|
|
jeff.update(silenced: true)
|
|
expect(status.descendants(viewer)).to_not include(reply3)
|
|
end
|
|
|
|
it 'does not return replies from blocked domains' do
|
|
viewer.block_domain!('example.com')
|
|
expect(status.descendants(viewer)).to_not include(reply2)
|
|
end
|
|
end
|
|
|
|
describe '.mutes_map' do
|
|
let(:status) { Fabricate(:status) }
|
|
let(:account) { Fabricate(:account) }
|
|
|
|
subject { Status.mutes_map([status.conversation.id], account) }
|
|
|
|
it 'returns a hash' do
|
|
expect(subject).to be_a Hash
|
|
end
|
|
|
|
it 'contains true value' do
|
|
account.mute_conversation!(status.conversation)
|
|
expect(subject[status.conversation.id]).to be true
|
|
end
|
|
end
|
|
|
|
describe '.favourites_map' do
|
|
let(:status) { Fabricate(:status) }
|
|
let(:account) { Fabricate(:account) }
|
|
|
|
subject { Status.favourites_map([status], account) }
|
|
|
|
it 'returns a hash' do
|
|
expect(subject).to be_a Hash
|
|
end
|
|
|
|
it 'contains true value' do
|
|
Fabricate(:favourite, status: status, account: account)
|
|
expect(subject[status.id]).to be true
|
|
end
|
|
end
|
|
|
|
describe '.reblogs_map' do
|
|
let(:status) { Fabricate(:status) }
|
|
let(:account) { Fabricate(:account) }
|
|
|
|
subject { Status.reblogs_map([status], account) }
|
|
|
|
it 'returns a hash' do
|
|
expect(subject).to be_a Hash
|
|
end
|
|
|
|
it 'contains true value' do
|
|
Fabricate(:status, account: account, reblog: status)
|
|
expect(subject[status.id]).to be true
|
|
end
|
|
end
|
|
|
|
describe '.local_only' do
|
|
it 'returns only statuses from local accounts' do
|
|
local_account = Fabricate(:account, domain: nil)
|
|
remote_account = Fabricate(:account, domain: 'test.com')
|
|
local_status = Fabricate(:status, account: local_account)
|
|
remote_status = Fabricate(:status, account: remote_account)
|
|
|
|
results = described_class.local_only
|
|
expect(results).to include(local_status)
|
|
expect(results).not_to include(remote_status)
|
|
end
|
|
end
|
|
|
|
describe '.as_home_timeline' do
|
|
before do
|
|
account = Fabricate(:account)
|
|
followed = Fabricate(:account)
|
|
not_followed = Fabricate(:account)
|
|
Fabricate(:follow, account: account, target_account: followed)
|
|
|
|
@self_status = Fabricate(:status, account: account)
|
|
@followed_status = Fabricate(:status, account: followed)
|
|
@not_followed_status = Fabricate(:status, account: not_followed)
|
|
|
|
@results = Status.as_home_timeline(account)
|
|
end
|
|
|
|
it 'includes statuses from self' do
|
|
expect(@results).to include(@self_status)
|
|
end
|
|
|
|
it 'includes statuses from followed' do
|
|
expect(@results).to include(@followed_status)
|
|
end
|
|
|
|
it 'does not include statuses from non-followed' do
|
|
expect(@results).not_to include(@not_followed_status)
|
|
end
|
|
end
|
|
|
|
describe '.as_public_timeline' do
|
|
it 'only includes statuses with public visibility' do
|
|
public_status = Fabricate(:status, visibility: :public)
|
|
private_status = Fabricate(:status, visibility: :private)
|
|
|
|
results = Status.as_public_timeline
|
|
expect(results).to include(public_status)
|
|
expect(results).not_to include(private_status)
|
|
end
|
|
|
|
it 'does not include replies' do
|
|
status = Fabricate(:status)
|
|
reply = Fabricate(:status, in_reply_to_id: status.id)
|
|
|
|
results = Status.as_public_timeline
|
|
expect(results).to include(status)
|
|
expect(results).not_to include(reply)
|
|
end
|
|
|
|
it 'does not include boosts' do
|
|
status = Fabricate(:status)
|
|
boost = Fabricate(:status, reblog_of_id: status.id)
|
|
|
|
results = Status.as_public_timeline
|
|
expect(results).to include(status)
|
|
expect(results).not_to include(boost)
|
|
end
|
|
|
|
it 'filters out silenced accounts' do
|
|
account = Fabricate(:account)
|
|
silenced_account = Fabricate(:account, silenced: true)
|
|
status = Fabricate(:status, account: account)
|
|
silenced_status = Fabricate(:status, account: silenced_account)
|
|
|
|
results = Status.as_public_timeline
|
|
expect(results).to include(status)
|
|
expect(results).not_to include(silenced_status)
|
|
end
|
|
|
|
context 'with a local_only option set' do
|
|
it 'does not include remote instances statuses' do
|
|
local_account = Fabricate(:account, domain: nil)
|
|
remote_account = Fabricate(:account, domain: 'test.com')
|
|
local_status = Fabricate(:status, account: local_account)
|
|
remote_status = Fabricate(:status, account: remote_account)
|
|
|
|
results = Status.as_public_timeline(nil, true)
|
|
expect(results).to include(local_status)
|
|
expect(results).not_to include(remote_status)
|
|
end
|
|
end
|
|
|
|
describe 'with an account passed in' do
|
|
before do
|
|
@account = Fabricate(:account)
|
|
end
|
|
|
|
it 'excludes statuses from accounts blocked by the account' do
|
|
blocked = Fabricate(:account)
|
|
Fabricate(:block, account: @account, target_account: blocked)
|
|
blocked_status = Fabricate(:status, account: blocked)
|
|
|
|
results = Status.as_public_timeline(@account)
|
|
expect(results).not_to include(blocked_status)
|
|
end
|
|
|
|
it 'excludes statuses from accounts who have blocked the account' do
|
|
blocked = Fabricate(:account)
|
|
Fabricate(:block, account: blocked, target_account: @account)
|
|
blocked_status = Fabricate(:status, account: blocked)
|
|
|
|
results = Status.as_public_timeline(@account)
|
|
expect(results).not_to include(blocked_status)
|
|
end
|
|
|
|
it 'excludes statuses from accounts muted by the account' do
|
|
muted = Fabricate(:account)
|
|
Fabricate(:mute, account: @account, target_account: muted)
|
|
muted_status = Fabricate(:status, account: muted)
|
|
|
|
results = Status.as_public_timeline(@account)
|
|
expect(results).not_to include(muted_status)
|
|
end
|
|
|
|
it 'excludes statuses from accounts from personally blocked domains' do
|
|
blocked = Fabricate(:account, domain: 'example.com')
|
|
@account.block_domain!(blocked.domain)
|
|
blocked_status = Fabricate(:status, account: blocked)
|
|
|
|
results = Status.as_public_timeline(@account)
|
|
expect(results).not_to include(blocked_status)
|
|
end
|
|
|
|
context 'with language preferences' do
|
|
it 'excludes statuses in languages not allowed by the account user' do
|
|
user = Fabricate(:user, allowed_languages: [:en, :es])
|
|
@account.update(user: user)
|
|
en_status = Fabricate(:status, language: 'en')
|
|
es_status = Fabricate(:status, language: 'es')
|
|
fr_status = Fabricate(:status, language: 'fr')
|
|
|
|
results = Status.as_public_timeline(@account)
|
|
expect(results).to include(en_status)
|
|
expect(results).to include(es_status)
|
|
expect(results).not_to include(fr_status)
|
|
end
|
|
|
|
it 'includes all languages when user does not have a setting' do
|
|
user = Fabricate(:user, allowed_languages: [])
|
|
@account.update(user: user)
|
|
|
|
en_status = Fabricate(:status, language: 'en')
|
|
es_status = Fabricate(:status, language: 'es')
|
|
|
|
results = Status.as_public_timeline(@account)
|
|
expect(results).to include(en_status)
|
|
expect(results).to include(es_status)
|
|
end
|
|
|
|
it 'includes all languages when account does not have a user' do
|
|
expect(@account.user).to be_nil
|
|
en_status = Fabricate(:status, language: 'en')
|
|
es_status = Fabricate(:status, language: 'es')
|
|
|
|
results = Status.as_public_timeline(@account)
|
|
expect(results).to include(en_status)
|
|
expect(results).to include(es_status)
|
|
end
|
|
end
|
|
|
|
context 'where that account is silenced' do
|
|
it 'includes statuses from other accounts that are silenced' do
|
|
@account.update(silenced: true)
|
|
other_silenced_account = Fabricate(:account, silenced: true)
|
|
other_status = Fabricate(:status, account: other_silenced_account)
|
|
|
|
results = Status.as_public_timeline(@account)
|
|
expect(results).to include(other_status)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
describe '.as_tag_timeline' do
|
|
it 'includes statuses with a tag' do
|
|
tag = Fabricate(:tag)
|
|
status = Fabricate(:status, tags: [tag])
|
|
other = Fabricate(:status)
|
|
|
|
results = Status.as_tag_timeline(tag)
|
|
expect(results).to include(status)
|
|
expect(results).not_to include(other)
|
|
end
|
|
|
|
it 'allows replies to be included' do
|
|
original = Fabricate(:status)
|
|
tag = Fabricate(:tag)
|
|
status = Fabricate(:status, tags: [tag], in_reply_to_id: original.id)
|
|
|
|
results = Status.as_tag_timeline(tag)
|
|
expect(results).to include(status)
|
|
end
|
|
end
|
|
|
|
describe '.permitted_for' do
|
|
subject { described_class.permitted_for(target_account, account).pluck(:visibility) }
|
|
|
|
let(:target_account) { alice }
|
|
let(:account) { bob }
|
|
let!(:public_status) { Fabricate(:status, account: target_account, visibility: 'public') }
|
|
let!(:unlisted_status) { Fabricate(:status, account: target_account, visibility: 'unlisted') }
|
|
let!(:private_status) { Fabricate(:status, account: target_account, visibility: 'private') }
|
|
|
|
let!(:direct_status) do
|
|
Fabricate(:status, account: target_account, visibility: 'direct').tap do |status|
|
|
Fabricate(:mention, status: status, account: account)
|
|
end
|
|
end
|
|
|
|
let!(:other_direct_status) do
|
|
Fabricate(:status, account: target_account, visibility: 'direct').tap do |status|
|
|
Fabricate(:mention, status: status)
|
|
end
|
|
end
|
|
|
|
context 'given nil' do
|
|
let(:account) { nil }
|
|
let(:direct_status) { nil }
|
|
it { is_expected.to eq(%w(unlisted public)) }
|
|
end
|
|
|
|
context 'given blocked account' do
|
|
before do
|
|
target_account.block!(account)
|
|
end
|
|
|
|
it { is_expected.to be_empty }
|
|
end
|
|
|
|
context 'given same account' do
|
|
let(:account) { target_account }
|
|
it { is_expected.to eq(%w(direct direct private unlisted public)) }
|
|
end
|
|
|
|
context 'given followed account' do
|
|
before do
|
|
account.follow!(target_account)
|
|
end
|
|
|
|
it { is_expected.to eq(%w(direct private unlisted public)) }
|
|
end
|
|
|
|
context 'given unfollowed account' do
|
|
it { is_expected.to eq(%w(direct unlisted public)) }
|
|
end
|
|
end
|
|
|
|
describe 'before_create' do
|
|
it 'sets account being replied to correctly over intermediary nodes' do
|
|
first_status = Fabricate(:status, account: bob)
|
|
intermediary = Fabricate(:status, thread: first_status, account: alice)
|
|
final = Fabricate(:status, thread: intermediary, account: alice)
|
|
|
|
expect(final.in_reply_to_account_id).to eq bob.id
|
|
end
|
|
|
|
it 'creates new conversation for stand-alone status' do
|
|
expect(Status.create(account: alice, text: 'First').conversation_id).to_not be_nil
|
|
end
|
|
|
|
it 'keeps conversation of parent node' do
|
|
parent = Fabricate(:status, text: 'First')
|
|
expect(Status.create(account: alice, thread: parent, text: 'Response').conversation_id).to eq parent.conversation_id
|
|
end
|
|
end
|
|
end
|