From 2da7c74e60b50e7afbee14f79e22ea6a710f4015 Mon Sep 17 00:00:00 2001 From: Ted Johansson Date: Fri, 2 Feb 2024 13:48:53 +0800 Subject: [PATCH] DEV: Remove TagGuardian#can_create_tag? fallback (#25535) We've changed access settings to be group membership based rather than based on the TL value directly. We kept both conditions here while we updated any plugins and themes. It should now be safe to remove. --- lib/guardian/tag_guardian.rb | 6 +----- plugins/chat/spec/lib/chat/channel_archive_service_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/guardian/tag_guardian.rb b/lib/guardian/tag_guardian.rb index e5ec0a93967..025a7e0c013 100644 --- a/lib/guardian/tag_guardian.rb +++ b/lib/guardian/tag_guardian.rb @@ -7,11 +7,7 @@ module TagGuardian end def can_create_tag? - SiteSetting.tagging_enabled && - ( - @user.has_trust_level_or_staff?(SiteSetting.min_trust_to_create_tag) || - @user.in_any_groups?(SiteSetting.create_tag_allowed_groups_map) - ) + SiteSetting.tagging_enabled && @user.in_any_groups?(SiteSetting.create_tag_allowed_groups_map) end def can_tag_topics? diff --git a/plugins/chat/spec/lib/chat/channel_archive_service_spec.rb b/plugins/chat/spec/lib/chat/channel_archive_service_spec.rb index 26ad7576e21..96451f3480c 100644 --- a/plugins/chat/spec/lib/chat/channel_archive_service_spec.rb +++ b/plugins/chat/spec/lib/chat/channel_archive_service_spec.rb @@ -7,7 +7,7 @@ describe Chat::ChannelArchiveService do end fab!(:channel) { Fabricate(:category_channel) } - fab!(:user) { Fabricate(:user, admin: true, refresh_auto_groups: true) } + fab!(:user) { Fabricate(:admin, refresh_auto_groups: true) } fab!(:category) let(:topic_params) { { topic_title: "This will be a new topic", category_id: category.id } } @@ -117,7 +117,7 @@ describe Chat::ChannelArchiveService do reaction_message = Chat::Message.last Chat::MessageReaction.create!( chat_message: reaction_message, - user: Fabricate(:user), + user: Fabricate(:user, refresh_auto_groups: true), emoji: "+1", ) stub_const(Chat::ChannelArchiveService, "ARCHIVED_MESSAGES_PER_POST", 5) do