From 45950f1bb4a68b6a03b029bcd17eb18f6c055737 Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Silva Date: Thu, 23 Mar 2023 17:28:01 -0300 Subject: [PATCH] FIX: Only show public visible topics as suggested for anons (#27) * FIX: Only show public visible topics as suggested for anons * DEV: Add tests for embeddings * Update spec/lib/modules/embeddings/semantic_suggested_spec.rb Co-authored-by: Bianca Nenciu * Update spec/lib/modules/embeddings/semantic_suggested_spec.rb Co-authored-by: Bianca Nenciu * move to top --------- Co-authored-by: Bianca Nenciu --- lib/modules/embeddings/semantic_suggested.rb | 7 +++- .../modules/embeddings/entry_point_spec.rb | 31 +++++++++++++++ .../embeddings/semantic_suggested_spec.rb | 38 +++++++++++++++++++ 3 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 spec/lib/modules/embeddings/entry_point_spec.rb create mode 100644 spec/lib/modules/embeddings/semantic_suggested_spec.rb diff --git a/lib/modules/embeddings/semantic_suggested.rb b/lib/modules/embeddings/semantic_suggested.rb index 18de0e3d..a170418f 100644 --- a/lib/modules/embeddings/semantic_suggested.rb +++ b/lib/modules/embeddings/semantic_suggested.rb @@ -33,7 +33,12 @@ module DiscourseAi # array_position forces the order of the topics to be preserved candidates = - ::Topic.where(id: candidate_ids).order("array_position(ARRAY#{candidate_ids}, id)") + ::Topic + .visible + .listable_topics + .secured + .where(id: candidate_ids) + .order("array_position(ARRAY#{candidate_ids}, id)") { result: candidates, params: {} } end diff --git a/spec/lib/modules/embeddings/entry_point_spec.rb b/spec/lib/modules/embeddings/entry_point_spec.rb new file mode 100644 index 00000000..3d4f14e8 --- /dev/null +++ b/spec/lib/modules/embeddings/entry_point_spec.rb @@ -0,0 +1,31 @@ +# frozen_string_literal: true + +require "rails_helper" + +describe DiscourseAi::Embeddings::EntryPoint do + fab!(:user) { Fabricate(:user) } + + describe "registering event callbacks" do + context "when creating a topic" do + let(:creator) do + PostCreator.new( + user, + raw: "this is the new content for my topic", + title: "this is my new topic title", + ) + end + + it "queues a job on create if embeddings is enabled" do + SiteSetting.ai_embeddings_enabled = true + + expect { creator.create }.to change(Jobs::GenerateEmbeddings.jobs, :size).by(1) + end + + it "does nothing if sentiment analysis is disabled" do + SiteSetting.ai_embeddings_enabled = false + + expect { creator.create }.not_to change(Jobs::GenerateEmbeddings.jobs, :size) + end + end + end +end diff --git a/spec/lib/modules/embeddings/semantic_suggested_spec.rb b/spec/lib/modules/embeddings/semantic_suggested_spec.rb new file mode 100644 index 00000000..d6f2affd --- /dev/null +++ b/spec/lib/modules/embeddings/semantic_suggested_spec.rb @@ -0,0 +1,38 @@ +# frozen_string_literal: true + +require "rails_helper" + +describe DiscourseAi::Embeddings::SemanticSuggested do + fab!(:target) { Fabricate(:topic) } + fab!(:normal_topic_1) { Fabricate(:topic) } + fab!(:normal_topic_2) { Fabricate(:topic) } + fab!(:normal_topic_3) { Fabricate(:topic) } + fab!(:unlisted_topic) { Fabricate(:topic, visible: false) } + fab!(:private_topic) { Fabricate(:private_message_topic) } + fab!(:secured_category) { Fabricate(:category, read_restricted: true) } + fab!(:secured_category_topic) { Fabricate(:topic, category: secured_category) } + + before { SiteSetting.ai_embeddings_semantic_suggested_topics_anons_enabled = true } + + describe "#build_suggested_topics" do + before do + Discourse.cache.clear + described_class.stubs(:search_suggestions).returns( + Topic.unscoped.order(id: :desc).limit(10).pluck(:id), + ) + end + + after { Discourse.cache.clear } + + it "returns the suggested topics without non public topics" do + suggested = described_class.build_suggested_topics(target, {}, TopicQuery.new(nil)) + suggested_results = suggested[:result] + expect(suggested_results).to include(normal_topic_1) + expect(suggested_results).to include(normal_topic_2) + expect(suggested_results).to include(normal_topic_3) + expect(suggested_results).to_not include(unlisted_topic) + expect(suggested_results).to_not include(private_topic) + expect(suggested_results).to_not include(secured_category_topic) + end + end +end