IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Add group messages and group_message_summary notifications in the messages tab in the user menu (#18390)

Browse Source 
This commit adds non-archived group messages and `group_message_summary` notifications in the messages tab in the user menu. With this change, the messages tab in the user menu now includes 3 types of items:

1. Unread `private_message` notifications (notifications when you receive a reply in a PM)
2. Unread and read `group_message_summary` notifications (notifications when there's a new message in a group inbox that you track)
3. Non-archived personal and group messages

Unread `private_message` notifications are always shown first, followed by unread `group_message_summary` notifications, and then everything else (messages and read `group_message_summary` notifications) sorted by recency (most recent first).

Internal topic: t/72976.
This commit is contained in:
Osama Sayegh
2022-09-30 08:44:04 +03:00
committed by GitHub
parent 6ebd2cecda
commit 5a5625460b
10 changed files with 554 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/models/notification.rb
View File

@@ -15,14 +15,26 @@ class Notification < ActiveRecord::Base
scope :recent, lambda { |n = nil| n ||= 10; order('notifications.created_at desc').limit(n) }
scope :visible , lambda { joins('LEFT JOIN topics ON notifications.topic_id = topics.id')
.where('topics.id IS NULL OR topics.deleted_at IS NULL') }
scope :unread_type, ->(user, type, limit = 20) do
where(user_id: user.id, read: false, notification_type: type).visible.includes(:topic).limit(limit)
scope :unread_type, ->(user, type, limit = 30) do
unread_types(user, [type], limit)
end
scope :prioritized, ->(limit = nil) do
scope :unread_types, ->(user, types, limit = 30) do
where(user_id: user.id, read: false, notification_type: types)
.visible
.includes(:topic)
.limit(limit)
end
scope :prioritized, ->() do
order("notifications.high_priority AND NOT notifications.read DESC")
.order("NOT notifications.read DESC")
.order("notifications.created_at DESC")
.limit(limit || 30)
end
scope :for_user_menu, ->(user_id, limit: 30) do
where(user_id: user_id)
.visible
.prioritized
.includes(:topic)
.limit(limit)
end
attr_accessor :skip_send_email
@@ -226,7 +238,8 @@ class Notification < ActiveRecord::Base
notifications = user.notifications
.includes(:topic)
.visible
.prioritized(count)
.prioritized
.limit(count)
if types.present?
notifications = notifications.where(notification_type: types)