github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 15:28:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: Publish read state on group messages. (#7989) [Undo revert] (#8024)

Browse Source 
* Reenable: "FEATURE: Publish read state on group messages. (#7989)"

This reverts commit 67f5cc1ce8da8d6301db0ab6ebcd6fc497f28455.

* FIX: Read indicator only appears when the group setting is enabled
This commit is contained in:
Roman Rizzi
2019-08-20 11:57:25 -03:00
committed by GitHub
parent 67f5cc1ce8
commit 5dda5c2f7c
35 changed files with 531 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/topic_query.rb
View File

@ -344,11 +344,13 @@ class TopicQuery
def list_private_messages_group(user)
list = private_messages_for(user, :group)
group_id = Group.where('name ilike ?', @options[:group_name]).pluck(:id).first
group = Group.where('name ilike ?', @options[:group_name]).select(:id, :publish_read_state).first
publish_read_state = !!group&.publish_read_state
list = list.joins("LEFT JOIN group_archived_messages gm ON gm.topic_id = topics.id AND
gm.group_id = #{group_id.to_i}")
gm.group_id = #{group&.id&.to_i}")
list = list.where("gm.id IS NULL")
create_list(:private_messages, {}, list)
list = append_read_state(list, group) if publish_read_state
create_list(:private_messages, { publish_read_state: publish_read_state }, list)
end
def list_private_messages_group_archive(user)
@ -1057,4 +1059,23 @@ class TopicQuery
def sanitize_sql_array(input)
ActiveRecord::Base.public_send(:sanitize_sql_array, input.join(','))
end
def append_read_state(list, group)
group_id = group&.id
return list if group_id.nil?
selected_values = list.select_values.empty? ? ['topics.*'] : list.select_values
selected_values << "tuig.minimum_unread_count"
# The calculation was borrowed from lib/unread.rb
minimum_unread_count = TopicUser
.joins(:topic)
.joins("INNER JOIN group_users ON group_users.user_id = topic_users.user_id")
.where(group_users: { group_id: group_id })
.select(
"MIN(COALESCE(topics.highest_post_number, 0) - COALESCE(highest_seen_post_number, 0)) AS minimum_unread_count, topic_id"
).group(:topic_id).to_sql
list.joins("LEFT OUTER JOIN (#{minimum_unread_count}) tuig ON topics.id = tuig.topic_id").select(*selected_values)
end
end