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

FEATURE: deprioritize like notifications on all list (#19029)

Browse Source 
On the all notifications list, likes should be deprioritized and marked as read.
This commit is contained in:
Krzysztof Kotlarek
2022-11-16 13:32:05 +11:00
committed by GitHub
parent f1548c801e
commit 2e655f8311
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/models/notification.rb
View File

@@ -24,10 +24,14 @@ class Notification < ActiveRecord::Base
.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")
scope :prioritized, ->(deprioritized_types = []) do
scope = order("notifications.high_priority AND NOT notifications.read DESC")
if deprioritized_types.present?
scope = scope.order(DB.sql_fragment("NOT notifications.read AND notifications.notification_type NOT IN (?) DESC", deprioritized_types))
else
scope = scope.order("NOT notifications.read DESC")
end
scope.order("notifications.created_at DESC")
end
scope :for_user_menu, ->(user_id, limit: 30) do
where(user_id: user_id)
@@ -232,22 +236,26 @@ class Notification < ActiveRecord::Base
Post.find_by(topic_id: topic_id, post_number: post_number)
end
def self.like_types
[
Notification.types[:liked],
Notification.types[:liked_consolidated]
]
end
def self.prioritized_list(user, count: 30, types: [])
return [] if !user&.user_option
notifications = user.notifications
.includes(:topic)
.visible
.prioritized
.prioritized(types.present? ? [] : like_types)
.limit(count)
if types.present?
notifications = notifications.where(notification_type: types)
elsif user.user_option.like_notification_frequency == UserOption.like_notification_frequency_type[:never]
[
Notification.types[:liked],
Notification.types[:liked_consolidated]
].each do |notification_type|
like_types.each do |notification_type|
notifications = notifications.where(
'notification_type <> ?', notification_type
)