A platform for community discussion. Free, open, simple.
FIX: Consistently exclude synonyms and hidden tags from tag lists (#42364)
Régis Hanolaec18e9f7094
diff --git a/app/controllers/tag_groups_controller.rb b/app/controllers/tag_groups_controller.rbindex 5257f6ba512..d53db61f411 100644--- a/app/controllers/tag_groups_controller.rb+++ b/app/controllers/tag_groups_controller.rb@@ -90,7 +90,7 @@ class TagGroupsController < ApplicationControllerenddef search- matches = TagGroup.includes(:tags).visible(guardian).all+ matches = TagGroup.visible(guardian).includes(:base_tags)matches = matches.where("lower(name) ILIKE ?", "%#{params[:q].strip}%") if params[:q].present?@@ -98,28 +98,26 @@ class TagGroupsController < ApplicationControllermatches = matches.where("lower(NAME) in (?)", params[:names].map(&:downcase))end- matches =- matches.order("name").limit(- fetch_limit_from_params(- default: SiteSetting.max_tag_search_results,- max: MAX_TAG_GROUPS_SEARCH_RESULTS,- ),+ limit =+ fetch_limit_from_params(+ default: SiteSetting.max_tag_search_results,+ max: MAX_TAG_GROUPS_SEARCH_RESULTS,)- render json: {- results:- matches.map do |x|- {- name: x.name,- tags:- x- .tags- .base_tags- .pluck(:id, :name, :slug)- .map { |id, name, slug| { id:, name:, slug: } },- }- end,- }+ matches = matches.order("name").limit(limit).to_a+ visible_tag_ids = DiscourseTagging.visible_tag_ids(matches.flat_map(&:base_tags), guardian)++ results =+ matches.map do |tag_group|+ tags = tag_group.base_tags.select { |tag| visible_tag_ids.include?(tag.id) }++ {+ name: tag_group.name,+ tags: tags.map { |tag| { id: tag.id, name: tag.name, slug: tag.slug } },+ }+ end++ render json: { results: }endprivatediff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rbindex 0890d30e816..2c0e200ca79 100644--- a/app/controllers/tags_controller.rb+++ b/app/controllers/tags_controller.rb@@ -49,40 +49,29 @@ class TagsController < ::ApplicationController@title = @description_metapreload_localizations = SiteSetting.content_localization_enabled+ base_tags_includes = preload_localizations ? { base_tags: :localizations } : :base_tagsif SiteSetting.tags_listed_by_group- ungrouped_tags = Tag.where("tags.id NOT IN (SELECT tag_id FROM tag_group_memberships)")+ ungrouped_tags =+ Tag.browsable(guardian).where("tags.id NOT IN (SELECT tag_id FROM tag_group_memberships)")ungrouped_tags = ungrouped_tags.used_tags_in_regular_topics(guardian) unless show_all_tags?ungrouped_tags = ungrouped_tags.order(:id)ungrouped_tags = ungrouped_tags.includes(:localizations) if preload_localizations- tag_group_includes =- preload_localizations ? { none_synonym_tags: :localizations } : :none_synonym_tags+ tag_groups = TagGroup.visible(guardian).order("name ASC").includes(base_tags_includes).to_agrouped_tag_counts =- TagGroup- .visible(guardian)- .order("name ASC")- .includes(tag_group_includes)- .map do |tag_group|- {- id: tag_group.id,- name: tag_group.name,- tags:- self.class.tag_counts_json(browsable_tags(tag_group.none_synonym_tags), guardian),- }- end+ tag_counts_json_per_owner(tag_groups).map do |tag_group, group_tags|+ { id: tag_group.id, name: tag_group.name, tags: group_tags }+ end@tags = self.class.tag_counts_json(ungrouped_tags, guardian)@extras = { tag_groups: grouped_tag_counts }else- tags = show_all_tags? ? Tag.all : Tag.used_tags_in_regular_topics(guardian)+ tags = Tag.browsable(guardian)+ tags = tags.used_tags_in_regular_topics(guardian) unless show_all_tags?tags = tags.order(:id)- unrestricted_tags = DiscourseTagging.filter_visible(tags.where(target_tag_id: nil), guardian)- unrestricted_tags = unrestricted_tags.includes(:localizations) if preload_localizations-- category_includes =- preload_localizations ? { none_synonym_tags: :localizations } : :none_synonym_tags+ tags = tags.includes(:localizations) if preload_localizationscategories =Category@@ -90,23 +79,16 @@ class TagsController < ::ApplicationController"id IN (SELECT category_id FROM category_tags WHERE category_id IN (?))",guardian.allowed_category_ids,)- .includes(category_includes)+ .includes(base_tags_includes).order(:id)+ .to_acategory_tag_counts =- categories- .map do |c|- visible_category_tags =- browsable_tags(DiscourseTagging.filter_visible(c.none_synonym_tags, guardian))- category_tags = self.class.tag_counts_json(visible_category_tags, guardian)-- next if category_tags.empty?-- { id: c.id, tags: category_tags }- end- .compact+ tag_counts_json_per_owner(categories).filter_map do |category, category_tags|+ { id: category.id, tags: category_tags } if category_tags.present?+ end- @tags = self.class.tag_counts_json(unrestricted_tags, guardian)+ @tags = self.class.tag_counts_json(tags, guardian)@extras = { categories: category_tag_counts }end@@ -121,7 +103,10 @@ class TagsController < ::ApplicationControllerdef listoffset = params[:offset].to_i || 0- tags = guardian.can_admin_tags? ? Tag.all : Tag.visible(guardian)+ only_tags = params[:only_tags]++ tags = only_tags.present? ? Tag.visible(guardian) : Tag.browsable(guardian)+ tags = tags.without_pm_only_tags(guardian) unless show_all_tags?load_more_query_params = { offset: offset + 1 }@@ -130,7 +115,7 @@ class TagsController < ::ApplicationControllerload_more_query_params[:filter] = filterend- if only_tags = params[:only_tags]+ if only_tagstags = tags.where("LOWER(tags.name) IN (?)", only_tags.split(",").map(&:downcase))load_more_query_params[:only_tags] = only_tagsend@@ -497,11 +482,20 @@ class TagsController < ::ApplicationControllerguardian.can_admin_tags? && guardian.is_admin?end- def browsable_tags(tags)+ def without_pm_only_tags(tags)return tags if show_all_tags?DiscourseTagging.without_pm_only_tags(tags, guardian)end+ def tag_counts_json_per_owner(owners)+ visible_tag_ids = DiscourseTagging.visible_tag_ids(owners.flat_map(&:base_tags), guardian)++ owners.map do |owner|+ tags = owner.base_tags.select { |tag| visible_tag_ids.include?(tag.id) }+ [owner, self.class.tag_counts_json(without_pm_only_tags(tags), guardian)]+ end+ end+def fetch_tag(raise_not_found: true)if params[:tag_id].present?# Try finding by ID first@@ -576,11 +570,13 @@ class TagsController < ::ApplicationControllerdef self.tag_counts_json(tags, guardian)show_pm_tags = guardian.can_tag_pms?+ target_tag_ids = tags.filter_map(&:target_tag_id).uniqtarget_tags =- Tag- .visible(guardian)- .where(id: tags.filter_map(&:target_tag_id).uniq)- .select(:id, :name, :slug)+ if target_tag_ids.present?+ Tag.visible(guardian).where(id: target_tag_ids).select(:id, :name, :slug)+ else+ []+ endtags.map do |t|topic_count = t.public_send(Tag.topic_count_column(guardian))diff --git a/app/models/category.rb b/app/models/category.rbindex 7b53b4ac081..3adf52511df 100644--- a/app/models/category.rb+++ b/app/models/category.rb@@ -187,10 +187,7 @@ class Category < ActiveRecord::Basehas_many :category_tags, dependent: :destroyhas_many :tags, through: :category_tags- has_many :none_synonym_tags,- -> { where(target_tag_id: nil) },- through: :category_tags,- source: :tag+ has_many :base_tags, -> { where(target_tag_id: nil) }, through: :category_tags, source: :taghas_many :category_tag_groups, dependent: :destroyhas_many :tag_groups, through: :category_tag_groupsdiff --git a/app/models/form_template.rb b/app/models/form_template.rbindex 07f50e784e6..95f4bfbf93d 100644--- a/app/models/form_template.rb+++ b/app/models/form_template.rb@@ -27,7 +27,7 @@ class FormTemplate < ActiveRecord::Basetag_groups =TagGroup- .includes(:tags)+ .includes(:base_tags).visible(guardian).where("lower(name) IN (?)", tag_group_names).index_by { |tg| tg.name }@@ -36,7 +36,7 @@ class FormTemplate < ActiveRecord::Basenext form_field unless form_field["tag_group"]tag_group_name = form_field["tag_group"]- tags = tag_groups[tag_group_name].tags.reject { |tag| tag.target_tag_id.present? }+ tags = tag_groups[tag_group_name].base_tagsordered_field = {}tags =diff --git a/app/models/tag.rb b/app/models/tag.rbindex af1508198fe..134d5eaa495 100644--- a/app/models/tag.rb+++ b/app/models/tag.rb@@ -27,12 +27,13 @@ class Tag < ActiveRecord::Basewhere("lower(tags.name) IN (?)", name)end- # tags that have never been used and don't belong to a tag group+ # base tags that have never been used and don't belong to a tag groupscope :unused,-> do- where(staff_topic_count: 0, pm_topic_count: 0, target_tag_id: nil).joins(- "LEFT JOIN tag_group_memberships tgm ON tags.id = tgm.tag_id",- ).where("tgm.tag_id IS NULL")+ base_tags+ .where(staff_topic_count: 0, pm_topic_count: 0)+ .joins("LEFT JOIN tag_group_memberships tgm ON tags.id = tgm.tag_id")+ .where("tgm.tag_id IS NULL")endscope :used_tags_in_regular_topics,@@ -41,6 +42,14 @@ class Tag < ActiveRecord::Basescope :base_tags, -> { where(target_tag_id: nil) }scope :visible, ->(guardian = nil) { merge(DiscourseTagging.visible_tags(guardian)) }+ scope :without_pm_only_tags,+ ->(guardian) do+ next all if guardian.can_tag_pms?+ where("NOT (tags.pm_topic_count > 0 AND tags.#{Tag.topic_count_column(guardian)} = 0)")+ end++ scope :browsable, ->(guardian) { base_tags.visible(guardian) }+has_many :tag_users, dependent: :destroy # notification settingshas_many :topic_tags, dependent: :destroy@@ -144,14 +153,10 @@ class Tag < ActiveRecord::Basereturn [] if scope_category_ids.empty?- filter_sql =- (- if guardian.is_staff?- ""- else- " AND tags.id IN (#{DiscourseTagging.visible_tags(guardian).select(:id).to_sql})"- end- )+ filter_sql = +" AND tags.target_tag_id IS NULL"+ if !guardian.is_admin?+ filter_sql << " AND tags.id IN (#{DiscourseTagging.visible_tags(guardian).select(:id).to_sql})"+ endtag_data = DB.query <<~SQLSELECT tags.id as tag_id, tags.name as tag_name, tags.slug as tag_slug, SUM(stats.topic_count) AS sum_topic_countdiff --git a/app/models/tag_group.rb b/app/models/tag_group.rbindex 77252c89ff3..247461f7c7e 100644--- a/app/models/tag_group.rb+++ b/app/models/tag_group.rb@@ -13,7 +13,7 @@ class TagGroup < ActiveRecord::Basehas_many :tag_group_memberships, dependent: :destroyhas_many :tags, through: :tag_group_memberships- has_many :none_synonym_tags,+ has_many :base_tags,-> { where(target_tag_id: nil) },through: :tag_group_memberships,source: "tag"@@ -37,9 +37,10 @@ class TagGroup < ActiveRecord::Baseenddef tag_ids=(ids)- base_tags = Tag.where(id: ids)- synonyms = Tag.where(target_tag_id: base_tags.select(:id)).where.not(id: base_tags.select(:id))- self.tags = base_tags + synonyms+ selected_tags = Tag.where(id: ids)+ synonyms =+ Tag.where(target_tag_id: selected_tags.select(:id)).where.not(id: selected_tags.select(:id))+ self.tags = selected_tags + synonymsenddef parent_tag_id=(id)diff --git a/app/models/user.rb b/app/models/user.rbindex 54861559702..9bdbba8622b 100644--- a/app/models/user.rb+++ b/app/models/user.rb@@ -409,11 +409,8 @@ class User < ActiveRecord::Basedef visible_sidebar_tags(user_guardian = nil)user_guardian ||= guardian- DiscourseTagging.filter_visible(- Tag.where(- id: SidebarSectionLink.where(user_id: id, linkable_type: "Tag").select(:linkable_id),- ),- user_guardian,+ Tag.browsable(user_guardian).where(+ id: sidebar_section_links.where(linkable_type: "Tag").select(:linkable_id),)enddiff --git a/app/serializers/concerns/user_sidebar_mixin.rb b/app/serializers/concerns/user_sidebar_mixin.rbindex 263be614691..d6cccdaabf9 100644--- a/app/serializers/concerns/user_sidebar_mixin.rb+++ b/app/serializers/concerns/user_sidebar_mixin.rb@@ -8,7 +8,7 @@ module UserSidebarMixinenddef display_sidebar_tags- DiscourseTagging.filter_visible(Tag, scope).exists?+ Tag.browsable(scope).exists?enddef include_display_sidebar_tags?diff --git a/app/serializers/tag_group_serializer.rb b/app/serializers/tag_group_serializer.rbindex b22f1855eb0..e1ba46aae6a 100644--- a/app/serializers/tag_group_serializer.rb+++ b/app/serializers/tag_group_serializer.rb@@ -4,7 +4,7 @@ class TagGroupSerializer < ApplicationSerializerattributes :id, :name, :tags, :parent_tag, :one_per_topic, :permissionsdef tags- object.tags.base_tags.order(:name).map { |t| { id: t.id, name: t.name, slug: t.slug_for_url } }+ object.base_tags.order(:name).map { |t| { id: t.id, name: t.name, slug: t.slug_for_url } }enddef parent_tagdiff --git a/app/services/user_updater.rb b/app/services/user_updater.rbindex 61e5f1ab708..2e494ce7a9c 100644--- a/app/services/user_updater.rb+++ b/app/services/user_updater.rb@@ -245,10 +245,7 @@ class UserUpdaterSidebarSectionLinksUpdater.update_tag_section_links(user,tag_ids:- DiscourseTagging- .filter_visible(Tag, @user_guardian)- .where(name: attributes[:sidebar_tag_names])- .pluck(:id),+ Tag.browsable(@user_guardian).where(name: attributes[:sidebar_tag_names]).pluck(:id),)enddiff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rbindex ffa30b19a88..82d7bb61b50 100644--- a/lib/discourse_tagging.rb+++ b/lib/discourse_tagging.rb@@ -750,6 +750,12 @@ module DiscourseTaggingguardian&.is_admin? ? query : query.where(id: visible_tags(guardian).select(:id))end+ def self.visible_tag_ids(tags, guardian = nil)+ ids = tags.map(&:id).uniq+ return ids.to_set if ids.empty? || guardian&.is_admin?+ visible_tags(guardian).where(id: ids).pluck(:id).to_set+ end+def self.filter_visible_in_accessible_categories(query, guardian = nil)return query if guardian.nil? || guardian.is_admin?diff --git a/lib/search.rb b/lib/search.rbindex 899e00c7b1a..963e3e1a0d1 100644--- a/lib/search.rb+++ b/lib/search.rb@@ -1199,15 +1199,15 @@ class Searchdef tags_searchreturn unless SiteSetting.tagging_enabled- tags =- DiscourseTagging- .visible_tags(@guardian)- .includes(:tag_search_data)- .where("tag_search_data.search_data @@ #{ts_query}")- .references(:tag_search_data)- .order("name asc")- .limit(limit)- .each { |tag| @results.add(tag) }++ Tag+ .browsable(@guardian)+ .includes(:tag_search_data)+ .where("tag_search_data.search_data @@ #{ts_query}")+ .references(:tag_search_data)+ .order("name asc")+ .limit(limit)+ .each { |tag| @results.add(tag) }enddef exclude_topics_searchdiff --git a/spec/lib/search_spec.rb b/spec/lib/search_spec.rbindex bd41835d0b9..a54990795db 100644--- a/spec/lib/search_spec.rb+++ b/spec/lib/search_spec.rb@@ -1874,6 +1874,12 @@ RSpec.describe Search doexpect(search.tags.map(&:name)).to eq([tag.name, "#{tag.name}9"])end+ it "does not return synonyms" do+ Fabricate(:tag, name: "#{tag.name}9", target_tag: tag)++ expect(search.tags).to eq([tag])+ end+it "filters category-restricted tags based on category access" docategory_tag = Fabricate(:tag, name: "#{tag.name}9")tag_group.tags = [category_tag]diff --git a/spec/models/form_template_spec.rb b/spec/models/form_template_spec.rbindex aace300434a..c1ef5703cc0 100644--- a/spec/models/form_template_spec.rb+++ b/spec/models/form_template_spec.rb@@ -96,8 +96,9 @@ RSpec.describe FormTemplate, type: :model dofab!(:tag5, :tag)fab!(:tag_group) { Fabricate(:tag_group, tags: [tag1, tag2, tag3]) }fab!(:tag_group2) { Fabricate(:tag_group, tags: [tag4, tag5]) }+ fab!(:synonym) { Fabricate(:tag, target_tag: tag1) }- it "automatically adds tags choices to the template" do+ it "automatically adds tags choices, but no synonyms, to the template" dotemplate = <<~YAML- type: tag-chooserid: tag-chooserdiff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rbindex aff240d080c..d7f74044b48 100644--- a/spec/models/tag_spec.rb+++ b/spec/models/tag_spec.rb@@ -174,6 +174,7 @@ RSpec.describe Tag doendcontext "with hidden tags" do+ fab!(:moderator)let(:hidden_tag) { Fabricate(:tag, name: "hidden") }let!(:staff_tag_group) doFabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name])@@ -197,6 +198,27 @@ RSpec.describe Tag do{ id: hidden_tag.id, name: hidden_tag.name, slug: hidden_tag.slug },)end++ it "doesn't return tags hidden from moderators to a moderator" do+ admin_only_tag = Fabricate(:tag, name: "admin-only")+ Fabricate(:tag_group, permissions: { "admins" => 1 }, tag_names: [admin_only_tag.name])+ Fabricate(:topic, tags: [admin_only_tag])++ expect(Tag.top_tags(guardian: Guardian.new(moderator))).to_not include(+ { id: admin_only_tag.id, name: admin_only_tag.name, slug: admin_only_tag.slug },+ )+ end+ end++ it "doesn't return synonyms" do+ target_tag = Fabricate(:tag)+ Fabricate(:topic, tags: [target_tag, Fabricate(:tag, target_tag: target_tag)])+ serialized_target_tag = { id: target_tag.id, name: target_tag.name, slug: target_tag.slug }++ expect(Tag.top_tags).to contain_exactly(serialized_target_tag)+ expect(Tag.top_tags(guardian: Guardian.new(Fabricate(:admin)))).to contain_exactly(+ serialized_target_tag,+ )endcontext "with numeric-only tag names" do@@ -384,6 +406,41 @@ RSpec.describe Tag doendend+ describe ".browsable" do+ fab!(:admin)+ fab!(:browsable_tag, :tag)+ fab!(:hidden_tag, :tag)+ fab!(:synonym) { Fabricate(:tag, target_tag: browsable_tag) }+ fab!(:admin_tag_group) do+ Fabricate(:tag_group, permissions: { "admins" => 1 }, tag_names: [hidden_tag.name])+ end++ it "excludes synonyms, and tags the guardian is not allowed to see" do+ expect(Tag.browsable(Guardian.new)).to contain_exactly(browsable_tag)+ expect(Tag.browsable(Guardian.new(admin))).to contain_exactly(browsable_tag, hidden_tag)+ end+ end++ describe ".without_pm_only_tags" do+ fab!(:admin)+ fab!(:used_tag) { Fabricate(:tag, public_topic_count: 1, staff_topic_count: 1) }+ fab!(:pm_only_tag) { Fabricate(:tag, pm_topic_count: 1) }++ it "excludes tags only used in personal messages" do+ expect(Tag.without_pm_only_tags(Guardian.new)).to contain_exactly(used_tag)+ expect(Tag.without_pm_only_tags(Guardian.new(user))).to contain_exactly(used_tag)+ end++ it "keeps them for a guardian allowed to tag personal messages" do+ SiteSetting.pm_tags_allowed_for_groups = Group::AUTO_GROUPS[:admins]++ expect(Tag.without_pm_only_tags(Guardian.new(admin))).to contain_exactly(+ used_tag,+ pm_only_tag,+ )+ end+ end+describe "unused tags scope" dolet!(:tags) do[diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rbindex 1215e3fe0f4..d2cd3cbca98 100644--- a/spec/models/user_spec.rb+++ b/spec/models/user_spec.rb@@ -3891,8 +3891,12 @@ RSpec.describe User dofab!(:tag_sidebar_section_link_2) doFabricate(:tag_sidebar_section_link, user: user, linkable: hidden_tag)end+ fab!(:synonym) { Fabricate(:tag, target_tag: tag) }+ fab!(:tag_sidebar_section_link_3) do+ Fabricate(:tag_sidebar_section_link, user: user, linkable: synonym)+ end- it "should only return tag sidebar section link records of tags that the user is allowed to see" do+ it "should only return tag sidebar section link records of tags that the user is allowed to browse" doexpect(user.visible_sidebar_tags).to contain_exactly(tag)user.update!(admin: true)diff --git a/spec/requests/tag_groups_controller_spec.rb b/spec/requests/tag_groups_controller_spec.rbindex 660a1f6efa2..cb8895c894d 100644--- a/spec/requests/tag_groups_controller_spec.rb+++ b/spec/requests/tag_groups_controller_spec.rb@@ -91,6 +91,25 @@ RSpec.describe TagGroupsController doexpect(results).to be_emptyend++ it "does not return the tags restricted to a category anons can't see" do+ tag_group = tag_group_with_permission(everyone, readonly)+ secret_tag = Fabricate(:tag)+ tag_group.tags << secret_tag+ CategoryTag.create!(+ category: Fabricate(:private_category, group: Fabricate(:group)),+ tag: secret_tag,+ )++ get "/tag_groups/filter/search.json"+ expect(response.status).to eq(200)++ results = JSON.parse(response.body, symbolize_names: true).fetch(:results)++ expect(results).to contain_exactly(+ { name: tag_group.name, tags: [{ id: tag.id, name: tag.name, slug: tag.slug }] },+ )+ endendcontext "for regular users" dodiff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rbindex 3263d3f6765..51ad98844e3 100644--- a/spec/requests/tags_controller_spec.rb+++ b/spec/requests/tags_controller_spec.rb@@ -11,6 +11,7 @@ RSpec.describe TagsController dobefore { SiteSetting.tagging_enabled = true }describe "#index" do+ fab!(:group)fab!(:test_tag) { Fabricate(:tag, name: "test", description: "some description") }fab!(:topic_tag) do@@ -30,7 +31,7 @@ RSpec.describe TagsController dofab!(:synonym) { Fabricate(:tag, name: "synonym", target_tag: topic_tag) }shared_examples "retrieves the right tags" do- it "retrieves all tags as a staff user" do+ it "retrieves all tags but the synonyms as a staff user" dosign_in(admin)get "/tags.json"@@ -39,6 +40,12 @@ RSpec.describe TagsController dotags = response.parsed_body["tags"]+ expect(tags.map { |t| t["name"] }).to contain_exactly(+ test_tag.name,+ topic_tag.name,+ pm_only_tag.name,+ )+serialized_tag = tags.find { |t| t["name"] == test_tag.name }expect(serialized_tag["count"]).to eq(0)@@ -104,7 +111,23 @@ RSpec.describe TagsController doexpect(serialized_tag["pm_only"]).to eq(true)end+ it "does not list tags restricted to a category the user can't see" do+ secret_tag = Fabricate(:tag, name: "secret", public_topic_count: 1, staff_topic_count: 1)+ CategoryTag.create!(category: Fabricate(:private_category, group:), tag: secret_tag)++ sign_in(moderator)++ get "/tags.json"++ expect(response.status).to eq(200)+ expect(response.parsed_body["tags"].map { |tag| tag["name"] }).to_not include(+ secret_tag.name,+ )+ end+it "only retrieve tags that have been used in public topics for non-staff user" do+ synonym.update_columns(public_topic_count: 2, staff_topic_count: 2)+sign_in(user)get "/tags.json"@@ -195,6 +218,18 @@ RSpec.describe TagsController dobefore { SiteSetting.tags_listed_by_group = true }include_examples "retrieves the right tags"+ it "does not list tags of a visible group when they are restricted to a category the user can't see" do+ secret_tag = Fabricate(:tag, name: "secret")+ CategoryTag.create!(category: Fabricate(:private_category, group:), tag: secret_tag)+ Fabricate(:tag_group, tags: [topic_tag, secret_tag])++ get "/tags.json"++ expect(response.status).to eq(200)+ group = response.parsed_body.dig("extras", "tag_groups").first+ expect(group["tags"].map { |tag| tag["name"] }).to contain_exactly(topic_tag.name)+ end+it "hides tags only used in personal messages from grouped lists for regular users" doFabricate(:tag_group, tags: [topic_tag, pm_only_tag])@@ -2662,6 +2697,62 @@ RSpec.describe TagsController doendend+ it "does not return synonyms unless they are requested by name" do+ synonym = Fabricate(:tag, name: "tag5", target_tag: tag1)++ sign_in(user)++ get "/tags/list.json"++ expect(response.status).to eq(200)+ expect(response.parsed_body["list_tags"].map { |tag| tag["name"] }).to eq(+ [tag1.name, tag2.name, tag3.name],+ )++ get "/tags/list.json", params: { only_tags: synonym.name }++ expect(response.status).to eq(200)+ expect(response.parsed_body["list_tags"].map { |tag| tag["name"] }).to eq([synonym.name])+ end++ it "only returns the tags each user is allowed to browse" do+ pm_only_tag = Fabricate(:tag, name: "tag5", pm_topic_count: 1)+ admin_only_tag = Fabricate(:tag, name: "tag6")+ Fabricate(:tag_group, permissions: { "admins" => 1 }, tag_names: [admin_only_tag.name])++ sign_in(user)++ get "/tags/list.json"++ expect(response.status).to eq(200)+ expect(response.parsed_body["list_tags"].map { |tag| tag["name"] }).to eq(+ [tag1.name, tag2.name, tag3.name],+ )++ sign_in(moderator)++ get "/tags/list.json"++ expect(response.parsed_body["list_tags"].map { |tag| tag["name"] }).to eq(+ [tag1.name, tag2.name, tag3.name, staff_only_tag.name],+ )++ sign_in(admin)++ get "/tags/list.json"++ expect(response.parsed_body["list_tags"].map { |tag| tag["name"] }).to eq(+ [+ tag1.name,+ tag2.name,+ tag3.name,+ staff_only_tag.name,+ pm_only_tag.name,+ admin_only_tag.name,+ ],+ )+ end+it "accepts a `filter` param and filters the tags by tag name" dosign_in(user)diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rbindex 3c5ab534994..b8f2fad638a 100644--- a/spec/requests/users_controller_spec.rb+++ b/spec/requests/users_controller_spec.rb@@ -3126,7 +3126,7 @@ RSpec.describe UsersController doexpect(user.reload.sidebar_section_links.count).to eq(0)end- it "should allow user to add tag sidebar section links only for tags that are visible to the user" do+ it "should allow user to add tag sidebar section links only for tags that the user can browse" doSiteSetting.tagging_enabled = truetag = Fabricate(:tag)@@ -3135,10 +3135,11 @@ RSpec.describe UsersController dohidden_tag = Fabricate(:tag)Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name])- put "/u/#{user.username}.json",- params: {- sidebar_tag_names: [tag.name, "somerandomtag", hidden_tag.name],- }+ synonym = Fabricate(:tag, target_tag: tag)++ sidebar_tag_names = [tag.name, "somerandomtag", hidden_tag.name, synonym.name]++ put "/u/#{user.username}.json", params: { sidebar_tag_names: }expect(response.status).to eq(200)expect(user.sidebar_section_links.count).to eq(1)@@ -3151,10 +3152,7 @@ RSpec.describe UsersController douser.update!(admin: true)expect do- put "/u/#{user.username}.json",- params: {- sidebar_tag_names: [tag.name, "somerandomtag", hidden_tag.name],- }+ put "/u/#{user.username}.json", params: { sidebar_tag_names: }expect(response.status).to eq(200)end.to change { user.sidebar_section_links.count }.from(1).to(2)