diff --git a/.github/styles/config/vocabularies/Decidim/accept.txt b/.github/styles/config/vocabularies/Decidim/accept.txt index d1e37358a3..9e559ea971 100644 --- a/.github/styles/config/vocabularies/Decidim/accept.txt +++ b/.github/styles/config/vocabularies/Decidim/accept.txt @@ -1,10 +1,12 @@ -Decidim -CSV Config -[Nn]ickame +CSV +[Dd]ecidim [Ee]mail -[Oo]fficialize +[Mm]oderations +[Nn]ickame [Oo]fficialization [Oo]fficializing -Reoffficialize -moderations +[Oo]fficialize +[Rr]eoffficialize +[Uu]nreport +[Uu]nhide diff --git a/docs/en/modules/ROOT/nav.adoc b/docs/en/modules/ROOT/nav.adoc index 03875ee2dd..affc2d6f8a 100644 --- a/docs/en/modules/ROOT/nav.adoc +++ b/docs/en/modules/ROOT/nav.adoc @@ -46,7 +46,6 @@ *** xref:admin:participants/participants.adoc[Participants] *** xref:admin:participants/impersonations.adoc[Impersonations] **** xref:admin:participants/verifications_conflicts.adoc[Verifications conflicts] -*** xref:admin:participants/reported_users.adoc[Reported users] *** xref:admin:participants/authorizations.adoc[Authorizations] **** xref:admin:participants/authorizations/identity_documents.adoc[Identity documents] **** xref:admin:participants/authorizations/code_postal_letter.adoc[Code by postal letter] @@ -132,6 +131,8 @@ *** xref:admin:features/versions.adoc[Versions] ** xref:admin:newsletters.adoc[Newsletters] ** xref:admin:global_moderations.adoc[Global moderations] +*** xref:admin:moderations/reported_users.adoc[Reported users] +*** xref:admin:moderations/reported_content.adoc[Reported content] * xref:contribute:index.adoc[Contribute] ** xref:contribute:governance.adoc[Governance] diff --git a/docs/en/modules/admin/assets/images/global_moderations_list_unhidden.png b/docs/en/modules/admin/assets/images/global_moderations_list_unhidden.png deleted file mode 100644 index e4e14d02bd..0000000000 Binary files a/docs/en/modules/admin/assets/images/global_moderations_list_unhidden.png and /dev/null differ diff --git a/docs/en/modules/admin/assets/images/global_moderations_report01.png b/docs/en/modules/admin/assets/images/global_moderations_report01.png deleted file mode 100644 index a8aa04a7b4..0000000000 Binary files a/docs/en/modules/admin/assets/images/global_moderations_report01.png and /dev/null differ diff --git a/docs/en/modules/admin/assets/images/global_moderations_report02.png b/docs/en/modules/admin/assets/images/global_moderations_report02.png deleted file mode 100644 index b7fdefba33..0000000000 Binary files a/docs/en/modules/admin/assets/images/global_moderations_report02.png and /dev/null differ diff --git a/docs/en/modules/admin/assets/images/icons/action_block.png b/docs/en/modules/admin/assets/images/icons/action_block.png new file mode 100644 index 0000000000..3ed3d94a23 Binary files /dev/null and b/docs/en/modules/admin/assets/images/icons/action_block.png differ diff --git a/docs/en/modules/admin/assets/images/icons/action_expand.png b/docs/en/modules/admin/assets/images/icons/action_expand.png new file mode 100644 index 0000000000..a435412e68 Binary files /dev/null and b/docs/en/modules/admin/assets/images/icons/action_expand.png differ diff --git a/docs/en/modules/admin/assets/images/icons/action_hide.png b/docs/en/modules/admin/assets/images/icons/action_hide.png new file mode 100644 index 0000000000..2b650f36d4 Binary files /dev/null and b/docs/en/modules/admin/assets/images/icons/action_hide.png differ diff --git a/docs/en/modules/admin/assets/images/icons/action_unreport.png b/docs/en/modules/admin/assets/images/icons/action_unreport.png new file mode 100644 index 0000000000..69fca6ca59 Binary files /dev/null and b/docs/en/modules/admin/assets/images/icons/action_unreport.png differ diff --git a/docs/en/modules/admin/assets/images/moderation_modal.png b/docs/en/modules/admin/assets/images/moderation_modal.png deleted file mode 100644 index 1ce83b9f45..0000000000 Binary files a/docs/en/modules/admin/assets/images/moderation_modal.png and /dev/null differ diff --git a/docs/en/modules/admin/assets/images/moderations/moderation_modal.png b/docs/en/modules/admin/assets/images/moderations/moderation_modal.png new file mode 100644 index 0000000000..027efcda79 Binary files /dev/null and b/docs/en/modules/admin/assets/images/moderations/moderation_modal.png differ diff --git a/docs/en/modules/admin/assets/images/moderations/moderations_backend_list_content.png b/docs/en/modules/admin/assets/images/moderations/moderations_backend_list_content.png new file mode 100644 index 0000000000..dda0fdd55c Binary files /dev/null and b/docs/en/modules/admin/assets/images/moderations/moderations_backend_list_content.png differ diff --git a/docs/en/modules/admin/assets/images/moderations/moderations_backend_list_users.png b/docs/en/modules/admin/assets/images/moderations/moderations_backend_list_users.png new file mode 100644 index 0000000000..50d96e0331 Binary files /dev/null and b/docs/en/modules/admin/assets/images/moderations/moderations_backend_list_users.png differ diff --git a/docs/en/modules/admin/assets/images/moderations/moderations_backend_report_content.png b/docs/en/modules/admin/assets/images/moderations/moderations_backend_report_content.png new file mode 100644 index 0000000000..b2d390573b Binary files /dev/null and b/docs/en/modules/admin/assets/images/moderations/moderations_backend_report_content.png differ diff --git a/docs/en/modules/admin/assets/images/moderations/moderations_backend_report_details.png b/docs/en/modules/admin/assets/images/moderations/moderations_backend_report_details.png new file mode 100644 index 0000000000..1633be83e6 Binary files /dev/null and b/docs/en/modules/admin/assets/images/moderations/moderations_backend_report_details.png differ diff --git a/docs/en/modules/admin/assets/images/moderations/moderations_menu.png b/docs/en/modules/admin/assets/images/moderations/moderations_menu.png new file mode 100644 index 0000000000..a134d0fb85 Binary files /dev/null and b/docs/en/modules/admin/assets/images/moderations/moderations_menu.png differ diff --git a/docs/en/modules/admin/assets/images/moderations/moderations_participants_block_user_alert.png b/docs/en/modules/admin/assets/images/moderations/moderations_participants_block_user_alert.png new file mode 100644 index 0000000000..348e9ebf7b Binary files /dev/null and b/docs/en/modules/admin/assets/images/moderations/moderations_participants_block_user_alert.png differ diff --git a/docs/en/modules/admin/assets/images/moderations/moderations_participants_block_user_justification.png b/docs/en/modules/admin/assets/images/moderations/moderations_participants_block_user_justification.png new file mode 100644 index 0000000000..5cdfa4e3e2 Binary files /dev/null and b/docs/en/modules/admin/assets/images/moderations/moderations_participants_block_user_justification.png differ diff --git a/docs/en/modules/admin/assets/images/moderations/moderations_reported_comment_flag.png b/docs/en/modules/admin/assets/images/moderations/moderations_reported_comment_flag.png new file mode 100644 index 0000000000..af6f827226 Binary files /dev/null and b/docs/en/modules/admin/assets/images/moderations/moderations_reported_comment_flag.png differ diff --git a/docs/en/modules/admin/assets/images/moderations/moderations_reported_content_flag.png b/docs/en/modules/admin/assets/images/moderations/moderations_reported_content_flag.png new file mode 100644 index 0000000000..e0561fe7db Binary files /dev/null and b/docs/en/modules/admin/assets/images/moderations/moderations_reported_content_flag.png differ diff --git a/docs/en/modules/admin/assets/images/moderations/moderations_reported_participant_flag.png b/docs/en/modules/admin/assets/images/moderations/moderations_reported_participant_flag.png new file mode 100644 index 0000000000..bca51eab6c Binary files /dev/null and b/docs/en/modules/admin/assets/images/moderations/moderations_reported_participant_flag.png differ diff --git a/docs/en/modules/admin/assets/images/moderations/reported_participant_modal_admin.png b/docs/en/modules/admin/assets/images/moderations/reported_participant_modal_admin.png new file mode 100644 index 0000000000..0a33549677 Binary files /dev/null and b/docs/en/modules/admin/assets/images/moderations/reported_participant_modal_admin.png differ diff --git a/docs/en/modules/admin/assets/images/moderations/reported_participant_modal_user.png b/docs/en/modules/admin/assets/images/moderations/reported_participant_modal_user.png new file mode 100644 index 0000000000..734862a83d Binary files /dev/null and b/docs/en/modules/admin/assets/images/moderations/reported_participant_modal_user.png differ diff --git a/docs/en/modules/admin/assets/images/participants_block_user_alert.png b/docs/en/modules/admin/assets/images/participants_block_user_alert.png deleted file mode 100644 index d0e697f225..0000000000 Binary files a/docs/en/modules/admin/assets/images/participants_block_user_alert.png and /dev/null differ diff --git a/docs/en/modules/admin/assets/images/participants_block_user_justification.png b/docs/en/modules/admin/assets/images/participants_block_user_justification.png deleted file mode 100644 index 45e68494d3..0000000000 Binary files a/docs/en/modules/admin/assets/images/participants_block_user_justification.png and /dev/null differ diff --git a/docs/en/modules/admin/assets/images/reported_participant_flag.png b/docs/en/modules/admin/assets/images/reported_participant_flag.png deleted file mode 100644 index 483b4374c8..0000000000 Binary files a/docs/en/modules/admin/assets/images/reported_participant_flag.png and /dev/null differ diff --git a/docs/en/modules/admin/pages/global_moderations.adoc b/docs/en/modules/admin/pages/global_moderations.adoc index 7abe85cf51..70c37f9a14 100644 --- a/docs/en/modules/admin/pages/global_moderations.adoc +++ b/docs/en/modules/admin/pages/global_moderations.adoc @@ -1,12 +1,12 @@ = Global moderations +== Understand the basics + The *Global moderations* function allows you to moderate different kind of contents and -ensure that the dialog in your platform is democratic and constructive. Making -use of this function, administrators, collaborators and moderators of a space can -hide the contents/contributions that have been reported, where the complaint is -deemed appropriate, or delete the complaint. +ensure that the dialog in your platform is democratic and constructive. +It also allows managing participants who infringe the rules of the platform. -NOTE: Looking for how to report users? See xref:participants/reported_users.adoc[Reported users]. +NOTE: Looking for how to report participants or content? See xref:moderations/reported_users.adoc[Reported participants] and xref:moderations/reported_content.adoc[Reported content]. For instance, in the case of https://www.decidim.barcelona/[Decidim Barcelona], the https://www.decidim.barcelona/pages/terms-and-conditions[Terms of Service] says: @@ -35,87 +35,23 @@ offensive meaning or character; process and the framework for discussion, and > * to create multiple users by pretending to be different people (astroturfing). -Anyone can propose a moderation in Decidim, through the "Flag" icon in the participant -profile. After a participant has clicked in this action then they need to provide a -reason why they are making this report: - -* Contains clickbait, advertising, scams or script bots. -* Contains racism, sexism, slurs, personal attacks, death threats, suicide requests or any form of hate speech. -* Contains illegal activity, suicide threats, personal information, or something else you think doesn't belong on [This organization]. - -Participants can also add extra information regarding their report. - -image:moderation_modal.png[Give reason for moderation modal] - -After a participant has reported a content, it'll be shown in two sections of the -administration panel: - -* Global moderations panel -* Participatory space moderation panel - -To go to the Global moderations panel, you need to: - -. Sign in as administrator -. Go to administration panel -. Click in Global moderations in the sidebar - -There you'll find first all the unprocessed reports if there's any: - -image:global_moderations_list_unhidden.png[Show all the moderated content list] - -It's also possible to filter by the type of content that was moderated and the -state of the reported content (if it was hidden or not). - -* *Id*: unique identificator of the reported content. -* *Type*: which kind of content it was reported, for instance a *Proposal* or a *Comment*. -* *Participatory Space*: which space this content belongs to. -* *Count*: Number of times it has been reported by different users. -* *Reported content URL*: link for seeing the content reported and see the context of the complaint. -* *Reports*: why it has been reported. If the participant that made the report has given extra -information it's possible to see it by hovering it. -* *Creation date*: when it was originally reported. -* *Actions*: you can *Expand*, *Unreport* or *Hide*. - -== Actions (when the report wasn't accepted yet) - -|=== -|Icon |Name |Definition - -|image:action_expand.png[Expand icon] -|Expand -|To see the full metadata of the reported content. - -|image:action_hide.png[Hide icon] -|Hide -|Allows an admin or moderator to hide this content (accepting the report). - -|image:action_unreport.png[Unreport icon] -|Unreport -|Allows an admin or moderator to keep showing this content (rejecting the report). -|=== +== Configuration -== Actions (after the content is hidden) +To access the Global moderations panel, go in the administration panel and click in the "Global moderations" item in +the administrator navigation bar. -|=== -|Icon |Name |Definition +image::moderations/moderations_menu.png[Global moderations menu] -|image:action_expand.png[Expand icon] -|Expand -|To see the full metadata of the reported content. +The Global moderations panel allows to manage reported contents as well as reported participants. -|image:action_unhide.png[Unhide icon] -|Unhide -|Allows an admin or moderator to unhide this content (showing it publicly again). -|=== +image:moderations/moderations_backend_list_content.png[Global moderations panel for content] -If the report was "Unreported" and it was a mistake, meaning that for instance the -content was spam but it was a mistake not accepting the report, then you'll need -to find that again in the public view and report it yourself so you can moderate it. +== Examples -== Expand +=== Report content -To see all the metadata of a report, you can see it Expanded. +You can report and hide a comment containing private information, or a link to a commercial platform posted by a user. -image:global_moderations_report01.png[Expanded moderation 01] +=== Report user -image:global_moderations_report02.png[Expanded moderation 02] +You can report and block participants who are constantly violating the participation chart, or spamming and trolling the platform. \ No newline at end of file diff --git a/docs/en/modules/admin/pages/moderations/reported_content.adoc b/docs/en/modules/admin/pages/moderations/reported_content.adoc new file mode 100644 index 0000000000..8e2ece358f --- /dev/null +++ b/docs/en/modules/admin/pages/moderations/reported_content.adoc @@ -0,0 +1,80 @@ += Reported content + +When writing the Terms and Conditions of your platform, or your participation chart, you want to make sure that the +participants respect the participation rules in the contents they're writing. +All participants are able to report comments, proposals, debates, etc. + +== Report a content + +Any logged in participant can report content, clicking on the "Report" button available next to the resource. + +image:moderations/moderations_reported_content_flag.png[Report flag in content] + +image:moderations/moderations_reported_comment_flag.png[Report flag in comment] + +Participants have to select a reason for the report, and can add extra information if needed. + +image:moderations/moderation_modal.png[Give reason for moderation modal] + +== Manage reported content + +After a participant has reported a content, it appears in two sections of the administration panel: + +* Global moderations panel +* Participatory space moderation panel + +image:moderations/moderations_backend_list_content.png[Global moderations panel for content] + +There you'll find first all the unprocessed reports if there's any, with: +* *Id*: unique identifier of the reported content. +* *Type*: the kind of content reported, for instance comment, proposal, debate, etc. +* *Participatory Space*: which space this content belongs to. +* *Reported content URL*: link for seeing the content reported and see the context of the complaint. +* *Reason*: why the content is reported. If the participant that made the report has given extra +information it's possible to see it by hovering it. +* *Reported at*: when it was originally reported. +* *Count*: number of reports by different users. +* *Actions*: you can *Expand*, *Unreport* or *Hide*. + +Once you moderate a content, it appears in the "Hidden" contents list, accessible at the top right of the page. + +=== Actions + +|=== +|Icon |Name |Definition |Condition + +|image:icons/action_expand.png[Expand icon] +|Expand +|To see the full details of the reported content and reports. +|Always available. + +|image:icons/action_unreport.png[Unreport icon] +|Unreport +|Allows an administrator or moderator to keep showing this content and cancel the report. +|Available when the content isn't yet hidden. + +|image:icons/action_hide.png[Hide icon] +|Hide +|Allows an administrator or moderator to hide this content and accept the report. +|Available when the content isn't yet hidden. + +|image:icons/action_hide.png[Unhide icon] +|Unhide +|Allows an administrator or moderator to Unhide this content (showing it publicly again). +|Available when the content is hidden. +|=== + +If a content has been mistakenly "Unreported" then you'll need to find it again in the public platform +and report it again so you can moderate it. + +=== Expand + +To review the details of a content, and the different reports made by participants, you can click the "Expand" button. +see all the metadata of a report, you can see it Expanded. + +image:moderations/moderations_backend_report_content.png[Global moderations panel for content] + +This view allow you to assess quickly if it's necessary to hide or not the content. +At the bottom of the report, you can also review the different reports made by other participants, and expand them as well. + +image:moderations/moderations_backend_report_details.png[Global moderations panel for content] \ No newline at end of file diff --git a/docs/en/modules/admin/pages/moderations/reported_users.adoc b/docs/en/modules/admin/pages/moderations/reported_users.adoc new file mode 100644 index 0000000000..9e4d046f9d --- /dev/null +++ b/docs/en/modules/admin/pages/moderations/reported_users.adoc @@ -0,0 +1,74 @@ += Reported participants + +There are cases where participants could go against the Terms of Service of the +platform, so it's useful to have the option for reporting and blocking participants. +You can block participants from the xref:participants/participants.adoc[participants +section in the administration panel] or through the "Reported participants" section. + +== Report a participant + +Any logged in participant can report another participant through the "Flag" icon in the participant +profile. + +image:moderations/moderations_reported_participant_flag.png[Report flag in participant profile] + +After a participant has clicked in this action they need to provide a reason why they're making this report: + +image:moderations/reported_participant_modal_user.png[Give reason for reporting a participant modal] + +When an administrator or a moderator report a participant, they have additional options that allow them to +directly block the user and hide all their contents. They have to give a justification for blocking this participant. + +image:moderations/reported_participant_modal_admin.png[Give reason for reporting a participant modal administrators] + +== Manage reported participants + +Reported participants are visible on the "Reported participants" section of the Global moderations panel. + +image:moderations/moderations_backend_list_users.png[Global moderations panel for users] + +You can find all the reported participants on the reported participant list in the administration panel, with: +* *Name*: name of the participant, with a link to their profile. +* *Nickname*: nickname of the participant, with a link to their profile. +* *Reason*: why the participant is reported. If the participant that made the report has given extra +information it's possible to see it by hovering it. +* *Reported at*: when they were originally reported. +* *Reports count*: number of reports by different users. +* *Actions*: you can *Unreport* or *Block* the participant. + +=== Actions + +|=== +|Icon |Name |Definition |Condition + +|image:icons/action_unreport.png[Unreport icon] +|Unreport +|To Unreport the participant and remove them from the list. +|Available when the participant isn't yet blocked. + +|image:icons/action_block.png[Block user] +|Block user +|To block the participant. +|Available when the participant isn't yet blocked. + +|image:icons/action_block.png[Unblock user] +|Unblock user +|To unblock the participant. +|Available for blocked participants. + +|=== + +=== Block a participant + +If a content has been mistakenly "Unreported" then you'll need to find it again in the public platform +and report it again so you can moderate it. + +Administrators need to provide a justification if they want to block a participant. + +image:moderations/moderations_participants_block_user_justification.png[Justify block user action] + +Once a blocked participant tries to log-in they see an error message: + +image:moderations/moderations_participants_block_user_alert.png[Message shown to blocked user] + +Blocked participants names change for "Blocked user." \ No newline at end of file diff --git a/docs/en/modules/admin/pages/participants.adoc b/docs/en/modules/admin/pages/participants.adoc index 9eec5591b2..ced59c75b0 100644 --- a/docs/en/modules/admin/pages/participants.adoc +++ b/docs/en/modules/admin/pages/participants.adoc @@ -27,7 +27,6 @@ In the secondary navigation panel, you can see all the participants configuratio * xref:admin:participants/participants.adoc[Participants] * xref:admin:participants/impersonations.adoc[Impersonations] ** xref:admin:participants/verifications_conflicts.adoc[Verifications conflicts] -* xref:admin:participants/reported_users.adoc[Reported users] * xref:admin:participants/authorizations.adoc[Authorizations] ** xref:admin:participants/authorizations/identity_documents.adoc[Identity documents] ** xref:admin:participants/authorizations/code_postal_letter.adoc[Code by postal letter] diff --git a/docs/en/modules/admin/pages/participants/reported_users.adoc b/docs/en/modules/admin/pages/participants/reported_users.adoc deleted file mode 100644 index 947ae12825..0000000000 --- a/docs/en/modules/admin/pages/participants/reported_users.adoc +++ /dev/null @@ -1,33 +0,0 @@ -# Reported users - -There are cases where participants could go against the Terms of Service of the -platform, so it's useful to have the option for reporting and blocking users. You -can read more about how moderation and reporting contents work in xref:global_moderations.adoc[Global moderations]. - -A participant can be blocked from the xref:participants/participants.adoc[participants -section in the admin panel] or through this "Reported users" section. - -Anyone can propose a moderation in Decidim, through the "Flag" icon in the participant -profile. After a participant has clicked in this action they need to provide a -reason why they are making this report: - -* Contains clickbait, advertising, scams or script bots. -* Contains racism, sexism, slurs, personal attacks, death threats, suicide requests -or any form of hate speech. -* Contains illegal activity, suicide threats, personal information, or something -else you think doesn't belong on Demo. -* Other (and add it) - -image:reported_participant_modal.png[Give reason for reporting a participant modal] -image:reported_participant_flag.png[Flag in sidebar profile] - -After clicking in this option you'll need to provide a justification why you're -blocking this participant: - -image:participants_block_user_justification.png[Justificate the blocked user action] - -Once a blocked participant tries to log-in they will see an error message: - -image:participants_block_user_alert.png[Message shown to blocked user] - -After a participant was blocked its name is changed to "Blocked user".