From 2dd7068b46355ea4db0a229dde52ac418ba7acb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Mon, 24 Mar 2025 10:33:18 +0100
Subject: [PATCH] DEV: add `guardian` argument to `TopicsFilter` callback
 (#1206)

To match the updates in discourse/discourse#31908
---
 lib/sentiment/emotion_filter_order.rb               |  2 +-
 .../modules/sentiment/emotion_filter_order_spec.rb  | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/lib/sentiment/emotion_filter_order.rb b/lib/sentiment/emotion_filter_order.rb
index 6f77fecf..0f1b3b62 100644
--- a/lib/sentiment/emotion_filter_order.rb
+++ b/lib/sentiment/emotion_filter_order.rb
@@ -5,7 +5,7 @@ module DiscourseAi
     class EmotionFilterOrder
       def self.register!(plugin)
         Emotions::LIST.each do |emotion|
-          filter_order_emotion = ->(scope, order_direction) do
+          filter_order_emotion = ->(scope, order_direction, _guardian) do
             scope_period =
               scope
                 .arel
diff --git a/spec/lib/modules/sentiment/emotion_filter_order_spec.rb b/spec/lib/modules/sentiment/emotion_filter_order_spec.rb
index 35d886c2..4a2ba53e 100644
--- a/spec/lib/modules/sentiment/emotion_filter_order_spec.rb
+++ b/spec/lib/modules/sentiment/emotion_filter_order_spec.rb
@@ -8,6 +8,7 @@ RSpec.describe DiscourseAi::Sentiment::EmotionFilterOrder do
   let(:post_1) { Fabricate(:post) }
   let(:post_2) { Fabricate(:post) }
   let(:post_3) { Fabricate(:post) }
+  let(:guardian) { Guardian.new }
   let(:classification_1) do
     {
       love: 0.9444406,
@@ -179,7 +180,7 @@ RSpec.describe DiscourseAi::Sentiment::EmotionFilterOrder do
         .find { _1.keys.include? "order:emotion_#{emotion}" }
         .values
         .first
-    result = filter.call(scope, order_direction)
+    result = filter.call(scope, order_direction, guardian)
 
     expect(result.to_sql).to include("classification_results")
     expect(result.to_sql).to include(
@@ -190,18 +191,12 @@ RSpec.describe DiscourseAi::Sentiment::EmotionFilterOrder do
 
   it "sorts emotion in ascending order" do
     expect(
-      TopicsFilter
-        .new(guardian: Guardian.new)
-        .filter_from_query_string("order:emotion_love-asc")
-        .pluck(:id),
+      TopicsFilter.new(guardian:).filter_from_query_string("order:emotion_love-asc").pluck(:id),
     ).to contain_exactly(post_2.topic.id, post_1.topic.id)
   end
   it "sorts emotion in default descending order" do
     expect(
-      TopicsFilter
-        .new(guardian: Guardian.new)
-        .filter_from_query_string("order:emotion_love")
-        .pluck(:id),
+      TopicsFilter.new(guardian:).filter_from_query_string("order:emotion_love").pluck(:id),
     ).to contain_exactly(post_1.topic.id, post_2.topic.id)
   end
 end