A platform for community discussion. Free, open, simple.
UX: Expose DSA settings (#45490)
Alan Guo Xiang Tan1fd92edec315
diff --git a/config/locales/server.en.yml b/config/locales/server.en.ymlindex 95cb417180e..8145a6b4b96 100644--- a/config/locales/server.en.yml+++ b/config/locales/server.en.yml@@ -582,6 +582,8 @@ en:site_settings:invalid_site_setting: "No setting named '%{name}' exists"invalid_category_id: "You specified a category that does not exist"+ dsa_community_rules_required: "Add at least one community rule before enabling DSA reporting."+ dsa_community_rules_in_use: "Disable DSA reporting before removing all community rules."site_settings_are_deprecated: "The following settings are deprecated: %{old_names}. Use %{new_names} instead"site_settings_are_hidden: "You are not allowed to change hidden settings: %{setting_names}"site_settings_are_shadowed_globally: "You cannot change those settings because they are globally configured: %{setting_names}"@@ -2149,9 +2151,10 @@ en:unavailable: "A random username could not be generated. Check the random username word lists in your site settings."site_settings:- dsa_notice_group: "Group receiving illegal content notices when {{setting:dsa_reporting_enabled}} is enabled. Members can read notices and reporter contact details. Defaults to admins, which also receives notices if the selected group is missing or empty."- dsa_moderation_appeal_email: "Users can appeal moderation decisions by emailing this address. Leave blank to omit appeal instructions. Requires {{setting:dsa_reporting_enabled}} to be turned on."- dsa_community_rules: "Community rules available for DSA classification when {{setting:dsa_reporting_enabled}} is enabled. Each rule needs an exact contractual reference (up to 500 characters) and an explanation (up to 2000 characters). Leave empty to disable classification."+ dsa_reporting_enabled: "Enable EU Digital Services Act (DSA) reporting and moderation tools. Requires {{setting:dsa_community_rules}}."+ dsa_notice_group: "Group receiving illegal content reports and reporter contact details. Defaults to admins."+ dsa_moderation_appeal_email: "Email address shown in moderation emails and system messages when DSA reporting is enabled. Leave blank to omit appeal instructions from those messages."+ dsa_community_rules: "Define rules from your Terms of Service or community guidelines. Each rule’s reference and explanation are included in DSA statements of reasons when selected by a moderator."allow_bulk_invite: "Allow bulk invites by uploading a CSV file"disabled: "disabled"display_local_time_in_user_card: "Display the local time based on a user's timezone when their user card is opened."diff --git a/config/site_settings.yml b/config/site_settings.ymlindex bd1ec243faf..5e6722596a6 100644--- a/config/site_settings.yml+++ b/config/site_settings.yml@@ -4873,20 +4873,14 @@ experimental:enable_form_templates:client: truedefault: true- dsa_notice_group:- default: "1"- type: group- hidden: true- area: "experimental"dsa_reporting_enabled:client: truedefault: false- hidden: truearea: "experimental"- dsa_moderation_appeal_email:- default: ""- type: email- hidden: true+ dsa_notice_group:+ default: "1"+ type: group+ area: "experimental"dsa_community_rules:type: objectsdefault: []@@ -4903,7 +4897,11 @@ experimental:type: stringrequired: truevalidations:- max_length: 2000+ max_length: 500+ dsa_moderation_appeal_email:+ default: ""+ type: email+ area: "experimental"experimental_impersonation_time_limit_minutes:default: 15hidden: truediff --git a/lib/site_settings/label_formatter.rb b/lib/site_settings/label_formatter.rbindex 828174e271f..64eae1cd5cd 100644--- a/lib/site_settings/label_formatter.rb+++ b/lib/site_settings/label_formatter.rb@@ -23,6 +23,7 @@ module SiteSettingsdbdmdns+ dsaeufaqfgdiff --git a/lib/site_settings/validations.rb b/lib/site_settings/validations.rbindex c0278a19cf1..748e12d8e07 100644--- a/lib/site_settings/validations.rb+++ b/lib/site_settings/validations.rb@@ -263,6 +263,18 @@ module SiteSettings::Validationsvalidate_error :x_summary_large_image_no_svgend+ def validate_dsa_reporting_enabled(new_val)+ return if new_val == "f" || JSON.parse(SiteSetting.dsa_community_rules).present?++ validate_error :dsa_community_rules_required+ end++ def validate_dsa_community_rules(new_val)+ return if !SiteSetting.dsa_reporting_enabled || JSON.parse(new_val).present?++ validate_error :dsa_community_rules_in_use+ end+def validate_allow_all_users_to_flag_illegal_content(new_val)return if new_val == "f"if SiteSetting.contact_email.present? ||diff --git a/plugins/chat/spec/models/chat/reviewable_chat_message_spec.rb b/plugins/chat/spec/models/chat/reviewable_chat_message_spec.rbindex a69fc2b48ae..a8c01ad35f6 100644--- a/plugins/chat/spec/models/chat/reviewable_chat_message_spec.rb+++ b/plugins/chat/spec/models/chat/reviewable_chat_message_spec.rb@@ -77,7 +77,7 @@ RSpec.describe Chat::ReviewableMessage, type: :model dobefore doreviewable.update!(target_created_by: chat_message.user)freeze_time- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingendit "creates no statement when unsilence_user handles the chat message reviewable" dodiff --git a/plugins/chat/spec/requests/chat/api/channels_messages_flags_controller_spec.rb b/plugins/chat/spec/requests/chat/api/channels_messages_flags_controller_spec.rbindex 777012c4eb2..f41c10a1937 100644--- a/plugins/chat/spec/requests/chat/api/channels_messages_flags_controller_spec.rb+++ b/plugins/chat/spec/requests/chat/api/channels_messages_flags_controller_spec.rb@@ -15,7 +15,7 @@ RSpec.describe Chat::Api::ChannelsMessagesFlagsController dodescribe "#create" doit "requires the DSA form for illegal reports only when DSA reporting is enabled" do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingexpect dopost "/chat/api/channels/#{message_1.chat_channel.id}/messages/#{message_1.id}/flags",diff --git a/plugins/chat/spec/serializer/chat/chat_message_serializer_spec.rb b/plugins/chat/spec/serializer/chat/chat_message_serializer_spec.rbindex e05e8dc916e..c86855ff3de 100644--- a/plugins/chat/spec/serializer/chat/chat_message_serializer_spec.rb+++ b/plugins/chat/spec/serializer/chat/chat_message_serializer_spec.rb@@ -192,7 +192,7 @@ describe Chat::MessageSerializer dolet(:options) { { scope: guardian, root: nil, chat_channel: message_1.chat_channel } }it "omits the illegal flag when DSA reporting is enabled" do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingexpect(serializer.as_json[:available_flags]).to contain_exactly(*PostActionType.flag_types.keys.reject { |name| name == :illegal },diff --git a/plugins/chat/spec/system/flag_message_spec.rb b/plugins/chat/spec/system/flag_message_spec.rbindex 2279df54269..f3282708883 100644--- a/plugins/chat/spec/system/flag_message_spec.rb+++ b/plugins/chat/spec/system/flag_message_spec.rb@@ -20,7 +20,7 @@ RSpec.describe "Flag message" dobefore { category_channel_1.add(current_user) }it "lets a user flag a message and then report illegal content" do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingSiteSetting.allow_all_users_to_flag_illegal_content = falsecurrent_user.activatechat.visit_channel(category_channel_1)diff --git a/plugins/discourse-ai/spec/models/reviewable_ai_chat_message_spec.rb b/plugins/discourse-ai/spec/models/reviewable_ai_chat_message_spec.rbindex 2b653f24bd1..532ea857ed3 100644--- a/plugins/discourse-ai/spec/models/reviewable_ai_chat_message_spec.rb+++ b/plugins/discourse-ai/spec/models/reviewable_ai_chat_message_spec.rb@@ -42,7 +42,7 @@ RSpec.describe ReviewableAiChatMessage, type: :model dobefore doreviewable.update!(target_created_by: chat_message.user)freeze_time- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingendit "creates no statement when agree_and_keep_message handles the AI chat message reviewable" dodiff --git a/plugins/discourse-ai/spec/models/reviewable_ai_post_spec.rb b/plugins/discourse-ai/spec/models/reviewable_ai_post_spec.rbindex 45b3608988a..c521c7ccb17 100644--- a/plugins/discourse-ai/spec/models/reviewable_ai_post_spec.rb+++ b/plugins/discourse-ai/spec/models/reviewable_ai_post_spec.rb@@ -279,7 +279,7 @@ describe ReviewableAiPost docontext "when the dsa_reporting_enabled site setting is enabled" dobefore dofreeze_time- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingendit "creates no statement when agree_and_keep handles the AI post reviewable" dodiff --git a/plugins/discourse-ai/spec/models/reviewable_ai_tool_action_spec.rb b/plugins/discourse-ai/spec/models/reviewable_ai_tool_action_spec.rbindex 4f745568cee..5a62f539687 100644--- a/plugins/discourse-ai/spec/models/reviewable_ai_tool_action_spec.rb+++ b/plugins/discourse-ai/spec/models/reviewable_ai_tool_action_spec.rb@@ -550,7 +550,7 @@ RSpec.describe ReviewableAiToolAction docontext "when the dsa_reporting_enabled site setting is enabled" dobefore dofreeze_time- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingendit "records a statement when an AI tool reviewable closes a topic" dodiff --git a/plugins/discourse-ai/spec/models/reviewable_flagged_post_spec.rb b/plugins/discourse-ai/spec/models/reviewable_flagged_post_spec.rbindex 236c2cb8925..cb770f874ef 100644--- a/plugins/discourse-ai/spec/models/reviewable_flagged_post_spec.rb+++ b/plugins/discourse-ai/spec/models/reviewable_flagged_post_spec.rb@@ -5,7 +5,7 @@ RSpec.describe ReviewableFlaggedPost dobefore doenable_current_pluginfreeze_time- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingendit "records automatic detection when a moderator deletes spam detected by the spam bot" dodiff --git a/plugins/discourse-ai/spec/models/reviewable_post_spec.rb b/plugins/discourse-ai/spec/models/reviewable_post_spec.rbindex 5cbe2b00ef7..0fd11070e14 100644--- a/plugins/discourse-ai/spec/models/reviewable_post_spec.rb+++ b/plugins/discourse-ai/spec/models/reviewable_post_spec.rb@@ -5,7 +5,7 @@ RSpec.describe ReviewablePost dobefore doenable_current_pluginfreeze_time- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingendit "records automatic detection when a moderator deletes a post queued for review by AI triage" dodiff --git a/plugins/discourse-post-voting/spec/models/reviewable_post_voting_comment_spec.rb b/plugins/discourse-post-voting/spec/models/reviewable_post_voting_comment_spec.rbindex 936ec18098d..8ce4860e57c 100644--- a/plugins/discourse-post-voting/spec/models/reviewable_post_voting_comment_spec.rb+++ b/plugins/discourse-post-voting/spec/models/reviewable_post_voting_comment_spec.rb@@ -56,7 +56,7 @@ RSpec.describe ReviewablePostVotingComment, type: :model dobefore doreviewable.update!(target_created_by: comment.user)freeze_time- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingendit "creates no statement when agree_and_keep_comment handles the post voting comment reviewable" dodiff --git a/plugins/discourse-post-voting/spec/requests/post_voting/comments_controller_spec.rb b/plugins/discourse-post-voting/spec/requests/post_voting/comments_controller_spec.rbindex b54b87467b6..a557f071477 100644--- a/plugins/discourse-post-voting/spec/requests/post_voting/comments_controller_spec.rb+++ b/plugins/discourse-post-voting/spec/requests/post_voting/comments_controller_spec.rb@@ -460,7 +460,7 @@ RSpec.describe PostVoting::CommentsController dobefore { sign_in(flagger) }it "requires the DSA form for illegal reports only when DSA reporting is enabled" do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingexpect doput "/post_voting/comments/flag.json",diff --git a/plugins/discourse-post-voting/spec/serializers/post_voting/comment_serializer_spec.rb b/plugins/discourse-post-voting/spec/serializers/post_voting/comment_serializer_spec.rbindex 7f3d5d43fb0..e0a8dfa4861 100644--- a/plugins/discourse-post-voting/spec/serializers/post_voting/comment_serializer_spec.rb+++ b/plugins/discourse-post-voting/spec/serializers/post_voting/comment_serializer_spec.rb@@ -12,7 +12,7 @@ describe PostVotingCommentSerializer doendit "omits the illegal flag when DSA reporting is enabled" do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingSiteSetting.flag_posts_voting_comments_allowed_groups = Group::AUTO_GROUPS[:everyone]serialized = described_class.new(comment, scope: user.guardian).as_json[:post_voting_comment]diff --git a/plugins/live/spec/models/reviewable_live_user_spec.rb b/plugins/live/spec/models/reviewable_live_user_spec.rbindex 29b3eb54317..d9b0c2f30e4 100644--- a/plugins/live/spec/models/reviewable_live_user_spec.rb+++ b/plugins/live/spec/models/reviewable_live_user_spec.rb@@ -115,7 +115,7 @@ RSpec.describe ReviewableLiveUser docontext "when the dsa_reporting_enabled site setting is enabled" dobefore dofreeze_time- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingendit "creates no statement when agree_and_keep handles the live user reviewable" dodiff --git a/spec/lib/dsa/appeal_instructions_spec.rb b/spec/lib/dsa/appeal_instructions_spec.rbindex 25ec32f7620..a93727904e6 100644--- a/spec/lib/dsa/appeal_instructions_spec.rb+++ b/spec/lib/dsa/appeal_instructions_spec.rb@@ -8,7 +8,7 @@ RSpec.describe Dsa::AppealInstructions doendcontext "when the dsa_reporting_enabled site setting is enabled" do- before { SiteSetting.dsa_reporting_enabled = true }+ before { enable_dsa_reporting }it "uses the DSA appeal address" doSiteSetting.dsa_moderation_appeal_email = "[email protected]"diff --git a/spec/lib/post_destroyer_spec.rb b/spec/lib/post_destroyer_spec.rbindex 575a0bb3636..6fda59ab493 100644--- a/spec/lib/post_destroyer_spec.rb+++ b/spec/lib/post_destroyer_spec.rb@@ -1225,7 +1225,7 @@ RSpec.describe PostDestroyer docontext "when the dsa_reporting_enabled site setting is enabled" dobefore do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingSiteSetting.dsa_moderation_appeal_email = "[email protected]"enddiff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rbindex 00274303150..c06b29801a3 100644--- a/spec/mailers/user_notifications_spec.rb+++ b/spec/mailers/user_notifications_spec.rb@@ -133,7 +133,7 @@ RSpec.describe UserNotifications docontext "when the dsa_reporting_enabled site setting is enabled" dobefore do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingSiteSetting.dsa_moderation_appeal_email = "[email protected]"end@@ -160,7 +160,7 @@ RSpec.describe UserNotifications docontext "when the dsa_reporting_enabled site setting is enabled" dobefore do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingSiteSetting.dsa_moderation_appeal_email = "[email protected]"end@@ -1565,7 +1565,7 @@ RSpec.describe UserNotifications docontext "when the dsa_reporting_enabled site setting is enabled" dobefore do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingSiteSetting.dsa_moderation_appeal_email = "[email protected]"end@@ -2537,7 +2537,7 @@ RSpec.describe UserNotifications docontext "when the dsa_reporting_enabled site setting is enabled" dobefore do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingSiteSetting.dsa_moderation_appeal_email = "[email protected]"end@@ -2651,7 +2651,7 @@ RSpec.describe UserNotifications docontext "when the dsa_reporting_enabled site setting is enabled" dobefore do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingSiteSetting.dsa_moderation_appeal_email = "[email protected]"end@@ -2733,7 +2733,7 @@ RSpec.describe UserNotifications docontext "when the dsa_reporting_enabled site setting is enabled" dobefore do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingSiteSetting.dsa_moderation_appeal_email = "[email protected]"end@@ -2840,7 +2840,7 @@ RSpec.describe UserNotifications dodescribe ".signup_after_reject" docontext "when the dsa_reporting_enabled site setting is enabled" dobefore do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingSiteSetting.dsa_moderation_appeal_email = "[email protected]"enddiff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rbindex b5ee97d8e6a..8adadb43ab2 100644--- a/spec/models/post_spec.rb+++ b/spec/models/post_spec.rb@@ -1625,7 +1625,7 @@ RSpec.describe Post docontext "when the dsa_reporting_enabled site setting is enabled" dobefore do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingSiteSetting.dsa_moderation_appeal_email = "[email protected]"enddiff --git a/spec/models/reviewable_flagged_post_spec.rb b/spec/models/reviewable_flagged_post_spec.rbindex b9b6d217542..ce169daaa0f 100644--- a/spec/models/reviewable_flagged_post_spec.rb+++ b/spec/models/reviewable_flagged_post_spec.rb@@ -624,7 +624,7 @@ RSpec.describe ReviewableFlaggedPost, type: :model dobefore dofreeze_time- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingendit "creates no statement when unsilence_user handles the flagged post reviewable" do@@ -1505,7 +1505,7 @@ RSpec.describe ReviewableFlaggedPost, type: :model docontext "when the dsa_reporting_enabled site setting is enabled" dobefore do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingSiteSetting.dsa_moderation_appeal_email = "[email protected]"enddiff --git a/spec/models/reviewable_post_spec.rb b/spec/models/reviewable_post_spec.rbindex 31a0b07eb68..f2729f1098e 100644--- a/spec/models/reviewable_post_spec.rb+++ b/spec/models/reviewable_post_spec.rb@@ -200,7 +200,7 @@ RSpec.describe ReviewablePost dobefore dofreeze_time- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingendit "creates no statement when approve handles the post reviewable" dodiff --git a/spec/models/reviewable_queued_post_spec.rb b/spec/models/reviewable_queued_post_spec.rbindex 1bbc7009a80..0b6cf826193 100644--- a/spec/models/reviewable_queued_post_spec.rb+++ b/spec/models/reviewable_queued_post_spec.rb@@ -180,7 +180,7 @@ RSpec.describe ReviewableQueuedPost, type: :model docontext "when the dsa_reporting_enabled site setting is enabled" dobefore do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingSiteSetting.dsa_moderation_appeal_email = "[email protected]"end@@ -653,7 +653,7 @@ RSpec.describe ReviewableQueuedPost, type: :model dodescribe "#perform" doit "retains the classified decision when account deletion removes the queued review" do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingrecipient = Fabricate(:user)queued =Fabricate(@@ -695,7 +695,7 @@ RSpec.describe ReviewableQueuedPost, type: :model dobefore dofreeze_time- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingendit "creates no statement when approve_post handles the queued post reviewable" dodiff --git a/spec/models/reviewable_spec.rb b/spec/models/reviewable_spec.rbindex f3b27611aea..006bc949ba3 100644--- a/spec/models/reviewable_spec.rb+++ b/spec/models/reviewable_spec.rb@@ -681,7 +681,7 @@ RSpec.describe Reviewable, type: :model do}end- before { SiteSetting.dsa_reporting_enabled = true }+ before { enable_dsa_reporting }it "classifies the moderation decision and records the acting staff member in its note" doresult = reviewable.perform(admin, :delete_and_agree, dsa_classification: classification)diff --git a/spec/models/reviewable_user_spec.rb b/spec/models/reviewable_user_spec.rbindex a1dfba034ef..f947b99ef15 100644--- a/spec/models/reviewable_user_spec.rb+++ b/spec/models/reviewable_user_spec.rb@@ -273,7 +273,7 @@ RSpec.describe ReviewableUser, type: :model dofab!(:reviewable)it "rejects a registration without creating a statement when classification is supplied" do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingreviewable = Fabricate(:reviewable_user, target: Fabricate(:user, approved: false))result =@@ -296,7 +296,7 @@ RSpec.describe ReviewableUser, type: :model doendit "classifies avatar removal while leaving the account review pending" do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportinguser = Fabricate(:user, uploaded_avatar: Fabricate(:upload))reviewable = Fabricate(:suspect_user_reviewable, target: user)@@ -564,7 +564,7 @@ RSpec.describe ReviewableUser, type: :model dobefore dofreeze_time- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingendit "creates no statement when approve_user handles the user reviewable" dodiff --git a/spec/models/site_setting_spec.rb b/spec/models/site_setting_spec.rbindex 2e1023edb61..5f3aea7f9f6 100644--- a/spec/models/site_setting_spec.rb+++ b/spec/models/site_setting_spec.rb@@ -1,9 +1,42 @@# frozen_string_literal: trueRSpec.describe SiteSetting do+ describe ".dsa_reporting_enabled=" do+ it "requires a community rule before enabling reporting" do+ expect { SiteSetting.dsa_reporting_enabled = true }.to raise_error(+ Discourse::InvalidParameters,+ I18n.t("errors.site_settings.dsa_community_rules_required"),+ )+ expect(SiteSetting.dsa_reporting_enabled).to eq(false)++ SiteSetting.dsa_community_rules = [+ { ground: "Terms, section 3", explanation: "Personal attacks are prohibited." },+ ].to_json+ SiteSetting.dsa_reporting_enabled = true++ expect(SiteSetting.dsa_reporting_enabled).to eq(true)+ end+ end+describe ".dsa_community_rules=" dolet(:rule) { { ground: "Terms, section 3", explanation: "Personal attacks are prohibited." } }+ it "requires reporting to be disabled before removing the last community rule" do+ SiteSetting.dsa_community_rules = [rule].to_json+ SiteSetting.dsa_reporting_enabled = true++ expect { SiteSetting.dsa_community_rules = "[]" }.to raise_error(+ Discourse::InvalidParameters,+ I18n.t("errors.site_settings.dsa_community_rules_in_use"),+ )+ expect(JSON.parse(SiteSetting.dsa_community_rules)).to eq([rule.stringify_keys])++ SiteSetting.dsa_reporting_enabled = false+ SiteSetting.dsa_community_rules = "[]"++ expect(JSON.parse(SiteSetting.dsa_community_rules)).to eq([])+ end+it "accepts a 500 character contractual ground and rejects 501 characters" dorule[:ground] = "é" * 500@@ -18,8 +51,8 @@ RSpec.describe SiteSetting do)end- it "accepts a 2000 character explanation and rejects 2001 characters" do- rule[:explanation] = "é" * 2000+ it "accepts a 500 character explanation and rejects 501 characters" do+ rule[:explanation] = "é" * 500SiteSetting.dsa_community_rules = [rule].to_jsondiff --git a/spec/requests/dsa_notices_controller_spec.rb b/spec/requests/dsa_notices_controller_spec.rbindex 0f475155697..15838932102 100644--- a/spec/requests/dsa_notices_controller_spec.rb+++ b/spec/requests/dsa_notices_controller_spec.rb@@ -16,7 +16,7 @@ RSpec.describe DsaNoticesController doendbefore do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingSiteSetting.dsa_notice_group = group.id.to_senddiff --git a/spec/requests/dsa_statements_controller_spec.rb b/spec/requests/dsa_statements_controller_spec.rbindex 51944cde1f2..d43ef2eff98 100644--- a/spec/requests/dsa_statements_controller_spec.rb+++ b/spec/requests/dsa_statements_controller_spec.rb@@ -15,13 +15,14 @@ RSpec.describe DsaStatementsController doendbefore do- SiteSetting.dsa_reporting_enabled = true- SiteSetting.dsa_community_rules = [- {- ground: "Terms, section 3",- explanation: "The content targets another person with insults.",- },- ].to_json+ enable_dsa_reporting(+ community_rules: [+ {+ ground: "Terms, section 3",+ explanation: "The content targets another person with insults.",+ },+ ],+ )endit "returns forbidden when a nonstaff user classifies a flagged post" dodiff --git a/spec/requests/post_actions_controller_spec.rb b/spec/requests/post_actions_controller_spec.rbindex 54296780ed4..5f30eb999ce 100644--- a/spec/requests/post_actions_controller_spec.rb+++ b/spec/requests/post_actions_controller_spec.rb@@ -104,7 +104,7 @@ RSpec.describe PostActionsController doendit "forbids illegal flags when DSA reporting is enabled" do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingsign_in(user)target_post = Fabricate(:post, user: coding_horror)reviewable =diff --git a/spec/requests/reviewables_controller_spec.rb b/spec/requests/reviewables_controller_spec.rbindex 5afa84e8cb1..ccc91ed0c78 100644--- a/spec/requests/reviewables_controller_spec.rb+++ b/spec/requests/reviewables_controller_spec.rb@@ -44,10 +44,11 @@ RSpec.describe ReviewablesController dodescribe "#index" doit "includes DSA classification for flagged posts without loading each statement separately" do- SiteSetting.dsa_reporting_enabled = true- SiteSetting.dsa_community_rules = [- { ground: "Terms, section 3", explanation: "Personal attacks are prohibited." },- ].to_json+ enable_dsa_reporting(+ community_rules: [+ { ground: "Terms, section 3", explanation: "Personal attacks are prohibited." },+ ],+ )first_reviewable = Fabricate(:reviewable_flagged_post)second_reviewable = Fabricate(:reviewable_flagged_post)first_statement = Fabricate(:dsa_statement_of_record, reviewable_id: first_reviewable.id)@@ -648,10 +649,11 @@ RSpec.describe ReviewablesController dobefore dosign_in(Fabricate(:moderator))- SiteSetting.dsa_reporting_enabled = true- SiteSetting.dsa_community_rules = [- { ground: "Terms, section 3", explanation: "Personal attacks are prohibited." },- ].to_json+ enable_dsa_reporting(+ community_rules: [+ { ground: "Terms, section 3", explanation: "Personal attacks are prohibited." },+ ],+ )endit "includes pending statement IDs and shared classification options for a flagged post" do@@ -676,8 +678,8 @@ RSpec.describe ReviewablesController do)end- it "omits classification when community rules are empty" do- SiteSetting.dsa_community_rules = "[]"+ it "omits classification for an existing site without community rules" do+ SiteSetting.stubs(:dsa_community_rules).returns("[]")get "/review/#{reviewable.id}.json"@@ -1887,8 +1889,7 @@ RSpec.describe ReviewablesController doendbefore do- SiteSetting.dsa_reporting_enabled = true- SiteSetting.dsa_community_rules = [rule].to_json+ enable_dsa_reporting(community_rules: [rule])sign_in(admin)enddiff --git a/spec/serializers/current_user_serializer_spec.rb b/spec/serializers/current_user_serializer_spec.rbindex 3d81193582d..93f1b5cb8b0 100644--- a/spec/serializers/current_user_serializer_spec.rb+++ b/spec/serializers/current_user_serializer_spec.rb@@ -7,7 +7,7 @@ RSpec.describe CurrentUserSerializer dolet(:guardian) { user.guardian }describe "#can_use_dsa_account_email" do- before { SiteSetting.dsa_reporting_enabled = true }+ before { enable_dsa_reporting }it "allows a reporter to use their confirmed account email" douser.activatediff --git a/spec/services/dsa_statement_of_record/classify_spec.rb b/spec/services/dsa_statement_of_record/classify_spec.rbindex 299c6b7d16d..58b1670234b 100644--- a/spec/services/dsa_statement_of_record/classify_spec.rb+++ b/spec/services/dsa_statement_of_record/classify_spec.rb@@ -24,10 +24,7 @@ RSpec.describe DsaStatementOfRecord::Classify do}end- before do- SiteSetting.dsa_reporting_enabled = true- SiteSetting.dsa_community_rules = [rule].to_json- end+ before { enable_dsa_reporting(community_rules: [rule]) }it "classifies a flagged post removal and records the staff member's decision in a note" dooriginal_payload = statement.payload@@ -149,10 +146,10 @@ RSpec.describe DsaStatementOfRecord::Classify doit { is_expected.to fail_a_policy(:classification_enabled) }end- context "when community rules are empty" do+ context "when an existing site has no community rules" dobefore doparams- SiteSetting.dsa_community_rules = "[]"+ SiteSetting.stubs(:dsa_community_rules).returns("[]")endit { is_expected.to fail_a_policy(:classification_enabled) }diff --git a/spec/services/user_silencer_spec.rb b/spec/services/user_silencer_spec.rbindex 5fa59fc9779..966dab4a728 100644--- a/spec/services/user_silencer_spec.rb+++ b/spec/services/user_silencer_spec.rb@@ -143,7 +143,7 @@ RSpec.describe UserSilencer docontext "when the dsa_reporting_enabled site setting is enabled" dobefore do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingSiteSetting.dsa_moderation_appeal_email = "[email protected]"end@@ -187,7 +187,7 @@ RSpec.describe UserSilencer docontext "when the dsa_reporting_enabled site setting is enabled" dobefore do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingSiteSetting.dsa_moderation_appeal_email = "[email protected]"enddiff --git a/spec/services/user_suspender_spec.rb b/spec/services/user_suspender_spec.rbindex 35ef1069ba9..65711bf2a36 100644--- a/spec/services/user_suspender_spec.rb+++ b/spec/services/user_suspender_spec.rb@@ -127,7 +127,7 @@ RSpec.describe UserSuspender doendit "delivers a suspension email with the reason when DSA reporting is enabled" do- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportinguser.user_option.update!(timezone: "Asia/Singapore")expect { suspend_user }.to change { Jobs::CriticalUserEmail.jobs.size }.by(1)diff --git a/spec/support/site_settings_helpers.rb b/spec/support/site_settings_helpers.rbindex 3c8da75184d..9b113a920f4 100644--- a/spec/support/site_settings_helpers.rb+++ b/spec/support/site_settings_helpers.rb@@ -1,6 +1,15 @@# frozen_string_literal: truemodule SiteSettingsHelpers+ def enable_dsa_reporting(+ community_rules: [+ { ground: "Terms, section 3", explanation: "Personal attacks are prohibited." },+ ]+ )+ SiteSetting.dsa_community_rules = community_rules.to_json+ SiteSetting.dsa_reporting_enabled = true+ end+def new_settings(provider)Class.new doextend SiteSettingExtensiondiff --git a/spec/system/dsa_notice_spec.rb b/spec/system/dsa_notice_spec.rbindex 32012fe33d6..2d9b96a0cce 100644--- a/spec/system/dsa_notice_spec.rb+++ b/spec/system/dsa_notice_spec.rb@@ -17,7 +17,7 @@ RSpec.describe "Illegal content notices" dobefore doSiteSetting.post_menu_hidden_items = ""SiteSetting.contact_email = "[email protected]"- SiteSetting.dsa_reporting_enabled = true+ enable_dsa_reportingSiteSetting.disable_emails = "no"SiteSetting.allow_all_users_to_flag_illegal_content = falseJobs.run_immediately!diff --git a/spec/system/review_dsa_moderation_spec.rb b/spec/system/review_dsa_moderation_spec.rbindex 849a92a51f8..63eca2fa185 100644--- a/spec/system/review_dsa_moderation_spec.rb+++ b/spec/system/review_dsa_moderation_spec.rb@@ -15,8 +15,7 @@ describe "Classifying reviewable moderation" doendbefore do- SiteSetting.dsa_reporting_enabled = true- SiteSetting.dsa_community_rules = [rule].to_json+ enable_dsa_reporting(community_rules: [rule])sign_in(admin)end