IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FEATURE: display process information on flag modal (#31300)

Browse Source 
Information about the process is displayed on top of the flag modal.

In addition `allow_tl0_and_anonymous_users_to_flag_illegal_content` site
setting was renamed to `allow_all_users_to_flag_illegal_content` as it
is more descriptive.

<img width="629" alt="Screenshot 2025-02-12 at 3 58 12 pm"
src="https://github.com/user-attachments/assets/67c74ebc-6771-490d-b2c4-cbec25db8128"
/>
<img width="642" alt="Screenshot 2025-02-12 at 3 58 04 pm"
src="https://github.com/user-attachments/assets/5e4b8c84-601a-40c2-812f-b73d2b88a549"
/>
This commit is contained in:
Krzysztof Kotlarek
2025-02-14 11:26:20 +11:00
committed by GitHub
parent fa8945fee2
commit 2763e1726e
15 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/app/components/modal/anonymous-flag.gjs
View File

@@ -32,7 +32,8 @@ export default class AnonymousFlagModal extends Component {
class="anonymous-flag-modal"
>
<:body>
{{htmlSafe this.description}}
<p>{{i18n "flagging.review_process_description"}}</p>
<p>{{htmlSafe this.description}}</p>
</:body>
</DModal>
</template>

1
app/assets/javascripts/discourse/app/components/modal/flag.hbs
View File

@@ -7,6 +7,7 @@
{{on "keydown" this.onKeydown}}
>
<:body>
<p>{{i18n "flagging.review_process_description"}}</p>
<form>
<FlagSelection
@nameKey={{this.selected.name_key}}

3
app/assets/javascripts/discourse/app/components/post/menu/buttons/flag.gjs
View File

@@ -11,8 +11,7 @@ export default class PostMenuFlagButton extends Component {
return (
reviewable_id ||
(canFlag && !hidden) ||
(helper.siteSettings
.allow_tl0_and_anonymous_users_to_flag_illegal_content &&
(helper.siteSettings.allow_all_users_to_flag_illegal_content &&
!helper.currentUser)
);
}

3
app/assets/javascripts/discourse/app/widgets/post-menu.js
View File

@@ -215,8 +215,7 @@ registerButton(
if (
attrs.reviewableId ||
(attrs.canFlag && !attrs.hidden) ||
(siteSettings.allow_tl0_and_anonymous_users_to_flag_illegal_content &&
!currentUser)
(siteSettings.allow_all_users_to_flag_illegal_content && !currentUser)
) {
const button = {
action: "showFlags",

1
config/locales/client.en.yml
View File

@@ -4233,6 +4233,7 @@ en:
flagging:
title: "Thanks for keeping our community civil!"
review_process_description: "All flags are received by moderators and will be reviewed as soon as possible."
action: "Flag Post"
take_action: "Take Action…"
take_action_options:

2
config/locales/server.en.yml
View File

@@ -2319,7 +2319,7 @@ en:
reviewable_default_visibility: "Don't show reviewable items unless they meet this priority"
reviewable_low_priority_threshold: "The priority filter hides reviewable items that don't meet this score unless the '(any)' filter is used."
high_trust_flaggers_auto_hide_posts: "New user posts are automatically hidden after being flagged as spam by a TL3+ user"
allow_tl0_and_anonymous_users_to_flag_illegal_content: "Anonymous users will see information that they have to e-mail administrators to report illegal content."
allow_all_users_to_flag_illegal_content: "Anonymous users will see information that they have to e-mail administrators to report illegal content. This setting takes precedence over 'flag post allowed groups'."
email_address_to_report_illegal_content: "If left blank the default site admin email will be used."
cooldown_hours_until_reflag: "How much time users will have to wait until they are able to reflag a post"
slow_mode_prevents_editing: "Does 'Slow Mode' prevent editing, after editing_grace_period?"

2
config/site_settings.yml
View File

@@ -1962,7 +1962,7 @@ trust:
allow_any: false
refresh: true
area: "group_permissions"
allow_tl0_and_anonymous_users_to_flag_illegal_content:
allow_all_users_to_flag_illegal_content:
default: false
area: "flags"
client: true

10
db/migrate/20250212044021_rename_allow_all_users_to_flag_illegal_content_site_setting.rb Normal file
View File

@@ -0,0 +1,10 @@
# frozen_string_literal: true
class RenameAllowAllUsersToFlagIllegalContentSiteSetting < ActiveRecord::Migration[7.2]
def up
execute "UPDATE site_settings SET name = 'allow_all_users_to_flag_illegal_content' where name = 'allow_tl0_and_anonymous_users_to_flag_illegal_content'"
end
def down
execute "UPDATE site_settings SET name = 'allow_tl0_and_anonymous_users_to_flag_illegal_content' where name = 'allow_all_users_to_flag_illegal_content'"
end
end

6
lib/guardian/post_guardian.rb
View File

@@ -93,11 +93,7 @@ module PostGuardian
@user.in_any_groups?(SiteSetting.flag_post_allowed_groups_map) ||
post.topic.private_message?
)
) ||
(
action_key == :illegal &&
SiteSetting.allow_tl0_and_anonymous_users_to_flag_illegal_content
) ||
) || (action_key == :illegal && SiteSetting.allow_all_users_to_flag_illegal_content) ||
# not a flagging action, and haven't done it already
not(is_flag || already_taken_this_action) &&
# nothing except flagging on archived topics

2
lib/site_settings/validations.rb
View File

@@ -267,7 +267,7 @@ module SiteSettings::Validations
validate_error :twitter_summary_large_image_no_svg
end
def validate_allow_tl0_and_anonymous_users_to_flag_illegal_content(new_val)
def validate_allow_all_users_to_flag_illegal_content(new_val)
return if new_val == "f"
if SiteSetting.contact_email.present? ||
SiteSetting.email_address_to_report_illegal_content.present?

4
spec/lib/guardian_spec.rb
View File

@@ -163,13 +163,13 @@ RSpec.describe Guardian do
Flag.reset_flag_settings!
end
it "return true for illegal if tl0 and allow_tl0_and_anonymous_users_to_flag_illegal_content" do
it "return true for illegal if tl0 and allow_all_users_to_flag_illegal_content" do
SiteSetting.flag_post_allowed_groups = ""
user.trust_level = TrustLevel[0]
expect(Guardian.new(user).post_can_act?(post, :illegal)).to be false
SiteSetting.email_address_to_report_illegal_content = "illegal@example.com"
SiteSetting.allow_tl0_and_anonymous_users_to_flag_illegal_content = true
SiteSetting.allow_all_users_to_flag_illegal_content = true
expect(Guardian.new(user).post_can_act?(post, :illegal)).to be true
end

8
spec/lib/site_settings/validations_spec.rb
View File

@@ -475,17 +475,15 @@ RSpec.describe SiteSettings::Validations do
end
end
describe "#validate_allow_tl0_and_anonymous_users_to_flag_illegal_content" do
describe "#validate_allow_all_users_to_flag_illegal_content" do
it "does not allow to enable when no contact email is provided" do
expect {
validations.validate_allow_tl0_and_anonymous_users_to_flag_illegal_content("t")
}.to raise_error(
expect { validations.validate_allow_all_users_to_flag_illegal_content("t") }.to raise_error(
Discourse::InvalidParameters,
I18n.t("errors.site_settings.tl0_and_anonymous_flag"),
)
SiteSetting.contact_email = "illegal@example.com"
expect {
validations.validate_allow_tl0_and_anonymous_users_to_flag_illegal_content("t")
validations.validate_allow_all_users_to_flag_illegal_content("t")
}.not_to raise_error
end
end

2
spec/requests/admin/config/site_settings_controller_spec.rb
View File

@@ -69,7 +69,7 @@ RSpec.describe Admin::SiteSettingsController do
expect(response.status).to eq(200)
expect(response.parsed_body["site_settings"].map { |s| s["setting"] }).to match_array(
%w[
allow_tl0_and_anonymous_users_to_flag_illegal_content
allow_all_users_to_flag_illegal_content
email_address_to_report_illegal_content
silence_new_user_sensitivity
num_users_to_silence_new_user

2
spec/system/admin_flags_spec.rb
View File

@@ -164,7 +164,7 @@ describe "Admin Flags Page", type: :system do
admin_flags_page.click_tab("settings")
expect(page.all(".setting-label h3").map(&:text).map(&:downcase)).to eq(
[
"allow tl0 and anonymous users to flag illegal content",
"allow all users to flag illegal content",
"email address to report illegal content",
"silence new user sensitivity",
"num users to silence new user",

14
spec/system/flagging_post_spec.rb
View File

@@ -65,10 +65,13 @@ describe "Flagging post", type: :system do
expect(topic_page).to have_no_flag_button
end
it "allows to mark posts as illegal when allow_tl0_and_anonymous_users_to_flag_illegal_content setting is enabled" do
it "allows to mark posts as illegal when allow_all_users_to_flag_illegal_content setting is enabled" do
SiteSetting.email_address_to_report_illegal_content = "illegal@example.com"
SiteSetting.allow_tl0_and_anonymous_users_to_flag_illegal_content = true
SiteSetting.allow_all_users_to_flag_illegal_content = true
topic_page.visit_topic(topic).open_flag_topic_modal
expect(flag_modal.body).to have_content(
ActionView::Base.full_sanitizer.sanitize(I18n.t("js.flagging.review_process_description")),
)
expect(flag_modal).to have_choices(I18n.t("js.flagging.formatted_name.illegal"))
end
end
@@ -81,13 +84,16 @@ describe "Flagging post", type: :system do
expect(topic_page).to have_no_post_more_actions(post_to_flag)
end
it "allows to mark posts as illegal when allow_tl0_and_anonymous_users_to_flag_illegal_content setting is enabled" do
it "allows to mark posts as illegal when allow_all_users_to_flag_illegal_content setting is enabled" do
SiteSetting.contact_email = "contact@example.com"
SiteSetting.allow_tl0_and_anonymous_users_to_flag_illegal_content = true
SiteSetting.allow_all_users_to_flag_illegal_content = true
topic_page.visit_topic(topic, post_number: post_to_flag.post_number)
topic_page.find_post_action_button(post_to_flag, :flag).click
expect(anonymous_flag_modal.body).to have_content(
ActionView::Base.full_sanitizer.sanitize(I18n.t("js.flagging.review_process_description")),
)
expect(anonymous_flag_modal.body).to have_content(
ActionView::Base.full_sanitizer.sanitize(
I18n.t(