mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-16 11:53:13 +00:00
01d6f7529f
Conflicts: - `README.md`: Upstream added a link to the roadmap, but we have a completely different README. Kept ours. - `app/models/media_attachment.rb`: Upstream upped media attachment limits. Updated the default according to upstream's. - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream changed the migration compatibility level. Did so too. - `config/initializers/content_security_policy.rb`: Upstream refactored this file but we have a different version. Kept our version. - `app/controllers/settings/preferences_controller.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file does not directly references individual settings anymore. Applied upstream changes. - `app/lib/user_settings_decorator.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file got removed entirely. Removed it as well. - `app/models/user.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. References to individual settings have been removed from the file. Removed them as well. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/other/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `config/settings.yml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. In particular, upstream removed user-specific and unused settings. Did the same in glitch-soc. - `spec/controllers/application_controller_spec.rb`: Conflicts due to glitch-soc's theming system. Mostly kept our version, as upstream messed up the tests.
180 lines
6.1 KiB
Ruby
180 lines
6.1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'rails_helper'
|
|
|
|
RSpec.describe NotifyService, type: :service do
|
|
subject { described_class.new.call(recipient, type, activity) }
|
|
|
|
let(:user) { Fabricate(:user) }
|
|
let(:recipient) { user.account }
|
|
let(:sender) { Fabricate(:account, domain: 'example.com') }
|
|
let(:activity) { Fabricate(:follow, account: sender, target_account: recipient) }
|
|
let(:type) { :follow }
|
|
|
|
it { expect { subject }.to change(Notification, :count).by(1) }
|
|
|
|
it 'does not notify when sender is blocked' do
|
|
recipient.block!(sender)
|
|
expect { subject }.to_not change(Notification, :count)
|
|
end
|
|
|
|
it 'does not notify when sender is muted with hide_notifications' do
|
|
recipient.mute!(sender, notifications: true)
|
|
expect { subject }.to_not change(Notification, :count)
|
|
end
|
|
|
|
it 'does notify when sender is muted without hide_notifications' do
|
|
recipient.mute!(sender, notifications: false)
|
|
expect { subject }.to change(Notification, :count)
|
|
end
|
|
|
|
it 'does not notify when sender\'s domain is blocked' do
|
|
recipient.block_domain!(sender.domain)
|
|
expect { subject }.to_not change(Notification, :count)
|
|
end
|
|
|
|
it 'does still notify when sender\'s domain is blocked but sender is followed' do
|
|
recipient.block_domain!(sender.domain)
|
|
recipient.follow!(sender)
|
|
expect { subject }.to change(Notification, :count)
|
|
end
|
|
|
|
it 'does not notify when sender is silenced and not followed' do
|
|
sender.silence!
|
|
expect { subject }.to_not change(Notification, :count)
|
|
end
|
|
|
|
it 'does not notify when recipient is suspended' do
|
|
recipient.suspend!
|
|
expect { subject }.to_not change(Notification, :count)
|
|
end
|
|
|
|
context 'for direct messages' do
|
|
let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct)) }
|
|
let(:type) { :mention }
|
|
|
|
before do
|
|
user.settings.update('interactions.must_be_following_dm': enabled)
|
|
user.save
|
|
end
|
|
|
|
context 'if recipient is supposed to be following sender' do
|
|
let(:enabled) { true }
|
|
|
|
it 'does not notify' do
|
|
expect { subject }.to_not change(Notification, :count)
|
|
end
|
|
|
|
context 'if the message chain is initiated by recipient, but is not direct message' do
|
|
let(:reply_to) { Fabricate(:status, account: recipient) }
|
|
let!(:mention) { Fabricate(:mention, account: sender, status: reply_to) }
|
|
let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct, thread: reply_to)) }
|
|
|
|
it 'does not notify' do
|
|
expect { subject }.to_not change(Notification, :count)
|
|
end
|
|
end
|
|
|
|
context 'if the message chain is initiated by recipient, but without a mention to the sender, even if the sender sends multiple messages in a row' do
|
|
let(:reply_to) { Fabricate(:status, account: recipient) }
|
|
let!(:mention) { Fabricate(:mention, account: sender, status: reply_to) }
|
|
let(:dummy_reply) { Fabricate(:status, account: sender, visibility: :direct, thread: reply_to) }
|
|
let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct, thread: dummy_reply)) }
|
|
|
|
it 'does not notify' do
|
|
expect { subject }.to_not change(Notification, :count)
|
|
end
|
|
end
|
|
|
|
context 'if the message chain is initiated by the recipient with a mention to the sender' do
|
|
let(:reply_to) { Fabricate(:status, account: recipient, visibility: :direct) }
|
|
let!(:mention) { Fabricate(:mention, account: sender, status: reply_to) }
|
|
let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct, thread: reply_to)) }
|
|
|
|
it 'does notify' do
|
|
expect { subject }.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
|
|
expect { subject }.to change(Notification, :count)
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'reblogs' do
|
|
let(:status) { Fabricate(:status, account: Fabricate(:account)) }
|
|
let(:activity) { Fabricate(:status, account: sender, reblog: status) }
|
|
let(:type) { :reblog }
|
|
|
|
it 'shows reblogs by default' do
|
|
recipient.follow!(sender)
|
|
expect { subject }.to change(Notification, :count)
|
|
end
|
|
|
|
it 'shows reblogs when explicitly enabled' do
|
|
recipient.follow!(sender, reblogs: true)
|
|
expect { subject }.to change(Notification, :count)
|
|
end
|
|
|
|
it 'shows reblogs when disabled' do
|
|
recipient.follow!(sender, reblogs: false)
|
|
expect { subject }.to change(Notification, :count)
|
|
end
|
|
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)) }
|
|
let(:type) { :mention }
|
|
|
|
it 'does not notify when conversation is muted' do
|
|
recipient.mute_conversation!(activity.status.conversation)
|
|
expect { subject }.to_not change(Notification, :count)
|
|
end
|
|
|
|
it 'does not notify when it is a reply to a blocked user' do
|
|
recipient.block!(asshole)
|
|
expect { subject }.to_not change(Notification, :count)
|
|
end
|
|
end
|
|
|
|
context do
|
|
let(:sender) { recipient }
|
|
|
|
it 'does not notify when recipient is the sender' do
|
|
expect { subject }.to_not change(Notification, :count)
|
|
end
|
|
end
|
|
|
|
describe 'email' do
|
|
before do
|
|
ActionMailer::Base.deliveries.clear
|
|
|
|
user.settings.update('notification_emails.follow': enabled)
|
|
user.save
|
|
end
|
|
|
|
context 'when email notification is enabled' do
|
|
let(:enabled) { true }
|
|
|
|
it 'sends email' do
|
|
expect { subject }.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
|
|
expect { subject }.to_not change(ActionMailer::Base.deliveries, :count).from(0)
|
|
end
|
|
end
|
|
end
|
|
end
|