Merge pull request #4587 from coralproject/develop

v9.0.1
coralproject · Mar 26, 2024 · a4684e0 · a4684e0
2 parents a7461d6 + dd22931
commit a4684e0
Show file tree

Hide file tree

Showing 23 changed files with 54 additions and 47 deletions.
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "9.0.0",
+  "version": "9.0.1",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [

diff --git a/client/src/core/client/admin/components/ModerateCard/FlagDetailsContainer.tsx b/client/src/core/client/admin/components/ModerateCard/FlagDetailsContainer.tsx
@@ -81,7 +81,7 @@ const FlagDetailsContainer: FunctionComponent<Props> = ({
         <FlagDetails
           category={
             <Localized id="moderate-flagDetails-illegalContent">
-              <span>Illegal content</span>
+              <span>Potentially illegal content</span>
             </Localized>
           }
           nodes={illegalContent}

diff --git a/client/src/core/client/admin/components/ModerateCard/MarkersContainer.tsx b/client/src/core/client/admin/components/ModerateCard/MarkersContainer.tsx
@@ -195,7 +195,7 @@ const markers: Array<
     (c.revision && c.revision.actionCounts.illegal.total > 0 && (
       <Marker key={keyCounter++} color="reported">
         <Localized id="moderate-marker-illegal">
-          <span>Illegal content</span>
+          <span>Potentially illegal content</span>
         </Localized>{" "}
         <MarkerCount>{c.revision.actionCounts.illegal.total}</MarkerCount>
       </Marker>

diff --git a/client/src/core/client/admin/routes/Reports/ReportHistory.tsx b/client/src/core/client/admin/routes/Reports/ReportHistory.tsx
@@ -259,7 +259,7 @@ const ReportHistory: FunctionComponent<Props> = ({
                           >
                             <div
                               className={styles.reportHistoryText}
-                            >{`${h.createdBy?.username} made a decision that this report contains illegal content`}</div>
+                            >{`${h.createdBy?.username} made a decision that this report contains potentially illegal content`}</div>
                           </Localized>
                         ) : (
                           <Localized
@@ -270,7 +270,7 @@ const ReportHistory: FunctionComponent<Props> = ({
                           >
                             <div
                               className={styles.reportHistoryText}
-                            >{`${h.createdBy?.username} made a decision that this report does not contain illegal content`}</div>
+                            >{`${h.createdBy?.username} made a decision that this report does not contain potentially illegal content`}</div>
                           </Localized>
                         )}
                         {h.decision?.legality === "ILLEGAL" && (

diff --git a/client/src/core/client/admin/routes/Reports/ReportMakeDecisionModal.tsx b/client/src/core/client/admin/routes/Reports/ReportMakeDecisionModal.tsx
@@ -112,7 +112,8 @@ const ReportMakeDecisionModal: FunctionComponent<Props> = ({
                     <Flex alignItems="center" direction="column">
                       <Localized id="reports-decisionModal-prompt">
                         <div className={styles.decisionModalThisComment}>
-                          Does this comment appear to contain illegal content?
+                          Does this comment appear to contain potentially
+                          illegal content?
                         </div>
                       </Localized>
                       <Flex margin={2} className={styles.buttonWrapper}>

diff --git a/client/src/core/client/admin/routes/Reports/SingleReportRoute.tsx b/client/src/core/client/admin/routes/Reports/SingleReportRoute.tsx
@@ -265,7 +265,8 @@ const SingleReportRoute: FunctionComponent<Props> & {
                       <div>
                         <Localized id="reports-singleReport-decision-doesItContain">
                           <div className={styles.label}>
-                            Does this comment contain illegal content?
+                            Does this comment contain potentially illegal
+                            content?
                           </div>
                         </Localized>
                         {dsaReport.decision.legality ===

diff --git a/client/src/core/client/admin/test/dsaReports/dsaReportsSingle.spec.tsx b/client/src/core/client/admin/test/dsaReports/dsaReportsSingle.spec.tsx
@@ -259,7 +259,7 @@ it("can make a legality decision on a report", async () => {
   userEvent.click(submitButton);
   expect(
     await within(container).findByText(
-      "Markus made a decision that this report contains illegal content"
+      "Markus made a decision that this report contains potentially illegal content"
     )
   );
 });

diff --git a/...re/client/stream/tabs/Comments/Comment/ArchivedReportFlow/ArchivedReportFlowContainer.tsx b/...re/client/stream/tabs/Comments/Comment/ArchivedReportFlow/ArchivedReportFlowContainer.tsx
@@ -111,7 +111,7 @@ const ArchivedReportFlowContainer: FunctionComponent<Props> = ({
           href={reportLink}
         >
           <Localized id="comments-reportForm-reportIllegalContent-button">
-            <span>This comment contains illegal content</span>
+            <span>This comment contains potentially illegal content</span>
           </Localized>
           <ButtonSvgIcon
             className={styles.linkIcon}

diff --git a/client/src/core/client/stream/tabs/Comments/Comment/ReportFlow/ReportCommentForm.tsx b/client/src/core/client/stream/tabs/Comments/Comment/ReportFlow/ReportCommentForm.tsx
@@ -62,7 +62,7 @@ const IllegalContentLink: FunctionComponent<{ reportLink: string }> = ({
     href={reportLink}
   >
     <Localized id="comments-reportForm-reportIllegalContent-button">
-      <span>This comment contains illegal content</span>
+      <span>This comment contains potentially illegal content</span>
     </Localized>
     <ButtonSvgIcon className={styles.linkIcon} Icon={ShareExternalLinkIcon} />
   </Button>

diff --git a/.../src/core/client/stream/tabs/Comments/IllegalContentReportView/AdditionalCommentQuery.tsx b/.../src/core/client/stream/tabs/Comments/IllegalContentReportView/AdditionalCommentQuery.tsx
@@ -34,7 +34,7 @@ export const render = (
       const previouslyReportedError = getMessage(
         localeBundles,
         "comments-permalinkView-reportIllegalContent-additionalComments-previouslyReportedCommentError",
-        "You've previously reported this comment for containing illegal content. You may only report a comment for this reason one time."
+        "You've previously reported this comment for containing potentially illegal content. You may only report a comment for this reason one time."
       );
       onAddCommentError(previouslyReportedError, additionalComment.id);
       return null;

diff --git a/...lient/stream/tabs/Comments/IllegalContentReportView/IllegalContentReportViewContainer.tsx b/...lient/stream/tabs/Comments/IllegalContentReportView/IllegalContentReportViewContainer.tsx
@@ -225,7 +225,7 @@ const IllegalContentReportViewContainer: FunctionComponent<Props> = (props) => {
                     <div className={styles.confirmationDescription}>
                       Your report will now be reviewed by our moderation team.
                       You will receive a notification once a decision is made.
-                      If the content is found to contain illegal content, it
+                      If the content is found to contain potentially illegal
                       will be removed from the site and further action may be
                       taken against the commenter.
                     </div>
@@ -246,8 +246,8 @@ const IllegalContentReportViewContainer: FunctionComponent<Props> = (props) => {
                     <div className={styles.confirmationDescription}>
                       Your report will now be reviewed by our moderation team
                       and you will receive a notification once a decision is
-                      made. If the content is found to contain illegal content,
-                      it will be removed from our site.
+                      made. If the content is found to contain potentially
+                      illegal content it will be removed from our site.
                     </div>
                   </Localized>
                 </Flex>

diff --git a/client/src/core/client/stream/tabs/Notifications/DSAReportDecisionMadeNotificationBody.tsx b/client/src/core/client/stream/tabs/Notifications/DSAReportDecisionMadeNotificationBody.tsx
@@ -38,10 +38,13 @@ const DSAReportDecisionMadeNotificationBody: FunctionComponent<Props> = ({
           >
             <span>
               On <strong>{date}</strong> you reported a comment written by{" "}
-              <strong>{username}</strong> for containing illegal content. After
-              reviewing your report, our moderation team has decide this comment{" "}
-              <strong>does not appear to contain illegal content.</strong> Thank
-              you for helping to keep our community safe.
+              <strong>{username}</strong> for containing potentially illegal
+              content. After reviewing your report, our moderation team has
+              decided this comment{" "}
+              <strong>
+                does not appear to contain potentially illegal content.
+              </strong>{" "}
+              Thank you for helping to keep our community safe.
             </span>
           </Localized>
         )}
@@ -57,9 +60,10 @@ const DSAReportDecisionMadeNotificationBody: FunctionComponent<Props> = ({
           >
             <span>
               On <strong>{date}</strong> you reported a comment written by{" "}
-              <strong>{username}</strong> for containing illegal content. After
-              reviewing your report, our moderation team has decided this
-              comment <strong>does contain illegal content</strong> and has been
+              <strong>{username}</strong> for containing potentially illegal
+              content. After reviewing your report, our moderation team has
+              decided this comment{" "}
+              <strong>does contain potentially illegal content</strong> and has
               removed. Further action may be taken against the commenter,
               however you will not be notified of any additional steps. Thank
               you for helping to keep our community safe.

diff --git a/client/src/core/client/stream/tabs/Notifications/RejectedCommentNotificationBody.tsx b/client/src/core/client/stream/tabs/Notifications/RejectedCommentNotificationBody.tsx
@@ -97,7 +97,7 @@ const getGeneralReason = (
     return getMessage(
       bundles,
       "notifications-rejectionReason-illegalContent",
-      "This comment contains illegal content"
+      "This comment contains potentially illegal content"
     );
   }
 

diff --git a/client/src/core/client/stream/test/comments/permalink/reportIllegalContentView.spec.tsx b/client/src/core/client/stream/test/comments/permalink/reportIllegalContentView.spec.tsx
@@ -111,7 +111,7 @@ beforeEach(async () => {
 
 it("includes and submits report illegal content form", async () => {
   await createTestRenderer();
-  await screen.findByText("Report illegal content");
+  await screen.findByText("Report potentially illegal content");
   const currentTab = screen.getByTestId("current-tab-pane");
 
   const lawBrokenTextbox = within(currentTab).getByRole("textbox", {

diff --git a/client/src/core/client/stream/test/comments/stream/reportComment.spec.tsx b/client/src/core/client/stream/test/comments/stream/reportComment.spec.tsx
@@ -205,7 +205,7 @@ it("report comment includes link to report illegal content", async () => {
   userEvent.click(reportButton);
   const form = within(comment).getByTestId("report-comment-form");
   const reportIllegalContentButton = within(form).getByRole("link", {
-    name: "This comment contains illegal content share-external-link-1",
+    name: "This comment contains potentially illegal content share-external-link-1",
   });
   expect(reportIllegalContentButton).toHaveAttribute(
     "href",
@@ -223,7 +223,7 @@ it("can report illegal content when not signed in", async () => {
   userEvent.click(reportButton);
   const form = within(comment).getByTestId("report-comment-form");
   const reportIllegalContentButton = within(form).getByRole("link", {
-    name: "This comment contains illegal content share-external-link-1",
+    name: "This comment contains potentially illegal content share-external-link-1",
   });
   expect(reportIllegalContentButton).toHaveAttribute(
     "href",

diff --git a/common/package.json b/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "9.0.0",
+  "version": "9.0.1",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/config/package.json b/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "9.0.0",
+  "version": "9.0.1",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/locales/en-US/admin.ftl b/locales/en-US/admin.ftl
@@ -1052,7 +1052,7 @@ moderate-marker-preMod = Pre-mod
 moderate-marker-link = Link
 moderate-marker-bannedWord = Banned word
 moderate-marker-bio = Bio
-moderate-marker-illegal = Illegal content
+moderate-marker-illegal = Potentially illegal content
 moderate-marker-possibleBannedWord = Possible Banned Word
 moderate-marker-suspectWord = Suspect word
 moderate-marker-possibleSuspectWord = Possible Suspect Word
@@ -1075,7 +1075,7 @@ moderate-flagDetails-abusive = Abusive
 moderate-flagDetails-spam = Spam
 moderate-flagDetails-bio = Bio
 moderate-flagDetails-other = Other
-moderate-flagDetails-illegalContent = Illegal content
+moderate-flagDetails-illegalContent = Potentially illegal content
 moderate-flagDetails-viewDSAReport = View DSA Report
 
 moderate-card-flag-details-anonymousUser = Anonymous user
@@ -1954,8 +1954,8 @@ reports-singleReport-history = History
 reports-singleReport-history-reportSubmitted = Illegal content report submitted
 reports-singleReport-history-addedNote = { $username } added a note
 reports-singleReport-history-deleteNoteButton = <icon></icon> Delete
-reports-singleReport-history-madeDecision-illegal = { $username } made a decision that this report contains illegal content
-reports-singleReport-history-madeDecision-legal = { $username } made a decision that this report does not contain illegal content
+reports-singleReport-history-madeDecision-illegal = { $username } made a decision that this report contains potentially illegal content
+reports-singleReport-history-madeDecision-legal = { $username } made a decision that this report does not contain potentially illegal content
 reports-singleReport-history-legalGrounds = Legal grounds: { $legalGrounds }
 reports-singleReport-history-explanation = Explanation: { $explanation }
 reports-singleReport-history-changedStatus = { $username } changed status to { $status }
@@ -1968,7 +1968,7 @@ reports-singleReport-decisionLabel = Decision
 reports-singleReport-decision-legalGrounds = Legal grounds
 reports-singleReport-decision-explanation = Detailed explanation
 reports-singleReport-makeDecisionButton = <icon></icon> Decision
-reports-singleReport-decision-doesItContain = Does this comment contain illegal content?
+reports-singleReport-decision-doesItContain = Does this comment contain potentially illegal content?
 reports-singleReport-decision-doesItContain-yes = Yes
 reports-singleReport-decision-doesItContain-no = No
 
@@ -1986,7 +1986,7 @@ reports-changeStatusModal-dontUpdateButton = No
 reports-changeStatusModal-header = Update status?
 
 reports-decisionModal-header = Report decision
-reports-decisionModal-prompt = Does this comment appear to contain illegal content?
+reports-decisionModal-prompt = Does this comment appear to contain potentially illegal content?
 reports-decisionModal-yes = Yes
 reports-decisionModal-no = No
 reports-decisionModal-submit = Submit