Account domain blocks (#2381)
* 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
7 years ago Account domain blocks (#2381)
* 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
7 years ago |
|
- require 'rails_helper'
-
- RSpec.describe FeedManager do
- describe '#key' do
- subject { FeedManager.instance.key(:home, 1) }
-
- it 'returns a string' do
- expect(subject).to be_a String
- end
- end
-
- describe '#filter?' do
- let(:alice) { Fabricate(:account, username: 'alice') }
- let(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com') }
- let(:jeff) { Fabricate(:account, username: 'jeff') }
-
- context 'for home feed' do
- it 'returns false for followee\'s status' do
- status = Fabricate(:status, text: 'Hello world', account: alice)
- bob.follow!(alice)
- expect(FeedManager.instance.filter?(:home, status, bob.id)).to be false
- end
-
- it 'returns false for reblog by followee' do
- status = Fabricate(:status, text: 'Hello world', account: jeff)
- reblog = Fabricate(:status, reblog: status, account: alice)
- bob.follow!(alice)
- expect(FeedManager.instance.filter?(:home, reblog, bob.id)).to be false
- end
-
- it 'returns true for reblog by followee of blocked account' do
- status = Fabricate(:status, text: 'Hello world', account: jeff)
- reblog = Fabricate(:status, reblog: status, account: alice)
- bob.follow!(alice)
- bob.block!(jeff)
- expect(FeedManager.instance.filter?(:home, reblog, bob.id)).to be true
- end
-
- it 'returns true for reblog by followee of muted account' do
- status = Fabricate(:status, text: 'Hello world', account: jeff)
- reblog = Fabricate(:status, reblog: status, account: alice)
- bob.follow!(alice)
- bob.mute!(jeff)
- expect(FeedManager.instance.filter?(:home, reblog, bob.id)).to be true
- end
-
- it 'returns true for reblog by followee of someone who is blocking recipient' do
- status = Fabricate(:status, text: 'Hello world', account: jeff)
- reblog = Fabricate(:status, reblog: status, account: alice)
- bob.follow!(alice)
- jeff.block!(bob)
- expect(FeedManager.instance.filter?(:home, reblog, bob.id)).to be true
- end
-
- it 'returns false for reply by followee to another followee' do
- status = Fabricate(:status, text: 'Hello world', account: jeff)
- reply = Fabricate(:status, text: 'Nay', thread: status, account: alice)
- bob.follow!(alice)
- bob.follow!(jeff)
- expect(FeedManager.instance.filter?(:home, reply, bob.id)).to be false
- end
-
- it 'returns false for reply by followee to recipient' do
- status = Fabricate(:status, text: 'Hello world', account: bob)
- reply = Fabricate(:status, text: 'Nay', thread: status, account: alice)
- bob.follow!(alice)
- expect(FeedManager.instance.filter?(:home, reply, bob.id)).to be false
- end
-
- it 'returns false for reply by followee to self' do
- status = Fabricate(:status, text: 'Hello world', account: alice)
- reply = Fabricate(:status, text: 'Nay', thread: status, account: alice)
- bob.follow!(alice)
- expect(FeedManager.instance.filter?(:home, reply, bob.id)).to be false
- end
-
- it 'returns true for reply by followee to non-followed account' do
- status = Fabricate(:status, text: 'Hello world', account: jeff)
- reply = Fabricate(:status, text: 'Nay', thread: status, account: alice)
- bob.follow!(alice)
- expect(FeedManager.instance.filter?(:home, reply, bob.id)).to be true
- end
-
- it 'returns false for status by followee mentioning another account' do
- bob.follow!(alice)
- status = PostStatusService.new.call(alice, 'Hey @jeff')
- expect(FeedManager.instance.filter?(:home, status, bob.id)).to be false
- end
-
- it 'returns true for status by followee mentioning blocked account' do
- bob.block!(jeff)
- bob.follow!(alice)
- status = PostStatusService.new.call(alice, 'Hey @jeff')
- expect(FeedManager.instance.filter?(:home, status, bob.id)).to be true
- end
-
- it 'returns true for reblog of a personally blocked domain' do
- alice.block_domain!('example.com')
- alice.follow!(jeff)
- status = Fabricate(:status, text: 'Hello world', account: bob)
- reblog = Fabricate(:status, reblog: status, account: jeff)
- expect(FeedManager.instance.filter?(:home, reblog, alice.id)).to be true
- end
- end
-
- context 'for mentions feed' do
- it 'returns true for status that mentions blocked account' do
- bob.block!(jeff)
- status = PostStatusService.new.call(alice, 'Hey @jeff')
- expect(FeedManager.instance.filter?(:mentions, status, bob.id)).to be true
- end
-
- it 'returns true for status that replies to a blocked account' do
- status = Fabricate(:status, text: 'Hello world', account: jeff)
- reply = Fabricate(:status, text: 'Nay', thread: status, account: alice)
- bob.block!(jeff)
- expect(FeedManager.instance.filter?(:mentions, reply, bob.id)).to be true
- end
-
- it 'returns true for status by silenced account who recipient is not following' do
- status = Fabricate(:status, text: 'Hello world', account: alice)
- alice.update(silenced: true)
- expect(FeedManager.instance.filter?(:mentions, status, bob.id)).to be true
- end
-
- it 'returns false for status by followed silenced account' do
- status = Fabricate(:status, text: 'Hello world', account: alice)
- alice.update(silenced: true)
- bob.follow!(alice)
- expect(FeedManager.instance.filter?(:mentions, status, bob.id)).to be false
- end
- end
- end
-
- describe '#push' do
- it 'trims timelines if they will have more than FeedManager::MAX_ITEMS' do
- account = Fabricate(:account)
- status = Fabricate(:status)
- members = FeedManager::MAX_ITEMS.times.map { |count| [count, count] }
- Redis.current.zadd("feed:type:#{account.id}", members)
-
- FeedManager.instance.push('type', account, status)
-
- expect(Redis.current.zcard("feed:type:#{account.id}")).to eq FeedManager::MAX_ITEMS
- end
- end
- end
|