From 5ca0fbc42374b26575a7ec26edc5f6e4fc92abb0 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Fri, 13 Nov 2020 19:13:37 +0200
Subject: [PATCH] FIX: Show read indicator only for group PMs (#11224)

It used to show for PMs converted to public topics.
---
 lib/topic_view.rb                  |  2 +-
 spec/components/topic_view_spec.rb | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index 8d985757ceb..d02d4028b16 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -106,7 +106,7 @@ class TopicView
   end
 
   def show_read_indicator?
-    return false unless @user || topic.private_message?
+    return false if !@user || !topic.private_message?
 
     topic.allowed_groups.any? do |group|
       group.publish_read_state? && group.users.include?(@user)
diff --git a/spec/components/topic_view_spec.rb b/spec/components/topic_view_spec.rb
index e6a1c0f1840..e3a159ded3a 100644
--- a/spec/components/topic_view_spec.rb
+++ b/spec/components/topic_view_spec.rb
@@ -795,4 +795,30 @@ describe TopicView do
       end
     end
   end
+
+  describe '#show_read_indicator?' do
+    let(:topic) { Fabricate(:topic) }
+    let(:pm_topic) { Fabricate(:private_message_topic) }
+
+    it "shows read indicator for private messages" do
+      group = Fabricate(:group, users: [admin], publish_read_state: true)
+      pm_topic.topic_allowed_groups = [Fabricate.build(:topic_allowed_group, group: group)]
+
+      topic_view = TopicView.new(pm_topic.id, admin)
+      expect(topic_view.show_read_indicator?).to be_truthy
+    end
+
+    it "does not show read indicator if groups do not have read indicator enabled" do
+      topic_view = TopicView.new(pm_topic.id, admin)
+      expect(topic_view.show_read_indicator?).to be_falsey
+    end
+
+    it "does not show read indicator for topics with allowed groups" do
+      group = Fabricate(:group, users: [admin], publish_read_state: true)
+      topic.topic_allowed_groups = [Fabricate.build(:topic_allowed_group, group: group)]
+
+      topic_view = TopicView.new(topic.id, admin)
+      expect(topic_view.show_read_indicator?).to be_falsey
+    end
+  end
 end