mirrors
/
glitch-social
mirror of https://github.com/glitch-soc/mastodon
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/master' into merge-upstream

This commit is contained in:
David Yip 2018-01-18 09:17:58 -06:00
parent e27eedbd08 e56404be41
commit 1964a0f941
No known key found for this signature in database
GPG Key ID: 7DA0036508FCC0CC
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/notify_service.rb
View File

@ -54,7 +54,7 @@ class NotifyService < BaseService
end end
def response_to_recipient? def response_to_recipient?
@notification.target_status.in_reply_to_account_id == @recipient.id @notification.target_status.in_reply_to_account_id == @recipient.id && @notification.target_status.thread&.direct_visibility?
end end
def optional_non_following_and_direct? def optional_non_following_and_direct?

11
spec/services/notify_service_spec.rb
View File

@ -82,10 +82,19 @@ RSpec.describe NotifyService do
is_expected.to_not change(Notification, :count) is_expected.to_not change(Notification, :count)
end end
context 'if the message chain initiated by recipient' do context 'if the message chain initiated by recipient, but is not direct message' do
let(:reply_to) { Fabricate(:status, account: recipient) } let(:reply_to) { Fabricate(:status, account: recipient) }
let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct, thread: reply_to)) } let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct, thread: reply_to)) }
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)) }
it 'does notify' do it 'does notify' do
is_expected.to change(Notification, :count) is_expected.to change(Notification, :count)
end end