From 0dbcc54d4bc45d63126970785d3b8d059dc328b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Thu, 4 Jul 2024 19:27:26 +0200
Subject: [PATCH] DEV: use new 'ignore allowed groups' site settings (#27670)

Instead of the deprecated 'min trust level to allow ignore' in order to reduce the number of deprecation notices in the logs.

This tweaks a few serializers so that the 'can_ignore_users?` property is always coming from the server and properly used on the client-side.
---
 .../app/controllers/preferences/users.js      | 17 +---
 .../app/templates/preferences/users.hbs       | 33 +++----
 .../tests/fixtures/session-fixtures.js        |  2 +
 app/serializers/current_user_serializer.rb    |  2 +-
 app/serializers/user_serializer.rb            | 10 +++
 lib/guardian.rb                               |  3 +-
 .../api/schemas/json/user_get_response.json   |  6 ++
 .../web_hook_user_serializer_spec.rb          | 86 ++++++++++---------
 8 files changed, 83 insertions(+), 76 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/users.js b/app/assets/javascripts/discourse/app/controllers/preferences/users.js
index 5c5ac48cd3c..4c6719e3f4d 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/users.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/users.js
@@ -1,26 +1,11 @@
 import Controller from "@ember/controller";
 import { action, computed } from "@ember/object";
-import { alias, and } from "@ember/object/computed";
+import { and } from "@ember/object/computed";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { makeArray } from "discourse-common/lib/helpers";
 import discourseComputed from "discourse-common/utils/decorators";
 
 export default Controller.extend({
-  ignoredUsernames: alias("model.ignored_usernames"),
-
-  @discourseComputed("model.trust_level", "model.groups")
-  userCanIgnore(trustLevel) {
-    return (
-      trustLevel >= this.siteSettings.min_trust_level_to_allow_ignore ||
-      this.currentUser.can_ignore_users
-    );
-  },
-
-  @discourseComputed("userCanIgnore", "model.staff")
-  ignoredEnabled(userCanIgnore, userIsStaff) {
-    return this.currentUser.staff || userCanIgnore || userIsStaff;
-  },
-
   allowPmUsersEnabled: and(
     "model.user_option.enable_allowed_pm_users",
     "model.user_option.allow_private_messages"
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/users.hbs b/app/assets/javascripts/discourse/app/templates/preferences/users.hbs
index 6ffb37ffaaa..37d39f3f93e 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/users.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/users.hbs
@@ -1,5 +1,6 @@
 <label class="control-label">{{i18n "user.users"}}</label>
-{{#if this.ignoredEnabled}}
+
+{{#if this.model.can_ignore_users}}
   <div class="control-group user-ignore" data-setting-name="user-ignored-users">
     <div class="controls tracking-controls user-notifications">
       <label>{{d-icon "far-eye-slash" class="icon"}}
@@ -13,22 +14,24 @@
   </div>
 {{/if}}
 
-<div class="control-group user-mute" data-setting-name="user-muted-users">
-  <div class="controls tracking-controls">
-    <label>
-      {{d-icon "d-muted" class="icon"}}
-      <span>{{i18n "user.muted_users"}}</span>
-    </label>
-    <UserChooser
-      @value={{this.mutedUsernames}}
-      @onChange={{action "onChangeMutedUsernames"}}
-      @options={{hash excludeCurrentUser=true}}
-    />
+{{#if this.model.can_mute_users}}
+  <div class="control-group user-mute" data-setting-name="user-muted-users">
+    <div class="controls tracking-controls">
+      <label>
+        {{d-icon "d-muted" class="icon"}}
+        <span>{{i18n "user.muted_users"}}</span>
+      </label>
+      <UserChooser
+        @value={{this.mutedUsernames}}
+        @onChange={{action "onChangeMutedUsernames"}}
+        @options={{hash excludeCurrentUser=true}}
+      />
+    </div>
+    <div class="instructions">{{i18n "user.muted_users_instructions"}}</div>
   </div>
-  <div class="instructions">{{i18n "user.muted_users_instructions"}}</div>
-</div>
+{{/if}}
 
-{{#if this.currentUser.can_send_private_messages}}
+{{#if this.model.can_send_private_messages}}
   <div class="control-group private-messages">
     <label class="control-label">{{i18n "user.private_messages"}}</label>
     <div
diff --git a/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js
index 5ed1c0903c4..14a8e5bd8c4 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/session-fixtures.js
@@ -26,6 +26,8 @@ export default {
       trust_level: 4,
       can_edit: true,
       can_invite_to_forum: true,
+      can_ignore_users: true,
+      can_mute_users: true,
       can_send_private_messages: true,
       custom_fields: {},
       muted_category_ids: [],
diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
index fb73b850630..fb0433f44df 100644
--- a/app/serializers/current_user_serializer.rb
+++ b/app/serializers/current_user_serializer.rb
@@ -147,7 +147,7 @@ class CurrentUserSerializer < BasicUserSerializer
   end
 
   def can_ignore_users
-    !is_anonymous && object.in_any_groups?(SiteSetting.ignore_allowed_groups_map)
+    scope.can_ignore_users?
   end
 
   def can_delete_all_posts_and_topics
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index ca7734f7e3d..070f57e3e44 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -51,7 +51,9 @@ class UserSerializer < UserCardSerializer
                      :custom_avatar_template,
                      :has_title_badges,
                      :muted_usernames,
+                     :can_mute_users,
                      :ignored_usernames,
+                     :can_ignore_users,
                      :allowed_pm_usernames,
                      :mailing_list_posts_per_day,
                      :can_change_bio,
@@ -254,10 +256,18 @@ class UserSerializer < UserCardSerializer
     MutedUser.where(user_id: object.id).joins(:muted_user).pluck(:username)
   end
 
+  def can_mute_users
+    scope.can_mute_users?
+  end
+
   def ignored_usernames
     IgnoredUser.where(user_id: object.id).joins(:ignored_user).pluck(:username)
   end
 
+  def can_ignore_users
+    scope.can_ignore_users?
+  end
+
   def allowed_pm_usernames
     AllowedPmUser.where(user_id: object.id).joins(:allowed_pm_user).pluck(:username)
   end
diff --git a/lib/guardian.rb b/lib/guardian.rb
index b88c9292d55..523b398dd0f 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -559,8 +559,7 @@ class Guardian
 
   def can_ignore_users?
     return false if anonymous?
-    @user.staff? || @user.has_trust_level?(SiteSetting.min_trust_level_to_allow_ignore.to_i) ||
-      @user.in_any_groups?(SiteSetting.ignore_allowed_groups_map)
+    @user.staff? || @user.in_any_groups?(SiteSetting.ignore_allowed_groups_map)
   end
 
   def allowed_theme_repo_import?(repo)
diff --git a/spec/requests/api/schemas/json/user_get_response.json b/spec/requests/api/schemas/json/user_get_response.json
index 1bf590efc3c..6783e532217 100644
--- a/spec/requests/api/schemas/json/user_get_response.json
+++ b/spec/requests/api/schemas/json/user_get_response.json
@@ -47,9 +47,15 @@
         "can_ignore_user": {
           "type": "boolean"
         },
+        "can_ignore_users": {
+          "type": "boolean"
+        },
         "can_mute_user": {
           "type": "boolean"
         },
+        "can_mute_users": {
+          "type": "boolean"
+        },
         "can_send_private_messages": {
           "type": "boolean"
         },
diff --git a/spec/serializers/web_hook_user_serializer_spec.rb b/spec/serializers/web_hook_user_serializer_spec.rb
index 067a98f1eea..f3d4e5900fc 100644
--- a/spec/serializers/web_hook_user_serializer_spec.rb
+++ b/spec/serializers/web_hook_user_serializer_spec.rb
@@ -21,59 +21,61 @@ RSpec.describe WebHookUserSerializer do
 
   it "should only include the required keys" do
     expect(serializer.as_json.keys).to contain_exactly(
-      :id,
-      :username,
-      :name,
-      :avatar_template,
-      :email,
-      :secondary_emails,
-      :last_posted_at,
-      :last_seen_at,
-      :created_at,
-      :muted,
-      :trust_level,
-      :moderator,
       :admin,
-      :title,
+      :allowed_pm_usernames,
+      :avatar_template,
       :badge_count,
-      :time_read,
-      :recent_time_read,
-      :primary_group_id,
-      :primary_group_name,
+      :can_ignore_users,
+      :can_mute_users,
+      :can_upload_profile_header,
+      :can_upload_user_card_background,
+      :created_at,
+      :email,
+      :external_id,
+      :featured_topic,
+      :featured_user_badge_ids,
+      :flair_bg_color,
+      :flair_color,
       :flair_group_id,
       :flair_name,
       :flair_url,
-      :flair_bg_color,
-      :flair_color,
-      :featured_topic,
-      :staged,
-      :pending_count,
-      :profile_view_count,
-      :second_factor_enabled,
-      :can_upload_profile_header,
-      :can_upload_user_card_background,
-      :post_count,
+      :groups,
+      :id,
+      :ignored_usernames,
+      :invited_by,
+      :last_posted_at,
+      :last_seen_at,
       :locale,
+      :mailing_list_posts_per_day,
+      :moderator,
       :muted_category_ids,
-      :regular_category_ids,
-      :watched_tags,
-      :watching_first_post_tags,
-      :tracked_tags,
       :muted_tags,
+      :muted_usernames,
+      :muted,
+      :name,
+      :pending_count,
+      :post_count,
+      :primary_group_id,
+      :primary_group_name,
+      :profile_view_count,
+      :recent_time_read,
+      :regular_category_ids,
+      :second_factor_enabled,
+      :secondary_emails,
+      :staged,
+      :system_avatar_template,
+      :time_read,
+      :title,
       :tracked_category_ids,
+      :tracked_tags,
+      :trust_level,
+      :user_notification_schedule,
+      :user_option,
+      :username,
       :watched_category_ids,
       :watched_first_post_category_ids,
-      :system_avatar_template,
-      :muted_usernames,
-      :ignored_usernames,
-      :allowed_pm_usernames,
-      :mailing_list_posts_per_day,
-      :user_notification_schedule,
-      :external_id,
-      :featured_user_badge_ids,
-      :invited_by,
-      :groups,
-      :user_option,
+      :watched_tags,
+      :watching_first_post_tags,
     )
   end
 end