Skip to content

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

FIX: user action notifications and list should not list ignored users (#39589)

Gabriel Grubbade27c3175b33
diff --git a/app/models/user_action.rb b/app/models/user_action.rb
index 6387ad767b3..683e5e8f512 100644
--- a/app/models/user_action.rb
+++ b/app/models/user_action.rb
@@ -421,6 +421,7 @@ class UserAction < ActiveRecord::Base
filter_private_messages(builder, user_id, guardian, ignore_private_messages)
filter_categories(builder, guardian)
+ filter_ignored_users(builder, guardian)
end
def self.filter_private_messages(builder, user_id, guardian, ignore_private_messages = false)
@@ -467,6 +468,20 @@ class UserAction < ActiveRecord::Base
builder
end
+ def self.filter_ignored_users(builder, guardian)
+ return unless guardian&.user
+
+ builder.where(<<~SQL, current_user_id: guardian.user.id)
+ NOT EXISTS (
+ SELECT 1 FROM ignored_users ig
+ INNER JOIN users iu ON iu.id = ig.ignored_user_id
+ WHERE ig.user_id = :current_user_id
+ AND ig.ignored_user_id = a.acting_user_id
+ AND ig.ignored_user_id <> :current_user_id
+ )
+ SQL
+ end
+
def self.require_parameters(data, *params)
params.each { |p| raise Discourse::InvalidParameters.new(p) if data[p].nil? }
end
diff --git a/plugins/discourse-reactions/app/controllers/discourse_reactions/custom_reactions_controller.rb b/plugins/discourse-reactions/app/controllers/discourse_reactions/custom_reactions_controller.rb
index ee2c9081653..d1bb3952346 100644
--- a/plugins/discourse-reactions/app/controllers/discourse_reactions/custom_reactions_controller.rb
+++ b/plugins/discourse-reactions/app/controllers/discourse_reactions/custom_reactions_controller.rb
@@ -325,7 +325,13 @@ class DiscourseReactions::CustomReactionsController < ApplicationController
def secure_reaction_users!(reaction_users)
builder = DB.build("/*where*/")
UserAction.apply_common_filters(builder, current_user.id, guardian)
- reaction_users.where(builder.to_sql.delete_prefix("/*where*/").delete_prefix("WHERE"))
+ sql =
+ builder
+ .to_sql
+ .delete_prefix("/*where*/")
+ .delete_prefix("WHERE")
+ .gsub("a.acting_user_id", "discourse_reactions_reaction_users.user_id")
+ reaction_users.where(sql)
end
def translate_to_reactions(likes)
diff --git a/spec/models/user_action_spec.rb b/spec/models/user_action_spec.rb
index 2fcf46e9a2b..a816d74381f 100644
--- a/spec/models/user_action_spec.rb
+++ b/spec/models/user_action_spec.rb
@@ -246,6 +246,40 @@ RSpec.describe UserAction do
expect(likee_stream.count).not_to eq(old_count + 1)
end
end
+
+ context "with ignored users" do
+ before { Fabricate(:ignored_user, user: likee, ignored_user: liker) }
+
+ def likee_stream_for(viewer)
+ UserAction.stream(user_id: likee.id, guardian: Guardian.new(viewer))
+ end
+
+ it "hides likes from ignored users when the ignorer views the stream" do
+ PostActionCreator.like(liker, post)
+ expect(likee_stream_for(likee).count).to eq(old_count)
+ end
+
+ it "still shows the likes to anonymous viewers" do
+ PostActionCreator.like(liker, post)
+ expect(likee_stream.count).to eq(old_count + 1)
+ end
+
+ it "still shows the likes to other logged-in viewers who aren't ignoring the liker" do
+ other = Fabricate(:user)
+ PostActionCreator.like(liker, post)
+ expect(likee_stream_for(other).count).to eq(old_count + 1)
+ end
+
+ it "hides only the ignored user's actions, not other users' actions on the same topic" do
+ normal_user = Fabricate(:user)
+ PostActionCreator.like(normal_user, post)
+ PostActionCreator.like(liker, post)
+
+ acting_user_ids = likee_stream_for(likee).map(&:acting_user_id).uniq
+ expect(acting_user_ids).to include(normal_user.id)
+ expect(acting_user_ids).not_to include(liker.id)
+ end
+ end
end
describe "when a user posts a new topic" do