github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 16:34:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: Dismiss new per category (#8330)

Browse Source 
Ability to dismiss new topics per category.
This commit is contained in:
Krzysztof Kotlarek
2019-11-14 11:16:13 +11:00
committed by GitHub
parent d095c2cee7
commit 6e1fe22a9d
13 changed files with 135 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
lib/topic_query.rb
View File

@ -517,6 +517,7 @@ class TopicQuery
result = remove_muted_topics(result, @user)
result = remove_muted_categories(result, @user, exclude: options[:category])
result = remove_muted_tags(result, @user, options)
result = remove_already_seen_for_category(result, @user)
self.class.results_filter_callbacks.each do |filter_callback|
result = filter_callback.call(:new, result, @user, options)
@ -871,21 +872,15 @@ class TopicQuery
if SiteSetting.mute_all_categories_by_default
if user
list = list.references("cu")
.where("
NOT EXISTS (
SELECT 1
FROM categories c
LEFT OUTER JOIN category_users cu
ON c.id = cu.category_id AND cu.user_id = :user_id
WHERE c.id = topics.category_id
AND c.id <> :category_id
AND (COALESCE(cu.notification_level, :muted) = :muted)
AND (COALESCE(tu.notification_level, :regular) <= :regular)
)", user_id: user.id,
muted: CategoryUser.notification_levels[:muted],
regular: TopicUser.notification_levels[:regular],
category_id: category_id || -1)
list = list
.references("cu")
.joins("LEFT JOIN category_users ON category_users.category_id = topics.category_id AND category_users.user_id = #{user.id}")
.where("topics.category_id = :category_id
OR COALESCE(category_users.notification_level, :muted) <> :muted
OR tu.notification_level > :regular",
muted: CategoryUser.notification_levels[:muted],
regular: TopicUser.notification_levels[:regular],
category_id: category_id || -1)
else
category_ids = [
SiteSetting.default_categories_watching.split("|"),
@ -897,20 +892,15 @@ class TopicQuery
list = list.where("topics.category_id IN (?)", category_ids) if category_ids.present?
end
elsif user
list = list.references("cu")
.where("
NOT EXISTS (
SELECT 1
FROM category_users cu
WHERE cu.user_id = :user_id
AND cu.category_id = topics.category_id
AND cu.notification_level = :muted
AND cu.category_id <> :category_id
AND (tu.notification_level IS NULL OR tu.notification_level < :tracking)
)", user_id: user.id,
muted: CategoryUser.notification_levels[:muted],
tracking: TopicUser.notification_levels[:tracking],
category_id: category_id || -1)
list = list
.references("cu")
.joins("LEFT JOIN category_users ON category_users.category_id = topics.category_id AND category_users.user_id = #{user.id}")
.where("COALESCE(category_users.notification_level, :regular) <> :muted
OR category_users.category_id = :category_id OR tu.notification_level >= :tracking",
muted: CategoryUser.notification_levels[:muted],
regular: CategoryUser.notification_levels[:regular],
tracking: TopicUser.notification_levels[:tracking],
category_id: category_id || -1)
end
list
@ -949,6 +939,15 @@ class TopicQuery
end
end
def remove_already_seen_for_category(list, user)
if user
list = list
.where("category_users.last_seen_at IS NULL OR topics.created_at > category_users.last_seen_at")
end
list
end
def new_messages(params)
query = TopicQuery
.new_filter(messages_for_groups_or_user(params[:my_group_ids]), Time.at(SiteSetting.min_new_topics_time).to_datetime)