From d0dd9eb5b5d2c0d80a756a6e432b5d502ed0e0fc Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 15 May 2017 03:04:13 +0200 Subject: Feature conversations muting (#3017) * Add 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 --- spec/services/notify_service_spec.rb | 42 +++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) (limited to 'spec/services/notify_service_spec.rb') diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb index 86848e1ff..032c37a28 100644 --- a/spec/services/notify_service_spec.rb +++ b/spec/services/notify_service_spec.rb @@ -7,10 +7,50 @@ RSpec.describe NotifyService do let(:user) { Fabricate(:user) } let(:recipient) { user.account } - let(:activity) { Fabricate(:follow, target_account: recipient) } + let(:sender) { Fabricate(:account) } + let(:activity) { Fabricate(:follow, account: sender, target_account: recipient) } it { is_expected.to change(Notification, :count).by(1) } + it 'does not notify when sender is blocked' do + recipient.block!(sender) + is_expected.to_not change(Notification, :count) + end + + it 'does not notify when sender is silenced and not followed' do + sender.update(silenced: true) + is_expected.to_not change(Notification, :count) + end + + it 'does not notify when recipient is suspended' do + recipient.update(suspended: true) + is_expected.to_not change(Notification, :count) + end + + context do + let(:asshole) { Fabricate(:account, username: 'asshole') } + let(:reply_to) { Fabricate(:status, account: asshole) } + let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, thread: reply_to)) } + + it 'does not notify when conversation is muted' do + recipient.mute_conversation!(activity.status.conversation) + is_expected.to_not change(Notification, :count) + end + + it 'does not notify when it is a reply to a blocked user' do + recipient.block!(asshole) + is_expected.to_not change(Notification, :count) + end + end + + context do + let(:sender) { recipient } + + it 'does not notify when recipient is the sender' do + is_expected.to_not change(Notification, :count) + end + end + describe 'email' do before do ActionMailer::Base.deliveries.clear -- cgit