OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

Change notification requests to only count mentions (#31322)

pull/31320/head
Claire 2024-08-07 13:12:36 +02:00 committed by GitHub
parent fc964c9bfd
commit af2aec1a82
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/notification_request.rb
View File

@ -47,6 +47,6 @@ class NotificationRequest < ApplicationRecord
private private
def prepare_notifications_count def prepare_notifications_count
self.notifications_count = Notification.where(account: account, from_account: from_account, filtered: true).limit(MAX_MEANINGFUL_COUNT).count self.notifications_count = Notification.where(account: account, from_account: from_account, type: :mention, filtered: true).limit(MAX_MEANINGFUL_COUNT).count
end end
end end

2
spec/models/notification_policy_spec.rb
View File

@ -9,7 +9,7 @@ RSpec.describe NotificationPolicy do
let(:sender) { Fabricate(:account) } let(:sender) { Fabricate(:account) }
before do before do
Fabricate.times(2, :notification, account: subject.account, activity: Fabricate(:status, account: sender), filtered: true) Fabricate.times(2, :notification, account: subject.account, activity: Fabricate(:status, account: sender), filtered: true, type: :mention)
Fabricate(:notification_request, account: subject.account, from_account: sender) Fabricate(:notification_request, account: subject.account, from_account: sender)
subject.summarize! subject.summarize!
end end

2
spec/models/notification_request_spec.rb
View File

@ -8,7 +8,7 @@ RSpec.describe NotificationRequest do
context 'when there are remaining notifications' do context 'when there are remaining notifications' do
before do before do
Fabricate(:notification, account: subject.account, activity: Fabricate(:status, account: subject.from_account), filtered: true) Fabricate(:notification, account: subject.account, activity: Fabricate(:status, account: subject.from_account), filtered: true, type: :mention)
subject.reconsider_existence! subject.reconsider_existence!
end end