A platform for community discussion. Free, open, simple.
FIX: Allow selecting tags that are only used in personal messages (#41918)
Régis Hanolb8077beba5cf
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rbindex f1e6f3992bc..08dec37cb2d 100644--- a/app/controllers/tags_controller.rb+++ b/app/controllers/tags_controller.rb@@ -48,12 +48,11 @@ class TagsController < ::ApplicationController@description_meta = I18n.t("tags.title")@title = @description_meta- show_all_tags = guardian.can_admin_tags? && guardian.is_admin?preload_localizations = SiteSetting.content_localization_enabledif SiteSetting.tags_listed_by_groupungrouped_tags = Tag.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.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@@ -69,14 +68,15 @@ class TagsController < ::ApplicationController{id: tag_group.id,name: tag_group.name,- tags: self.class.tag_counts_json(tag_group.none_synonym_tags, guardian),+ tags:+ self.class.tag_counts_json(browsable_tags(tag_group.none_synonym_tags), guardian),}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 = show_all_tags? ? Tag.all : Tag.used_tags_in_regular_topics(guardian)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@@ -96,11 +96,9 @@ class TagsController < ::ApplicationControllercategory_tag_counts =categories.map do |c|- category_tags =- self.class.tag_counts_json(- DiscourseTagging.filter_visible(c.none_synonym_tags, guardian),- guardian,- )+ 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?@@ -495,6 +493,15 @@ class TagsController < ::ApplicationControllerprivate+ def show_all_tags?+ guardian.can_admin_tags? && guardian.is_admin?+ end++ def browsable_tags(tags)+ return tags if show_all_tags?+ DiscourseTagging.without_pm_only_tags(tags, guardian)+ end+def fetch_tag(raise_not_found: true)if params[:tag_id].present?# Try finding by ID first@@ -575,43 +582,39 @@ class TagsController < ::ApplicationController.where(id: tags.filter_map(&:target_tag_id).uniq).select(:id, :name, :slug)- tags- .map do |t|- topic_count = t.public_send(Tag.topic_count_column(guardian))-- next if topic_count == 0 && t.pm_topic_count > 0 && !show_pm_tags+ tags.map do |t|+ topic_count = t.public_send(Tag.topic_count_column(guardian))- tag_name = t.name- tag_description = t.description+ tag_name = t.name+ tag_description = t.description- if ContentLocalization.show_translated_tag?(t, guardian)- localization = t.get_localization- tag_name = localization&.name || tag_name- tag_description = localization&.description || tag_description- end-- attrs = {- id: t.id,- text: tag_name,- name: tag_name,- slug: t.slug.presence || "#{t.id}-tag",- description: tag_description,- count: topic_count,- pm_only: topic_count == 0 && t.pm_topic_count > 0,- target_tag:- if t.target_tag_id- target = target_tags.find { |x| x.id == t.target_tag_id }- target ? { id: target.id, name: target.name, slug: target.slug } : nil- end,- }-- if show_pm_tags && SiteSetting.display_personal_messages_tag_counts- attrs[:pm_count] = t.pm_topic_count- end+ if ContentLocalization.show_translated_tag?(t, guardian)+ localization = t.get_localization+ tag_name = localization&.name || tag_name+ tag_description = localization&.description || tag_description+ end- attrs+ attrs = {+ id: t.id,+ text: tag_name,+ name: tag_name,+ slug: t.slug.presence || "#{t.id}-tag",+ description: tag_description,+ count: topic_count,+ pm_only: topic_count == 0 && t.pm_topic_count > 0,+ target_tag:+ if t.target_tag_id+ target = target_tags.find { |x| x.id == t.target_tag_id }+ target ? { id: target.id, name: target.name, slug: target.slug } : nil+ end,+ }++ if show_pm_tags && SiteSetting.display_personal_messages_tag_counts+ attrs[:pm_count] = t.pm_topic_countend- .compact++ attrs+ endenddef set_categorydiff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rbindex 4de029c6485..620fdc0ee2a 100644--- a/app/controllers/topics_controller.rb+++ b/app/controllers/topics_controller.rb@@ -1592,7 +1592,7 @@ class TopicsController < ApplicationControllerrespond_to do |format|format.html do- @tags = SiteSetting.tagging_enabled ? @topic_view.topic.tags.visible(guardian) : []+ @tags = @topic_view.visible_tagsif SiteSetting.content_localization_enabled && use_crawler_layout?helpers.localize_topic_view_content(@topic_view)diff --git a/app/models/topic_converter.rb b/app/models/topic_converter.rbindex 2218d415dc2..4cde42bb953 100644--- a/app/models/topic_converter.rb+++ b/app/models/topic_converter.rb@@ -21,18 +21,20 @@ class TopicConverter.where.not(id: SiteSetting.uncategorized_category_id).first- PostRevisor.new(@topic.first_post, @topic).revise!(- @user,- { category_id: @category.id, archetype: Archetype.default },- revise_opts,- )+ revised =+ PostRevisor.new(@topic.first_post, @topic).revise!(+ @user,+ { category_id: @category.id, archetype: Archetype.default },+ revise_opts,+ )- raise ActiveRecord::Rollback if [email protected]?+ raise ActiveRecord::Rollback if !revised || [email protected]?update_user_statsupdate_post_uploads_secure_statusadd_small_action("public_topic") unless @silent- Tag.update_counters(@topic.tags, { public_topic_count: 1 }) if [email protected]_restricted++ update_tag_counters(1, include_public: [email protected]_restricted)Jobs.enqueue(:topic_action_converter, topic_id: @topic.id)Jobs.enqueue(:delete_inaccessible_notifications, topic_id: @topic.id)@@ -59,18 +61,20 @@ class TopicConverterwas_public = [email protected]_restricted@topic.update_category_topic_count_by(-1) if @topic.visible- PostRevisor.new(@topic.first_post, @topic).revise!(- @user,- { category_id: nil, archetype: Archetype.private_message },- revise_opts,- )+ revised =+ PostRevisor.new(@topic.first_post, @topic).revise!(+ @user,+ { category_id: nil, archetype: Archetype.private_message },+ revise_opts,+ )- raise ActiveRecord::Rollback if [email protected]?+ raise ActiveRecord::Rollback if !revised || [email protected]?add_allowed_usersupdate_post_uploads_secure_statusadd_small_action("private_topic") unless @silent- Tag.update_counters(@topic.tags, { public_topic_count: -1 }) if was_public++ update_tag_counters(-1, include_public: was_public)UserProfile.remove_featured_topic_from_all_profiles(@topic)Jobs.enqueue(:topic_action_converter, topic_id: @topic.id)@@ -84,6 +88,12 @@ class TopicConverterprivate+ def update_tag_counters(topic_count_delta, include_public:)+ counters = { staff_topic_count: topic_count_delta, pm_topic_count: -topic_count_delta }+ counters[:public_topic_count] = topic_count_delta if include_public+ Tag.update_counters(@topic.tags, counters)+ end+def revise_opts{ bypass_bump: @silent, silent: @silent, hidden: true }enddiff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rbindex 5405817cb78..ffa30b19a88 100644--- a/lib/discourse_tagging.rb+++ b/lib/discourse_tagging.rb@@ -772,6 +772,13 @@ module DiscourseTaggingSQLend+ def self.without_pm_only_tags(tags, guardian)+ return tags if guardian.can_tag_pms?++ topic_count_column = Tag.topic_count_column(guardian)+ tags.reject { |tag| tag.pm_topic_count > 0 && tag.public_send(topic_count_column) == 0 }+ end+def self.hidden_tags(guardian = nil)if guardian&.is_admin?Tag.nonediff --git a/lib/topic_view.rb b/lib/topic_view.rbindex ca7f04691d3..13893fabe65 100644--- a/lib/topic_view.rb+++ b/lib/topic_view.rb@@ -355,7 +355,7 @@ class TopicViewif @topic.category_id != SiteSetting.uncategorized_category_id && @topic.category_id &&@topic.categorytitle += " - #{@topic.category.name}"- elsif SiteSetting.tagging_enabled && visible_tags.exists?+ elsif visible_tags.exists?title +=" - #{visible_tags.order("tags.#{Tag.topic_count_column(@guardian)} DESC").first.name}"end@@ -927,6 +927,10 @@ class TopicView.compactend+ def visible_tags+ @visible_tags ||= guardian.can_see_tags?(topic) ? topic.tags.visible(guardian) : Tag.none+ end+protecteddef read_posts_set@@ -1206,8 +1210,4 @@ class TopicViewendendend-- def visible_tags- @visible_tags ||= topic.tags.visible(guardian)- endenddiff --git a/spec/lib/discourse_tagging_spec.rb b/spec/lib/discourse_tagging_spec.rbindex a5aafbd0ac8..a9cae32c5ed 100644--- a/spec/lib/discourse_tagging_spec.rb+++ b/spec/lib/discourse_tagging_spec.rb@@ -1140,6 +1140,31 @@ RSpec.describe DiscourseTagging doendend+ describe "without_pm_only_tags" do+ fab!(:pm_only_tag) { Fabricate(:tag, pm_topic_count: 1) }+ fab!(:used_tag) { Fabricate(:tag, public_topic_count: 1, staff_topic_count: 1) }+ fab!(:unused_tag, :tag)+ fab!(:staff_seen_tag) { Fabricate(:tag, staff_topic_count: 1, pm_topic_count: 1) }++ let(:all_tags) { Tag.where(id: [pm_only_tag, used_tag, unused_tag, staff_seen_tag]) }++ it "rejects tags only used in personal messages for users who cannot tag PMs" do+ tags = DiscourseTagging.without_pm_only_tags(all_tags, Guardian.new(user))+ expect(tags).to contain_exactly(used_tag, unused_tag)+ end++ it "uses the staff topic count for staff users" do+ tags = DiscourseTagging.without_pm_only_tags(all_tags, Guardian.new(admin))+ expect(tags).to contain_exactly(used_tag, unused_tag, staff_seen_tag)+ end++ it "keeps all tags for users who can tag PMs" do+ SiteSetting.pm_tags_allowed_for_groups = Group::AUTO_GROUPS[:trust_level_0]+ tags = DiscourseTagging.without_pm_only_tags(all_tags, Guardian.new(user))+ expect(tags).to contain_exactly(pm_only_tag, used_tag, unused_tag, staff_seen_tag)+ end+ end+describe "tag_topic_by_names" docontext "with a tag restricted to other categories" dofab!(:allowed_category, :category)diff --git a/spec/lib/topic_view_spec.rb b/spec/lib/topic_view_spec.rbindex 88099f4cae6..dece3f6c70a 100644--- a/spec/lib/topic_view_spec.rb+++ b/spec/lib/topic_view_spec.rb@@ -972,6 +972,27 @@ RSpec.describe TopicView doendend+ context "with a tagged personal message" do+ fab!(:pm) { Fabricate(:private_message_topic, user: user) }+ fab!(:pm_post) { Fabricate(:post, topic: pm) }++ before do+ SiteSetting.tagging_enabled = true+ SiteSetting.topic_page_title_includes_category = true+ pm.tags << tag2+ end++ it "does not include the tag for participants who cannot tag personal messages" do+ expect(TopicView.new(pm.id, user).page_title).not_to include(tag2.name)+ end++ it "includes the tag for participants who can tag personal messages" do+ SiteSetting.pm_tags_allowed_for_groups = Group::AUTO_GROUPS[:trust_level_0]++ expect(TopicView.new(pm.id, user).page_title).to end_with(tag2.name)+ end+ end+context "with categorized topic" dolet(:category) { Fabricate(:category) }diff --git a/spec/models/topic_converter_spec.rb b/spec/models/topic_converter_spec.rbindex 5fb737048a7..660613b6749 100644--- a/spec/models/topic_converter_spec.rb+++ b/spec/models/topic_converter_spec.rb@@ -44,6 +44,52 @@ RSpec.describe TopicConverter doexpect(topic.category_id).to eq(SiteSetting.uncategorized_category_id)end+ it "moves the tags' personal message counts to their topic counts" do+ SiteSetting.allow_uncategorized_topics = true+ tag = Fabricate(:tag)+ first_post.topic.tags << tag+ expect(tag.reload.pm_topic_count).to eq(1)++ TopicConverter.new(first_post.topic, admin).convert_to_public_topic++ tag.reload+ expect(tag.pm_topic_count).to eq(0)+ expect(tag.staff_topic_count).to eq(1)+ expect(tag.public_topic_count).to eq(1)+ end++ it "does not change the tags' public topic counts when converting into a read-restricted category" do+ private_category = Fabricate(:private_category, group: Group[:staff])+ tag = Fabricate(:tag)+ first_post.topic.tags << tag+ expect(tag.reload.pm_topic_count).to eq(1)++ TopicConverter.new(first_post.topic, admin).convert_to_public_topic(private_category.id)++ tag.reload+ expect(tag.pm_topic_count).to eq(0)+ expect(tag.staff_topic_count).to eq(1)+ expect(tag.public_topic_count).to eq(0)+ end++ it "does not update tag counters when the post revision fails" do+ tag = Fabricate(:tag)+ first_post.topic.tags << tag+ expect(tag.reload.pm_topic_count).to eq(1)++ required_tag_group = Fabricate(:tag_group, tags: [Fabricate(:tag)])+ category.category_required_tag_groups.create!(tag_group: required_tag_group, min_count: 1)+ moderator = Fabricate(:moderator)++ TopicConverter.new(first_post.topic, moderator).convert_to_public_topic(category.id)++ expect(first_post.topic.reload.archetype).to eq(Archetype.private_message)+ tag.reload+ expect(tag.pm_topic_count).to eq(1)+ expect(tag.staff_topic_count).to eq(0)+ expect(tag.public_topic_count).to eq(0)+ end+context "when uncategorized category is not allowed" dobefore doSiteSetting.allow_uncategorized_topics = false@@ -178,6 +224,36 @@ RSpec.describe TopicConverter doexpect(category.reload.topic_count).to eq(0)end+ it "moves the tags' topic counts to their personal message counts" do+ tag = Fabricate(:tag)+ topic.tags << tag+ expect(tag.reload.staff_topic_count).to eq(1)++ topic.convert_to_private_message(admin)++ tag.reload+ expect(tag.public_topic_count).to eq(0)+ expect(tag.staff_topic_count).to eq(0)+ expect(tag.pm_topic_count).to eq(1)+ end++ it "does not change the tags' public topic counts when converting from a read-restricted category" do+ private_category = Fabricate(:private_category, group: Group[:staff])+ restricted_topic = Fabricate(:topic, user: author, category: private_category)+ Fabricate(:post, topic: restricted_topic, user: author)+ tag = Fabricate(:tag)+ restricted_topic.tags << tag+ expect(tag.reload.staff_topic_count).to eq(1)+ expect(tag.public_topic_count).to eq(0)++ restricted_topic.convert_to_private_message(admin)++ tag.reload+ expect(tag.public_topic_count).to eq(0)+ expect(tag.staff_topic_count).to eq(0)+ expect(tag.pm_topic_count).to eq(1)+ end+it "converts unlisted topic to private message" dotopic.update_status("visible", false, admin)private_message = topic.convert_to_private_message(admin)diff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rbindex dd2d94768a0..546071e3265 100644--- a/spec/requests/tags_controller_spec.rb+++ b/spec/requests/tags_controller_spec.rb@@ -50,6 +50,12 @@ RSpec.describe TagsController doexpect(serialized_tag["count"]).to eq(1)expect(serialized_tag["pm_count"]).to eq(nil)expect(serialized_tag["pm_only"]).to eq(false)++ serialized_tag = tags.find { |t| t["name"] == pm_only_tag.name }++ expect(serialized_tag["count"]).to eq(0)+ expect(serialized_tag["pm_count"]).to eq(nil)+ expect(serialized_tag["pm_only"]).to eq(true)endit "does not include pm_count attribute when user cannot tag PM topics even if display_personal_messages_tag_counts site setting has been enabled" do@@ -157,12 +163,25 @@ RSpec.describe TagsController doendcontext "when disabled" do- before do- SiteSetting.pm_tags_allowed_for_groups = ""+ before { SiteSetting.pm_tags_allowed_for_groups = "" }++ it "shows tags only used in personal messages to admins" dosign_in(admin)++ get "/tags.json"++ expect(response.parsed_body["tags"]).to match(+ [+ include(name: test_tag.name, id: test_tag.id, pm_only: true),+ include(name: topic_tag.name, id: topic_tag.id),+ include(name: pm_only_tag.name, id: pm_only_tag.id, pm_only: true),+ ],+ )end- it "hides pm tags" do+ it "hides tags only used in personal messages from regular users" do+ sign_in(user)+get "/tags.json"expect(response.parsed_body["tags"]).to match(@@ -176,6 +195,31 @@ RSpec.describe TagsController dobefore { SiteSetting.tags_listed_by_group = true }include_examples "retrieves the right tags"+ it "hides tags only used in personal messages from grouped lists for regular users" do+ Fabricate(:tag_group, tags: [topic_tag, pm_only_tag])++ sign_in(user)++ get "/tags.json"++ group = response.parsed_body.dig("extras", "tag_groups").first+ expect(group["tags"].map { |tag| tag["name"] }).to contain_exactly(topic_tag.name)+ end++ it "shows tags only used in personal messages in grouped lists to admins" do+ Fabricate(:tag_group, tags: [topic_tag, pm_only_tag])++ sign_in(admin)++ get "/tags.json"++ group = response.parsed_body.dig("extras", "tag_groups").first+ expect(group["tags"].map { |tag| tag["name"] }).to contain_exactly(+ topic_tag.name,+ pm_only_tag.name,+ )+ end+it "works for tags in groups" do_tag_group = Fabricate(:tag_group, tags: [test_tag, topic_tag, synonym])@@ -240,6 +284,31 @@ RSpec.describe TagsController dobefore { SiteSetting.tags_listed_by_group = false }include_examples "retrieves the right tags"+ it "hides tags only used in personal messages from category tag lists for regular users" do+ category.update!(tags: [topic_tag, pm_only_tag])++ sign_in(user)++ get "/tags.json"++ category_tags = response.parsed_body.dig("extras", "categories").first+ expect(category_tags["tags"].map { |tag| tag["name"] }).to contain_exactly(topic_tag.name)+ end++ it "shows tags only used in personal messages in category tag lists to admins" do+ category.update!(tags: [topic_tag, pm_only_tag])++ sign_in(admin)++ get "/tags.json"++ category_tags = response.parsed_body.dig("extras", "categories").first+ expect(category_tags["tags"].map { |tag| tag["name"] }).to contain_exactly(+ topic_tag.name,+ pm_only_tag.name,+ )+ end+it "returns the right tags and categories tags for admin user" docategory.update!(tags: [test_tag])@@ -251,7 +320,7 @@ RSpec.describe TagsController dotags = response.parsed_body["tags"]- expect(tags.length).to eq(2)+ expect(tags.length).to eq(3)expect(tags[0]["name"]).to eq(test_tag.name)expect(tags[0]["text"]).to eq(test_tag.name)@@ -262,6 +331,9 @@ RSpec.describe TagsController doexpect(tags[1]["name"]).to eq(topic_tag.name)+ expect(tags[2]["name"]).to eq(pm_only_tag.name)+ expect(tags[2]["pm_only"]).to eq(true)+categories = response.parsed_body["extras"]["categories"]expect(categories[0]["id"]).to eq(category.id)@@ -285,8 +357,10 @@ RSpec.describe TagsController dotags = response.parsed_body["tags"]- expect(tags.length).to eq(2)- expect(tags.map { |tag| tag["name"] }).to eq([test_tag.name, topic_tag.name])+ expect(tags.length).to eq(3)+ expect(tags.map { |tag| tag["name"] }).to eq(+ [test_tag.name, topic_tag.name, pm_only_tag.name],+ )initial_sql_queries_count =track_sql_queries do@@ -296,8 +370,10 @@ RSpec.describe TagsController dotags = response.parsed_body["tags"]- expect(tags.length).to eq(2)- expect(tags.map { |tag| tag["name"] }).to eq([test_tag.name, topic_tag.name])+ expect(tags.length).to eq(3)+ expect(tags.map { |tag| tag["name"] }).to eq(+ [test_tag.name, topic_tag.name, pm_only_tag.name],+ )categories = response.parsed_body["extras"]["categories"]@@ -316,8 +392,10 @@ RSpec.describe TagsController dotags = response.parsed_body["tags"]- expect(tags.length).to eq(2)- expect(tags.map { |tag| tag["name"] }).to eq([test_tag.name, topic_tag.name])+ expect(tags.length).to eq(3)+ expect(tags.map { |tag| tag["name"] }).to eq(+ [test_tag.name, topic_tag.name, pm_only_tag.name],+ )categories = response.parsed_body["extras"]["categories"]@@ -712,6 +790,15 @@ RSpec.describe TagsController do)end+ it "returns synonyms only used in personal messages to users who cannot tag PMs" do+ synonym.update!(pm_topic_count: 1)+ get "/tag/#{tag.name}/info.json"+ expect(response.status).to eq(200)+ expect(response.parsed_body.dig("tag_info", "synonyms").map { |t| t["text"] }).to eq(+ [synonym.name],+ )+ end+context "when a synonym is hidden from the current user" dofab!(:hidden_synonym) doFabricate(diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rbindex 96576106732..bee9bd68680 100644--- a/spec/requests/topics_controller_spec.rb+++ b/spec/requests/topics_controller_spec.rb@@ -7266,6 +7266,37 @@ RSpec.describe TopicsController doendend+ context "with a tagged personal message rendered in the crawler layout" do+ fab!(:participant) { Fabricate(:user, refresh_auto_groups: true) }+ fab!(:pm_tag, :tag)+ fab!(:pm) { Fabricate(:private_message_topic, user: user, recipient: participant) }+ fab!(:pm_post) { Fabricate(:post, topic: pm, user: user) }++ before do+ SiteSetting.tagging_enabled = true+ pm.tags << pm_tag+ end++ it "does not include the tags in the print view for participants who cannot tag PMs" do+ sign_in(participant)++ get "#{pm.relative_url}/print"++ expect(response.status).to eq(200)+ expect(response.body).not_to include(pm_tag.name)+ end++ it "includes the tags in the print view for participants who can tag PMs" do+ SiteSetting.pm_tags_allowed_for_groups = Group::AUTO_GROUPS[:trust_level_0]+ sign_in(participant)++ get "#{pm.relative_url}/print"++ expect(response.status).to eq(200)+ expect(response.body).to include(pm_tag.name)+ end+ end+context "when a crawler" dofab!(:page1_time) { 3.months.ago }fab!(:page2_time) { 2.months.ago }diff --git a/spec/services/tag_hashtag_data_source_spec.rb b/spec/services/tag_hashtag_data_source_spec.rbindex 032afdeebe8..c8c9d8b00d4 100644--- a/spec/services/tag_hashtag_data_source_spec.rb+++ b/spec/services/tag_hashtag_data_source_spec.rb@@ -37,6 +37,11 @@ RSpec.describe TagHashtagDataSource doexpect(described_class.search(guardian, "fact", 5).map(&:slug)).not_to include("fact")end+ it "includes tags only used in personal messages for users who cannot tag PMs" do+ tag1.update!(pm_topic_count: 1)+ expect(described_class.search(guardian, "fact", 5).map(&:slug)).to include("fact")+ end+it "returns an array of HashtagAutocompleteService::HashtagItem" doexpect(described_class.search(guardian, "fact", 1).first).to be_a(HashtagAutocompleteService::HashtagItem,@@ -74,6 +79,11 @@ RSpec.describe TagHashtagDataSource doTagUser.create(user: user, tag: tag2, notification_level: TagUser.notification_levels[:muted])expect(described_class.search_without_term(guardian, 5).map(&:slug)).not_to include("factor")end++ it "includes tags only used in personal messages for users who cannot tag PMs" do+ tag1.update!(pm_topic_count: 1)+ expect(described_class.search_without_term(guardian, 5).map(&:slug)).to include("fact")+ endendcontext "with content_localization_enabled" dodiff --git a/spec/services/tags/search_spec.rb b/spec/services/tags/search_spec.rbindex a3fc5fe2582..ff071b8e023 100644--- a/spec/services/tags/search_spec.rb+++ b/spec/services/tags/search_spec.rb@@ -544,6 +544,27 @@ RSpec.describe(Tags::Search) doendend+ context "with a tag only used in personal messages" do+ fab!(:category)+ fab!(:pm_only_tag) { Fabricate(:tag, name: "pmonly", pm_topic_count: 1) }++ let(:params) { { q: "pmonly", categoryId: category.id, filterForInput: true, limit: 5 } }++ it "returns the tag as selectable instead of mislabeling it as unusable" do+ row = result[:tags].find { |tag| tag[:name] == "pmonly" }+ expect(row).to be_present+ expect(row[:disabled]).to be_blank+ expect(result[:forbidden]).to be_nil+ expect(result[:forbidden_message]).to be_nil+ end++ it "does not expose the PM tag count to users who cannot tag PMs" do+ SiteSetting.display_personal_messages_tag_counts = true+ row = result[:tags].find { |tag| tag[:name] == "pmonly" }+ expect(row).not_to have_key(:pm_count)+ end+ end+context "when a hidden tag does not leak via forbidden" dofab!(:hidden_tag) { Fabricate(:tag, name: "secrethidden") }