2017-05-06 14:06:52 -07:00
|
|
|
require 'rails_helper'
|
|
|
|
|
|
|
|
RSpec.describe NotifyService do
|
|
|
|
subject do
|
|
|
|
-> { described_class.new.call(recipient, activity) }
|
|
|
|
end
|
|
|
|
|
|
|
|
let(:user) { Fabricate(:user) }
|
|
|
|
let(:recipient) { user.account }
|
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
2017-05-18 16:14:30 -07:00
|
|
|
let(:sender) { Fabricate(:account, domain: 'example.com') }
|
Feature conversations muting (#3017)
* 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
2017-05-14 18:04:13 -07:00
|
|
|
let(:activity) { Fabricate(:follow, account: sender, target_account: recipient) }
|
2017-05-06 14:06:52 -07:00
|
|
|
|
|
|
|
it { is_expected.to change(Notification, :count).by(1) }
|
|
|
|
|
Feature conversations muting (#3017)
* 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
2017-05-14 18:04:13 -07:00
|
|
|
it 'does not notify when sender is blocked' do
|
|
|
|
recipient.block!(sender)
|
|
|
|
is_expected.to_not change(Notification, :count)
|
|
|
|
end
|
|
|
|
|
2017-11-14 18:56:41 -08:00
|
|
|
it 'does not notify when sender is muted with hide_notifications' do
|
|
|
|
recipient.mute!(sender, notifications: true)
|
|
|
|
is_expected.to_not change(Notification, :count)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does notify when sender is muted without hide_notifications' do
|
|
|
|
recipient.mute!(sender, notifications: false)
|
|
|
|
is_expected.to change(Notification, :count)
|
|
|
|
end
|
|
|
|
|
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
2017-05-18 16:14:30 -07:00
|
|
|
it 'does not notify when sender\'s domain is blocked' do
|
|
|
|
recipient.block_domain!(sender.domain)
|
|
|
|
is_expected.to_not change(Notification, :count)
|
|
|
|
end
|
|
|
|
|
2017-05-19 12:05:32 -07:00
|
|
|
it 'does still notify when sender\'s domain is blocked but sender is followed' do
|
|
|
|
recipient.block_domain!(sender.domain)
|
|
|
|
recipient.follow!(sender)
|
|
|
|
is_expected.to change(Notification, :count)
|
|
|
|
end
|
|
|
|
|
Feature conversations muting (#3017)
* 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
2017-05-14 18:04:13 -07:00
|
|
|
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
|
|
|
|
|
2017-11-10 18:11:10 -08:00
|
|
|
describe 'reblogs' do
|
|
|
|
let(:status) { Fabricate(:status, account: Fabricate(:account)) }
|
|
|
|
let(:activity) { Fabricate(:status, account: sender, reblog: status) }
|
|
|
|
|
|
|
|
it 'shows reblogs by default' do
|
|
|
|
recipient.follow!(sender)
|
|
|
|
is_expected.to change(Notification, :count)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'shows reblogs when explicitly enabled' do
|
|
|
|
recipient.follow!(sender, reblogs: true)
|
|
|
|
is_expected.to change(Notification, :count)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'hides reblogs when disabled' do
|
|
|
|
recipient.follow!(sender, reblogs: false)
|
|
|
|
is_expected.to_not change(Notification, :count)
|
|
|
|
end
|
|
|
|
end
|
2017-11-15 23:21:16 -08:00
|
|
|
|
2017-11-14 12:12:57 -08:00
|
|
|
context 'for direct messages' do
|
|
|
|
let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct)) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
user.settings.interactions = user.settings.interactions.merge('must_be_following_dm' => enabled)
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'if recipient is supposed to be following sender' do
|
|
|
|
let(:enabled) { true }
|
|
|
|
|
|
|
|
it 'does not notify' do
|
|
|
|
is_expected.to_not change(Notification, :count)
|
|
|
|
end
|
|
|
|
|
2018-01-18 07:12:10 -08:00
|
|
|
context 'if the message chain initiated by recipient, but is not direct message' do
|
2017-11-14 12:12:57 -08:00
|
|
|
let(:reply_to) { Fabricate(:status, account: recipient) }
|
|
|
|
let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct, thread: reply_to)) }
|
|
|
|
|
2018-01-18 07:12:10 -08:00
|
|
|
it 'does not notify' do
|
|
|
|
is_expected.to_not change(Notification, :count)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'if the message chain initiated by recipient and is direct message' do
|
|
|
|
let(:reply_to) { Fabricate(:status, account: recipient, visibility: :direct) }
|
|
|
|
let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct, thread: reply_to)) }
|
|
|
|
|
2017-11-14 12:12:57 -08:00
|
|
|
it 'does notify' do
|
|
|
|
is_expected.to change(Notification, :count)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'if recipient is NOT supposed to be following sender' do
|
|
|
|
let(:enabled) { false }
|
|
|
|
|
|
|
|
it 'does notify' do
|
|
|
|
is_expected.to change(Notification, :count)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
Allow hiding of reblogs from followed users (#5762)
* Allow hiding of reblogs from followed users
This adds a new entry to the account menu to allow users to hide
future reblogs from a user (and then if they've done that, to show
future reblogs instead).
This does not remove or add historical reblogs from/to the user's
timeline; it only affects new statuses.
The API for this operates by sending a "reblogs" key to the follow
endpoint. If this is sent when starting a new follow, it will be
respected from the beginning of the follow relationship (even if
the follow request must be approved by the followee). If this is
sent when a follow relationship already exists, it will simply
update the existing follow relationship. As with the notification
muting, this will now return an object ({reblogs: [true|false]}) or
false for each follow relationship when requesting relationship
information for an account. This should cause few issues due to an
object being truthy in many languages, but some modifications may
need to be made in pickier languages.
Database changes: adds a show_reblogs column (default true,
non-nullable) to the follows and follow_requests tables. Because
these are non-nullable, we use the existing MigrationHelpers to
perform this change without locking those tables, although the
tables are likely to be small anyway.
Tests included.
See also <https://github.com/glitch-soc/mastodon/pull/212>.
* Rubocop fixes
* Code review changes
* Test fixes
This patchset closes #648 and resolves #3271.
* Rubocop fix
* Revert reblogs defaulting in argument, fix tests
It turns out we needed this for the same reason we needed it in muting:
if nil gets passed in somehow (most usually by an API client not passing
any value), we need to detect and handle it.
We could specify a default in the parameter and then also catch nil, but
there's no great reason to duplicate the default value.
2017-11-28 06:00:35 -08:00
|
|
|
describe 'reblogs' do
|
|
|
|
let(:status) { Fabricate(:status, account: Fabricate(:account)) }
|
|
|
|
let(:activity) { Fabricate(:status, account: sender, reblog: status) }
|
|
|
|
|
|
|
|
it 'shows reblogs by default' do
|
|
|
|
recipient.follow!(sender)
|
|
|
|
is_expected.to change(Notification, :count)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'shows reblogs when explicitly enabled' do
|
|
|
|
recipient.follow!(sender, reblogs: true)
|
|
|
|
is_expected.to change(Notification, :count)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'hides reblogs when disabled' do
|
|
|
|
recipient.follow!(sender, reblogs: false)
|
|
|
|
is_expected.to_not change(Notification, :count)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
Feature conversations muting (#3017)
* 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
2017-05-14 18:04:13 -07:00
|
|
|
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
|
|
|
|
|
2017-05-06 14:06:52 -07:00
|
|
|
describe 'email' do
|
|
|
|
before do
|
|
|
|
ActionMailer::Base.deliveries.clear
|
|
|
|
|
|
|
|
notification_emails = user.settings.notification_emails
|
|
|
|
user.settings.notification_emails = notification_emails.merge('follow' => enabled)
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when email notification is enabled' do
|
|
|
|
let(:enabled) { true }
|
|
|
|
|
|
|
|
it 'sends email' do
|
|
|
|
is_expected.to change(ActionMailer::Base.deliveries, :count).by(1)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when email notification is disabled' do
|
|
|
|
let(:enabled) { false }
|
|
|
|
|
|
|
|
it "doesn't send email" do
|
|
|
|
is_expected.to_not change(ActionMailer::Base.deliveries, :count).from(0)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|