Skip to content

A platform for community discussion. Free, open, simple.

FIX: Ignore private topics in Rewind Most Viewed Tags

Régis Hanola89292bbb0ec
diff --git a/plugins/discourse-rewind/app/services/discourse_rewind/action/most_viewed_tags.rb b/plugins/discourse-rewind/app/services/discourse_rewind/action/most_viewed_tags.rb
index b0e038082d3..aec319a357d 100644
--- a/plugins/discourse-rewind/app/services/discourse_rewind/action/most_viewed_tags.rb
+++ b/plugins/discourse-rewind/app/services/discourse_rewind/action/most_viewed_tags.rb
@@ -20,6 +20,7 @@ module DiscourseRewind
most_viewed_tags =
TopicViewItem
.joins(:topic)
+ .merge(Topic.listable_topics.secured)
.joins("INNER JOIN topic_tags ON topic_tags.topic_id = topics.id")
.joins("INNER JOIN tags ON tags.id = topic_tags.tag_id")
.where(user: user, viewed_at: date, tags: { id: Tag.visible(Guardian.new).pluck(:id) })
diff --git a/plugins/discourse-rewind/spec/actions/most_viewed_tags_spec.rb b/plugins/discourse-rewind/spec/actions/most_viewed_tags_spec.rb
index d59c58d5f54..c4dbb443043 100644
--- a/plugins/discourse-rewind/spec/actions/most_viewed_tags_spec.rb
+++ b/plugins/discourse-rewind/spec/actions/most_viewed_tags_spec.rb
@@ -28,6 +28,17 @@ RSpec.describe DiscourseRewind::Action::MostViewedTags do
end
describe ".call" do
+ it "ignores personal messages and read-restricted categories" do
+ restricted_topic =
+ Fabricate(:topic, category: Fabricate(:private_category, group: Fabricate(:group)))
+ [Fabricate(:private_message_topic), restricted_topic].each do |topic|
+ topic.tags = [tag_5]
+ TopicViewItem.add(topic.id, "127.0.0.1", user.id, Date.new(2021, 3, 15))
+ end
+
+ expect(call_report[:data]).to be_empty
+ end
+
it "returns top 4 most viewed tags ordered by view count" do
# Tag 1 (ruby): 2 views (2 different topics)
TopicViewItem.add(topic_1.id, "127.0.0.1", user.id, Date.new(2021, 3, 15))