mirror of
https://github.com/discourse/discourse.git
synced 2025-06-02 16:29:32 +08:00
Fix: Don't show non-members as readers when the post is a whisper
This commit is contained in:
@ -4,16 +4,20 @@ class PostReadersController < ApplicationController
|
||||
requires_login
|
||||
|
||||
def index
|
||||
post = Post.includes(topic: %i[allowed_groups]).find(params[:id])
|
||||
read_state = post.topic.allowed_groups.any? { |g| g.publish_read_state? && g.users.include?(current_user) }
|
||||
raise Discourse::InvalidAccess unless read_state
|
||||
post = Post.includes(topic: %i[topic_allowed_groups topic_allowed_users]).find(params[:id])
|
||||
ensure_can_see_readers!(post)
|
||||
|
||||
readers = User
|
||||
.joins(:topic_users)
|
||||
.where(staged: false)
|
||||
.where.not(id: post.user_id)
|
||||
.joins(:topic_users)
|
||||
.where.not(topic_users: { last_read_post_number: nil })
|
||||
.where('topic_users.topic_id = ? AND topic_users.last_read_post_number >= ?', post.topic_id, post.post_number)
|
||||
.where.not(id: post.user_id)
|
||||
|
||||
if post.whisper?
|
||||
non_group_members = post.topic.topic_allowed_users.map(&:user_id)
|
||||
readers = readers.where.not(id: non_group_members)
|
||||
end
|
||||
|
||||
readers = readers.map do |r|
|
||||
{
|
||||
@ -25,4 +29,15 @@ class PostReadersController < ApplicationController
|
||||
|
||||
render_json_dump(post_readers: readers)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def ensure_can_see_readers!(post)
|
||||
show_readers = GroupUser
|
||||
.where(user: current_user)
|
||||
.joins(:group)
|
||||
.where(groups: { id: post.topic.topic_allowed_groups.map(&:group_id), publish_read_state: true }).exists?
|
||||
|
||||
raise Discourse::InvalidAccess unless show_readers
|
||||
end
|
||||
end
|
||||
|
Reference in New Issue
Block a user