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

FIX: Filter readers avatars correctly when the post is a whisper

Browse Source
This commit is contained in:
romanrizzi 2019-12-03 10:49:25 -03:00
parent e4f05a0d15
commit c86ca3609e
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/post_readers_controller.rb
View File

@ -15,10 +15,7 @@ class PostReadersController < ApplicationController
.where.not(topic_users: { last_read_post_number: nil }) .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('topic_users.topic_id = ? AND topic_users.last_read_post_number >= ?', post.topic_id, post.post_number)
if post.whisper? readers = readers.where('admin = true OR moderator = true') 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| readers = readers.map do |r|
{ {

18
spec/requests/post_readers_controller_spec.rb
View File

@ -77,11 +77,10 @@ describe PostReadersController do
expect(readers).to be_empty expect(readers).to be_empty
end end
it "doesn't include non-members when the post is a whisper" do it "doesn't include non-staff users when the post is a whisper" do
@post.update(post_type: Post.types[:whisper]) @post.update(post_type: Post.types[:whisper])
non_member_reader = Fabricate(:user) non_staff_user = Fabricate(:user)
@group_message.allowed_users << non_member_reader TopicUser.create!(user: non_staff_user, topic: @group_message, last_read_post_number: 4)
TopicUser.create!(user: non_member_reader, topic: @group_message, last_read_post_number: 4)
get '/post_readers.json', params: { id: @post.id } get '/post_readers.json', params: { id: @post.id }
readers = JSON.parse(response.body)['post_readers'] readers = JSON.parse(response.body)['post_readers']
@ -89,6 +88,17 @@ describe PostReadersController do
expect(readers).to be_empty expect(readers).to be_empty
end end
it "includes staff users when the post is a whisper" do
@post.update(post_type: Post.types[:whisper])
admin = Fabricate(:admin)
TopicUser.create!(user: admin, topic: @group_message, last_read_post_number: 4)
get '/post_readers.json', params: { id: @post.id }
reader_data = JSON.parse(response.body)['post_readers'].first
assert_reader_is_correctly_serialized(reader_data, admin, @post)
end
it "doesn't include bots" do it "doesn't include bots" do
TopicUser.create!(user: Discourse.system_user, topic: @group_message, last_read_post_number: 4) TopicUser.create!(user: Discourse.system_user, topic: @group_message, last_read_post_number: 4)