diff --git a/config/settings.yml b/config/settings.yml index 2246fed7e..665c2c83a 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -25,9 +25,6 @@ discourse_ai: ai_sentiment_backfill_post_max_age_days: default: 60 hidden: true - ai_sentiment_reports_enabled: - default: true - client: true ai_openai_dall_e_3_url: "https://api.openai.com/v1/images/generations" ai_openai_embeddings_url: diff --git a/lib/sentiment/entry_point.rb b/lib/sentiment/entry_point.rb index 76302ebe3..3c66985bc 100644 --- a/lib/sentiment/entry_point.rb +++ b/lib/sentiment/entry_point.rb @@ -15,13 +15,11 @@ def inject_into(plugin) plugin.on(:post_edited, &sentiment_analysis_cb) plugin.add_to_serializer(:current_user, :can_see_sentiment_reports) do - ClassificationResult.has_sentiment_classification? && SiteSetting.ai_sentiment_enabled && - SiteSetting.ai_sentiment_reports_enabled + ClassificationResult.has_sentiment_classification? && SiteSetting.ai_sentiment_enabled end if Rails.env.test? || - ClassificationResult.has_sentiment_classification? && - SiteSetting.ai_sentiment_enabled && SiteSetting.ai_sentiment_reports_enabled + ClassificationResult.has_sentiment_classification? && SiteSetting.ai_sentiment_enabled EmotionFilterOrder.register!(plugin) EmotionDashboardReport.register!(plugin) SentimentDashboardReport.register!(plugin) diff --git a/spec/reports/sentiment_analysis_spec.rb b/spec/reports/sentiment_analysis_spec.rb index c5ea9464f..d251877c7 100644 --- a/spec/reports/sentiment_analysis_spec.rb +++ b/spec/reports/sentiment_analysis_spec.rb @@ -8,10 +8,7 @@ fab!(:post_2) { Fabricate(:post, user: admin, topic: topic) } fab!(:classification_result) { Fabricate(:classification_result, target: post) } - before do - SiteSetting.ai_sentiment_reports_enabled = true - SiteSetting.ai_sentiment_enabled = true - end + before { SiteSetting.ai_sentiment_enabled = true } it "contains the correct filters" do report = Report.find("sentiment_analysis")