Backport "Don't display blocked users in mentions" to v0.26 (#8770)

Co-authored-by: Armand Fardeau <armandfardeau@users.noreply.github.com>

decidim-core/app/models/decidim/user.rb

@@ -63,12 +63,6 @@ def self.all
     scope :officialized, -> { where.not(officialized_at: nil) }
     scope :not_officialized, -> { where(officialized_at: nil) }
 
-    scope :confirmed, -> { where.not(confirmed_at: nil) }
-    scope :not_confirmed, -> { where(confirmed_at: nil) }
-
-    scope :blocked, -> { where(blocked: true) }
-    scope :not_blocked, -> { where(blocked: false) }
-
     scope :interested_in_scopes, lambda { |scope_ids|
       actual_ids = scope_ids.select(&:presence)
       if actual_ids.count.positive?

decidim-core/app/models/decidim/user_base_entity.rb

@@ -25,6 +25,12 @@ class UserBaseEntity < ApplicationRecord
 
     validates :name, format: { with: REGEXP_NAME }
 
+    scope :confirmed, -> { where.not(confirmed_at: nil) }
+    scope :not_confirmed, -> { where(confirmed_at: nil) }
+
+    scope :blocked, -> { where(blocked: true) }
+    scope :not_blocked, -> { where(blocked: false) }
+
     # Public: Returns a collection with all the public entities this user is following.
     #
     # This can't be done as with a `has_many :following, through: :following_follows`

decidim-core/lib/decidim/api/functions/user_entity_finder.rb

@@ -22,7 +22,8 @@ def call(_obj, args, ctx)
           filters[argument.to_sym] = v
         end
         Decidim::UserBaseEntity
-          .where.not(confirmed_at: nil)
+          .confirmed
+          .not_blocked
           .find_by(filters)
       end
     end

decidim-core/lib/decidim/api/functions/user_entity_list.rb

@@ -19,7 +19,8 @@ def initialize
       def call(_obj, args, ctx)
         @query = Decidim::UserBaseEntity
                  .where(organization: ctx[:current_organization])
-                 .where.not(confirmed_at: nil)
+                 .confirmed
+                 .not_blocked
                  .includes(avatar_attachment: :blob)
         add_filter_keys(args[:filter])
         add_order_keys(args[:order].to_h)

decidim-core/spec/types/user_entity_input_filter_spec.rb

@@ -22,6 +22,15 @@ module Core
           expect(users).to include({ "id" => user.id.to_s, "__typename" => "User" },
                                    "id" => user_group.id.to_s, "__typename" => "UserGroup")
         end
+
+        context "when user is blocked" do
+          let(:user) { create(:user, :blocked, :confirmed, organization: current_organization) }
+
+          it "doesn't returns all the types" do
+            users = response["users"]
+            expect(users).to include("id" => user_group.id.to_s, "__typename" => "UserGroup")
+          end
+        end
       end
 
       context "when user or groups are not confirmed" do
@@ -43,6 +52,15 @@ module Core
           expect(users).to include("id" => user.id.to_s)
           expect(users).not_to include("id" => user_group.id.to_s)
         end
+
+        context "when user is blocked" do
+          let(:user) { create(:user, :blocked, :confirmed, organization: current_organization) }
+
+          it "doesn't returns all the types" do
+            users = response["users"]
+            expect(users).to eq([])
+          end
+        end
       end
 
       context "when filtering by type UserGroup" do
@@ -86,6 +104,14 @@ module Core
             expect(response["users"]).to include("name" => user5.name)
             expect(response["users"]).to include("name" => user6.name)
           end
+
+          context "when user is blocked" do
+            let!(:user1) { create(:user, :blocked, :confirmed, nickname: "_foo_user_1", name: "FooBar User 1", organization: current_organization) }
+
+            it "doesn't returns matching users" do
+              expect(response["users"]).not_to include("name" => user1.name)
+            end
+          end
         end
 
         context "when search a user by name" do
@@ -100,6 +126,14 @@ module Core
             expect(response["users"]).to include("name" => user5.name)
             expect(response["users"]).to include("name" => user6.name)
           end
+
+          context "when user is blocked" do
+            let!(:user1) { create(:user, :blocked, :confirmed, nickname: "_foo_user_1", name: "FooBar User 1", organization: current_organization) }
+
+            it "doesn't returns matching users" do
+              expect(response["users"]).not_to include("name" => user1.name)
+            end
+          end
         end
 
         context "when search a user by wildcard" do
@@ -114,6 +148,14 @@ module Core
             expect(response["users"]).to include("name" => user5.name)
             expect(response["users"]).to include("name" => user6.name)
           end
+
+          context "when user is blocked" do
+            let!(:user1) { create(:user, :blocked, :confirmed, nickname: "_foo_user_1", name: "FooBar User 1", organization: current_organization) }
+
+            it "doesn't returns matching users" do
+              expect(response["users"]).not_to include("name" => user1.name)
+            end
+          end
         end
 
         context "when search a user by wildcard but with empty exclusion list" do
@@ -129,6 +171,14 @@ module Core
             expect(response["users"]).to include("name" => user5.name)
             expect(response["users"]).to include("name" => user6.name)
           end
+
+          context "when user is blocked" do
+            let!(:user1) { create(:user, :blocked, :confirmed, nickname: "_foo_user_1", name: "FooBar User 1", organization: current_organization) }
+
+            it "doesn't returns matching users" do
+              expect(response["users"]).not_to include("name" => user1.name)
+            end
+          end
         end
 
         context "when search a user by wildcard but with exclusion list" do
@@ -144,6 +194,14 @@ module Core
             expect(response["users"]).not_to include("name" => user5.name)
             expect(response["users"]).to include("name" => user6.name)
           end
+
+          context "when user is blocked" do
+            let!(:user1) { create(:user, :blocked, :confirmed, nickname: "_foo_user_1", name: "FooBar User 1", organization: current_organization) }
+
+            it "doesn't returns matching users" do
+              expect(response["users"]).not_to include("name" => user1.name)
+            end
+          end
         end
 
         context "when search a user by wildcard but with multiple exclusion list" do
@@ -159,6 +217,14 @@ module Core
             expect(response["users"]).not_to include("name" => user5.name)
             expect(response["users"]).not_to include("name" => user6.name)
           end
+
+          context "when user is blocked" do
+            let!(:user1) { create(:user, :blocked, :confirmed, nickname: "_foo_user_1", name: "FooBar User 1", organization: current_organization) }
+
+            it "doesn't returns matching users" do
+              expect(response["users"]).not_to include("name" => user1.name)
+            end
+          end
         end
       end
     end