KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: Unread notification count in multiple accounts (#4373)

Browse source 
Fixes: #4367
This commit is contained in:
Muhsin Keloth 2022-04-04 14:34:01 +05:30 committed by GitHub
parent 3509692055
commit 1dd0c7249c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/listeners/base_listener.rb
View file

@ -8,8 +8,9 @@ class BaseListener
def extract_notification_and_account(event)
notification = event.data[:notification]
unread_count = notification.user.notifications_meta[:unread_count]
count = notification.user.notifications_meta[:count]
notifications_meta = notification.user.notifications_meta(notification.account_id)
unread_count = notifications_meta[:unread_count]
count = notifications_meta[:count]
[notification, notification.account, unread_count, count]
end

6
app/models/user.rb
View file

@ -188,10 +188,10 @@ class User < ApplicationRecord
mutations_from_database.changed?('email')
end
def notifications_meta
def notifications_meta(account_id)
{
unread_count: notifications.where(read_at: nil).count,
count: notifications.count
unread_count: notifications.where(account_id: account_id, read_at: nil).count,
count: notifications.where(account_id: account_id).count
}
end
end