From eb591da80768c0d49e48f2fe2f939465c1f089f2 Mon Sep 17 00:00:00 2001
From: nick-funk <nick.funk@outlook.com>
Date: Wed, 27 Apr 2022 10:42:42 -0600
Subject: [PATCH 01/72] Create a simple import blocker that checks for cross
 imports

Prevents you from import `coral-server` into `src/core/client` source
files and vice versa for `coral-client` into `src/core/server`.

Runs as part of our linting.
---
 importBlocker.json       |  20 ++++++++
 package.json             |   1 +
 scripts/importBlocker.ts | 107 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 128 insertions(+)
 create mode 100644 importBlocker.json
 create mode 100644 scripts/importBlocker.ts

diff --git a/importBlocker.json b/importBlocker.json
new file mode 100644
index 0000000000..bb817cc4f8
--- /dev/null
+++ b/importBlocker.json
@@ -0,0 +1,20 @@
+{
+  "sources": [
+    {
+      "name": "client",
+      "directory": "src/core/client",
+      "blockedImports": [
+        "coral-server/"
+      ],
+      "extensions": [ ".ts", ".tsx" ]
+    },
+    {
+      "name": "server",
+      "directory": "src/core/server",
+      "blockedImports": [
+        "coral-client/"
+      ],
+      "extensions": [ ".ts" ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 39c7ee4706..5249ef6c7e 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
     "lint:graphql": "graphql-schema-linter src/core/server/graph/schema/schema.graphql",
     "lint:scripts": "eslint 'scripts/**/*.{js,ts,tsx}'",
     "lint:server": "eslint 'src/**/*.{js,ts,tsx}' --ignore-pattern 'src/core/client/**'",
+    "lint:imports": "ts-node --transpile-only ./scripts/importBlocker.ts",
     "lint": "npm-run-all --parallel lint:* tscheck:*",
     "migration:create": "ts-node --transpile-only ./scripts/migration/create.ts",
     "start:development": "NODE_ENV=development TS_NODE_PROJECT=./src/tsconfig.json ts-node-dev --inspect --transpile-only --no-notify -r tsconfig-paths/register --ignore-watch ./docs/ ./src/index.ts",
diff --git a/scripts/importBlocker.ts b/scripts/importBlocker.ts
new file mode 100644
index 0000000000..fc4b7b1cc9
--- /dev/null
+++ b/scripts/importBlocker.ts
@@ -0,0 +1,107 @@
+/* eslint-disable no-console */
+
+import fs from "fs";
+import path from "path";
+import readLine from "readline";
+
+const CONFIG_FILE = "importBlocker.json";
+
+interface Source {
+  name: string;
+  directory: string;
+  blockedImports: string[];
+  extensions: string[];
+}
+
+interface Config {
+  sources: Source[];
+}
+
+interface Error {
+  path: string;
+  lineNumber: number;
+  line: string;
+}
+
+const loadConfig = (): Config => {
+  const configRaw = fs.readFileSync(CONFIG_FILE).toString();
+  const config = JSON.parse(configRaw) as Config;
+
+  return config;
+};
+
+const errors: Error[] = [];
+
+const processFile = async (
+  source: Source,
+  filePath: string,
+  filters: string[]
+) => {
+  const stream = fs.createReadStream(filePath);
+  const reader = readLine.createInterface({
+    input: stream,
+    crlfDelay: Infinity,
+  });
+
+  let lineCounter = 0;
+  for await (const line of reader) {
+    for (const filter of filters) {
+      if (line.includes(filter)) {
+        errors.push({
+          path: filePath,
+          lineNumber: lineCounter,
+          line,
+        });
+      }
+    }
+
+    lineCounter++;
+  }
+};
+
+const processDir = async (source: Source, dir: string, filters: string[]) => {
+  const items = fs.readdirSync(dir);
+
+  for (const item of items) {
+    const fullPath = path.join(dir, item);
+    const stats = fs.lstatSync(fullPath);
+
+    if (stats.isDirectory()) {
+      await processDir(source, fullPath, filters);
+    } else if (stats.isFile()) {
+      const ext = path.extname(item);
+
+      if (source.extensions.includes(ext)) {
+        await processFile(source, fullPath, filters);
+      }
+    }
+  }
+};
+
+const run = async () => {
+  const config = loadConfig();
+
+  for (const source of config.sources) {
+    const filters = source.blockedImports.map(
+      (blockedImport) => `from "${blockedImport}`
+    );
+
+    await processDir(source, source.directory, filters);
+  }
+
+  if (errors.length > 0) {
+    console.error("Blocked imports linter found the following errors:");
+
+    for (const error of errors) {
+      console.error(
+        `  Blocked import found in '${error.path}' on line ${error.lineNumber}: ${error.line}`
+      );
+    }
+
+    process.exit(1);
+  } else {
+    console.log("Blocked imports linter found 0 errors.");
+  }
+};
+
+run().finally(() => {});

From f5b0e28215134213549ec14a5aa999d2e0fe9eae Mon Sep 17 00:00:00 2001
From: nick-funk <nick.funk@outlook.com>
Date: Tue, 10 May 2022 14:35:59 -0600
Subject: [PATCH 02/72] Add further blocked imports to coral-server config

---
 importBlocker.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/importBlocker.json b/importBlocker.json
index bb817cc4f8..5f9074e1ad 100644
--- a/importBlocker.json
+++ b/importBlocker.json
@@ -12,7 +12,9 @@
       "name": "server",
       "directory": "src/core/server",
       "blockedImports": [
-        "coral-client/"
+        "coral-client/",
+        "coral-stream/",
+        "coral-framework/"
       ],
       "extensions": [ ".ts" ]
     }

From 8f05376b9d4755821e5ec48e9b18bb91e73029dd Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Tue, 7 Feb 2023 14:40:19 -0800
Subject: [PATCH 03/72] get username of tag creator for featured comments

---
 .../Stream/FeaturedComments/FeaturedCommentContainer.tsx     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentContainer.tsx b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentContainer.tsx
index 3a83c78f6a..c73718a146 100644
--- a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentContainer.tsx
+++ b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentContainer.tsx
@@ -253,6 +253,11 @@ const enhanced = withFragmentContainer<Props>({
           username
         }
       }
+      tags {
+        createdBy {
+          username
+        }
+      }
       rating
       body
       createdAt

From 05b0d90b6985abf7c4e59d6780463e192b402e26 Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Thu, 9 Feb 2023 10:54:59 -0800
Subject: [PATCH 04/72] create FeaturedBy component

---
 .../Stream/FeaturedComments/FeaturedBy.css      | 14 ++++++++++++++
 .../Stream/FeaturedComments/FeaturedBy.tsx      | 17 +++++++++++++++++
 .../FeaturedCommentContainer.tsx                | 10 ++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.css
 create mode 100644 src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx

diff --git a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.css b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.css
new file mode 100644
index 0000000000..13c025ba8e
--- /dev/null
+++ b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.css
@@ -0,0 +1,14 @@
+$status-modal-username: $colors-mono-900;
+
+.root {
+  font-weight: var(--font-weight-secondary-regular);
+  font-family: var(--font-family-secondary);
+  color: --pallete-primary-400;
+  font-size: var(--font-size-1);
+  text-transform: uppercase;
+}
+
+.name {
+  font-size: var(--font-size-1);
+  font-weight: var(--font-weight-primary-bold);
+}
diff --git a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx
new file mode 100644
index 0000000000..a122e5bfe8
--- /dev/null
+++ b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx
@@ -0,0 +1,17 @@
+import React, { FunctionComponent } from "react";
+
+import styles from "./FeaturedBy.css";
+
+interface Props {
+  username: string;
+}
+
+const FeaturedBy: FunctionComponent<Props> = ({ username }) => {
+  return (
+    <span className={styles.root}>
+      FEATURED BY <strong className={styles.name}>{username}</strong>
+    </span>
+  );
+};
+
+export default FeaturedBy;
diff --git a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentContainer.tsx b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentContainer.tsx
index c73718a146..e39fce034f 100644
--- a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentContainer.tsx
+++ b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentContainer.tsx
@@ -34,6 +34,8 @@ import ReactionButtonContainer from "../../Comment/ReactionButton";
 import { UsernameWithPopoverContainer } from "../../Comment/Username";
 import IgnoredTombstoneOrHideContainer from "../../IgnoredTombstoneOrHideContainer";
 
+import FeaturedBy from "./FeaturedBy";
+
 import styles from "./FeaturedCommentContainer.css";
 
 interface Props {
@@ -72,6 +74,10 @@ const FeaturedCommentContainer: FunctionComponent<Props> = (props) => {
     [emitViewConversationEvent, comment.id, setCommentID]
   );
 
+  const featuringUser = comment.tags.find(
+    (tag) => tag.code === "FEATURED"
+  )?.createdBy;
+
   const gotoConvAriaLabelId = comment.author?.username
     ? "comments-featured-gotoConversation-label-with-username"
     : "comments-featured-gotoConversation-label-without-username";
@@ -94,6 +100,9 @@ const FeaturedCommentContainer: FunctionComponent<Props> = (props) => {
           </Hidden>
         </Localized>
         <HorizontalGutter>
+          {featuringUser?.username && (
+            <FeaturedBy username={featuringUser.username} />
+          )}
           {isRatingsAndReviews && comment.rating && (
             <StarRating rating={comment.rating} />
           )}
@@ -254,6 +263,7 @@ const enhanced = withFragmentContainer<Props>({
         }
       }
       tags {
+        code
         createdBy {
           username
         }

From 5f9e1685ac4f48712cab4f56d6a352fae60c7056 Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Fri, 10 Feb 2023 09:19:51 -0800
Subject: [PATCH 05/72] lowercase featured by

---
 .../stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx
index a122e5bfe8..d4f828513d 100644
--- a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx
+++ b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx
@@ -9,7 +9,7 @@ interface Props {
 const FeaturedBy: FunctionComponent<Props> = ({ username }) => {
   return (
     <span className={styles.root}>
-      FEATURED BY <strong className={styles.name}>{username}</strong>
+      featured by <strong className={styles.name}>{username}</strong>
     </span>
   );
 };

From 1e25ec5673b085c70dae35be1414b34849e838f9 Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Fri, 10 Feb 2023 10:19:02 -0800
Subject: [PATCH 06/72] add todo

---
 .../stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx
index d4f828513d..aa9cfb13a6 100644
--- a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx
+++ b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx
@@ -6,6 +6,7 @@ interface Props {
   username: string;
 }
 
+// TODO (marcushaddon): localize!
 const FeaturedBy: FunctionComponent<Props> = ({ username }) => {
   return (
     <span className={styles.root}>

From 1d69c95252ea758e5dc681c44d2b0b10c364c19d Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Tue, 14 Feb 2023 16:17:28 -0800
Subject: [PATCH 07/72] localize featured by

---
 .../tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx | 9 ++++++---
 src/locales/en-US/stream.ftl                             | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx
index aa9cfb13a6..50af326735 100644
--- a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx
+++ b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx
@@ -1,3 +1,4 @@
+import { Localized } from "@fluent/react/compat";
 import React, { FunctionComponent } from "react";
 
 import styles from "./FeaturedBy.css";
@@ -9,9 +10,11 @@ interface Props {
 // TODO (marcushaddon): localize!
 const FeaturedBy: FunctionComponent<Props> = ({ username }) => {
   return (
-    <span className={styles.root}>
-      featured by <strong className={styles.name}>{username}</strong>
-    </span>
+    <Localized id="comments-featuredBy" vars={{ username }}>
+      <span className={styles.root}>
+        featured by <strong className={styles.name}>{username}</strong>
+      </span>
+    </Localized>
   );
 };
 
diff --git a/src/locales/en-US/stream.ftl b/src/locales/en-US/stream.ftl
index 041a35713b..4513840640 100644
--- a/src/locales/en-US/stream.ftl
+++ b/src/locales/en-US/stream.ftl
@@ -286,6 +286,7 @@ comments-moderationRejectedTombstone-moderateLink =
   Go to moderate to review this decision
 
 comments-featuredTag = Featured
+comments-featuredBy = Featured by {$username}
 
 # $reaction could be "Respect" as an example. Be careful when translating to other languages with different grammar cases.
 comments-react =

From 301b426335e3c297d9caee22ab696dd3060d21c6 Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Wed, 15 Mar 2023 11:58:54 -0700
Subject: [PATCH 08/72] adjustments to match design

---
 src/core/client/admin/components/BanModal.css |  16 ++
 src/core/client/admin/components/BanModal.tsx | 146 ++++++++++--------
 2 files changed, 97 insertions(+), 65 deletions(-)

diff --git a/src/core/client/admin/components/BanModal.css b/src/core/client/admin/components/BanModal.css
index 2a2439b7b7..aa213aebb5 100644
--- a/src/core/client/admin/components/BanModal.css
+++ b/src/core/client/admin/components/BanModal.css
@@ -15,3 +15,19 @@ $ban-modal-text: var(--palette-text-500);
 .sitesToggle {
   margin-bottom: var(--spacing-3);
 }
+
+.banFrom {
+  margin-bottom: var(--spacing-1);
+
+}
+
+.customizeMessage {
+  color: -var(--palette-grey-800);
+}
+.toggleButton {
+
+}
+
+.toggleIcon {
+
+}
diff --git a/src/core/client/admin/components/BanModal.tsx b/src/core/client/admin/components/BanModal.tsx
index e209a2f4f1..32791a0288 100644
--- a/src/core/client/admin/components/BanModal.tsx
+++ b/src/core/client/admin/components/BanModal.tsx
@@ -15,6 +15,7 @@ import { useMutation } from "coral-framework/lib/relay";
 import { GQLUSER_ROLE } from "coral-framework/schema";
 import {
   Button,
+  ButtonIcon,
   CheckBox,
   Flex,
   FormField,
@@ -37,6 +38,7 @@ import ChangeStatusModal from "./UserStatus/ChangeStatusModal";
 import { getTextForUpdateType } from "./UserStatus/helpers";
 import UserStatusSitesList, { Scopes } from "./UserStatus/UserStatusSitesList";
 
+import { header4 } from "coral-ui/components/v2/Typography/Typography.css";
 import styles from "./BanModal.css";
 
 export enum UpdateType {
@@ -291,70 +293,13 @@ const BanModal: FunctionComponent<Props> = ({
           <Form onSubmit={onFormSubmit}>
             {({ handleSubmit, submitError }) => (
               <form onSubmit={handleSubmit}>
-                <HorizontalGutter spacing={3}>
-                  {updateType !== UpdateType.NO_SITES && (
-                    <Localized
-                      id={
-                        viewerIsSingleSiteMod
-                          ? "community-banModal-reject-existing-singleSite"
-                          : rejectExistingCommentsLocalizationId!
-                      }
-                    >
-                      <CheckBox
-                        id="banModal-rejectExisting"
-                        checked={rejectExistingComments}
-                        onChange={(event) =>
-                          setRejectExistingComments(event.target.checked)
-                        }
-                      >
-                        {viewerIsSingleSiteMod
-                          ? "Reject all comments on this site"
-                          : rejectExistingCommentsMessage}
-                      </CheckBox>
-                    </Localized>
-                  )}
-                  {updateType !== UpdateType.NO_SITES &&
-                    emailDomain &&
-                    !domainIsConfigured && (
-                      <Localized
-                        id="community-banModal-banEmailDomain"
-                        vars={{ domain: emailDomain }}
-                      >
-                        <CheckBox
-                          onChange={({ target }) => {
-                            setBanDomain(target.checked);
-                          }}
-                        >
-                          Ban all new accounts on <strong>{emailDomain}</strong>
-                        </CheckBox>
-                      </Localized>
-                    )}
-                  {updateType !== UpdateType.NO_SITES && (
-                    <Localized id="community-banModal-customize">
-                      <CheckBox
-                        checked={customizeMessage}
-                        onChange={(event) =>
-                          setCustomizeMessage(event.target.checked)
-                        }
-                      >
-                        Customize ban email message
-                      </CheckBox>
-                    </Localized>
-                  )}
-                  {updateType !== UpdateType.NO_SITES && customizeMessage && (
-                    <Textarea
-                      id="banModal-message"
-                      className={styles.textArea}
-                      fullwidth
-                      value={emailMessage}
-                      onChange={(event) => setEmailMessage(event.target.value)}
-                    />
-                  )}
-                  {(viewerIsAdmin ||
-                    viewerIsOrgAdmin ||
-                    (viewerIsScoped && !viewerIsSingleSiteMod)) &&
-                    isMultisite && (
-                      <Flex className={styles.sitesToggle} spacing={5}>
+                <h4 className={header4}>Ban From</h4>
+                {(viewerIsAdmin ||
+                  viewerIsOrgAdmin ||
+                  (viewerIsScoped && !viewerIsSingleSiteMod)) &&
+                  isMultisite && (
+                    <Flex direction="column" className={styles.sitesToggle}>
+                      <Flex spacing={5}>
                         {!(userRole === GQLUSER_ROLE.MODERATOR) && (
                           <FormField>
                             <Localized id="community-banModal-allSites">
@@ -397,8 +342,79 @@ const BanModal: FunctionComponent<Props> = ({
                           </FormField>
                         )}
                       </Flex>
-                    )}
+                      <Flex>
+                        {updateType !== UpdateType.NO_SITES && (
+                          <Localized
+                            id={
+                              viewerIsSingleSiteMod
+                                ? "community-banModal-reject-existing-singleSite"
+                                : rejectExistingCommentsLocalizationId!
+                            }
+                          >
+                            <CheckBox
+                              id="banModal-rejectExisting"
+                              checked={rejectExistingComments}
+                              onChange={(event) =>
+                                setRejectExistingComments(event.target.checked)
+                              }
+                            >
+                              {viewerIsSingleSiteMod
+                                ? "Reject all comments on this site"
+                                : rejectExistingCommentsMessage}
+                            </CheckBox>
+                          </Localized>
+                        )}
+                      </Flex>
+                    </Flex>
+                  )}
 
+                <HorizontalGutter spacing={1}>
+                  {updateType !== UpdateType.NO_SITES &&
+                    emailDomain &&
+                    !domainIsConfigured && (
+                      <HorizontalGutter spacing={3}>
+                        <h4 className={styles.banFrom}>Email domain ban</h4>
+                        <Localized
+                          id="community-banModal-banEmailDomain"
+                          vars={{ domain: emailDomain }}
+                        >
+                          <CheckBox
+                            onChange={({ target }) => {
+                              setBanDomain(target.checked);
+                            }}
+                          >
+                            Ban all new accounts on{" "}
+                            <strong>{emailDomain}</strong>
+                          </CheckBox>
+                        </Localized>
+                      </HorizontalGutter>
+                    )}
+                  {updateType !== UpdateType.NO_SITES && (
+                    <Button
+                      className={styles.customizeMessage}
+                      variant="text"
+                      color="mono"
+                      onClick={(event) =>
+                        setCustomizeMessage(!customizeMessage)
+                      }
+                    >
+                      <Localized id="community-banModal-customize">
+                        Customize ban email message{" "}
+                      </Localized>
+                      <ButtonIcon size="lg" className={styles.toggleIcon}>
+                        {customizeMessage ? "arrow_drop_up" : "arrow_drop_down"}
+                      </ButtonIcon>
+                    </Button>
+                  )}
+                  {updateType !== UpdateType.NO_SITES && customizeMessage && (
+                    <Textarea
+                      id="banModal-message"
+                      className={styles.textArea}
+                      fullwidth
+                      value={emailMessage}
+                      onChange={(event) => setEmailMessage(event.target.value)}
+                    />
+                  )}
                   {(viewerIsSingleSiteMod ||
                     (isMultisite &&
                       updateType === UpdateType.SPECIFIC_SITES)) && (

From a1b6cae063d693cfbc6f3e4084992319396e44c2 Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Thu, 16 Mar 2023 08:43:27 -0700
Subject: [PATCH 09/72] remove unused css classes

---
 src/core/client/admin/components/BanModal.css |  22 +-
 src/core/client/admin/components/BanModal.tsx | 241 +++++++++++++++---
 2 files changed, 221 insertions(+), 42 deletions(-)

diff --git a/src/core/client/admin/components/BanModal.css b/src/core/client/admin/components/BanModal.css
index aa213aebb5..0c2500cd31 100644
--- a/src/core/client/admin/components/BanModal.css
+++ b/src/core/client/admin/components/BanModal.css
@@ -21,13 +21,27 @@ $ban-modal-text: var(--palette-text-500);
 
 }
 
-.customizeMessage {
-  color: -var(--palette-grey-800);
+
+.form {
+  gap: var(--spacing-3);
+  margin-bottom: var(--spacing-3);
 }
-.toggleButton {
 
+.banFromHeader {
+  margin-bottom: var(--spacing-1);
+  margin-top: 0;
 }
 
-.toggleIcon {
+.sitesOptions {
+  margin-bottom: var(--spacing-1);
+  gap: var(--spacing-2);
+}
+
+.banDomainOption {
+  margin: var(--spacing-1) 0;
+}
 
+.customizeMessage {
+  align-self: flex-start;
+  color: -var(--palette-grey-800);
 }
diff --git a/src/core/client/admin/components/BanModal.tsx b/src/core/client/admin/components/BanModal.tsx
index 32791a0288..e5159d0193 100644
--- a/src/core/client/admin/components/BanModal.tsx
+++ b/src/core/client/admin/components/BanModal.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable */
 import { Localized } from "@fluent/react/compat";
 import React, {
   FunctionComponent,
@@ -293,56 +294,220 @@ const BanModal: FunctionComponent<Props> = ({
           <Form onSubmit={onFormSubmit}>
             {({ handleSubmit, submitError }) => (
               <form onSubmit={handleSubmit}>
-                <h4 className={header4}>Ban From</h4>
-                {(viewerIsAdmin ||
-                  viewerIsOrgAdmin ||
-                  (viewerIsScoped && !viewerIsSingleSiteMod)) &&
-                  isMultisite && (
-                    <Flex direction="column" className={styles.sitesToggle}>
-                      <Flex spacing={5}>
-                        {!(userRole === GQLUSER_ROLE.MODERATOR) && (
+                {/* MAIN */}
+                <Flex direction="column" className={styles.form} justifyContent="flex-start">
+                  {/* BAN FROM/REJECT COMMENTS */}
+                  <Flex direction="column">
+                    {/* ban from header */}
+                    <h4 className={styles.banFromHeader}>Ban From</h4>
+                    <Flex direction="row" className={styles.sitesOptions} justifyContent="flex-start">
+                      {/* sites options */}
+                      {!(userRole === GQLUSER_ROLE.MODERATOR) && (
+                            <FormField>
+                              <Localized id="community-banModal-allSites">
+                                <RadioButton
+                                  checked={updateType === UpdateType.ALL_SITES}
+                                  onChange={() =>
+                                    setUpdateType(UpdateType.ALL_SITES)
+                                  }
+                                  disabled={userBanStatus?.active}
+                                >
+                                  All sites
+                                </RadioButton>
+                              </Localized>
+                            </FormField>
+                          )}
                           <FormField>
-                            <Localized id="community-banModal-allSites">
+                            <Localized id="community-banModal-specificSites">
                               <RadioButton
-                                checked={updateType === UpdateType.ALL_SITES}
+                                checked={
+                                  updateType === UpdateType.SPECIFIC_SITES
+                                }
                                 onChange={() =>
-                                  setUpdateType(UpdateType.ALL_SITES)
+                                  setUpdateType(UpdateType.SPECIFIC_SITES)
                                 }
-                                disabled={userBanStatus?.active}
                               >
-                                All sites
+                                Specific Sites
                               </RadioButton>
                             </Localized>
                           </FormField>
-                        )}
-                        <FormField>
-                          <Localized id="community-banModal-specificSites">
-                            <RadioButton
-                              checked={updateType === UpdateType.SPECIFIC_SITES}
-                              onChange={() =>
-                                setUpdateType(UpdateType.SPECIFIC_SITES)
+                          {!viewerIsScoped && userHasAnyBan && (
+                            <FormField>
+                              <Localized id="community-banModal-noSites">
+                                <RadioButton
+                                  checked={updateType === UpdateType.NO_SITES}
+                                  onChange={() =>
+                                    setUpdateType(UpdateType.NO_SITES)
+                                  }
+                                >
+                                  No Sites
+                                </RadioButton>
+                              </Localized>
+                            </FormField>
+                          )}
+                    </Flex>
+                    {/* reject comments option */}
+                    {updateType !== UpdateType.NO_SITES && (
+                          <Localized
+                            id={
+                              viewerIsSingleSiteMod
+                                ? "community-banModal-reject-existing-singleSite"
+                                : rejectExistingCommentsLocalizationId!
+                            }
+                          >
+                            <CheckBox
+                              id="banModal-rejectExisting"
+                              checked={rejectExistingComments}
+                              onChange={(event) =>
+                                setRejectExistingComments(event.target.checked)
                               }
                             >
-                              Specific Sites
-                            </RadioButton>
+                              {viewerIsSingleSiteMod
+                                ? "Reject all comments on this site"
+                                : rejectExistingCommentsMessage}
+                            </CheckBox>
                           </Localized>
-                        </FormField>
-                        {!viewerIsScoped && userHasAnyBan && (
+                        )}
+                  </Flex>
+                  {/* EMAIL BAN */}
+                  <Flex direction="column" className={styles.banDomainOption}>
+                  {updateType !== UpdateType.NO_SITES &&
+                    emailDomain &&
+                    !domainIsConfigured && (
+                      <HorizontalGutter spacing={1}>
+                        {/* doman ban header */}
+                        <h4 className={styles.banFrom}>Email domain ban</h4>
+                        {/* domain ban checkbox */}
+                        <Localized
+                          id="community-banModal-banEmailDomain"
+                          vars={{ domain: emailDomain }}
+                        >
+                          <CheckBox
+                            onChange={({ target }) => {
+                              setBanDomain(target.checked);
+                            }}
+                          >
+                            Ban all new accounts on{" "}
+                            <strong>{emailDomain}</strong>
+                          </CheckBox>
+                        </Localized>
+                      </HorizontalGutter>
+                    )}
+                  </Flex>
+                  {/* customize message button*/}
+                  {updateType !== UpdateType.NO_SITES && (
+                    <Button
+                      className={styles.customizeMessage}
+                      variant="text"
+                      color="mono"
+                      onClick={(event) =>
+                        setCustomizeMessage(!customizeMessage)
+                      }
+                    >
+                      <Localized id="community-banModal-customize">
+                        <>Customize ban email message </>
+                      </Localized>
+                      <ButtonIcon size="lg">
+                        {customizeMessage ? "arrow_drop_up" : "arrow_drop_down"}
+                      </ButtonIcon>
+                    </Button>
+                  )}
+                  {/* optional custom message field */}
+                  {updateType !== UpdateType.NO_SITES && customizeMessage && (
+                    <Textarea
+                      id="banModal-message"
+                      className={styles.textArea}
+                      fullwidth
+                      value={emailMessage}
+                      onChange={(event) => setEmailMessage(event.target.value)}
+                    />
+                  )}
+                  {/* option sites list */}
+                  {(viewerIsSingleSiteMod ||
+                    (isMultisite &&
+                      updateType === UpdateType.SPECIFIC_SITES)) && (
+                    <UserStatusSitesList
+                      userBanStatus={userBanStatus}
+                      viewerScopes={viewerScopes}
+                      banState={[banSiteIDs, setBanSiteIDs]}
+                      unbanState={[unbanSiteIDs, setUnbanSiteIDs]}
+                    />
+                  )}
+                </Flex>
+                {submitError && (
+                    <CallOut
+                      color="error"
+                      title={submitError}
+                      titleWeight="semiBold"
+                    />
+                  )}
+
+                  <Flex justifyContent="flex-end" itemGutter="half">
+                    <Localized id="community-banModal-cancel">
+                      <Button variant="flat" onClick={onClose}>
+                        Cancel
+                      </Button>
+                    </Localized>
+                    <BanButton
+                      isMultisite={isMultisite}
+                      isBanned={!!(userBanStatus && userBanStatus?.active)}
+                      lastFocusableRef={lastFocusableRef}
+                      disabled={disableForm}
+                    />
+                  </Flex>
+                {/* <HorizontalGutter spacing={3}>
+                  <h4 className={header4}>Ban From</h4>
+                  {(viewerIsAdmin ||
+                    viewerIsOrgAdmin ||
+                    (viewerIsScoped && !viewerIsSingleSiteMod)) &&
+                    isMultisite && (
+                      <HorizontalGutter spacing={2}>
+                        <Flex direction="row">
+                          {!(userRole === GQLUSER_ROLE.MODERATOR) && (
+                            <FormField>
+                              <Localized id="community-banModal-allSites">
+                                <RadioButton
+                                  checked={updateType === UpdateType.ALL_SITES}
+                                  onChange={() =>
+                                    setUpdateType(UpdateType.ALL_SITES)
+                                  }
+                                  disabled={userBanStatus?.active}
+                                >
+                                  All sites
+                                </RadioButton>
+                              </Localized>
+                            </FormField>
+                          )}
                           <FormField>
-                            <Localized id="community-banModal-noSites">
+                            <Localized id="community-banModal-specificSites">
                               <RadioButton
-                                checked={updateType === UpdateType.NO_SITES}
+                                checked={
+                                  updateType === UpdateType.SPECIFIC_SITES
+                                }
                                 onChange={() =>
-                                  setUpdateType(UpdateType.NO_SITES)
+                                  setUpdateType(UpdateType.SPECIFIC_SITES)
                                 }
                               >
-                                No Sites
+                                Specific Sites
                               </RadioButton>
                             </Localized>
                           </FormField>
-                        )}
-                      </Flex>
-                      <Flex>
+                          {!viewerIsScoped && userHasAnyBan && (
+                            <FormField>
+                              <Localized id="community-banModal-noSites">
+                                <RadioButton
+                                  checked={updateType === UpdateType.NO_SITES}
+                                  onChange={() =>
+                                    setUpdateType(UpdateType.NO_SITES)
+                                  }
+                                >
+                                  No Sites
+                                </RadioButton>
+                              </Localized>
+                            </FormField>
+                          )}
+                        </Flex>
+
                         {updateType !== UpdateType.NO_SITES && (
                           <Localized
                             id={
@@ -364,15 +529,15 @@ const BanModal: FunctionComponent<Props> = ({
                             </CheckBox>
                           </Localized>
                         )}
-                      </Flex>
-                    </Flex>
-                  )}
+                      </HorizontalGutter>
+                    )}
+                </HorizontalGutter>
 
-                <HorizontalGutter spacing={1}>
+                <HorizontalGutter spacing={3}>
                   {updateType !== UpdateType.NO_SITES &&
                     emailDomain &&
                     !domainIsConfigured && (
-                      <HorizontalGutter spacing={3}>
+                      <HorizontalGutter spacing={1}>
                         <h4 className={styles.banFrom}>Email domain ban</h4>
                         <Localized
                           id="community-banModal-banEmailDomain"
@@ -399,7 +564,7 @@ const BanModal: FunctionComponent<Props> = ({
                       }
                     >
                       <Localized id="community-banModal-customize">
-                        Customize ban email message{" "}
+                        <>Customize ban email message </>
                       </Localized>
                       <ButtonIcon size="lg" className={styles.toggleIcon}>
                         {customizeMessage ? "arrow_drop_up" : "arrow_drop_down"}
@@ -447,7 +612,7 @@ const BanModal: FunctionComponent<Props> = ({
                       disabled={disableForm}
                     />
                   </Flex>
-                </HorizontalGutter>
+                </HorizontalGutter> */}
               </form>
             )}
           </Form>

From c427ae9dcf7b767ef460819deca19f76df0cf0e5 Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Thu, 16 Mar 2023 14:06:33 -0700
Subject: [PATCH 10/72] some prop drilling conditionally render container of
 ban domain option

---
 src/core/client/admin/components/BanModal.tsx | 261 ++++++++++--------
 .../UserStatus/UserStatusChangeContainer.tsx  |   5 +-
 .../UserStatus/UserStatusSitesList.tsx        |  15 +-
 3 files changed, 146 insertions(+), 135 deletions(-)

diff --git a/src/core/client/admin/components/BanModal.tsx b/src/core/client/admin/components/BanModal.tsx
index e5159d0193..d53d12e47f 100644
--- a/src/core/client/admin/components/BanModal.tsx
+++ b/src/core/client/admin/components/BanModal.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable */
 import { Localized } from "@fluent/react/compat";
 import React, {
   FunctionComponent,
@@ -28,6 +27,7 @@ import { CallOut } from "coral-ui/components/v3";
 
 import { UserStatusChangeContainer_settings } from "coral-admin/__generated__/UserStatusChangeContainer_settings.graphql";
 import { UserStatusChangeContainer_user } from "coral-admin/__generated__/UserStatusChangeContainer_user.graphql";
+import { UserStatusChangeContainer_viewer } from "coral-admin/__generated__/UserStatusChangeContainer_viewer.graphql";
 
 import BanDomainMutation from "./BanDomainMutation";
 import BanUserMutation from "./BanUserMutation";
@@ -37,9 +37,12 @@ import RemoveUserBanMutation from "./RemoveUserBanMutation";
 import UpdateUserBanMutation from "./UpdateUserBanMutation";
 import ChangeStatusModal from "./UserStatus/ChangeStatusModal";
 import { getTextForUpdateType } from "./UserStatus/helpers";
-import UserStatusSitesList, { Scopes } from "./UserStatus/UserStatusSitesList";
+import UserStatusSitesList from "./UserStatus/UserStatusSitesList";
 
-import { header4 } from "coral-ui/components/v2/Typography/Typography.css";
+import {
+  isOrgModerator,
+  isSiteModerator,
+} from "coral-common/permissions/types";
 import styles from "./BanModal.css";
 
 export enum UpdateType {
@@ -56,7 +59,7 @@ interface Props {
   open: boolean;
   onClose: () => void;
   onConfirm: () => void;
-  viewerScopes: Scopes;
+  viewer: UserStatusChangeContainer_viewer;
   emailDomainModeration: UserStatusChangeContainer_settings["emailDomainModeration"];
   userRole: string;
   isMultisite: boolean;
@@ -119,7 +122,7 @@ const BanModal: FunctionComponent<Props> = ({
   userID,
   username,
   userEmail,
-  viewerScopes,
+  viewer,
   emailDomainModeration,
   userBanStatus,
   userRole,
@@ -141,24 +144,22 @@ const BanModal: FunctionComponent<Props> = ({
     );
   }, [getMessage, username]);
 
-  const viewerIsScoped = !!viewerScopes.sites && viewerScopes.sites.length > 0;
+  const viewerIsScoped = isSiteModerator(viewer);
 
   const viewerIsSiteMod =
     !!isMultisite &&
-    viewerScopes.role === GQLUSER_ROLE.MODERATOR &&
-    !!viewerScopes.sites &&
-    viewerScopes.sites?.length > 0;
+    viewer.role === GQLUSER_ROLE.MODERATOR &&
+    !!viewer.moderationScopes?.sites &&
+    viewer.moderationScopes.sites?.length > 0;
 
   const viewerIsSingleSiteMod = !!(
     viewerIsSiteMod &&
-    viewerScopes.sites &&
-    viewerScopes.sites.length === 1
+    viewer.moderationScopes?.sites &&
+    viewer.moderationScopes.sites.length === 1
   );
 
-  const viewerIsAdmin = viewerScopes.role === GQLUSER_ROLE.ADMIN;
-  const viewerIsOrgAdmin =
-    viewerScopes.role === GQLUSER_ROLE.MODERATOR &&
-    !!(!viewerScopes.sites || viewerScopes.sites?.length === 0);
+  const viewerIsAdmin = viewer.role === GQLUSER_ROLE.ADMIN;
+  const viewerIsOrgMod = isOrgModerator(viewer);
 
   const userIsBlanketBanned = !!userBanStatus?.active;
   const userIsSingleSiteBanned = !!userBanStatus?.sites?.length;
@@ -176,6 +177,11 @@ const BanModal: FunctionComponent<Props> = ({
       : UpdateType.ALL_SITES;
   });
 
+  const showAllSitesOption =
+    viewerIsAdmin ||
+    viewerIsOrgMod ||
+    (viewerIsScoped && !viewerIsSingleSiteMod && isMultisite);
+
   const [customizeMessage, setCustomizeMessage] = useState(false);
   const [emailMessage, setEmailMessage] = useState<string>(getDefaultMessage);
   const [rejectExistingComments, setRejectExistingComments] = useState(false);
@@ -191,9 +197,11 @@ const BanModal: FunctionComponent<Props> = ({
 
   useEffect(() => {
     if (viewerIsSingleSiteMod) {
-      setBanSiteIDs(viewerScopes.sites!.map((scopeSite) => scopeSite.id));
+      setBanSiteIDs(
+        viewer.moderationScopes!.sites!.map((scopeSite) => scopeSite.id)
+      );
     }
-  }, [viewerIsSingleSiteMod, viewerScopes.sites]);
+  }, [viewerIsSingleSiteMod, viewer.moderationScopes]);
 
   const onFormSubmit = useCallback(async () => {
     switch (updateType) {
@@ -203,7 +211,7 @@ const BanModal: FunctionComponent<Props> = ({
           message: customizeMessage ? emailMessage : getDefaultMessage,
           rejectExistingComments,
           siteIDs: viewerIsScoped
-            ? viewerScopes.sites!.map(({ id }) => id)
+            ? viewer.moderationScopes!.sites!.map(({ id }) => id)
             : [],
         });
         break;
@@ -237,7 +245,7 @@ const BanModal: FunctionComponent<Props> = ({
     getDefaultMessage,
     rejectExistingComments,
     viewerIsScoped,
-    viewerScopes.sites,
+    viewer.moderationScopes,
     updateUserBan,
     banSiteIDs,
     unbanSiteIDs,
@@ -295,105 +303,114 @@ const BanModal: FunctionComponent<Props> = ({
             {({ handleSubmit, submitError }) => (
               <form onSubmit={handleSubmit}>
                 {/* MAIN */}
-                <Flex direction="column" className={styles.form} justifyContent="flex-start">
+                <Flex
+                  direction="column"
+                  className={styles.form}
+                  justifyContent="flex-start"
+                >
                   {/* BAN FROM/REJECT COMMENTS */}
                   <Flex direction="column">
                     {/* ban from header */}
                     <h4 className={styles.banFromHeader}>Ban From</h4>
-                    <Flex direction="row" className={styles.sitesOptions} justifyContent="flex-start">
+                    <Flex
+                      direction="row"
+                      className={styles.sitesOptions}
+                      justifyContent="flex-start"
+                    >
                       {/* sites options */}
-                      {!(userRole === GQLUSER_ROLE.MODERATOR) && (
-                            <FormField>
-                              <Localized id="community-banModal-allSites">
-                                <RadioButton
-                                  checked={updateType === UpdateType.ALL_SITES}
-                                  onChange={() =>
-                                    setUpdateType(UpdateType.ALL_SITES)
-                                  }
-                                  disabled={userBanStatus?.active}
-                                >
-                                  All sites
-                                </RadioButton>
-                              </Localized>
-                            </FormField>
-                          )}
-                          <FormField>
-                            <Localized id="community-banModal-specificSites">
-                              <RadioButton
-                                checked={
-                                  updateType === UpdateType.SPECIFIC_SITES
-                                }
-                                onChange={() =>
-                                  setUpdateType(UpdateType.SPECIFIC_SITES)
-                                }
-                              >
-                                Specific Sites
-                              </RadioButton>
-                            </Localized>
-                          </FormField>
-                          {!viewerIsScoped && userHasAnyBan && (
-                            <FormField>
-                              <Localized id="community-banModal-noSites">
-                                <RadioButton
-                                  checked={updateType === UpdateType.NO_SITES}
-                                  onChange={() =>
-                                    setUpdateType(UpdateType.NO_SITES)
-                                  }
-                                >
-                                  No Sites
-                                </RadioButton>
-                              </Localized>
-                            </FormField>
-                          )}
-                    </Flex>
-                    {/* reject comments option */}
-                    {updateType !== UpdateType.NO_SITES && (
-                          <Localized
-                            id={
-                              viewerIsSingleSiteMod
-                                ? "community-banModal-reject-existing-singleSite"
-                                : rejectExistingCommentsLocalizationId!
+                      {showAllSitesOption && (
+                        <FormField>
+                          <Localized id="community-banModal-allSites">
+                            <RadioButton
+                              checked={updateType === UpdateType.ALL_SITES}
+                              onChange={() =>
+                                setUpdateType(UpdateType.ALL_SITES)
+                              }
+                              disabled={userBanStatus?.active}
+                            >
+                              All sites
+                            </RadioButton>
+                          </Localized>
+                        </FormField>
+                      )}
+                      <FormField>
+                        <Localized id="community-banModal-specificSites">
+                          <RadioButton
+                            checked={updateType === UpdateType.SPECIFIC_SITES}
+                            onChange={() =>
+                              setUpdateType(UpdateType.SPECIFIC_SITES)
                             }
                           >
-                            <CheckBox
-                              id="banModal-rejectExisting"
-                              checked={rejectExistingComments}
-                              onChange={(event) =>
-                                setRejectExistingComments(event.target.checked)
+                            Specific Sites
+                          </RadioButton>
+                        </Localized>
+                      </FormField>
+                      {!viewerIsScoped && userHasAnyBan && (
+                        <FormField>
+                          <Localized id="community-banModal-noSites">
+                            <RadioButton
+                              checked={updateType === UpdateType.NO_SITES}
+                              onChange={() =>
+                                setUpdateType(UpdateType.NO_SITES)
                               }
                             >
-                              {viewerIsSingleSiteMod
-                                ? "Reject all comments on this site"
-                                : rejectExistingCommentsMessage}
-                            </CheckBox>
+                              No Sites
+                            </RadioButton>
                           </Localized>
-                        )}
+                        </FormField>
+                      )}
+                    </Flex>
+                    {/* reject comments option */}
+                    {updateType !== UpdateType.NO_SITES && (
+                      <Localized
+                        id={
+                          viewerIsSingleSiteMod
+                            ? "community-banModal-reject-existing-singleSite"
+                            : rejectExistingCommentsLocalizationId!
+                        }
+                      >
+                        <CheckBox
+                          id="banModal-rejectExisting"
+                          checked={rejectExistingComments}
+                          onChange={(event) =>
+                            setRejectExistingComments(event.target.checked)
+                          }
+                        >
+                          {viewerIsSingleSiteMod
+                            ? "Reject all comments on this site"
+                            : rejectExistingCommentsMessage}
+                        </CheckBox>
+                      </Localized>
+                    )}
                   </Flex>
                   {/* EMAIL BAN */}
-                  <Flex direction="column" className={styles.banDomainOption}>
                   {updateType !== UpdateType.NO_SITES &&
                     emailDomain &&
                     !domainIsConfigured && (
-                      <HorizontalGutter spacing={1}>
-                        {/* doman ban header */}
-                        <h4 className={styles.banFrom}>Email domain ban</h4>
-                        {/* domain ban checkbox */}
-                        <Localized
-                          id="community-banModal-banEmailDomain"
-                          vars={{ domain: emailDomain }}
-                        >
-                          <CheckBox
-                            onChange={({ target }) => {
-                              setBanDomain(target.checked);
-                            }}
+                      <Flex
+                        direction="column"
+                        className={styles.banDomainOption}
+                      >
+                        <HorizontalGutter spacing={1}>
+                          {/* doman ban header */}
+                          <h4 className={styles.banFrom}>Email domain ban</h4>
+                          {/* domain ban checkbox */}
+                          <Localized
+                            id="community-banModal-banEmailDomain"
+                            vars={{ domain: emailDomain }}
                           >
-                            Ban all new accounts on{" "}
-                            <strong>{emailDomain}</strong>
-                          </CheckBox>
-                        </Localized>
-                      </HorizontalGutter>
+                            <CheckBox
+                              onChange={({ target }) => {
+                                setBanDomain(target.checked);
+                              }}
+                            >
+                              Ban all new accounts on{" "}
+                              <strong>{emailDomain}</strong>
+                            </CheckBox>
+                          </Localized>
+                        </HorizontalGutter>
+                      </Flex>
                     )}
-                  </Flex>
                   {/* customize message button*/}
                   {updateType !== UpdateType.NO_SITES && (
                     <Button
@@ -428,33 +445,33 @@ const BanModal: FunctionComponent<Props> = ({
                       updateType === UpdateType.SPECIFIC_SITES)) && (
                     <UserStatusSitesList
                       userBanStatus={userBanStatus}
-                      viewerScopes={viewerScopes}
+                      viewerScopes={viewer.moderationScopes}
                       banState={[banSiteIDs, setBanSiteIDs]}
                       unbanState={[unbanSiteIDs, setUnbanSiteIDs]}
                     />
                   )}
                 </Flex>
                 {submitError && (
-                    <CallOut
-                      color="error"
-                      title={submitError}
-                      titleWeight="semiBold"
-                    />
-                  )}
+                  <CallOut
+                    color="error"
+                    title={submitError}
+                    titleWeight="semiBold"
+                  />
+                )}
 
-                  <Flex justifyContent="flex-end" itemGutter="half">
-                    <Localized id="community-banModal-cancel">
-                      <Button variant="flat" onClick={onClose}>
-                        Cancel
-                      </Button>
-                    </Localized>
-                    <BanButton
-                      isMultisite={isMultisite}
-                      isBanned={!!(userBanStatus && userBanStatus?.active)}
-                      lastFocusableRef={lastFocusableRef}
-                      disabled={disableForm}
-                    />
-                  </Flex>
+                <Flex justifyContent="flex-end" itemGutter="half">
+                  <Localized id="community-banModal-cancel">
+                    <Button variant="flat" onClick={onClose}>
+                      Cancel
+                    </Button>
+                  </Localized>
+                  <BanButton
+                    isMultisite={isMultisite}
+                    isBanned={!!(userBanStatus && userBanStatus?.active)}
+                    lastFocusableRef={lastFocusableRef}
+                    disabled={disableForm}
+                  />
+                </Flex>
                 {/* <HorizontalGutter spacing={3}>
                   <h4 className={header4}>Ban From</h4>
                   {(viewerIsAdmin ||
@@ -585,7 +602,7 @@ const BanModal: FunctionComponent<Props> = ({
                       updateType === UpdateType.SPECIFIC_SITES)) && (
                     <UserStatusSitesList
                       userBanStatus={userBanStatus}
-                      viewerScopes={viewerScopes}
+                      viewer.moderationScopes={viewer.moderationScopes}
                       banState={[banSiteIDs, setBanSiteIDs]}
                       unbanState={[unbanSiteIDs, setUnbanSiteIDs]}
                     />
diff --git a/src/core/client/admin/components/UserStatus/UserStatusChangeContainer.tsx b/src/core/client/admin/components/UserStatus/UserStatusChangeContainer.tsx
index 92f02a1198..4f53142908 100644
--- a/src/core/client/admin/components/UserStatus/UserStatusChangeContainer.tsx
+++ b/src/core/client/admin/components/UserStatus/UserStatusChangeContainer.tsx
@@ -235,10 +235,7 @@ const UserStatusChangeContainer: FunctionComponent<Props> = ({
           onClose={handleBanModalClose}
           onConfirm={handleUpdateBan}
           isMultisite={settings.multisite}
-          viewerScopes={{
-            role: viewer.role,
-            sites: viewer.moderationScopes?.sites?.map((s) => s),
-          }}
+          viewer={viewer}
           emailDomainModeration={settings.emailDomainModeration}
           userBanStatus={user.status.ban}
           userRole={user.role}
diff --git a/src/core/client/admin/components/UserStatus/UserStatusSitesList.tsx b/src/core/client/admin/components/UserStatus/UserStatusSitesList.tsx
index 29649b2901..446fc222be 100644
--- a/src/core/client/admin/components/UserStatus/UserStatusSitesList.tsx
+++ b/src/core/client/admin/components/UserStatus/UserStatusSitesList.tsx
@@ -10,8 +10,6 @@ import SiteSearch from "coral-admin/components/SiteSearch";
 import { IntersectionProvider } from "coral-framework/lib/intersection";
 import { FieldSet, HorizontalGutter, Label } from "coral-ui/components/v2";
 
-import { USER_ROLE } from "coral-admin/__generated__/UserStatusChangeContainer_viewer.graphql";
-
 import { dedupe } from "./helpers";
 import UserStatusSitesListSelectedSiteQuery from "./UserStatusSitesListSelectedSiteQuery";
 
@@ -23,8 +21,7 @@ interface ScopeSite {
 }
 
 export interface Scopes {
-  role: USER_ROLE;
-  sites?: ScopeSite[] | null;
+  sites?: Readonly<Readonly<ScopeSite>[]> | null;
 }
 
 export interface UserBanStatus {
@@ -36,7 +33,7 @@ interface Props {
   readonly userBanStatus?: UserBanStatus;
   banState: [string[], (siteIDs: string[]) => void];
   unbanState: [string[], (siteIDs: string[]) => void];
-  viewerScopes: Scopes;
+  viewerScopes: Scopes | null;
 }
 
 const UserStatusSitesList: FunctionComponent<Props> = ({
@@ -45,10 +42,10 @@ const UserStatusSitesList: FunctionComponent<Props> = ({
   banState: [banSiteIDs, setBanSiteIDs],
   unbanState: [unbanSiteIDs, setUnbanSiteIDs],
 }) => {
-  const viewerIsScoped = !!viewerScopes.sites && viewerScopes.sites.length > 0;
+  const viewerIsScoped = !!viewerScopes?.sites && viewerScopes.sites.length > 0;
   const viewerScopesSiteIDs = useMemo(() => {
-    return viewerScopes.sites?.map((site) => site.id);
-  }, [viewerScopes.sites]);
+    return viewerScopes?.sites?.map((site) => site.id);
+  }, [viewerScopes?.sites]);
 
   const initiallyBanned = useCallback(
     (siteID: string) => !!userBanStatus?.sites?.some(({ id }) => id === siteID),
@@ -62,7 +59,7 @@ const UserStatusSitesList: FunctionComponent<Props> = ({
       .concat(unbanSiteIDs);
 
     if (viewerIsScoped) {
-      all = all.concat(viewerScopes.sites!.map((scopeSite) => scopeSite.id));
+      all = all.concat(viewerScopes!.sites!.map((scopeSite) => scopeSite.id));
     }
 
     return dedupe(all);

From 2d9fb403b63b9190b74e8d7371a16c3149405854 Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Thu, 16 Mar 2023 14:17:06 -0700
Subject: [PATCH 11/72] update query for mod queue ban modal

---
 .../admin/components/ModerateCard/ModerateCardContainer.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/core/client/admin/components/ModerateCard/ModerateCardContainer.tsx b/src/core/client/admin/components/ModerateCard/ModerateCardContainer.tsx
index 03c5678ce6..4ee384cc24 100644
--- a/src/core/client/admin/components/ModerateCard/ModerateCardContainer.tsx
+++ b/src/core/client/admin/components/ModerateCard/ModerateCardContainer.tsx
@@ -359,10 +359,7 @@ const ModerateCardContainer: FunctionComponent<Props> = ({
           open={showBanModal}
           onClose={handleBanModalClose}
           onConfirm={handleBanConfirm}
-          viewerScopes={{
-            role: viewer.role,
-            sites: viewer.moderationScopes?.sites?.map((s) => s),
-          }}
+          viewer={viewer}
           emailDomainModeration={settings.emailDomainModeration}
           userBanStatus={comment.author.status.ban}
           userEmail={comment.author.email}
@@ -480,6 +477,7 @@ const enhanced = withFragmentContainer<Props>({
   `,
   viewer: graphql`
     fragment ModerateCardContainer_viewer on User {
+      id
       role
       moderationScopes {
         scoped

From 4087f6de27ceab5a31bf6359e2787dcd33455bf8 Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Mon, 20 Mar 2023 16:54:03 -0700
Subject: [PATCH 12/72] fix headers/labels in mod queue

---
 src/core/client/admin/components/BanModal.css |  7 +++--
 src/core/client/admin/components/BanModal.tsx | 30 +++++++++++++++----
 src/core/common/permissions/types.ts          |  8 ++---
 3 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/core/client/admin/components/BanModal.css b/src/core/client/admin/components/BanModal.css
index 0c2500cd31..0be256675c 100644
--- a/src/core/client/admin/components/BanModal.css
+++ b/src/core/client/admin/components/BanModal.css
@@ -16,8 +16,8 @@ $ban-modal-text: var(--palette-text-500);
   margin-bottom: var(--spacing-3);
 }
 
-.banFrom {
-  margin-bottom: var(--spacing-1);
+.domainBanHeader {
+  margin-bottom: var(--spacing-2);
 
 }
 
@@ -28,8 +28,9 @@ $ban-modal-text: var(--palette-text-500);
 }
 
 .banFromHeader {
-  margin-bottom: var(--spacing-1);
+  margin-bottom: var(--spacing-2);
   margin-top: 0;
+  font-family: var(--font-family-primary);
 }
 
 .sitesOptions {
diff --git a/src/core/client/admin/components/BanModal.tsx b/src/core/client/admin/components/BanModal.tsx
index d53d12e47f..b701987443 100644
--- a/src/core/client/admin/components/BanModal.tsx
+++ b/src/core/client/admin/components/BanModal.tsx
@@ -20,13 +20,17 @@ import {
   Flex,
   FormField,
   HorizontalGutter,
+  Label,
   RadioButton,
   Textarea,
 } from "coral-ui/components/v2";
 import { CallOut } from "coral-ui/components/v3";
 
 import { UserStatusChangeContainer_settings } from "coral-admin/__generated__/UserStatusChangeContainer_settings.graphql";
-import { UserStatusChangeContainer_user } from "coral-admin/__generated__/UserStatusChangeContainer_user.graphql";
+import {
+  USER_ROLE,
+  UserStatusChangeContainer_user,
+} from "coral-admin/__generated__/UserStatusChangeContainer_user.graphql";
 import { UserStatusChangeContainer_viewer } from "coral-admin/__generated__/UserStatusChangeContainer_viewer.graphql";
 
 import BanDomainMutation from "./BanDomainMutation";
@@ -51,6 +55,20 @@ export enum UpdateType {
   NO_SITES = "NO_SITES",
 }
 
+interface BanModalViewer {
+  readonly id: string;
+  readonly role: USER_ROLE; // marcus: This feels...
+  readonly moderationScopes: {
+    readonly scoped: boolean;
+    readonly sites: ReadonlyArray<{
+      readonly id: string;
+      readonly name: string;
+    }> | null;
+  } | null;
+}
+
+type BanModalViewerAlt = Omit<UserStatusChangeContainer_viewer, " $refType">;
+
 interface Props {
   userID: string;
   username: string | null;
@@ -59,7 +77,7 @@ interface Props {
   open: boolean;
   onClose: () => void;
   onConfirm: () => void;
-  viewer: UserStatusChangeContainer_viewer;
+  readonly viewer: BanModalViewerAlt;
   emailDomainModeration: UserStatusChangeContainer_settings["emailDomainModeration"];
   userRole: string;
   isMultisite: boolean;
@@ -311,7 +329,7 @@ const BanModal: FunctionComponent<Props> = ({
                   {/* BAN FROM/REJECT COMMENTS */}
                   <Flex direction="column">
                     {/* ban from header */}
-                    <h4 className={styles.banFromHeader}>Ban From</h4>
+                    <Label className={styles.banFromHeader}>Ban From</Label>
                     <Flex
                       direction="row"
                       className={styles.sitesOptions}
@@ -391,9 +409,11 @@ const BanModal: FunctionComponent<Props> = ({
                         direction="column"
                         className={styles.banDomainOption}
                       >
-                        <HorizontalGutter spacing={1}>
+                        <HorizontalGutter spacing={2}>
                           {/* doman ban header */}
-                          <h4 className={styles.banFrom}>Email domain ban</h4>
+                          <Label className={styles.domainBanHeader}>
+                            Email domain ban
+                          </Label>
                           {/* domain ban checkbox */}
                           <Localized
                             id="community-banModal-banEmailDomain"
diff --git a/src/core/common/permissions/types.ts b/src/core/common/permissions/types.ts
index 3acabf25d6..22031e34e6 100644
--- a/src/core/common/permissions/types.ts
+++ b/src/core/common/permissions/types.ts
@@ -71,17 +71,17 @@ export const isModerator = (user: Readonly<User>): user is Moderator => {
   return user.role === "MODERATOR";
 };
 
-export const isSiteModerator = (user: Readonly<User>): user is SiteModerator =>
+export const isSiteModerator = (user: User): user is SiteModerator =>
   user.role === "MODERATOR" && isSiteModerationScoped(user.moderationScopes);
 
-export const isOrgModerator = (user: Readonly<User>): user is OrgModerator =>
+export const isOrgModerator = (user: User): user is OrgModerator =>
   user.role === "MODERATOR" && !isSiteModerationScoped(user.moderationScopes);
 
-export const isLTEModerator = (user: Readonly<User>): user is LTEModerator => {
+export const isLTEModerator = (user: User): user is LTEModerator => {
   return user.role !== "ADMIN";
 };
 
-export const isLTModerator = (user: Readonly<User>): user is LTModerator =>
+export const isLTModerator = (user: User): user is LTModerator =>
   user.role === "COMMENTER" || user.role === "MEMBER" || user.role === "STAFF";
 
 export const isLTESiteModerator = (

From 1916b644b7b02430167cd74a5fb77a581bfd7056 Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Mon, 20 Mar 2023 17:02:38 -0700
Subject: [PATCH 13/72] remove unused type

---
 src/core/client/admin/components/BanModal.tsx | 175 +-----------------
 1 file changed, 1 insertion(+), 174 deletions(-)

diff --git a/src/core/client/admin/components/BanModal.tsx b/src/core/client/admin/components/BanModal.tsx
index b701987443..e3df21e654 100644
--- a/src/core/client/admin/components/BanModal.tsx
+++ b/src/core/client/admin/components/BanModal.tsx
@@ -27,10 +27,7 @@ import {
 import { CallOut } from "coral-ui/components/v3";
 
 import { UserStatusChangeContainer_settings } from "coral-admin/__generated__/UserStatusChangeContainer_settings.graphql";
-import {
-  USER_ROLE,
-  UserStatusChangeContainer_user,
-} from "coral-admin/__generated__/UserStatusChangeContainer_user.graphql";
+import { UserStatusChangeContainer_user } from "coral-admin/__generated__/UserStatusChangeContainer_user.graphql";
 import { UserStatusChangeContainer_viewer } from "coral-admin/__generated__/UserStatusChangeContainer_viewer.graphql";
 
 import BanDomainMutation from "./BanDomainMutation";
@@ -55,18 +52,6 @@ export enum UpdateType {
   NO_SITES = "NO_SITES",
 }
 
-interface BanModalViewer {
-  readonly id: string;
-  readonly role: USER_ROLE; // marcus: This feels...
-  readonly moderationScopes: {
-    readonly scoped: boolean;
-    readonly sites: ReadonlyArray<{
-      readonly id: string;
-      readonly name: string;
-    }> | null;
-  } | null;
-}
-
 type BanModalViewerAlt = Omit<UserStatusChangeContainer_viewer, " $refType">;
 
 interface Props {
@@ -492,164 +477,6 @@ const BanModal: FunctionComponent<Props> = ({
                     disabled={disableForm}
                   />
                 </Flex>
-                {/* <HorizontalGutter spacing={3}>
-                  <h4 className={header4}>Ban From</h4>
-                  {(viewerIsAdmin ||
-                    viewerIsOrgAdmin ||
-                    (viewerIsScoped && !viewerIsSingleSiteMod)) &&
-                    isMultisite && (
-                      <HorizontalGutter spacing={2}>
-                        <Flex direction="row">
-                          {!(userRole === GQLUSER_ROLE.MODERATOR) && (
-                            <FormField>
-                              <Localized id="community-banModal-allSites">
-                                <RadioButton
-                                  checked={updateType === UpdateType.ALL_SITES}
-                                  onChange={() =>
-                                    setUpdateType(UpdateType.ALL_SITES)
-                                  }
-                                  disabled={userBanStatus?.active}
-                                >
-                                  All sites
-                                </RadioButton>
-                              </Localized>
-                            </FormField>
-                          )}
-                          <FormField>
-                            <Localized id="community-banModal-specificSites">
-                              <RadioButton
-                                checked={
-                                  updateType === UpdateType.SPECIFIC_SITES
-                                }
-                                onChange={() =>
-                                  setUpdateType(UpdateType.SPECIFIC_SITES)
-                                }
-                              >
-                                Specific Sites
-                              </RadioButton>
-                            </Localized>
-                          </FormField>
-                          {!viewerIsScoped && userHasAnyBan && (
-                            <FormField>
-                              <Localized id="community-banModal-noSites">
-                                <RadioButton
-                                  checked={updateType === UpdateType.NO_SITES}
-                                  onChange={() =>
-                                    setUpdateType(UpdateType.NO_SITES)
-                                  }
-                                >
-                                  No Sites
-                                </RadioButton>
-                              </Localized>
-                            </FormField>
-                          )}
-                        </Flex>
-
-                        {updateType !== UpdateType.NO_SITES && (
-                          <Localized
-                            id={
-                              viewerIsSingleSiteMod
-                                ? "community-banModal-reject-existing-singleSite"
-                                : rejectExistingCommentsLocalizationId!
-                            }
-                          >
-                            <CheckBox
-                              id="banModal-rejectExisting"
-                              checked={rejectExistingComments}
-                              onChange={(event) =>
-                                setRejectExistingComments(event.target.checked)
-                              }
-                            >
-                              {viewerIsSingleSiteMod
-                                ? "Reject all comments on this site"
-                                : rejectExistingCommentsMessage}
-                            </CheckBox>
-                          </Localized>
-                        )}
-                      </HorizontalGutter>
-                    )}
-                </HorizontalGutter>
-
-                <HorizontalGutter spacing={3}>
-                  {updateType !== UpdateType.NO_SITES &&
-                    emailDomain &&
-                    !domainIsConfigured && (
-                      <HorizontalGutter spacing={1}>
-                        <h4 className={styles.banFrom}>Email domain ban</h4>
-                        <Localized
-                          id="community-banModal-banEmailDomain"
-                          vars={{ domain: emailDomain }}
-                        >
-                          <CheckBox
-                            onChange={({ target }) => {
-                              setBanDomain(target.checked);
-                            }}
-                          >
-                            Ban all new accounts on{" "}
-                            <strong>{emailDomain}</strong>
-                          </CheckBox>
-                        </Localized>
-                      </HorizontalGutter>
-                    )}
-                  {updateType !== UpdateType.NO_SITES && (
-                    <Button
-                      className={styles.customizeMessage}
-                      variant="text"
-                      color="mono"
-                      onClick={(event) =>
-                        setCustomizeMessage(!customizeMessage)
-                      }
-                    >
-                      <Localized id="community-banModal-customize">
-                        <>Customize ban email message </>
-                      </Localized>
-                      <ButtonIcon size="lg" className={styles.toggleIcon}>
-                        {customizeMessage ? "arrow_drop_up" : "arrow_drop_down"}
-                      </ButtonIcon>
-                    </Button>
-                  )}
-                  {updateType !== UpdateType.NO_SITES && customizeMessage && (
-                    <Textarea
-                      id="banModal-message"
-                      className={styles.textArea}
-                      fullwidth
-                      value={emailMessage}
-                      onChange={(event) => setEmailMessage(event.target.value)}
-                    />
-                  )}
-                  {(viewerIsSingleSiteMod ||
-                    (isMultisite &&
-                      updateType === UpdateType.SPECIFIC_SITES)) && (
-                    <UserStatusSitesList
-                      userBanStatus={userBanStatus}
-                      viewer.moderationScopes={viewer.moderationScopes}
-                      banState={[banSiteIDs, setBanSiteIDs]}
-                      unbanState={[unbanSiteIDs, setUnbanSiteIDs]}
-                    />
-                  )}
-
-                  {submitError && (
-                    <CallOut
-                      color="error"
-                      title={submitError}
-                      titleWeight="semiBold"
-                    />
-                  )}
-
-                  <Flex justifyContent="flex-end" itemGutter="half">
-                    <Localized id="community-banModal-cancel">
-                      <Button variant="flat" onClick={onClose}>
-                        Cancel
-                      </Button>
-                    </Localized>
-                    <BanButton
-                      isMultisite={isMultisite}
-                      isBanned={!!(userBanStatus && userBanStatus?.active)}
-                      lastFocusableRef={lastFocusableRef}
-                      disabled={disableForm}
-                    />
-                  </Flex>
-                </HorizontalGutter> */}
               </form>
             )}
           </Form>

From b2cfe9e8129675ab1ead64d3dc034864e1b87bde Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Tue, 21 Mar 2023 10:29:32 -0700
Subject: [PATCH 14/72] rename type

---
 src/core/client/admin/components/BanModal.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/client/admin/components/BanModal.tsx b/src/core/client/admin/components/BanModal.tsx
index e3df21e654..72844b877d 100644
--- a/src/core/client/admin/components/BanModal.tsx
+++ b/src/core/client/admin/components/BanModal.tsx
@@ -52,7 +52,7 @@ export enum UpdateType {
   NO_SITES = "NO_SITES",
 }
 
-type BanModalViewerAlt = Omit<UserStatusChangeContainer_viewer, " $refType">;
+type BanModalViewer = Omit<UserStatusChangeContainer_viewer, " $refType">;
 
 interface Props {
   userID: string;
@@ -62,7 +62,7 @@ interface Props {
   open: boolean;
   onClose: () => void;
   onConfirm: () => void;
-  readonly viewer: BanModalViewerAlt;
+  viewer: BanModalViewer;
   emailDomainModeration: UserStatusChangeContainer_settings["emailDomainModeration"];
   userRole: string;
   isMultisite: boolean;

From 88c23be222e6cb2863f251dfe078abc1e316e042 Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Tue, 21 Mar 2023 10:57:33 -0700
Subject: [PATCH 15/72] fix regressions

---
 src/core/client/admin/components/BanModal.tsx         | 7 ++++---
 src/core/client/admin/test/community/banUser.spec.tsx | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/core/client/admin/components/BanModal.tsx b/src/core/client/admin/components/BanModal.tsx
index 72844b877d..f66352bf89 100644
--- a/src/core/client/admin/components/BanModal.tsx
+++ b/src/core/client/admin/components/BanModal.tsx
@@ -181,9 +181,10 @@ const BanModal: FunctionComponent<Props> = ({
   });
 
   const showAllSitesOption =
-    viewerIsAdmin ||
-    viewerIsOrgMod ||
-    (viewerIsScoped && !viewerIsSingleSiteMod && isMultisite);
+    userRole !== GQLUSER_ROLE.MODERATOR &&
+    (viewerIsAdmin ||
+      viewerIsOrgMod ||
+      (viewerIsScoped && !viewerIsSingleSiteMod && isMultisite));
 
   const [customizeMessage, setCustomizeMessage] = useState(false);
   const [emailMessage, setEmailMessage] = useState<string>(getDefaultMessage);
diff --git a/src/core/client/admin/test/community/banUser.spec.tsx b/src/core/client/admin/test/community/banUser.spec.tsx
index d9529ab286..cd87d1068e 100644
--- a/src/core/client/admin/test/community/banUser.spec.tsx
+++ b/src/core/client/admin/test/community/banUser.spec.tsx
@@ -148,7 +148,7 @@ it("ban user with custom message", async () => {
   fireEvent.click(within(dropdown).getByRole("button", { name: "Manage Ban" }));
 
   const modal = screen.getByLabelText("Are you sure you want to ban Isabelle?");
-  const toggleMessage = within(modal).getByRole("checkbox", {
+  const toggleMessage = within(modal).getByRole("button", {
     name: "Customize ban email message",
   });
   userEvent.click(toggleMessage);

From 6cbd797f16df1f1cbf5d2dc70743733d7253d071 Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Tue, 21 Mar 2023 11:59:00 -0700
Subject: [PATCH 16/72] fix type issues resulting from conflict resolutions

---
 src/core/client/admin/components/BanModal.tsx                 | 4 ++--
 .../admin/components/ModerateCard/ModerateCardContainer.tsx   | 2 +-
 .../admin/components/UserStatus/UserStatusSitesList.tsx       | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/core/client/admin/components/BanModal.tsx b/src/core/client/admin/components/BanModal.tsx
index c4a701ef7c..d56146bdc7 100644
--- a/src/core/client/admin/components/BanModal.tsx
+++ b/src/core/client/admin/components/BanModal.tsx
@@ -53,7 +53,7 @@ export enum UpdateType {
   NO_SITES = "NO_SITES",
 }
 
-type BanModalViewer = Omit<UserStatusChangeContainer_viewer, " $refType">;
+// type BanModalViewer = Omit<UserStatusChangeContainer_viewer, " $refType">;
 
 interface Props {
   userID: string;
@@ -63,7 +63,7 @@ interface Props {
   open: boolean;
   onClose: () => void;
   onConfirm: () => void;
-  viewer: BanModalViewer;
+  viewer: UserStatusChangeContainer_viewer;
   emailDomainModeration: UserStatusChangeContainer_settings["emailDomainModeration"];
   userRole: string;
   isMultisite: boolean;
diff --git a/src/core/client/admin/components/ModerateCard/ModerateCardContainer.tsx b/src/core/client/admin/components/ModerateCard/ModerateCardContainer.tsx
index cea5acf121..5a1bcfe2e3 100644
--- a/src/core/client/admin/components/ModerateCard/ModerateCardContainer.tsx
+++ b/src/core/client/admin/components/ModerateCard/ModerateCardContainer.tsx
@@ -360,7 +360,7 @@ const ModerateCardContainer: FunctionComponent<Props> = ({
           open={showBanModal}
           onClose={handleBanModalClose}
           onConfirm={handleBanConfirm}
-          viewer={viewer}
+          viewer={viewer as unknown as UserStatusChangeContainer_viewer}
           emailDomainModeration={settings.emailDomainModeration}
           userBanStatus={comment.author.status.ban}
           userEmail={comment.author.email}
diff --git a/src/core/client/admin/components/UserStatus/UserStatusSitesList.tsx b/src/core/client/admin/components/UserStatus/UserStatusSitesList.tsx
index 1a6d0ef890..acf42c614e 100644
--- a/src/core/client/admin/components/UserStatus/UserStatusSitesList.tsx
+++ b/src/core/client/admin/components/UserStatus/UserStatusSitesList.tsx
@@ -35,7 +35,6 @@ interface Props {
   readonly userBanStatus?: UserBanStatus;
   banState: [string[], (siteIDs: string[]) => void];
   unbanState: [string[], (siteIDs: string[]) => void];
-  viewerScopes: Scopes | null;
   viewer: UserStatusChangeContainer_viewer;
 }
 

From b636110d90a53d4be6cfe48debe1984bcc069524 Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Tue, 21 Mar 2023 12:46:15 -0700
Subject: [PATCH 17/72] delete comments

---
 src/core/client/admin/components/BanModal.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/core/client/admin/components/BanModal.tsx b/src/core/client/admin/components/BanModal.tsx
index d56146bdc7..eba8db2bd6 100644
--- a/src/core/client/admin/components/BanModal.tsx
+++ b/src/core/client/admin/components/BanModal.tsx
@@ -53,8 +53,6 @@ export enum UpdateType {
   NO_SITES = "NO_SITES",
 }
 
-// type BanModalViewer = Omit<UserStatusChangeContainer_viewer, " $refType">;
-
 interface Props {
   userID: string;
   username: string | null;
@@ -455,7 +453,7 @@ const BanModal: FunctionComponent<Props> = ({
                       updateType === UpdateType.SPECIFIC_SITES)) && (
                     <UserStatusSitesList
                       userBanStatus={userBanStatus}
-                      viewer={viewer} // BIOOKMAKR: type mismatch
+                      viewer={viewer}
                       banState={[banSiteIDs, setBanSiteIDs]}
                       unbanState={[unbanSiteIDs, setUnbanSiteIDs]}
                     />

From bcbef71c9ec041b73d29c54c0aec0b9d990ae72f Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Thu, 6 Apr 2023 15:44:33 -0700
Subject: [PATCH 18/72] use aria-label to correct pronunciation of 'add'

---
 .../Configure/AddMessage/AddMessageClosed.tsx |  1 +
 .../Configure/AddMessage/AddMessageOpen.tsx   | 26 ++++++++++---------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/core/client/stream/tabs/Configure/AddMessage/AddMessageClosed.tsx b/src/core/client/stream/tabs/Configure/AddMessage/AddMessageClosed.tsx
index 40a99121ee..b45240a250 100644
--- a/src/core/client/stream/tabs/Configure/AddMessage/AddMessageClosed.tsx
+++ b/src/core/client/stream/tabs/Configure/AddMessage/AddMessageClosed.tsx
@@ -38,6 +38,7 @@ const AddMessageClosed: FunctionComponent<Props> = ({
           disabled={disableButton}
           upperCase
           data-testid="configure-addMessage"
+          aria-label="Add message"
         >
           Add message
         </Button>
diff --git a/src/core/client/stream/tabs/Configure/AddMessage/AddMessageOpen.tsx b/src/core/client/stream/tabs/Configure/AddMessage/AddMessageOpen.tsx
index 55a162d668..46b1e59920 100644
--- a/src/core/client/stream/tabs/Configure/AddMessage/AddMessageOpen.tsx
+++ b/src/core/client/stream/tabs/Configure/AddMessage/AddMessageOpen.tsx
@@ -169,19 +169,21 @@ const AddMessageOpen: FunctionComponent<Props> = ({
                 >
                   <Localized id="configure-addMessage-cancel">Cancel</Localized>
                 </Button>
-                <Button
-                  className={CLASSES.configureCommentStream.applyButton}
-                  color="primary"
-                  variant="filled"
-                  type="submit"
-                  disabled={submitting || pristine}
-                  upperCase
-                  data-testid="configure-addMessage-submitAdd"
-                >
-                  <Localized id="configure-addMessage-submitAdd">
+                <Localized id="configure-addMessage-submitAdd">
+                  <Button
+                    className={CLASSES.configureCommentStream.applyButton}
+                    color="primary"
+                    variant="filled"
+                    type="submit"
+                    disabled={submitting || pristine}
+                    upperCase
+                    data-testid="configure-addMessage-submitAdd"
+                    aria-label="Add message"
+                  >
                     Add message
-                  </Localized>
-                </Button>
+                  </Button>
+                </Localized>
+
                 {renderSuccess}
               </div>
             )}

From 313aa40a636160a0e0be489fd8fcac09390e748d Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Fri, 7 Apr 2023 09:19:42 -0700
Subject: [PATCH 19/72] remove todo comment

---
 .../stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx
index 50af326735..4a95813d3a 100644
--- a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx
+++ b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx
@@ -7,7 +7,6 @@ interface Props {
   username: string;
 }
 
-// TODO (marcushaddon): localize!
 const FeaturedBy: FunctionComponent<Props> = ({ username }) => {
   return (
     <Localized id="comments-featuredBy" vars={{ username }}>

From 10fd56bc21448b805f218e5b166d495f86b2e48a Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Mon, 10 Apr 2023 14:42:23 -0700
Subject: [PATCH 20/72] address comments

---
 src/core/client/admin/components/BanModal.tsx | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/core/client/admin/components/BanModal.tsx b/src/core/client/admin/components/BanModal.tsx
index eba8db2bd6..1eba88bed9 100644
--- a/src/core/client/admin/components/BanModal.tsx
+++ b/src/core/client/admin/components/BanModal.tsx
@@ -318,15 +318,19 @@ const BanModal: FunctionComponent<Props> = ({
                   direction="column"
                   className={styles.form}
                   justifyContent="flex-start"
+                  spacing={3}
                 >
                   {/* BAN FROM/REJECT COMMENTS */}
                   <Flex direction="column">
                     {/* ban from header */}
-                    <Label className={styles.banFromHeader}>Ban From</Label>
+                    <Localized id="community-banModal-banFrom">
+                      <Label className={styles.banFromHeader}>Ban from</Label>
+                    </Localized>
                     <Flex
                       direction="row"
                       className={styles.sitesOptions}
                       justifyContent="flex-start"
+                      spacing={4}
                     >
                       {/* sites options */}
                       {showAllSitesOption && (
@@ -398,10 +402,12 @@ const BanModal: FunctionComponent<Props> = ({
                   {canBanDomain && (
                     <Flex direction="column" className={styles.banDomainOption}>
                       <HorizontalGutter spacing={2}>
-                        {/* doman ban header */}
-                        <Label className={styles.domainBanHeader}>
-                          Email domain ban
-                        </Label>
+                        {/* domain ban header */}
+                        <Localized id="community-banModal-emailDomainBan">
+                          <Label className={styles.domainBanHeader}>
+                            Email domain ban
+                          </Label>
+                        </Localized>
                         {/* domain ban checkbox */}
                         <Localized
                           id="community-banModal-banEmailDomain"
@@ -412,7 +418,7 @@ const BanModal: FunctionComponent<Props> = ({
                               setBanDomain(target.checked);
                             }}
                           >
-                            Ban all new accounts on{" "}
+                            Ban all new commenter accounts from{" "}
                             <strong>{emailDomain}</strong>
                           </CheckBox>
                         </Localized>

From 12dda0358e1b12a5aef083aae23a2842c5cbf813 Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Tue, 11 Apr 2023 13:31:20 -0700
Subject: [PATCH 21/72] address comments

---
 src/core/client/admin/components/BanModal.css      |  6 ------
 src/core/client/admin/components/BanModal.spec.tsx | 10 +++++-----
 src/core/client/admin/components/BanModal.tsx      |  4 ++--
 src/locales/en-US/admin.ftl                        |  3 ++-
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/core/client/admin/components/BanModal.css b/src/core/client/admin/components/BanModal.css
index 0be256675c..6fbfb64a9e 100644
--- a/src/core/client/admin/components/BanModal.css
+++ b/src/core/client/admin/components/BanModal.css
@@ -12,10 +12,6 @@ $ban-modal-text: var(--palette-text-500);
   height: calc(12 * var(--mini-unit));
 }
 
-.sitesToggle {
-  margin-bottom: var(--spacing-3);
-}
-
 .domainBanHeader {
   margin-bottom: var(--spacing-2);
 
@@ -23,7 +19,6 @@ $ban-modal-text: var(--palette-text-500);
 
 
 .form {
-  gap: var(--spacing-3);
   margin-bottom: var(--spacing-3);
 }
 
@@ -35,7 +30,6 @@ $ban-modal-text: var(--palette-text-500);
 
 .sitesOptions {
   margin-bottom: var(--spacing-1);
-  gap: var(--spacing-2);
 }
 
 .banDomainOption {
diff --git a/src/core/client/admin/components/BanModal.spec.tsx b/src/core/client/admin/components/BanModal.spec.tsx
index f899b14e61..41c9a98731 100644
--- a/src/core/client/admin/components/BanModal.spec.tsx
+++ b/src/core/client/admin/components/BanModal.spec.tsx
@@ -137,7 +137,7 @@ it("creates domain ban for unmoderated domain while updating user ban status", a
   const modal = getBanModal(container, user);
 
   const banDomainButton = within(modal).getByLabelText(
-    `Ban all new accounts on test.com`
+    `Ban all new commenter accounts from test.com`
   );
   userEvent.click(banDomainButton);
   screen.debug(banDomainButton);
@@ -173,7 +173,7 @@ test.each(gteOrgMods)(
     const modal = getBanModal(container, commenterUser);
 
     const banDomainButton = within(modal).getByLabelText(
-      `Ban all new accounts on test.com`
+      `Ban all new commenter accounts from test.com`
     );
 
     expect(banDomainButton).toBeInTheDocument();
@@ -199,7 +199,7 @@ test.each(siteMods)(
     const modal = getBanModal(container, commenterUser);
 
     const banDomainButton = within(modal).queryByText(
-      `Ban all new accounts on test.com`
+      `Ban all new commenter accounts from test.com`
     );
 
     expect(banDomainButton).toBeNull();
@@ -234,7 +234,7 @@ it("does not display ban domain option for moderated domain", async () => {
   const modal = getBanModal(container, user);
 
   const banDomainButton = within(modal).queryByText(
-    `Ban all new accounts on test.com`
+    `Ban all new commenter accounts from test.com`
   );
 
   expect(banDomainButton).not.toBeInTheDocument();
@@ -280,7 +280,7 @@ test.each([...PROTECTED_EMAIL_DOMAINS.values()])(
     const modal = getBanModal(container, user);
 
     const banDomainButton = within(modal).queryByText(
-      `Ban all new accounts on test.com`
+      `Ban all new commenter accounts from test.com`
     );
 
     expect(banDomainButton).not.toBeInTheDocument();
diff --git a/src/core/client/admin/components/BanModal.tsx b/src/core/client/admin/components/BanModal.tsx
index 1eba88bed9..092e8fe238 100644
--- a/src/core/client/admin/components/BanModal.tsx
+++ b/src/core/client/admin/components/BanModal.tsx
@@ -330,7 +330,7 @@ const BanModal: FunctionComponent<Props> = ({
                       direction="row"
                       className={styles.sitesOptions}
                       justifyContent="flex-start"
-                      spacing={4}
+                      spacing={5}
                     >
                       {/* sites options */}
                       {showAllSitesOption && (
@@ -403,7 +403,7 @@ const BanModal: FunctionComponent<Props> = ({
                     <Flex direction="column" className={styles.banDomainOption}>
                       <HorizontalGutter spacing={2}>
                         {/* domain ban header */}
-                        <Localized id="community-banModal-emailDomainBan">
+                        <Localized id="community-banModal-banEmailDomain-title">
                           <Label className={styles.domainBanHeader}>
                             Email domain ban
                           </Label>
diff --git a/src/locales/en-US/admin.ftl b/src/locales/en-US/admin.ftl
index f48c17cf6e..6c12b175c0 100644
--- a/src/locales/en-US/admin.ftl
+++ b/src/locales/en-US/admin.ftl
@@ -1322,7 +1322,8 @@ community-userStatus-premodUser = Always pre-moderate
 community-userStatus-removePremod = Remove pre-moderate
 
 community-banModal-allSites-title = Are you sure you want to ban <username></username>?
-community-banModal-banEmailDomain = Ban all new accounts on { $domain }
+community-banModal-banEmailDomain-title = Email domain ban
+community-banModal-banEmailDomain = Ban all new commenter accounts from { $domain }
 community-banModal-specificSites-title = Are you sure you want to manage the ban status of <username></username>?
 community-banModal-noSites-title = Are you sure you want to unban <username></username>?
 community-banModal-allSites-consequence =

From 690c41e522b09cf9e01ef523823afe624149c114 Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Wed, 19 Apr 2023 16:34:55 -0700
Subject: [PATCH 22/72] remove font family style rule

---
 src/core/client/admin/components/BanModal.css | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/core/client/admin/components/BanModal.css b/src/core/client/admin/components/BanModal.css
index 6fbfb64a9e..080d7b21c7 100644
--- a/src/core/client/admin/components/BanModal.css
+++ b/src/core/client/admin/components/BanModal.css
@@ -14,7 +14,6 @@ $ban-modal-text: var(--palette-text-500);
 
 .domainBanHeader {
   margin-bottom: var(--spacing-2);
-
 }
 
 
@@ -25,7 +24,6 @@ $ban-modal-text: var(--palette-text-500);
 .banFromHeader {
   margin-bottom: var(--spacing-2);
   margin-top: 0;
-  font-family: var(--font-family-primary);
 }
 
 .sitesOptions {

From 37ee24bd50ee2e32a9ea0a8239b386a161904c01 Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Thu, 20 Apr 2023 10:44:13 -0700
Subject: [PATCH 23/72] remove uneeded margin rule

---
 src/core/client/admin/components/BanModal.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/core/client/admin/components/BanModal.css b/src/core/client/admin/components/BanModal.css
index 080d7b21c7..82069c9597 100644
--- a/src/core/client/admin/components/BanModal.css
+++ b/src/core/client/admin/components/BanModal.css
@@ -23,7 +23,6 @@ $ban-modal-text: var(--palette-text-500);
 
 .banFromHeader {
   margin-bottom: var(--spacing-2);
-  margin-top: 0;
 }
 
 .sitesOptions {

From 4f4b6400cdfac425a3514a20f53756173886d6d1 Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Tue, 25 Apr 2023 13:06:38 -0700
Subject: [PATCH 24/72] remove unneeded style rule

---
 src/core/client/admin/components/BanModal.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/core/client/admin/components/BanModal.css b/src/core/client/admin/components/BanModal.css
index 82069c9597..4c8b5303d9 100644
--- a/src/core/client/admin/components/BanModal.css
+++ b/src/core/client/admin/components/BanModal.css
@@ -35,5 +35,4 @@ $ban-modal-text: var(--palette-text-500);
 
 .customizeMessage {
   align-self: flex-start;
-  color: -var(--palette-grey-800);
 }

From 15de79aeaf4e791fdc61f6653591dffebcea348e Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Wed, 26 Apr 2023 13:49:40 -0700
Subject: [PATCH 25/72] remove extra space

---
 src/core/client/admin/components/BanModal.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/core/client/admin/components/BanModal.css b/src/core/client/admin/components/BanModal.css
index 4c8b5303d9..426d838b68 100644
--- a/src/core/client/admin/components/BanModal.css
+++ b/src/core/client/admin/components/BanModal.css
@@ -16,7 +16,6 @@ $ban-modal-text: var(--palette-text-500);
   margin-bottom: var(--spacing-2);
 }
 
-
 .form {
   margin-bottom: var(--spacing-3);
 }

From 866eba37d3d393b9d28accf38c818ef00a526bbd Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Wed, 26 Apr 2023 15:53:47 -0700
Subject: [PATCH 26/72] update failing snapshots

---
 .../__snapshots__/reportComment.spec.tsx.snap | 321 ++++++++++++++++++
 1 file changed, 321 insertions(+)

diff --git a/src/core/client/stream/test/comments/stream/__snapshots__/reportComment.spec.tsx.snap b/src/core/client/stream/test/comments/stream/__snapshots__/reportComment.spec.tsx.snap
index 223313c1e5..0b34c57b5a 100644
--- a/src/core/client/stream/test/comments/stream/__snapshots__/reportComment.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/stream/__snapshots__/reportComment.spec.tsx.snap
@@ -1,5 +1,326 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`dont agree with comment 1`] = `
+<div
+  aria-labelledby="comment-comment-0-label"
+  className="CommentContainer-root coral coral-comment coral coral-reacted-0"
+  data-key-stop={true}
+  data-testid="comment-comment-0"
+  id="comment-comment-0"
+  onFocus={[Function]}
+  role="article"
+  tabIndex={-1}
+>
+  <div
+    className="Hidden-root"
+    id="comment-comment-0-label"
+  >
+    <span>
+      Comment from Markus 
+      <time
+        className="RelativeTime-root"
+        dateTime="2018-07-06T18:24:00.000Z"
+        title="2018-07-06T18:24:00.000Z"
+      >
+        2018-07-06T18:24:00.000Z
+      </time>
+    </span>
+  </div>
+  <div
+    className="Box-root HorizontalGutter-root HorizontalGutter-full"
+  >
+    <div
+      className="coral coral-comment-collapse-toggle-indent Indent-root"
+    >
+      <div
+        className="CommentContainer-indentedCommentRoot coral coral-indent coral-indent-0 Indent-open"
+      >
+        <div
+          className="Box-root Flex-root Flex-flex Flex-alignFlexStart gutter Flex-spacing-1"
+        >
+          <button
+            aria-label="Hide comment by Markus and its replies"
+            className="BaseButton-root IndentedComment-toggleButton coral coral-comment-collapse-toggle"
+            onBlur={[Function]}
+            onClick={[Function]}
+            onFocus={[Function]}
+            onMouseOut={[Function]}
+            onMouseOver={[Function]}
+            onTouchEnd={[Function]}
+            type="button"
+          >
+            <i
+              aria-hidden="true"
+              className="Icon-root Icon-sm coral coral-icon ButtonIcon-root IndentedComment-icon coral coral-comment-collapse-toggle-icon"
+            >
+              remove
+            </i>
+          </button>
+          <div
+            className="Box-root HorizontalGutter-root Comment-root HorizontalGutter-half"
+          >
+            <div
+              className="Box-root Flex-root coral coral-comment-topBar Flex-flex Flex-justifySpaceBetween Flex-alignFlexStart Flex-directionRow"
+            >
+              <div
+                className="Box-root Flex-root Flex-flex Flex-wrap Flex-alignCenter"
+              >
+                <div
+                  className="Comment-username"
+                >
+                  <div
+                    className="Popover-root"
+                  >
+                    <button
+                      aria-controls="username-popover-comment-0"
+                      aria-label="User Markus"
+                      className="BaseButton-root CommentContainer-usernameButton coral coral-username coral-comment-username"
+                      onBlur={[Function]}
+                      onClick={[Function]}
+                      onFocus={[Function]}
+                      onMouseOut={[Function]}
+                      onMouseOver={[Function]}
+                      onTouchEnd={[Function]}
+                      type="button"
+                    >
+                      <span
+                        className="Username-root"
+                      >
+                        Markus
+                      </span>
+                    </button>
+                    <div
+                      aria-hidden={true}
+                      aria-label="A popover with more user information"
+                      id="username-popover-comment-0"
+                      role="dialog"
+                    />
+                  </div>
+                </div>
+                <div
+                  className="Box-root Flex-root Flex-flex Flex-wrap Flex-alignCenter Flex-directionRow"
+                >
+                  <button
+                    className="BaseButton-root Timestamp-root"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <time
+                      className="RelativeTime-root Timestamp-text Comment-timestamp coral coral-timestamp coral-comment-timestamp"
+                      dateTime="2018-07-06T18:24:00.000Z"
+                      title="2018-07-06T18:24:00.000Z"
+                    >
+                      2018-07-06T18:24:00.000Z
+                    </time>
+                  </button>
+                </div>
+              </div>
+              <div
+                className="Box-root Flex-root Flex-flex Flex-wrap Flex-justifyFlexEnd"
+              >
+                <div
+                  className="Box-root Flex-root Flex-flex Flex-itemGutter Flex-justifyFlexEnd Flex-alignCenter gutter"
+                />
+              </div>
+            </div>
+            <div
+              className="Box-root HorizontalGutter-root HorizontalGutter-oneAndAHalf"
+            >
+              <div
+                className="HTMLContent-root coral coral-content coral-comment-content"
+                dangerouslySetInnerHTML={
+                  Object {
+                    "__html": "Joining Too",
+                  }
+                }
+              />
+              <div
+                className="Box-root Flex-root coral coral-comment-actionBar Flex-flex Flex-justifySpaceBetween"
+              >
+                <div
+                  className="Box-root Flex-root CommentContainer-actionBar Flex-flex Flex-halfItemGutter Flex-justifySpaceBetween Flex-alignCenter Flex-directionRow gutter"
+                >
+                  <button
+                    aria-label="Respect comment by Markus"
+                    aria-pressed={false}
+                    className="BaseButton-root Button-base Button-flat Button-fontSizeSmall Button-textAlignCenter Button-fontFamilyPrimary Button-fontWeightPrimarySemiBold Button-paddingSizeExtraSmall Button-colorSecondary CommentContainer-actionButton coral coral-reactButton coral-comment-reactButton ReactionButton-button"
+                    data-testid="comment-reaction-button"
+                    data-variant="flat"
+                    disabled={false}
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <span
+                      className="Box-root Flex-root Flex-flex Flex-alignCenter"
+                    >
+                      <i
+                        aria-hidden="true"
+                        className="Icon-root Icon-sm coral coral-icon ReactionButton-icon"
+                      >
+                        thumb_up
+                      </i>
+                    </span>
+                  </button>
+                  <button
+                    aria-label="Reply to comment by Markus"
+                    aria-pressed={false}
+                    className="BaseButton-root Button-base Button-flat Button-fontSizeSmall Button-textAlignCenter Button-fontFamilyPrimary Button-fontWeightPrimarySemiBold Button-paddingSizeExtraSmall Button-colorSecondary CommentContainer-actionButton coral coral-comment-replyButton"
+                    data-testid="comment-reply-button"
+                    data-variant="flat"
+                    disabled={false}
+                    id="comments-commentContainer-replyButton-comment-0"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <span
+                      className="Box-root Flex-root Flex-flex Flex-alignCenter"
+                    >
+                      <i
+                        aria-hidden="true"
+                        className="Icon-root Icon-sm coral coral-icon ReplyButton-icon"
+                      >
+                        reply
+                      </i>
+                    </span>
+                  </button>
+                  <div
+                    className="Popover-root"
+                  >
+                    <button
+                      aria-controls="permalink-popover-comment-0"
+                      aria-label="Share comment by Markus"
+                      aria-pressed={false}
+                      className="BaseButton-root Button-base Button-flat Button-fontSizeSmall Button-textAlignCenter Button-fontFamilyPrimary Button-fontWeightPrimarySemiBold Button-paddingSizeExtraSmall Button-colorSecondary coral coral-comment-shareButton"
+                      data-variant="flat"
+                      disabled={false}
+                      onBlur={[Function]}
+                      onClick={[Function]}
+                      onFocus={[Function]}
+                      onMouseOut={[Function]}
+                      onMouseOver={[Function]}
+                      onTouchEnd={[Function]}
+                      type="button"
+                    >
+                      <span
+                        className="Box-root Flex-root Flex-flex Flex-alignCenter"
+                      >
+                        <i
+                          aria-hidden="true"
+                          className="Icon-root Icon-sm coral coral-icon PermalinkButton-icon"
+                        >
+                          share
+                        </i>
+                      </span>
+                    </button>
+                    <div
+                      aria-hidden={true}
+                      aria-label="A dialog showing a permalink to the comment"
+                      id="permalink-popover-comment-0"
+                      role="dialog"
+                    />
+                  </div>
+                </div>
+                <div
+                  className="Box-root Flex-root Flex-flex Flex-halfItemGutter Flex-justifySpaceBetween Flex-alignCenter Flex-directionRow gutter"
+                >
+                  <div
+                    aria-label="Reported"
+                    className="coral-reportedButton coral-comment-reportedButton ReportButton-reported"
+                    data-testid="comment-reported-button"
+                  >
+                    <div
+                      className="Box-root Flex-root Flex-flex Flex-alignCenter"
+                    >
+                      <i
+                        aria-hidden="true"
+                        className="Icon-root Icon-sm coral coral-icon ReportButton-icon"
+                      >
+                        flag
+                      </i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      className="CallOut-root CallOut-success CallOut-leftBorder"
+    >
+      <div
+        className="CallOut-container"
+      >
+        <div
+          className="CallOut-icon CallOut-success CallOut-leftIcon"
+        >
+          <i
+            aria-hidden="true"
+            className="Icon-root Icon-sm coral coral-icon"
+          >
+            check_circle
+          </i>
+        </div>
+        <div
+          aria-live="polite"
+          className="CallOut-content"
+        >
+          <div
+            className="CallOut-title CallOut-titleMargin CallOut-titleBold"
+          >
+            Thank you!
+          </div>
+          <div
+            className="CallOut-body"
+          >
+            We’ve received your message. Reports from members like you keep the community safe.
+          </div>
+        </div>
+        <div
+          className="CallOut-actions"
+        >
+          <button
+            aria-label="Close"
+            className="BaseButton-root"
+            data-testid="callout-close-button"
+            onBlur={[Function]}
+            onClick={[Function]}
+            onFocus={[Function]}
+            onMouseOut={[Function]}
+            onMouseOver={[Function]}
+            onTouchEnd={[Function]}
+            type="button"
+          >
+            <i
+              aria-hidden="true"
+              className="Icon-root Icon-sm coral coral-icon"
+            >
+              close
+            </i>
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
 exports[`render popup 1`] = `
 <div
   className="ReportCommentForm-root coral coral-reportPopover"

From 806fbcf2288b64327f0d462ba5c3b9e8501fabd7 Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Thu, 27 Apr 2023 09:57:23 -0700
Subject: [PATCH 27/72] forcing CI

---
 .../client/admin/routes/Moderate/Queue/ApprovedQueueRoute.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/client/admin/routes/Moderate/Queue/ApprovedQueueRoute.tsx b/src/core/client/admin/routes/Moderate/Queue/ApprovedQueueRoute.tsx
index 268c30a3ca..9943a48c7a 100644
--- a/src/core/client/admin/routes/Moderate/Queue/ApprovedQueueRoute.tsx
+++ b/src/core/client/admin/routes/Moderate/Queue/ApprovedQueueRoute.tsx
@@ -99,7 +99,7 @@ export const ApprovedQueueRoute: FunctionComponent<Props> = (props) => {
   );
 };
 
-// TODO: (cvle) If this could be autogenerated..
+// TODO: (cvle) If this could be autogenerated...
 type FragmentVariables = ApprovedQueueRoutePaginationQueryVariables;
 
 const enhanced = withPaginationContainer<

From 00054e15536d4f905ab16c345edd4ad39fd127d3 Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Thu, 27 Apr 2023 13:59:47 -0700
Subject: [PATCH 28/72] remove obsolete snapshot

---
 .../__snapshots__/reportComment.spec.tsx.snap | 321 ------------------
 1 file changed, 321 deletions(-)

diff --git a/src/core/client/stream/test/comments/stream/__snapshots__/reportComment.spec.tsx.snap b/src/core/client/stream/test/comments/stream/__snapshots__/reportComment.spec.tsx.snap
index 0b34c57b5a..223313c1e5 100644
--- a/src/core/client/stream/test/comments/stream/__snapshots__/reportComment.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/stream/__snapshots__/reportComment.spec.tsx.snap
@@ -1,326 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`dont agree with comment 1`] = `
-<div
-  aria-labelledby="comment-comment-0-label"
-  className="CommentContainer-root coral coral-comment coral coral-reacted-0"
-  data-key-stop={true}
-  data-testid="comment-comment-0"
-  id="comment-comment-0"
-  onFocus={[Function]}
-  role="article"
-  tabIndex={-1}
->
-  <div
-    className="Hidden-root"
-    id="comment-comment-0-label"
-  >
-    <span>
-      Comment from Markus 
-      <time
-        className="RelativeTime-root"
-        dateTime="2018-07-06T18:24:00.000Z"
-        title="2018-07-06T18:24:00.000Z"
-      >
-        2018-07-06T18:24:00.000Z
-      </time>
-    </span>
-  </div>
-  <div
-    className="Box-root HorizontalGutter-root HorizontalGutter-full"
-  >
-    <div
-      className="coral coral-comment-collapse-toggle-indent Indent-root"
-    >
-      <div
-        className="CommentContainer-indentedCommentRoot coral coral-indent coral-indent-0 Indent-open"
-      >
-        <div
-          className="Box-root Flex-root Flex-flex Flex-alignFlexStart gutter Flex-spacing-1"
-        >
-          <button
-            aria-label="Hide comment by Markus and its replies"
-            className="BaseButton-root IndentedComment-toggleButton coral coral-comment-collapse-toggle"
-            onBlur={[Function]}
-            onClick={[Function]}
-            onFocus={[Function]}
-            onMouseOut={[Function]}
-            onMouseOver={[Function]}
-            onTouchEnd={[Function]}
-            type="button"
-          >
-            <i
-              aria-hidden="true"
-              className="Icon-root Icon-sm coral coral-icon ButtonIcon-root IndentedComment-icon coral coral-comment-collapse-toggle-icon"
-            >
-              remove
-            </i>
-          </button>
-          <div
-            className="Box-root HorizontalGutter-root Comment-root HorizontalGutter-half"
-          >
-            <div
-              className="Box-root Flex-root coral coral-comment-topBar Flex-flex Flex-justifySpaceBetween Flex-alignFlexStart Flex-directionRow"
-            >
-              <div
-                className="Box-root Flex-root Flex-flex Flex-wrap Flex-alignCenter"
-              >
-                <div
-                  className="Comment-username"
-                >
-                  <div
-                    className="Popover-root"
-                  >
-                    <button
-                      aria-controls="username-popover-comment-0"
-                      aria-label="User Markus"
-                      className="BaseButton-root CommentContainer-usernameButton coral coral-username coral-comment-username"
-                      onBlur={[Function]}
-                      onClick={[Function]}
-                      onFocus={[Function]}
-                      onMouseOut={[Function]}
-                      onMouseOver={[Function]}
-                      onTouchEnd={[Function]}
-                      type="button"
-                    >
-                      <span
-                        className="Username-root"
-                      >
-                        Markus
-                      </span>
-                    </button>
-                    <div
-                      aria-hidden={true}
-                      aria-label="A popover with more user information"
-                      id="username-popover-comment-0"
-                      role="dialog"
-                    />
-                  </div>
-                </div>
-                <div
-                  className="Box-root Flex-root Flex-flex Flex-wrap Flex-alignCenter Flex-directionRow"
-                >
-                  <button
-                    className="BaseButton-root Timestamp-root"
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onFocus={[Function]}
-                    onMouseOut={[Function]}
-                    onMouseOver={[Function]}
-                    onTouchEnd={[Function]}
-                    type="button"
-                  >
-                    <time
-                      className="RelativeTime-root Timestamp-text Comment-timestamp coral coral-timestamp coral-comment-timestamp"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
-                    >
-                      2018-07-06T18:24:00.000Z
-                    </time>
-                  </button>
-                </div>
-              </div>
-              <div
-                className="Box-root Flex-root Flex-flex Flex-wrap Flex-justifyFlexEnd"
-              >
-                <div
-                  className="Box-root Flex-root Flex-flex Flex-itemGutter Flex-justifyFlexEnd Flex-alignCenter gutter"
-                />
-              </div>
-            </div>
-            <div
-              className="Box-root HorizontalGutter-root HorizontalGutter-oneAndAHalf"
-            >
-              <div
-                className="HTMLContent-root coral coral-content coral-comment-content"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "Joining Too",
-                  }
-                }
-              />
-              <div
-                className="Box-root Flex-root coral coral-comment-actionBar Flex-flex Flex-justifySpaceBetween"
-              >
-                <div
-                  className="Box-root Flex-root CommentContainer-actionBar Flex-flex Flex-halfItemGutter Flex-justifySpaceBetween Flex-alignCenter Flex-directionRow gutter"
-                >
-                  <button
-                    aria-label="Respect comment by Markus"
-                    aria-pressed={false}
-                    className="BaseButton-root Button-base Button-flat Button-fontSizeSmall Button-textAlignCenter Button-fontFamilyPrimary Button-fontWeightPrimarySemiBold Button-paddingSizeExtraSmall Button-colorSecondary CommentContainer-actionButton coral coral-reactButton coral-comment-reactButton ReactionButton-button"
-                    data-testid="comment-reaction-button"
-                    data-variant="flat"
-                    disabled={false}
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onFocus={[Function]}
-                    onMouseOut={[Function]}
-                    onMouseOver={[Function]}
-                    onTouchEnd={[Function]}
-                    type="button"
-                  >
-                    <span
-                      className="Box-root Flex-root Flex-flex Flex-alignCenter"
-                    >
-                      <i
-                        aria-hidden="true"
-                        className="Icon-root Icon-sm coral coral-icon ReactionButton-icon"
-                      >
-                        thumb_up
-                      </i>
-                    </span>
-                  </button>
-                  <button
-                    aria-label="Reply to comment by Markus"
-                    aria-pressed={false}
-                    className="BaseButton-root Button-base Button-flat Button-fontSizeSmall Button-textAlignCenter Button-fontFamilyPrimary Button-fontWeightPrimarySemiBold Button-paddingSizeExtraSmall Button-colorSecondary CommentContainer-actionButton coral coral-comment-replyButton"
-                    data-testid="comment-reply-button"
-                    data-variant="flat"
-                    disabled={false}
-                    id="comments-commentContainer-replyButton-comment-0"
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onFocus={[Function]}
-                    onMouseOut={[Function]}
-                    onMouseOver={[Function]}
-                    onTouchEnd={[Function]}
-                    type="button"
-                  >
-                    <span
-                      className="Box-root Flex-root Flex-flex Flex-alignCenter"
-                    >
-                      <i
-                        aria-hidden="true"
-                        className="Icon-root Icon-sm coral coral-icon ReplyButton-icon"
-                      >
-                        reply
-                      </i>
-                    </span>
-                  </button>
-                  <div
-                    className="Popover-root"
-                  >
-                    <button
-                      aria-controls="permalink-popover-comment-0"
-                      aria-label="Share comment by Markus"
-                      aria-pressed={false}
-                      className="BaseButton-root Button-base Button-flat Button-fontSizeSmall Button-textAlignCenter Button-fontFamilyPrimary Button-fontWeightPrimarySemiBold Button-paddingSizeExtraSmall Button-colorSecondary coral coral-comment-shareButton"
-                      data-variant="flat"
-                      disabled={false}
-                      onBlur={[Function]}
-                      onClick={[Function]}
-                      onFocus={[Function]}
-                      onMouseOut={[Function]}
-                      onMouseOver={[Function]}
-                      onTouchEnd={[Function]}
-                      type="button"
-                    >
-                      <span
-                        className="Box-root Flex-root Flex-flex Flex-alignCenter"
-                      >
-                        <i
-                          aria-hidden="true"
-                          className="Icon-root Icon-sm coral coral-icon PermalinkButton-icon"
-                        >
-                          share
-                        </i>
-                      </span>
-                    </button>
-                    <div
-                      aria-hidden={true}
-                      aria-label="A dialog showing a permalink to the comment"
-                      id="permalink-popover-comment-0"
-                      role="dialog"
-                    />
-                  </div>
-                </div>
-                <div
-                  className="Box-root Flex-root Flex-flex Flex-halfItemGutter Flex-justifySpaceBetween Flex-alignCenter Flex-directionRow gutter"
-                >
-                  <div
-                    aria-label="Reported"
-                    className="coral-reportedButton coral-comment-reportedButton ReportButton-reported"
-                    data-testid="comment-reported-button"
-                  >
-                    <div
-                      className="Box-root Flex-root Flex-flex Flex-alignCenter"
-                    >
-                      <i
-                        aria-hidden="true"
-                        className="Icon-root Icon-sm coral coral-icon ReportButton-icon"
-                      >
-                        flag
-                      </i>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      className="CallOut-root CallOut-success CallOut-leftBorder"
-    >
-      <div
-        className="CallOut-container"
-      >
-        <div
-          className="CallOut-icon CallOut-success CallOut-leftIcon"
-        >
-          <i
-            aria-hidden="true"
-            className="Icon-root Icon-sm coral coral-icon"
-          >
-            check_circle
-          </i>
-        </div>
-        <div
-          aria-live="polite"
-          className="CallOut-content"
-        >
-          <div
-            className="CallOut-title CallOut-titleMargin CallOut-titleBold"
-          >
-            Thank you!
-          </div>
-          <div
-            className="CallOut-body"
-          >
-            We’ve received your message. Reports from members like you keep the community safe.
-          </div>
-        </div>
-        <div
-          className="CallOut-actions"
-        >
-          <button
-            aria-label="Close"
-            className="BaseButton-root"
-            data-testid="callout-close-button"
-            onBlur={[Function]}
-            onClick={[Function]}
-            onFocus={[Function]}
-            onMouseOut={[Function]}
-            onMouseOver={[Function]}
-            onTouchEnd={[Function]}
-            type="button"
-          >
-            <i
-              aria-hidden="true"
-              className="Icon-root Icon-sm coral coral-icon"
-            >
-              close
-            </i>
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
 exports[`render popup 1`] = `
 <div
   className="ReportCommentForm-root coral coral-reportPopover"

From c08ad4ce25315e519ab9f8e52b8e55e949d3043f Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Fri, 28 Apr 2023 10:56:18 -0700
Subject: [PATCH 29/72] make feature configurable in admin per AC address other
 comments

---
 .../sections/General/FeaturedByConfig.tsx     | 48 +++++++++++++++++++
 .../General/GeneralConfigContainer.tsx        |  3 ++
 .../Stream/FeaturedComments/FeaturedBy.css    |  4 +-
 .../Stream/FeaturedComments/FeaturedBy.tsx    |  6 ++-
 .../FeaturedCommentContainer.tsx              |  7 +--
 src/core/server/graph/schema/schema.graphql   | 10 ++++
 src/locales/en-US/admin.ftl                   |  7 ++-
 src/locales/en-US/stream.ftl                  |  2 +-
 8 files changed, 78 insertions(+), 9 deletions(-)
 create mode 100644 src/core/client/admin/routes/Configure/sections/General/FeaturedByConfig.tsx

diff --git a/src/core/client/admin/routes/Configure/sections/General/FeaturedByConfig.tsx b/src/core/client/admin/routes/Configure/sections/General/FeaturedByConfig.tsx
new file mode 100644
index 0000000000..a8e9251a9b
--- /dev/null
+++ b/src/core/client/admin/routes/Configure/sections/General/FeaturedByConfig.tsx
@@ -0,0 +1,48 @@
+import { Localized } from "@fluent/react/compat";
+import {
+  FieldSet,
+  FormField,
+  FormFieldDescription,
+  Label,
+} from "coral-ui/components/v2";
+import React, { FunctionComponent } from "react";
+import { graphql } from "react-relay";
+import ConfigBox from "../../ConfigBox";
+import Header from "../../Header";
+import OnOffField from "../../OnOffField";
+
+// eslint-disable-next-line no-unused-expressions
+graphql`
+  fragment FeaturedByConfig_formValues on Settings {
+    featuredBy
+  }
+`;
+
+interface Props {
+  disabled: boolean;
+}
+
+const FeaturedByConfig: FunctionComponent<Props> = ({ disabled }) => (
+  <ConfigBox
+    title={
+      <Localized id="configure-general-featuredBy-title">
+        <Header container="h2">Featured by</Header>
+      </Localized>
+    }
+  >
+    <Localized id="configure-general-featuredBy-explanation">
+      <FormFieldDescription>
+        Toggles whether or not featured comments display the name of the staff
+        member who featured the comment.
+      </FormFieldDescription>
+    </Localized>
+    <FormField container={<FieldSet />}>
+      <Localized id="configure-general-featuredBy-enabled">
+        <Label component="legend">Featured by</Label>
+      </Localized>
+      <OnOffField name="featuredBy" disabled={disabled} />
+    </FormField>
+  </ConfigBox>
+);
+
+export default FeaturedByConfig;
diff --git a/src/core/client/admin/routes/Configure/sections/General/GeneralConfigContainer.tsx b/src/core/client/admin/routes/Configure/sections/General/GeneralConfigContainer.tsx
index 076fb0a99e..1b93abb415 100644
--- a/src/core/client/admin/routes/Configure/sections/General/GeneralConfigContainer.tsx
+++ b/src/core/client/admin/routes/Configure/sections/General/GeneralConfigContainer.tsx
@@ -16,6 +16,7 @@ import ClosedStreamMessageConfig from "./ClosedStreamMessageConfig";
 import ClosingCommentStreamsConfig from "./ClosingCommentStreamsConfig";
 import CommentEditingConfig from "./CommentEditingConfig";
 import CommentLengthConfig from "./CommentLengthConfig";
+import FeaturedByConfig from "./FeaturedByConfig";
 import FlattenRepliesConfig from "./FlattenRepliesConfig";
 import GuidelinesConfig from "./GuidelinesConfig";
 import LocaleConfig from "./LocaleConfig";
@@ -55,6 +56,7 @@ const GeneralConfigContainer: React.FunctionComponent<Props> = ({
       <ClosingCommentStreamsConfig disabled={submitting} />
       <ClosedStreamMessageConfig disabled={submitting} />
       <ReactionConfigContainer disabled={submitting} settings={settings} />
+      <FeaturedByConfig disabled={submitting} />
       <BadgeConfig disabled={submitting} />
       <MemberBioConfig disabled={submitting} />
       <MediaLinksConfig disabled={submitting} />
@@ -74,6 +76,7 @@ const enhanced = withFragmentContainer<Props>({
       ...ClosedStreamMessageConfig_formValues @relay(mask: false)
       ...ClosingCommentStreamsConfig_formValues @relay(mask: false)
       ...SitewideCommentingConfig_formValues @relay(mask: false)
+      ...FeaturedByConfig_formValues @relay(mask: false)
       ...ReactionConfig_formValues @relay(mask: false)
       ...BadgeConfig_formValues @relay(mask: false)
       ...RTEConfig_formValues @relay(mask: false)
diff --git a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.css b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.css
index 13c025ba8e..db6220ba27 100644
--- a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.css
+++ b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.css
@@ -1,9 +1,7 @@
-$status-modal-username: $colors-mono-900;
-
 .root {
   font-weight: var(--font-weight-secondary-regular);
   font-family: var(--font-family-secondary);
-  color: --pallete-primary-400;
+  color: var(--palette-primary-400);
   font-size: var(--font-size-1);
   text-transform: uppercase;
 }
diff --git a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx
index 4a95813d3a..b38c287e18 100644
--- a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx
+++ b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedBy.tsx
@@ -9,7 +9,11 @@ interface Props {
 
 const FeaturedBy: FunctionComponent<Props> = ({ username }) => {
   return (
-    <Localized id="comments-featuredBy" vars={{ username }}>
+    <Localized
+      id="comments-featuredBy"
+      vars={{ username }}
+      elems={{ strong: <strong className={styles.name} /> }}
+    >
       <span className={styles.root}>
         featured by <strong className={styles.name}>{username}</strong>
       </span>
diff --git a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentContainer.tsx b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentContainer.tsx
index e39fce034f..e8093649e2 100644
--- a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentContainer.tsx
+++ b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentContainer.tsx
@@ -7,7 +7,7 @@ import { getURLWithCommentID } from "coral-framework/helpers";
 import { useViewerEvent } from "coral-framework/lib/events";
 import { useMutation } from "coral-framework/lib/relay";
 import withFragmentContainer from "coral-framework/lib/relay/withFragmentContainer";
-import { GQLSTORY_MODE, GQLUSER_STATUS } from "coral-framework/schema";
+import { GQLSTORY_MODE, GQLTAG, GQLUSER_STATUS } from "coral-framework/schema";
 import CLASSES from "coral-stream/classes";
 import HTMLContent from "coral-stream/common/HTMLContent";
 import Timestamp from "coral-stream/common/Timestamp";
@@ -75,7 +75,7 @@ const FeaturedCommentContainer: FunctionComponent<Props> = (props) => {
   );
 
   const featuringUser = comment.tags.find(
-    (tag) => tag.code === "FEATURED"
+    (tag) => tag.code === GQLTAG.FEATURED
   )?.createdBy;
 
   const gotoConvAriaLabelId = comment.author?.username
@@ -100,7 +100,7 @@ const FeaturedCommentContainer: FunctionComponent<Props> = (props) => {
           </Hidden>
         </Localized>
         <HorizontalGutter>
-          {featuringUser?.username && (
+          {settings.featuredBy && featuringUser?.username && (
             <FeaturedBy username={featuringUser.username} />
           )}
           {isRatingsAndReviews && comment.rating && (
@@ -282,6 +282,7 @@ const enhanced = withFragmentContainer<Props>({
   `,
   settings: graphql`
     fragment FeaturedCommentContainer_settings on Settings {
+      featuredBy
       ...ReactionButtonContainer_settings
       ...UserTagsContainer_settings
       ...MediaSectionContainer_settings
diff --git a/src/core/server/graph/schema/schema.graphql b/src/core/server/graph/schema/schema.graphql
index 1786515b46..c68621b6d3 100644
--- a/src/core/server/graph/schema/schema.graphql
+++ b/src/core/server/graph/schema/schema.graphql
@@ -2073,6 +2073,11 @@ type Settings @cacheControl(maxAge: 30) {
   """
   reaction: ReactionConfiguration!
 
+  """
+  featuredBy specifies whether or not to display 'Featured by' for featured comments
+  """
+  featuredBy: Boolean
+
   """
   staff specifies the configuration for the user badges assigned to users with
   any role above COMMENTER
@@ -5636,6 +5641,11 @@ input SettingsInput {
   """
   reaction: ReactionConfigurationInput
 
+  """
+  featuredBy specifies whether or not the "Featured by" featured is enabled
+  """
+  featuredBy: Boolean
+
   """
   badges specifies the configuration for user badges assigned to users with
   any role above COMMENTER.
diff --git a/src/locales/en-US/admin.ftl b/src/locales/en-US/admin.ftl
index 3b8c48f176..8e9730a1c1 100644
--- a/src/locales/en-US/admin.ftl
+++ b/src/locales/en-US/admin.ftl
@@ -500,7 +500,12 @@ configure-general-commentEditing-seconds = Seconds
 configure-general-flattenReplies-title = Flatten replies
 configure-general-flattenReplies-enabled = Flatten replies enabled
 configure-general-flattenReplies-explanation =
-  Change how levels of replies display. When enabled, replies to comments can go up to seven levels deep before they are no longer indented on the page. When disabled, after a depth of seven replies, the rest of the conversation is displayed in a dedicated view away from the other comments.
+  Change how levels of replies display. When enabled, replies to comments can go up to seven levels deep before they are no longer indented on the page. When disabled, after a depth of seven replies, the rest of the conversation is displayed in a dedicated view away from the other comments.\
+
+configure-general-featuredBy-title = Featured by
+configure-general-featuredBy-enabled = Featured by enabled
+configure-general-featuredBy-explanation =
+  Toggles whether or not featured comments display the name of the staff member who featured the comment.
 
 #### Closed Stream Message
 configure-general-closedStreamMessage-title = Closed comment stream message
diff --git a/src/locales/en-US/stream.ftl b/src/locales/en-US/stream.ftl
index 4513840640..c1b0545f3b 100644
--- a/src/locales/en-US/stream.ftl
+++ b/src/locales/en-US/stream.ftl
@@ -286,7 +286,7 @@ comments-moderationRejectedTombstone-moderateLink =
   Go to moderate to review this decision
 
 comments-featuredTag = Featured
-comments-featuredBy = Featured by {$username}
+comments-featuredBy = Featured by <strong>{$username}</strong>
 
 # $reaction could be "Respect" as an example. Be careful when translating to other languages with different grammar cases.
 comments-react =

From 489333e4039df11ab7b46ae476d0f04d61a669e1 Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Fri, 28 Apr 2023 13:40:02 -0500
Subject: [PATCH 30/72] adds gha registry cache to image builds

---
 .github/workflows/build-and-test.yml    | 6 +++++-
 .github/workflows/build-test-deploy.yml | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index fafd86685c..0cca19a782 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         uses: webfactory/ssh-agent@v0.7.0
         with:
@@ -96,6 +96,8 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:develop-latest
           build-args: |
               REVISION_HASH=${GITHUB_SHA}
+          cache-from: type=registry,ref=${{ env.IMAGE_REPOSITORY }}/cache:latest
+          cache-to: type=inline
 # Build tag push the release candidate image when the branch name begins with release-
       -
         name: Build, Tag, Push RC
@@ -106,3 +108,5 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ github.ref_name }}-${{ env.SHORT_SHA }}
           build-args: |
               REVISION_HASH=${GITHUB_SHA}
+          cache-from: type=registry,ref=${{ env.IMAGE_REPOSITORY }}/cache:latest
+          cache-to: type=inline
diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index abb146928c..9713f243f2 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -124,6 +124,8 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.MAJOR_TAG }}
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
+          cache-from: type=registry,ref=${{ env.IMAGE_REPOSITORY }}/cache:latest
+          cache-to: type=inline
       -
         name: Build, Tag, Push Minor Tag
         uses: docker/build-push-action@v3
@@ -132,6 +134,8 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.MINOR_TAG }}
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
+          cache-from: type=registry,ref=${{ env.IMAGE_REPOSITORY }}/cache:latest
+          cache-to: type=inline
       -
         name: Build, Tag, Push Patch Tag
         uses: docker/build-push-action@v3
@@ -140,6 +144,8 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.PATCH_TAG }}
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
+          cache-from: type=registry,ref=${{ env.IMAGE_REPOSITORY }}/cache:latest
+          cache-to: type=inline
       -
         name: Deploy Static Assets to GCS Bucket
         run: |

From 4c86bc241ceb14fa6ec776522168d6911c9ecf11 Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Fri, 28 Apr 2023 13:45:37 -0500
Subject: [PATCH 31/72] upgrade action versions

---
 .github/workflows/build-and-test.yml    | 4 ++--
 .github/workflows/build-test-deploy.yml | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 0cca19a782..37b9b84436 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -89,7 +89,7 @@ jobs:
 # Build tag push the image after a merge to develop
       -
         name: Build, Tag, Push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         if: github.ref == 'refs/heads/develop'
         with:
           push: true
@@ -101,7 +101,7 @@ jobs:
 # Build tag push the release candidate image when the branch name begins with release-
       -
         name: Build, Tag, Push RC
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         if: startsWith( github.ref, 'refs/heads/release-')
         with:
           push: true
diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index 9713f243f2..798e31f90d 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         uses: webfactory/ssh-agent@v0.7.0
         with:
@@ -118,7 +118,7 @@ jobs:
           echo "PATCH_TAG=${MAJOR}.${MINOR}.${PATCH}" >> $GITHUB_ENV
       -
         name: Build, Tag, Push Major Tag
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.MAJOR_TAG }}
@@ -128,7 +128,7 @@ jobs:
           cache-to: type=inline
       -
         name: Build, Tag, Push Minor Tag
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.MINOR_TAG }}
@@ -138,7 +138,7 @@ jobs:
           cache-to: type=inline
       -
         name: Build, Tag, Push Patch Tag
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.PATCH_TAG }}

From 2a28b81f2b0340e15090031d2343547473340a46 Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Mon, 1 May 2023 09:55:58 -0700
Subject: [PATCH 32/72] organize imports

---
 .../routes/Configure/sections/General/FeaturedByConfig.tsx  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/core/client/admin/routes/Configure/sections/General/FeaturedByConfig.tsx b/src/core/client/admin/routes/Configure/sections/General/FeaturedByConfig.tsx
index a8e9251a9b..c0c4be5634 100644
--- a/src/core/client/admin/routes/Configure/sections/General/FeaturedByConfig.tsx
+++ b/src/core/client/admin/routes/Configure/sections/General/FeaturedByConfig.tsx
@@ -1,12 +1,14 @@
 import { Localized } from "@fluent/react/compat";
+import React, { FunctionComponent } from "react";
+import { graphql } from "react-relay";
+
 import {
   FieldSet,
   FormField,
   FormFieldDescription,
   Label,
 } from "coral-ui/components/v2";
-import React, { FunctionComponent } from "react";
-import { graphql } from "react-relay";
+
 import ConfigBox from "../../ConfigBox";
 import Header from "../../Header";
 import OnOffField from "../../OnOffField";

From 30da1170a54018b336a129dac523d4f70833bf15 Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Mon, 1 May 2023 10:05:38 -0700
Subject: [PATCH 33/72] match featured by copy from AC

---
 .../routes/Configure/sections/General/FeaturedByConfig.tsx     | 3 +--
 src/locales/en-US/admin.ftl                                    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/core/client/admin/routes/Configure/sections/General/FeaturedByConfig.tsx b/src/core/client/admin/routes/Configure/sections/General/FeaturedByConfig.tsx
index c0c4be5634..43220d201d 100644
--- a/src/core/client/admin/routes/Configure/sections/General/FeaturedByConfig.tsx
+++ b/src/core/client/admin/routes/Configure/sections/General/FeaturedByConfig.tsx
@@ -34,8 +34,7 @@ const FeaturedByConfig: FunctionComponent<Props> = ({ disabled }) => (
   >
     <Localized id="configure-general-featuredBy-explanation">
       <FormFieldDescription>
-        Toggles whether or not featured comments display the name of the staff
-        member who featured the comment.
+        Add moderator name to featured comment display
       </FormFieldDescription>
     </Localized>
     <FormField container={<FieldSet />}>
diff --git a/src/locales/en-US/admin.ftl b/src/locales/en-US/admin.ftl
index 2793b84d1f..fba12734dc 100644
--- a/src/locales/en-US/admin.ftl
+++ b/src/locales/en-US/admin.ftl
@@ -500,7 +500,7 @@ configure-general-commentEditing-seconds = Seconds
 configure-general-flattenReplies-title = Flatten replies
 configure-general-flattenReplies-enabled = Flatten replies enabled
 configure-general-flattenReplies-explanation =
-  Change how levels of replies display. When enabled, replies to comments can go up to seven levels deep before they are no longer indented on the page. When disabled, after a depth of seven replies, the rest of the conversation is displayed in a dedicated view away from the other comments.\
+  Change how levels of replies display. When enabled, replies to comments can go up to seven levels deep before they are no longer indented on the page. When disabled, after a depth of seven replies, the rest of the conversation is displayed in a dedicated view away from the other comments.
 
 configure-general-featuredBy-title = Featured by
 configure-general-featuredBy-enabled = Featured by enabled

From 6b3124cb3f2c6ac2c70f7c17a092464d96c6586f Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Mon, 1 May 2023 11:00:49 -0700
Subject: [PATCH 34/72] actually commit correction to localization

---
 src/locales/en-US/admin.ftl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/locales/en-US/admin.ftl b/src/locales/en-US/admin.ftl
index fba12734dc..5c94597459 100644
--- a/src/locales/en-US/admin.ftl
+++ b/src/locales/en-US/admin.ftl
@@ -504,8 +504,7 @@ configure-general-flattenReplies-explanation =
 
 configure-general-featuredBy-title = Featured by
 configure-general-featuredBy-enabled = Featured by enabled
-configure-general-featuredBy-explanation =
-  Toggles whether or not featured comments display the name of the staff member who featured the comment.
+configure-general-featuredBy-explanation = Add moderator name to featured comment display
 
 #### Closed Stream Message
 configure-general-closedStreamMessage-title = Closed comment stream message

From f44ba4eb933ddee566bad8d7b63b2d883e38652e Mon Sep 17 00:00:00 2001
From: Marcus Haddon <haddon.marcus@gmail.com>
Date: Mon, 1 May 2023 12:41:32 -0700
Subject: [PATCH 35/72] update failing snapshot

---
 .../test/configure/__snapshots__/renderConfigure.spec.tsx.snap   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/client/stream/test/configure/__snapshots__/renderConfigure.spec.tsx.snap b/src/core/client/stream/test/configure/__snapshots__/renderConfigure.spec.tsx.snap
index 943272dae7..550ad3deca 100644
--- a/src/core/client/stream/test/configure/__snapshots__/renderConfigure.spec.tsx.snap
+++ b/src/core/client/stream/test/configure/__snapshots__/renderConfigure.spec.tsx.snap
@@ -170,6 +170,7 @@ to pose a topic, ask a question or make announcements relating to this
 story.
         </div>
         <button
+          aria-label="Add message"
           class="BaseButton-root Button-base Button-filled Button-fontSizeSmall Button-textAlignCenter Button-fontFamilyPrimary Button-fontWeightPrimaryBold Button-paddingSizeSmall Button-colorSecondary Button-upperCase coral coral-openCommentStream-openButton"
           data-testid="configure-addMessage"
           data-variant="filled"

From 3e0869969c66d3b980f9939ab340f9dc9259e580 Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Mon, 1 May 2023 15:30:45 -0500
Subject: [PATCH 36/72] test image build cache on develop-latest

---
 .github/workflows/build-and-test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 37b9b84436..686bbebae0 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -90,9 +90,9 @@ jobs:
       -
         name: Build, Tag, Push
         uses: docker/build-push-action@v4
-        if: github.ref == 'refs/heads/develop'
+        # if: github.ref == 'refs/heads/develop'
         with:
-          push: true
+          # push: true
           tags: ${{ env.IMAGE_REPOSITORY }}:develop-latest
           build-args: |
               REVISION_HASH=${GITHUB_SHA}

From 06fbf1034f8d633d2579d2d0964d1079d2150ed9 Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Mon, 1 May 2023 17:04:10 -0500
Subject: [PATCH 37/72] push cache to registry

---
 .github/workflows/build-and-test.yml | 51 ++++++++++++++--------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 686bbebae0..db2c3d4c33 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -57,29 +57,29 @@ jobs:
       -
         name: Generate schemas and types
         run: npm run generate
-      -
-        name: Lint Source Code
-        run: npm run lint
-      -
-        name: Lint Markdown
-        run: |
-          npm run doctoc
-          git diff --exit-code
-      -
-        name: Lint Versions
-        run: npx @coralproject/package-version-lint
-      -
-        name: Run Server Unit Tests
-        run: npm run test:server -- --ci --runInBand --reporters=default --reporters=jest-junit
-      -
-        name: Run Client Stream Unit Tests
-        run: npm run test:client:stream -- --ci --runInBand --reporters=default --reporters=jest-junit
-      -
-        name: Run Client Admin Unit Tests
-        run: npm run test:client:admin -- --ci --runInBand --reporters=default --reporters=jest-junit
-      -
-        name: Run Client Other Unit Tests
-        run: npm run test:client:other -- --ci --runInBand --reporters=default --reporters=jest-junit
+      # -
+      #   name: Lint Source Code
+      #   run: npm run lint
+      # -
+      #   name: Lint Markdown
+      #   run: |
+      #     npm run doctoc
+      #     git diff --exit-code
+      # -
+      #   name: Lint Versions
+      #   run: npx @coralproject/package-version-lint
+      # -
+      #   name: Run Server Unit Tests
+      #   run: npm run test:server -- --ci --runInBand --reporters=default --reporters=jest-junit
+      # -
+      #   name: Run Client Stream Unit Tests
+      #   run: npm run test:client:stream -- --ci --runInBand --reporters=default --reporters=jest-junit
+      # -
+      #   name: Run Client Admin Unit Tests
+      #   run: npm run test:client:admin -- --ci --runInBand --reporters=default --reporters=jest-junit
+      # -
+      #   name: Run Client Other Unit Tests
+      #   run: npm run test:client:other -- --ci --runInBand --reporters=default --reporters=jest-junit
       -
         name: Build
         run: npm run build
@@ -92,8 +92,9 @@ jobs:
         uses: docker/build-push-action@v4
         # if: github.ref == 'refs/heads/develop'
         with:
-          # push: true
-          tags: ${{ env.IMAGE_REPOSITORY }}:develop-latest
+          push: true
+          tags: ${{ env.IMAGE_REPOSITORY }}:test
+          # tags: ${{ env.IMAGE_REPOSITORY }}:develop-latest
           build-args: |
               REVISION_HASH=${GITHUB_SHA}
           cache-from: type=registry,ref=${{ env.IMAGE_REPOSITORY }}/cache:latest

From 5db6172d4f269ba483aa289e863be128c12bcae6 Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Mon, 1 May 2023 18:19:31 -0500
Subject: [PATCH 38/72] fix tagging format

---
 .github/workflows/build-and-test.yml    | 4 ++--
 .github/workflows/build-test-deploy.yml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index db2c3d4c33..9d5f697335 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -97,7 +97,7 @@ jobs:
           # tags: ${{ env.IMAGE_REPOSITORY }}:develop-latest
           build-args: |
               REVISION_HASH=${GITHUB_SHA}
-          cache-from: type=registry,ref=${{ env.IMAGE_REPOSITORY }}/cache:latest
+          cache-from: type=registry,ref=${{ env.IMAGE_REPOSITORY }}:cache-latest
           cache-to: type=inline
 # Build tag push the release candidate image when the branch name begins with release-
       -
@@ -109,5 +109,5 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ github.ref_name }}-${{ env.SHORT_SHA }}
           build-args: |
               REVISION_HASH=${GITHUB_SHA}
-          cache-from: type=registry,ref=${{ env.IMAGE_REPOSITORY }}/cache:latest
+          cache-from: type=registry,ref=${{ env.IMAGE_REPOSITORY }}:cache-latest
           cache-to: type=inline
diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index 798e31f90d..792be89233 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -124,7 +124,7 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.MAJOR_TAG }}
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
-          cache-from: type=registry,ref=${{ env.IMAGE_REPOSITORY }}/cache:latest
+          cache-from: type=registry,ref=${{ env.IMAGE_REPOSITORY }}:cache-latest
           cache-to: type=inline
       -
         name: Build, Tag, Push Minor Tag
@@ -134,7 +134,7 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.MINOR_TAG }}
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
-          cache-from: type=registry,ref=${{ env.IMAGE_REPOSITORY }}/cache:latest
+          cache-from: type=registry,ref=${{ env.IMAGE_REPOSITORY }}:cache-latest
           cache-to: type=inline
       -
         name: Build, Tag, Push Patch Tag
@@ -144,7 +144,7 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.PATCH_TAG }}
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
-          cache-from: type=registry,ref=${{ env.IMAGE_REPOSITORY }}/cache:latest
+          cache-from: type=registry,ref=${{ env.IMAGE_REPOSITORY }}:cache-latest
           cache-to: type=inline
       -
         name: Deploy Static Assets to GCS Bucket

From a0918a3a5f075321812ac25d31b222fc8a8fc1f4 Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Mon, 1 May 2023 19:21:43 -0500
Subject: [PATCH 39/72] adds buildx setup step

---
 .github/workflows/build-and-test.yml    | 3 +++
 .github/workflows/build-test-deploy.yml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 9d5f697335..e2fd516928 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -16,6 +16,9 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v3
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       -
         uses: webfactory/ssh-agent@v0.7.0
         with:
diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index 792be89233..9c0f6b792e 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -21,6 +21,9 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v3
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       -
         uses: webfactory/ssh-agent@v0.7.0
         with:

From 60a03079450c3a81180003afe8da11fe591a1d4b Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Tue, 2 May 2023 12:50:19 -0500
Subject: [PATCH 40/72] use ghcr as cache

---
 .github/workflows/build-and-test.yml    | 7 ++++---
 .github/workflows/build-test-deploy.yml | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index e2fd516928..dd77b27545 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -6,6 +6,7 @@ on:
 
 env:
   IMAGE_REPOSITORY: 'gcr.io/the-coral-project/coral'
+  GHCR_CACHE: 'ghcr.io/coralproject/talk'
 
 
 jobs:
@@ -95,12 +96,12 @@ jobs:
         uses: docker/build-push-action@v4
         # if: github.ref == 'refs/heads/develop'
         with:
-          push: true
+          # push: true
           tags: ${{ env.IMAGE_REPOSITORY }}:test
           # tags: ${{ env.IMAGE_REPOSITORY }}:develop-latest
           build-args: |
               REVISION_HASH=${GITHUB_SHA}
-          cache-from: type=registry,ref=${{ env.IMAGE_REPOSITORY }}:cache-latest
+          cache-from: type=registry,ref=${{ env.GHCR_CACHE }}:cache-latest
           cache-to: type=inline
 # Build tag push the release candidate image when the branch name begins with release-
       -
@@ -112,5 +113,5 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ github.ref_name }}-${{ env.SHORT_SHA }}
           build-args: |
               REVISION_HASH=${GITHUB_SHA}
-          cache-from: type=registry,ref=${{ env.IMAGE_REPOSITORY }}:cache-latest
+          cache-from: type=registry,ref=${{ env.GHCR_CACHE }}:cache-latest
           cache-to: type=inline
diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index 9c0f6b792e..21e1a36121 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -12,6 +12,7 @@ env:
   IMAGE_REPOSITORY: 'coralproject/talk'
   SENTRY_ORG: 'voxmedia'
   SENTRY_PROJECT: 'coral'
+  GHCR_CACHE: 'ghcr.io/coralproject/talk'
 
 jobs:
   build-and-test:
@@ -127,7 +128,7 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.MAJOR_TAG }}
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
-          cache-from: type=registry,ref=${{ env.IMAGE_REPOSITORY }}:cache-latest
+          cache-from: type=registry,ref=${{ env.GHCR_CACHE }}:cache-latest
           cache-to: type=inline
       -
         name: Build, Tag, Push Minor Tag
@@ -137,7 +138,7 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.MINOR_TAG }}
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
-          cache-from: type=registry,ref=${{ env.IMAGE_REPOSITORY }}:cache-latest
+          cache-from: type=registry,ref=${{ env.GHCR_CACHE }}:cache-latest
           cache-to: type=inline
       -
         name: Build, Tag, Push Patch Tag
@@ -147,7 +148,7 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.PATCH_TAG }}
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
-          cache-from: type=registry,ref=${{ env.IMAGE_REPOSITORY }}:cache-latest
+          cache-from: type=registry,ref=${{ env.GHCR_CACHE }}:cache-latest
           cache-to: type=inline
       -
         name: Deploy Static Assets to GCS Bucket

From f5d2ccc89239fb2afdee28358ce7095937d4afdd Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Tue, 2 May 2023 16:42:31 -0500
Subject: [PATCH 41/72] adds login to ghcr step

---
 .github/workflows/build-and-test.yml    | 7 +++++++
 .github/workflows/build-test-deploy.yml | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index dd77b27545..510f520923 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -31,6 +31,13 @@ jobs:
           registry: gcr.io
           username: _json_key
           password: ${{ secrets.GCR_JSON_KEY }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Define SHORT_SHA with commit short sha
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index 21e1a36121..2cad21a1bc 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -44,6 +44,13 @@ jobs:
         with:
           username: ${{ env.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Define SHORT_SHA with commit short sha
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV

From dbdca9e362778e0cbdd054448064a59382ec668b Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Wed, 3 May 2023 15:05:58 -0500
Subject: [PATCH 42/72] point cache to docker hub

---
 .github/workflows/build-and-test.yml    | 18 +++++++++---------
 .github/workflows/build-test-deploy.yml | 14 +++-----------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 510f520923..28df47aa1e 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -6,7 +6,8 @@ on:
 
 env:
   IMAGE_REPOSITORY: 'gcr.io/the-coral-project/coral'
-  GHCR_CACHE: 'ghcr.io/coralproject/talk'
+  IMAGE_CACHE_REPOSITORY: 'coralproject/talk'
+  DOCKERHUB_USERNAME: 'coralproject'
 
 
 jobs:
@@ -32,12 +33,11 @@ jobs:
           username: _json_key
           password: ${{ secrets.GCR_JSON_KEY }}
       -
-        name: Login to GitHub Container Registry
+        name: Login to Docker Hub
         uses: docker/login-action@v2
         with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: ${{ env.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
       -
         name: Define SHORT_SHA with commit short sha
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
@@ -103,12 +103,12 @@ jobs:
         uses: docker/build-push-action@v4
         # if: github.ref == 'refs/heads/develop'
         with:
-          # push: true
-          tags: ${{ env.IMAGE_REPOSITORY }}:test
+          push: true
+          tags: ${{ env.IMAGE_CACHE_REPOSITORY }}:cache-latest
           # tags: ${{ env.IMAGE_REPOSITORY }}:develop-latest
           build-args: |
               REVISION_HASH=${GITHUB_SHA}
-          cache-from: type=registry,ref=${{ env.GHCR_CACHE }}:cache-latest
+          cache-from: type=registry,${{ env.IMAGE_CACHE_REPOSITORY }}:cache-latest
           cache-to: type=inline
 # Build tag push the release candidate image when the branch name begins with release-
       -
@@ -120,5 +120,5 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ github.ref_name }}-${{ env.SHORT_SHA }}
           build-args: |
               REVISION_HASH=${GITHUB_SHA}
-          cache-from: type=registry,ref=${{ env.GHCR_CACHE }}:cache-latest
+          cache-from: type=registry,${{ env.IMAGE_CACHE_REPOSITORY }}:cache-latest
           cache-to: type=inline
diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index 2cad21a1bc..0fa9954655 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -12,7 +12,6 @@ env:
   IMAGE_REPOSITORY: 'coralproject/talk'
   SENTRY_ORG: 'voxmedia'
   SENTRY_PROJECT: 'coral'
-  GHCR_CACHE: 'ghcr.io/coralproject/talk'
 
 jobs:
   build-and-test:
@@ -44,13 +43,6 @@ jobs:
         with:
           username: ${{ env.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
-      -
-        name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Define SHORT_SHA with commit short sha
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
@@ -135,7 +127,7 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.MAJOR_TAG }}
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
-          cache-from: type=registry,ref=${{ env.GHCR_CACHE }}:cache-latest
+          cache-from: type=registry,${{ env.IMAGE_REPOSITORY }}:cache-latest
           cache-to: type=inline
       -
         name: Build, Tag, Push Minor Tag
@@ -145,7 +137,7 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.MINOR_TAG }}
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
-          cache-from: type=registry,ref=${{ env.GHCR_CACHE }}:cache-latest
+          cache-from: type=registry,${{ env.IMAGE_REPOSITORY }}:cache-latest
           cache-to: type=inline
       -
         name: Build, Tag, Push Patch Tag
@@ -155,7 +147,7 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.PATCH_TAG }}
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
-          cache-from: type=registry,ref=${{ env.GHCR_CACHE }}:cache-latest
+          cache-from: type=registry,${{ env.IMAGE_REPOSITORY }}:cache-latest
           cache-to: type=inline
       -
         name: Deploy Static Assets to GCS Bucket

From 60e1e0a288df9fd81a0ce0ae5ba642e5f12727ef Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Wed, 3 May 2023 15:45:55 -0500
Subject: [PATCH 43/72] renamed cache image tag

---
 .github/workflows/build-and-test.yml    | 6 +++---
 .github/workflows/build-test-deploy.yml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 28df47aa1e..da71f20fbb 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -104,11 +104,11 @@ jobs:
         # if: github.ref == 'refs/heads/develop'
         with:
           push: true
-          tags: ${{ env.IMAGE_CACHE_REPOSITORY }}:cache-latest
+          tags: ${{ env.IMAGE_CACHE_REPOSITORY }}:cache
           # tags: ${{ env.IMAGE_REPOSITORY }}:develop-latest
           build-args: |
               REVISION_HASH=${GITHUB_SHA}
-          cache-from: type=registry,${{ env.IMAGE_CACHE_REPOSITORY }}:cache-latest
+          cache-from: type=registry,${{ env.IMAGE_CACHE_REPOSITORY }}:cache
           cache-to: type=inline
 # Build tag push the release candidate image when the branch name begins with release-
       -
@@ -120,5 +120,5 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ github.ref_name }}-${{ env.SHORT_SHA }}
           build-args: |
               REVISION_HASH=${GITHUB_SHA}
-          cache-from: type=registry,${{ env.IMAGE_CACHE_REPOSITORY }}:cache-latest
+          cache-from: type=registry,${{ env.IMAGE_CACHE_REPOSITORY }}:cache
           cache-to: type=inline
diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index 0fa9954655..b4853c3201 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -127,7 +127,7 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.MAJOR_TAG }}
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
-          cache-from: type=registry,${{ env.IMAGE_REPOSITORY }}:cache-latest
+          cache-from: type=registry,${{ env.IMAGE_REPOSITORY }}:cache
           cache-to: type=inline
       -
         name: Build, Tag, Push Minor Tag
@@ -137,7 +137,7 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.MINOR_TAG }}
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
-          cache-from: type=registry,${{ env.IMAGE_REPOSITORY }}:cache-latest
+          cache-from: type=registry,${{ env.IMAGE_REPOSITORY }}:cache
           cache-to: type=inline
       -
         name: Build, Tag, Push Patch Tag
@@ -147,7 +147,7 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.PATCH_TAG }}
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
-          cache-from: type=registry,${{ env.IMAGE_REPOSITORY }}:cache-latest
+          cache-from: type=registry,${{ env.IMAGE_REPOSITORY }}:cache
           cache-to: type=inline
       -
         name: Deploy Static Assets to GCS Bucket

From d2291ab09d7e6169a341ad365afe019e336f2a5c Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Mon, 8 May 2023 10:38:36 -0500
Subject: [PATCH 44/72] uses docker driver

---
 .github/workflows/build-and-test.yml | 40 +++++++++++++++-------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index da71f20fbb..e5b54cd542 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -21,6 +21,8 @@ jobs:
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
+        with:
+          driver: docker
       -
         uses: webfactory/ssh-agent@v0.7.0
         with:
@@ -54,20 +56,20 @@ jobs:
         uses: mansona/npm-lockfile-version@v1
         with:
           version: 2
-      -
-        name: Cache Dependencies
-        id: cache
-        uses: actions/cache@v3
-        with:
-          path: ./node_modules
-          key: modules-${{ hashFiles('package-lock.json') }}
-          restore-keys: npm-
-      -
-        name: npm ci
-        run: npm ci
-      -
-        name: Generate schemas and types
-        run: npm run generate
+      # -
+      #   name: Cache Dependencies
+      #   id: cache
+      #   uses: actions/cache@v3
+      #   with:
+      #     path: ./node_modules
+      #     key: modules-${{ hashFiles('package-lock.json') }}
+      #     restore-keys: npm-
+      # -
+      #   name: npm ci
+      #   run: npm ci
+      # -
+      #   name: Generate schemas and types
+      #   run: npm run generate
       # -
       #   name: Lint Source Code
       #   run: npm run lint
@@ -91,9 +93,9 @@ jobs:
       # -
       #   name: Run Client Other Unit Tests
       #   run: npm run test:client:other -- --ci --runInBand --reporters=default --reporters=jest-junit
-      -
-        name: Build
-        run: npm run build
+      # -
+      #   name: Build
+      #   run: npm run build
       -
         name: Verify Bundle Size
         run: ./node_modules/.bin/bundlesize --enable-github-checks
@@ -103,8 +105,8 @@ jobs:
         uses: docker/build-push-action@v4
         # if: github.ref == 'refs/heads/develop'
         with:
-          push: true
-          tags: ${{ env.IMAGE_CACHE_REPOSITORY }}:cache
+          # push: true
+          # tags: ${{ env.IMAGE_CACHE_REPOSITORY }}:cache
           # tags: ${{ env.IMAGE_REPOSITORY }}:develop-latest
           build-args: |
               REVISION_HASH=${GITHUB_SHA}

From a15e80cf0ee7ce7d42ec1780342c1737d4c7139a Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Mon, 8 May 2023 10:41:06 -0500
Subject: [PATCH 45/72] remove step for testing

---
 .github/workflows/build-and-test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index e5b54cd542..260e6e3ab6 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -96,9 +96,9 @@ jobs:
       # -
       #   name: Build
       #   run: npm run build
-      -
-        name: Verify Bundle Size
-        run: ./node_modules/.bin/bundlesize --enable-github-checks
+      # -
+      #   name: Verify Bundle Size
+      #   run: ./node_modules/.bin/bundlesize --enable-github-checks
 # Build tag push the image after a merge to develop
       -
         name: Build, Tag, Push

From 3718475edee9fdd82c3d83ca4f596a4753e028fb Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Mon, 8 May 2023 10:52:23 -0500
Subject: [PATCH 46/72] remove buildx for testing

---
 .github/workflows/build-and-test.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 260e6e3ab6..1f38a38dcd 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -18,11 +18,11 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          driver: docker
+      # -
+      #   name: Set up Docker Buildx
+      #   uses: docker/setup-buildx-action@v2
+      #   with:
+      #     driver: docker
       -
         uses: webfactory/ssh-agent@v0.7.0
         with:

From 47167c2eca26c3fc279da5bd9b3b4c0599feab0c Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Mon, 8 May 2023 10:56:08 -0500
Subject: [PATCH 47/72] edit cache tag name

---
 .github/workflows/build-and-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 1f38a38dcd..1055f9e314 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -6,7 +6,7 @@ on:
 
 env:
   IMAGE_REPOSITORY: 'gcr.io/the-coral-project/coral'
-  IMAGE_CACHE_REPOSITORY: 'coralproject/talk'
+  IMAGE_CACHE_REPOSITORY: 'coralproject'
   DOCKERHUB_USERNAME: 'coralproject'
 
 

From 99e3e13ae670d324c23ab072748248a0c31a50f2 Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Mon, 8 May 2023 11:02:31 -0500
Subject: [PATCH 48/72] revert docker action version upgrade

---
 .github/workflows/build-and-test.yml | 30 ++++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 1055f9e314..97115a198b 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -6,7 +6,7 @@ on:
 
 env:
   IMAGE_REPOSITORY: 'gcr.io/the-coral-project/coral'
-  IMAGE_CACHE_REPOSITORY: 'coralproject'
+  IMAGE_CACHE_REPOSITORY: 'coralproject/talk'
   DOCKERHUB_USERNAME: 'coralproject'
 
 
@@ -43,19 +43,19 @@ jobs:
       -
         name: Define SHORT_SHA with commit short sha
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
-      -
-        name: Setup Node14.x
-        uses: actions/setup-node@v3
-        with:
-          node-version: '14.x'
-      -
-        name: Install npm 8
-        run: npm i -g npm@8.0.0 --registry=https://registry.npmjs.org
-      -
-        name: npm Lockfile Version
-        uses: mansona/npm-lockfile-version@v1
-        with:
-          version: 2
+      # -
+      #   name: Setup Node14.x
+      #   uses: actions/setup-node@v3
+      #   with:
+      #     node-version: '14.x'
+      # -
+      #   name: Install npm 8
+      #   run: npm i -g npm@8.0.0 --registry=https://registry.npmjs.org
+      # -
+      #   name: npm Lockfile Version
+      #   uses: mansona/npm-lockfile-version@v1
+      #   with:
+      #     version: 2
       # -
       #   name: Cache Dependencies
       #   id: cache
@@ -102,7 +102,7 @@ jobs:
 # Build tag push the image after a merge to develop
       -
         name: Build, Tag, Push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v3
         # if: github.ref == 'refs/heads/develop'
         with:
           # push: true

From 563f5011f5f0fa8ad1c0942f35ac07810efcbe3a Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Mon, 8 May 2023 11:05:55 -0500
Subject: [PATCH 49/72] typo

---
 .github/workflows/build-and-test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 97115a198b..7e69af7908 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -102,7 +102,7 @@ jobs:
 # Build tag push the image after a merge to develop
       -
         name: Build, Tag, Push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         # if: github.ref == 'refs/heads/develop'
         with:
           # push: true
@@ -110,7 +110,7 @@ jobs:
           # tags: ${{ env.IMAGE_REPOSITORY }}:develop-latest
           build-args: |
               REVISION_HASH=${GITHUB_SHA}
-          cache-from: type=registry,${{ env.IMAGE_CACHE_REPOSITORY }}:cache
+          cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
           cache-to: type=inline
 # Build tag push the release candidate image when the branch name begins with release-
       -

From 66cd00b539781918d39b8c591b8a42eda61a54a2 Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Mon, 8 May 2023 12:01:28 -0500
Subject: [PATCH 50/72] caches full build

---
 .github/workflows/build-and-test.yml    | 68 +++++++++++--------------
 .github/workflows/build-test-deploy.yml |  9 ++--
 2 files changed, 34 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 7e69af7908..438e6c0abd 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -18,11 +18,6 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v3
-      # -
-      #   name: Set up Docker Buildx
-      #   uses: docker/setup-buildx-action@v2
-      #   with:
-      #     driver: docker
       -
         uses: webfactory/ssh-agent@v0.7.0
         with:
@@ -43,30 +38,30 @@ jobs:
       -
         name: Define SHORT_SHA with commit short sha
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
-      # -
-      #   name: Setup Node14.x
-      #   uses: actions/setup-node@v3
-      #   with:
-      #     node-version: '14.x'
-      # -
-      #   name: Install npm 8
-      #   run: npm i -g npm@8.0.0 --registry=https://registry.npmjs.org
-      # -
-      #   name: npm Lockfile Version
-      #   uses: mansona/npm-lockfile-version@v1
-      #   with:
-      #     version: 2
-      # -
-      #   name: Cache Dependencies
-      #   id: cache
-      #   uses: actions/cache@v3
-      #   with:
-      #     path: ./node_modules
-      #     key: modules-${{ hashFiles('package-lock.json') }}
-      #     restore-keys: npm-
-      # -
-      #   name: npm ci
-      #   run: npm ci
+      -
+        name: Setup Node14.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: '14.x'
+      -
+        name: Install npm 8
+        run: npm i -g npm@8.0.0 --registry=https://registry.npmjs.org
+      -
+        name: npm Lockfile Version
+        uses: mansona/npm-lockfile-version@v1
+        with:
+          version: 2
+      -
+        name: Cache Dependencies
+        id: cache
+        uses: actions/cache@v3
+        with:
+          path: ./node_modules
+          key: modules-${{ hashFiles('package-lock.json') }}
+          restore-keys: npm-
+      -
+        name: npm ci
+        run: npm ci
       # -
       #   name: Generate schemas and types
       #   run: npm run generate
@@ -93,12 +88,12 @@ jobs:
       # -
       #   name: Run Client Other Unit Tests
       #   run: npm run test:client:other -- --ci --runInBand --reporters=default --reporters=jest-junit
-      # -
-      #   name: Build
-      #   run: npm run build
-      # -
-      #   name: Verify Bundle Size
-      #   run: ./node_modules/.bin/bundlesize --enable-github-checks
+      -
+        name: Build
+        run: npm run build
+      -
+        name: Verify Bundle Size
+        run: ./node_modules/.bin/bundlesize --enable-github-checks
 # Build tag push the image after a merge to develop
       -
         name: Build, Tag, Push
@@ -106,7 +101,6 @@ jobs:
         # if: github.ref == 'refs/heads/develop'
         with:
           # push: true
-          # tags: ${{ env.IMAGE_CACHE_REPOSITORY }}:cache
           # tags: ${{ env.IMAGE_REPOSITORY }}:develop-latest
           build-args: |
               REVISION_HASH=${GITHUB_SHA}
@@ -122,5 +116,5 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ github.ref_name }}-${{ env.SHORT_SHA }}
           build-args: |
               REVISION_HASH=${GITHUB_SHA}
-          cache-from: type=registry,${{ env.IMAGE_CACHE_REPOSITORY }}:cache
+          cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
           cache-to: type=inline
diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index b4853c3201..e463b0eee8 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -21,9 +21,6 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
       -
         uses: webfactory/ssh-agent@v0.7.0
         with:
@@ -127,7 +124,7 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.MAJOR_TAG }}
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
-          cache-from: type=registry,${{ env.IMAGE_REPOSITORY }}:cache
+          cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
           cache-to: type=inline
       -
         name: Build, Tag, Push Minor Tag
@@ -137,7 +134,7 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.MINOR_TAG }}
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
-          cache-from: type=registry,${{ env.IMAGE_REPOSITORY }}:cache
+          cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
           cache-to: type=inline
       -
         name: Build, Tag, Push Patch Tag
@@ -147,7 +144,7 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.PATCH_TAG }}
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
-          cache-from: type=registry,${{ env.IMAGE_REPOSITORY }}:cache
+          cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
           cache-to: type=inline
       -
         name: Deploy Static Assets to GCS Bucket

From 9d0577a735838fafe478ef274360762bf6074df4 Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Mon, 8 May 2023 12:31:54 -0500
Subject: [PATCH 51/72] pushes cache to registry

---
 .github/workflows/build-and-test.yml | 62 ++++++++++++++--------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 438e6c0abd..641029efb6 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -38,30 +38,30 @@ jobs:
       -
         name: Define SHORT_SHA with commit short sha
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
-      -
-        name: Setup Node14.x
-        uses: actions/setup-node@v3
-        with:
-          node-version: '14.x'
-      -
-        name: Install npm 8
-        run: npm i -g npm@8.0.0 --registry=https://registry.npmjs.org
-      -
-        name: npm Lockfile Version
-        uses: mansona/npm-lockfile-version@v1
-        with:
-          version: 2
-      -
-        name: Cache Dependencies
-        id: cache
-        uses: actions/cache@v3
-        with:
-          path: ./node_modules
-          key: modules-${{ hashFiles('package-lock.json') }}
-          restore-keys: npm-
-      -
-        name: npm ci
-        run: npm ci
+      # -
+      #   name: Setup Node14.x
+      #   uses: actions/setup-node@v3
+      #   with:
+      #     node-version: '14.x'
+      # -
+      #   name: Install npm 8
+      #   run: npm i -g npm@8.0.0 --registry=https://registry.npmjs.org
+      # -
+      #   name: npm Lockfile Version
+      #   uses: mansona/npm-lockfile-version@v1
+      #   with:
+      #     version: 2
+      # -
+      #   name: Cache Dependencies
+      #   id: cache
+      #   uses: actions/cache@v3
+      #   with:
+      #     path: ./node_modules
+      #     key: modules-${{ hashFiles('package-lock.json') }}
+      #     restore-keys: npm-
+      # -
+      #   name: npm ci
+      #   run: npm ci
       # -
       #   name: Generate schemas and types
       #   run: npm run generate
@@ -88,19 +88,19 @@ jobs:
       # -
       #   name: Run Client Other Unit Tests
       #   run: npm run test:client:other -- --ci --runInBand --reporters=default --reporters=jest-junit
-      -
-        name: Build
-        run: npm run build
-      -
-        name: Verify Bundle Size
-        run: ./node_modules/.bin/bundlesize --enable-github-checks
+      # -
+      #   name: Build
+      #   run: npm run build
+      # -
+      #   name: Verify Bundle Size
+      #   run: ./node_modules/.bin/bundlesize --enable-github-checks
 # Build tag push the image after a merge to develop
       -
         name: Build, Tag, Push
         uses: docker/build-push-action@v4
         # if: github.ref == 'refs/heads/develop'
         with:
-          # push: true
+          push: true
           # tags: ${{ env.IMAGE_REPOSITORY }}:develop-latest
           build-args: |
               REVISION_HASH=${GITHUB_SHA}

From 6c9678187018cf9bfb8ebb404f5716ba76a0796e Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Mon, 8 May 2023 12:39:40 -0500
Subject: [PATCH 52/72] pushes cache to ci registry

---
 .github/workflows/build-and-test.yml    | 3 ++-
 .github/workflows/build-test-deploy.yml | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 641029efb6..22a282dafd 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -6,7 +6,7 @@ on:
 
 env:
   IMAGE_REPOSITORY: 'gcr.io/the-coral-project/coral'
-  IMAGE_CACHE_REPOSITORY: 'coralproject/talk'
+  IMAGE_CACHE_REPOSITORY: 'coralproject/ci'
   DOCKERHUB_USERNAME: 'coralproject'
 
 
@@ -102,6 +102,7 @@ jobs:
         with:
           push: true
           # tags: ${{ env.IMAGE_REPOSITORY }}:develop-latest
+          tags: ${{ env.IMAGE_CACHE_REPOSITORY }}:cache
           build-args: |
               REVISION_HASH=${GITHUB_SHA}
           cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index e463b0eee8..d4a2d72261 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -10,6 +10,7 @@ env:
   DOCKERHUB_USERNAME: 'coralproject'
   GOOGLE_CLOUD_BUCKET: 'coral-cdn'
   IMAGE_REPOSITORY: 'coralproject/talk'
+  IMAGE_CACHE_REPOSITORY: 'coralproject/ci'
   SENTRY_ORG: 'voxmedia'
   SENTRY_PROJECT: 'coral'
 

From 380544e7215076ae9165b5f9ca6c78c73e885994 Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Mon, 8 May 2023 12:57:56 -0500
Subject: [PATCH 53/72] pushes full build cache

---
 .github/workflows/build-and-test.yml | 66 ++++++++++++++--------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 22a282dafd..82d3717700 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -38,33 +38,33 @@ jobs:
       -
         name: Define SHORT_SHA with commit short sha
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
-      # -
-      #   name: Setup Node14.x
-      #   uses: actions/setup-node@v3
-      #   with:
-      #     node-version: '14.x'
-      # -
-      #   name: Install npm 8
-      #   run: npm i -g npm@8.0.0 --registry=https://registry.npmjs.org
-      # -
-      #   name: npm Lockfile Version
-      #   uses: mansona/npm-lockfile-version@v1
-      #   with:
-      #     version: 2
-      # -
-      #   name: Cache Dependencies
-      #   id: cache
-      #   uses: actions/cache@v3
-      #   with:
-      #     path: ./node_modules
-      #     key: modules-${{ hashFiles('package-lock.json') }}
-      #     restore-keys: npm-
-      # -
-      #   name: npm ci
-      #   run: npm ci
-      # -
-      #   name: Generate schemas and types
-      #   run: npm run generate
+      -
+        name: Setup Node14.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: '14.x'
+      -
+        name: Install npm 8
+        run: npm i -g npm@8.0.0 --registry=https://registry.npmjs.org
+      -
+        name: npm Lockfile Version
+        uses: mansona/npm-lockfile-version@v1
+        with:
+          version: 2
+      -
+        name: Cache Dependencies
+        id: cache
+        uses: actions/cache@v3
+        with:
+          path: ./node_modules
+          key: modules-${{ hashFiles('package-lock.json') }}
+          restore-keys: npm-
+      -
+        name: npm ci
+        run: npm ci
+      -
+        name: Generate schemas and types
+        run: npm run generate
       # -
       #   name: Lint Source Code
       #   run: npm run lint
@@ -88,12 +88,12 @@ jobs:
       # -
       #   name: Run Client Other Unit Tests
       #   run: npm run test:client:other -- --ci --runInBand --reporters=default --reporters=jest-junit
-      # -
-      #   name: Build
-      #   run: npm run build
-      # -
-      #   name: Verify Bundle Size
-      #   run: ./node_modules/.bin/bundlesize --enable-github-checks
+      -
+        name: Build
+        run: npm run build
+      -
+        name: Verify Bundle Size
+        run: ./node_modules/.bin/bundlesize --enable-github-checks
 # Build tag push the image after a merge to develop
       -
         name: Build, Tag, Push

From ee2023d7b254761b5487a58d4e0267b246e80b5f Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Mon, 8 May 2023 14:03:40 -0500
Subject: [PATCH 54/72] uses registry cache instead of inline

---
 .github/workflows/build-and-test.yml    | 8 ++++----
 .github/workflows/build-test-deploy.yml | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 82d3717700..874079859b 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -100,13 +100,13 @@ jobs:
         uses: docker/build-push-action@v4
         # if: github.ref == 'refs/heads/develop'
         with:
-          push: true
+          # push: true
           # tags: ${{ env.IMAGE_REPOSITORY }}:develop-latest
-          tags: ${{ env.IMAGE_CACHE_REPOSITORY }}:cache
+          # tags: ${{ env.IMAGE_CACHE_REPOSITORY }}:cache
           build-args: |
               REVISION_HASH=${GITHUB_SHA}
           cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
-          cache-to: type=inline
+          cache-to: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
 # Build tag push the release candidate image when the branch name begins with release-
       -
         name: Build, Tag, Push RC
@@ -118,4 +118,4 @@ jobs:
           build-args: |
               REVISION_HASH=${GITHUB_SHA}
           cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
-          cache-to: type=inline
+          cache-to: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index d4a2d72261..704f790181 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -126,7 +126,7 @@ jobs:
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
           cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
-          cache-to: type=inline
+          cache-to: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
       -
         name: Build, Tag, Push Minor Tag
         uses: docker/build-push-action@v4
@@ -136,7 +136,7 @@ jobs:
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
           cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
-          cache-to: type=inline
+          cache-to: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
       -
         name: Build, Tag, Push Patch Tag
         uses: docker/build-push-action@v4
@@ -146,7 +146,7 @@ jobs:
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
           cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
-          cache-to: type=inline
+          cache-to: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
       -
         name: Deploy Static Assets to GCS Bucket
         run: |

From 4d74c560f36e47e8dee19d1e5bbf4a1e221c79d8 Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Mon, 8 May 2023 14:19:22 -0500
Subject: [PATCH 55/72] uses buildx for docker-container driver

---
 .github/workflows/build-and-test.yml    | 69 +++++++++++++------------
 .github/workflows/build-test-deploy.yml |  3 ++
 2 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 874079859b..c6cce57a0b 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -18,6 +18,9 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v3
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       -
         uses: webfactory/ssh-agent@v0.7.0
         with:
@@ -38,33 +41,33 @@ jobs:
       -
         name: Define SHORT_SHA with commit short sha
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
-      -
-        name: Setup Node14.x
-        uses: actions/setup-node@v3
-        with:
-          node-version: '14.x'
-      -
-        name: Install npm 8
-        run: npm i -g npm@8.0.0 --registry=https://registry.npmjs.org
-      -
-        name: npm Lockfile Version
-        uses: mansona/npm-lockfile-version@v1
-        with:
-          version: 2
-      -
-        name: Cache Dependencies
-        id: cache
-        uses: actions/cache@v3
-        with:
-          path: ./node_modules
-          key: modules-${{ hashFiles('package-lock.json') }}
-          restore-keys: npm-
-      -
-        name: npm ci
-        run: npm ci
-      -
-        name: Generate schemas and types
-        run: npm run generate
+      # -
+      #   name: Setup Node14.x
+      #   uses: actions/setup-node@v3
+      #   with:
+      #     node-version: '14.x'
+      # -
+      #   name: Install npm 8
+      #   run: npm i -g npm@8.0.0 --registry=https://registry.npmjs.org
+      # -
+      #   name: npm Lockfile Version
+      #   uses: mansona/npm-lockfile-version@v1
+      #   with:
+      #     version: 2
+      # -
+      #   name: Cache Dependencies
+      #   id: cache
+      #   uses: actions/cache@v3
+      #   with:
+      #     path: ./node_modules
+      #     key: modules-${{ hashFiles('package-lock.json') }}
+      #     restore-keys: npm-
+      # -
+      #   name: npm ci
+      #   run: npm ci
+      # -
+      #   name: Generate schemas and types
+      #   run: npm run generate
       # -
       #   name: Lint Source Code
       #   run: npm run lint
@@ -88,12 +91,12 @@ jobs:
       # -
       #   name: Run Client Other Unit Tests
       #   run: npm run test:client:other -- --ci --runInBand --reporters=default --reporters=jest-junit
-      -
-        name: Build
-        run: npm run build
-      -
-        name: Verify Bundle Size
-        run: ./node_modules/.bin/bundlesize --enable-github-checks
+      # -
+      #   name: Build
+      #   run: npm run build
+      # -
+      #   name: Verify Bundle Size
+      #   run: ./node_modules/.bin/bundlesize --enable-github-checks
 # Build tag push the image after a merge to develop
       -
         name: Build, Tag, Push
diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index 704f790181..8f011921e4 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -22,6 +22,9 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v3
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       -
         uses: webfactory/ssh-agent@v0.7.0
         with:

From 4732f1f07deb40ac3f2e377990446ecf6bd9583e Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Mon, 8 May 2023 14:35:08 -0500
Subject: [PATCH 56/72] export full cache build

---
 .github/workflows/build-and-test.yml | 67 ++++++++++++++--------------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index c6cce57a0b..29f1f5342f 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -41,33 +41,33 @@ jobs:
       -
         name: Define SHORT_SHA with commit short sha
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
-      # -
-      #   name: Setup Node14.x
-      #   uses: actions/setup-node@v3
-      #   with:
-      #     node-version: '14.x'
-      # -
-      #   name: Install npm 8
-      #   run: npm i -g npm@8.0.0 --registry=https://registry.npmjs.org
-      # -
-      #   name: npm Lockfile Version
-      #   uses: mansona/npm-lockfile-version@v1
-      #   with:
-      #     version: 2
-      # -
-      #   name: Cache Dependencies
-      #   id: cache
-      #   uses: actions/cache@v3
-      #   with:
-      #     path: ./node_modules
-      #     key: modules-${{ hashFiles('package-lock.json') }}
-      #     restore-keys: npm-
-      # -
-      #   name: npm ci
-      #   run: npm ci
-      # -
-      #   name: Generate schemas and types
-      #   run: npm run generate
+      -
+        name: Setup Node14.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: '14.x'
+      -
+        name: Install npm 8
+        run: npm i -g npm@8.0.0 --registry=https://registry.npmjs.org
+      -
+        name: npm Lockfile Version
+        uses: mansona/npm-lockfile-version@v1
+        with:
+          version: 2
+      -
+        name: Cache Dependencies
+        id: cache
+        uses: actions/cache@v3
+        with:
+          path: ./node_modules
+          key: modules-${{ hashFiles('package-lock.json') }}
+          restore-keys: npm-
+      -
+        name: npm ci
+        run: npm ci
+      -
+        name: Generate schemas and types
+        run: npm run generate
       # -
       #   name: Lint Source Code
       #   run: npm run lint
@@ -91,12 +91,12 @@ jobs:
       # -
       #   name: Run Client Other Unit Tests
       #   run: npm run test:client:other -- --ci --runInBand --reporters=default --reporters=jest-junit
-      # -
-      #   name: Build
-      #   run: npm run build
-      # -
-      #   name: Verify Bundle Size
-      #   run: ./node_modules/.bin/bundlesize --enable-github-checks
+      -
+        name: Build
+        run: npm run build
+      -
+        name: Verify Bundle Size
+        run: ./node_modules/.bin/bundlesize --enable-github-checks
 # Build tag push the image after a merge to develop
       -
         name: Build, Tag, Push
@@ -105,7 +105,6 @@ jobs:
         with:
           # push: true
           # tags: ${{ env.IMAGE_REPOSITORY }}:develop-latest
-          # tags: ${{ env.IMAGE_CACHE_REPOSITORY }}:cache
           build-args: |
               REVISION_HASH=${GITHUB_SHA}
           cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache

From 3065b769e41ab3d874b67a41437b5f08c15934aa Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Mon, 8 May 2023 15:40:06 -0500
Subject: [PATCH 57/72] remove comments

---
 .github/workflows/build-and-test.yml | 52 ++++++++++++++--------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 29f1f5342f..76fd578889 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -68,29 +68,29 @@ jobs:
       -
         name: Generate schemas and types
         run: npm run generate
-      # -
-      #   name: Lint Source Code
-      #   run: npm run lint
-      # -
-      #   name: Lint Markdown
-      #   run: |
-      #     npm run doctoc
-      #     git diff --exit-code
-      # -
-      #   name: Lint Versions
-      #   run: npx @coralproject/package-version-lint
-      # -
-      #   name: Run Server Unit Tests
-      #   run: npm run test:server -- --ci --runInBand --reporters=default --reporters=jest-junit
-      # -
-      #   name: Run Client Stream Unit Tests
-      #   run: npm run test:client:stream -- --ci --runInBand --reporters=default --reporters=jest-junit
-      # -
-      #   name: Run Client Admin Unit Tests
-      #   run: npm run test:client:admin -- --ci --runInBand --reporters=default --reporters=jest-junit
-      # -
-      #   name: Run Client Other Unit Tests
-      #   run: npm run test:client:other -- --ci --runInBand --reporters=default --reporters=jest-junit
+      -
+        name: Lint Source Code
+        run: npm run lint
+      -
+        name: Lint Markdown
+        run: |
+          npm run doctoc
+          git diff --exit-code
+      -
+        name: Lint Versions
+        run: npx @coralproject/package-version-lint
+      -
+        name: Run Server Unit Tests
+        run: npm run test:server -- --ci --runInBand --reporters=default --reporters=jest-junit
+      -
+        name: Run Client Stream Unit Tests
+        run: npm run test:client:stream -- --ci --runInBand --reporters=default --reporters=jest-junit
+      -
+        name: Run Client Admin Unit Tests
+        run: npm run test:client:admin -- --ci --runInBand --reporters=default --reporters=jest-junit
+      -
+        name: Run Client Other Unit Tests
+        run: npm run test:client:other -- --ci --runInBand --reporters=default --reporters=jest-junit
       -
         name: Build
         run: npm run build
@@ -101,10 +101,10 @@ jobs:
       -
         name: Build, Tag, Push
         uses: docker/build-push-action@v4
-        # if: github.ref == 'refs/heads/develop'
+        if: github.ref == 'refs/heads/develop'
         with:
-          # push: true
-          # tags: ${{ env.IMAGE_REPOSITORY }}:develop-latest
+          push: true
+          tags: ${{ env.IMAGE_REPOSITORY }}:develop-latest
           build-args: |
               REVISION_HASH=${GITHUB_SHA}
           cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache

From 45d037bfe25b0a22b9c6457cdbea65a8beaff7c5 Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Mon, 8 May 2023 17:55:56 -0500
Subject: [PATCH 58/72] update with develop


From 2e23aa1c36f7e0e68f08ecd3cc2c8d2fee235af4 Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Tue, 9 May 2023 16:09:25 -0500
Subject: [PATCH 59/72] update cache image tags to be branch-specific

---
 .github/workflows/build-and-test.yml    | 14 +++++++-------
 .github/workflows/build-test-deploy.yml | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 6449484f90..6d90cdb0c8 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -102,14 +102,14 @@ jobs:
       -
         name: Build, Tag, Push
         uses: docker/build-push-action@v4
-        if: github.ref == 'refs/heads/develop'
+        # if: github.ref == 'refs/heads/develop'
         with:
-          push: true
-          tags: ${{ env.IMAGE_REPOSITORY }}:develop-latest
+          # push: true
+          # tags: ${{ env.IMAGE_REPOSITORY }}:develop-latest
           build-args: |
               REVISION_HASH=${GITHUB_SHA}
-          cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
-          cache-to: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
+          cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache-develop
+          cache-to: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache-develop
 # Build tag push the release candidate image when the branch name begins with release-
       -
         name: Build, Tag, Push RC
@@ -120,5 +120,5 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ github.ref_name }}-${{ env.SHORT_SHA }}
           build-args: |
               REVISION_HASH=${GITHUB_SHA}
-          cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
-          cache-to: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
+          cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache-release
+          cache-to: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache-release
diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index 8f011921e4..552a540e01 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -128,8 +128,8 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.MAJOR_TAG }}
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
-          cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
-          cache-to: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
+          cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache-major
+          cache-to: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache-major
       -
         name: Build, Tag, Push Minor Tag
         uses: docker/build-push-action@v4
@@ -138,8 +138,8 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.MINOR_TAG }}
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
-          cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
-          cache-to: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
+          cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache-minor
+          cache-to: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache-minor
       -
         name: Build, Tag, Push Patch Tag
         uses: docker/build-push-action@v4
@@ -148,8 +148,8 @@ jobs:
           tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.PATCH_TAG }}
           build-args: |
               REVISION_HASH=${{ env.GITHUB_SHA }}
-          cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
-          cache-to: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache
+          cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache-patch
+          cache-to: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache-patch
       -
         name: Deploy Static Assets to GCS Bucket
         run: |

From 611da2fa34e9f5924527c290cbaa16515c9622eb Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Tue, 9 May 2023 16:10:47 -0500
Subject: [PATCH 60/72] comments to single out image cache step

---
 .github/workflows/build-and-test.yml | 118 +++++++++++++--------------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 6d90cdb0c8..d35b02e9af 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -39,65 +39,65 @@ jobs:
         with:
           username: ${{ env.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
-      -
-        name: Define SHORT_SHA with commit short sha
-        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
-      -
-        name: Setup Node14.x
-        uses: actions/setup-node@v3
-        with:
-          node-version: '14.x'
-      -
-        name: Install npm 8
-        run: npm i -g npm@8.0.0 --registry=https://registry.npmjs.org
-      -
-        name: npm Lockfile Version
-        uses: mansona/npm-lockfile-version@v1
-        with:
-          version: 2
-      -
-        name: Cache Dependencies
-        id: cache
-        uses: actions/cache@v3
-        with:
-          path: ./node_modules
-          key: modules-${{ hashFiles('package-lock.json') }}
-          restore-keys: npm-
-      -
-        name: npm ci
-        run: npm ci
-      -
-        name: Generate schemas and types
-        run: npm run generate
-      -
-        name: Lint Source Code
-        run: npm run lint
-      -
-        name: Lint Markdown
-        run: |
-          npm run doctoc
-          git diff --exit-code
-      -
-        name: Lint Versions
-        run: npx @coralproject/package-version-lint
-      -
-        name: Run Server Unit Tests
-        run: npm run test:server -- --ci --runInBand --reporters=default --reporters=jest-junit
-      -
-        name: Run Client Stream Unit Tests
-        run: npm run test:client:stream -- --ci --runInBand --reporters=default --reporters=jest-junit
-      -
-        name: Run Client Admin Unit Tests
-        run: npm run test:client:admin -- --ci --runInBand --reporters=default --reporters=jest-junit
-      -
-        name: Run Client Other Unit Tests
-        run: npm run test:client:other -- --ci --runInBand --reporters=default --reporters=jest-junit
-      -
-        name: Build
-        run: npm run build
-      -
-        name: Verify Bundle Size
-        run: ./node_modules/.bin/bundlesize --enable-github-checks
+      # -
+      #   name: Define SHORT_SHA with commit short sha
+      #   run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+      # -
+      #   name: Setup Node14.x
+      #   uses: actions/setup-node@v3
+      #   with:
+      #     node-version: '14.x'
+      # -
+      #   name: Install npm 8
+      #   run: npm i -g npm@8.0.0 --registry=https://registry.npmjs.org
+      # -
+      #   name: npm Lockfile Version
+      #   uses: mansona/npm-lockfile-version@v1
+      #   with:
+      #     version: 2
+      # -
+      #   name: Cache Dependencies
+      #   id: cache
+      #   uses: actions/cache@v3
+      #   with:
+      #     path: ./node_modules
+      #     key: modules-${{ hashFiles('package-lock.json') }}
+      #     restore-keys: npm-
+      # -
+      #   name: npm ci
+      #   run: npm ci
+      # -
+      #   name: Generate schemas and types
+      #   run: npm run generate
+      # -
+      #   name: Lint Source Code
+      #   run: npm run lint
+      # -
+      #   name: Lint Markdown
+      #   run: |
+      #     npm run doctoc
+      #     git diff --exit-code
+      # -
+      #   name: Lint Versions
+      #   run: npx @coralproject/package-version-lint
+      # -
+      #   name: Run Server Unit Tests
+      #   run: npm run test:server -- --ci --runInBand --reporters=default --reporters=jest-junit
+      # -
+      #   name: Run Client Stream Unit Tests
+      #   run: npm run test:client:stream -- --ci --runInBand --reporters=default --reporters=jest-junit
+      # -
+      #   name: Run Client Admin Unit Tests
+      #   run: npm run test:client:admin -- --ci --runInBand --reporters=default --reporters=jest-junit
+      # -
+      #   name: Run Client Other Unit Tests
+      #   run: npm run test:client:other -- --ci --runInBand --reporters=default --reporters=jest-junit
+      # -
+      #   name: Build
+      #   run: npm run build
+      # -
+      #   name: Verify Bundle Size
+      #   run: ./node_modules/.bin/bundlesize --enable-github-checks
 # Build tag push the image after a merge to develop
       -
         name: Build, Tag, Push

From de183b485fe175a6ad35e63e5f32b2515d3f09ae Mon Sep 17 00:00:00 2001
From: Robin Aguilar <robin.aguilar@voxmedia.com>
Date: Tue, 9 May 2023 16:42:05 -0500
Subject: [PATCH 61/72] remove comments

---
 .github/workflows/build-and-test.yml | 124 +++++++++++++--------------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index d35b02e9af..cc3489709e 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -39,73 +39,73 @@ jobs:
         with:
           username: ${{ env.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
-      # -
-      #   name: Define SHORT_SHA with commit short sha
-      #   run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
-      # -
-      #   name: Setup Node14.x
-      #   uses: actions/setup-node@v3
-      #   with:
-      #     node-version: '14.x'
-      # -
-      #   name: Install npm 8
-      #   run: npm i -g npm@8.0.0 --registry=https://registry.npmjs.org
-      # -
-      #   name: npm Lockfile Version
-      #   uses: mansona/npm-lockfile-version@v1
-      #   with:
-      #     version: 2
-      # -
-      #   name: Cache Dependencies
-      #   id: cache
-      #   uses: actions/cache@v3
-      #   with:
-      #     path: ./node_modules
-      #     key: modules-${{ hashFiles('package-lock.json') }}
-      #     restore-keys: npm-
-      # -
-      #   name: npm ci
-      #   run: npm ci
-      # -
-      #   name: Generate schemas and types
-      #   run: npm run generate
-      # -
-      #   name: Lint Source Code
-      #   run: npm run lint
-      # -
-      #   name: Lint Markdown
-      #   run: |
-      #     npm run doctoc
-      #     git diff --exit-code
-      # -
-      #   name: Lint Versions
-      #   run: npx @coralproject/package-version-lint
-      # -
-      #   name: Run Server Unit Tests
-      #   run: npm run test:server -- --ci --runInBand --reporters=default --reporters=jest-junit
-      # -
-      #   name: Run Client Stream Unit Tests
-      #   run: npm run test:client:stream -- --ci --runInBand --reporters=default --reporters=jest-junit
-      # -
-      #   name: Run Client Admin Unit Tests
-      #   run: npm run test:client:admin -- --ci --runInBand --reporters=default --reporters=jest-junit
-      # -
-      #   name: Run Client Other Unit Tests
-      #   run: npm run test:client:other -- --ci --runInBand --reporters=default --reporters=jest-junit
-      # -
-      #   name: Build
-      #   run: npm run build
-      # -
-      #   name: Verify Bundle Size
-      #   run: ./node_modules/.bin/bundlesize --enable-github-checks
+      -
+        name: Define SHORT_SHA with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+      -
+        name: Setup Node14.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: '14.x'
+      -
+        name: Install npm 8
+        run: npm i -g npm@8.0.0 --registry=https://registry.npmjs.org
+      -
+        name: npm Lockfile Version
+        uses: mansona/npm-lockfile-version@v1
+        with:
+          version: 2
+      -
+        name: Cache Dependencies
+        id: cache
+        uses: actions/cache@v3
+        with:
+          path: ./node_modules
+          key: modules-${{ hashFiles('package-lock.json') }}
+          restore-keys: npm-
+      -
+        name: npm ci
+        run: npm ci
+      -
+        name: Generate schemas and types
+        run: npm run generate
+      -
+        name: Lint Source Code
+        run: npm run lint
+      -
+        name: Lint Markdown
+        run: |
+          npm run doctoc
+          git diff --exit-code
+      -
+        name: Lint Versions
+        run: npx @coralproject/package-version-lint
+      -
+        name: Run Server Unit Tests
+        run: npm run test:server -- --ci --runInBand --reporters=default --reporters=jest-junit
+      -
+        name: Run Client Stream Unit Tests
+        run: npm run test:client:stream -- --ci --runInBand --reporters=default --reporters=jest-junit
+      -
+        name: Run Client Admin Unit Tests
+        run: npm run test:client:admin -- --ci --runInBand --reporters=default --reporters=jest-junit
+      -
+        name: Run Client Other Unit Tests
+        run: npm run test:client:other -- --ci --runInBand --reporters=default --reporters=jest-junit
+      -
+        name: Build
+        run: npm run build
+      -
+        name: Verify Bundle Size
+        run: ./node_modules/.bin/bundlesize --enable-github-checks
 # Build tag push the image after a merge to develop
       -
         name: Build, Tag, Push
         uses: docker/build-push-action@v4
-        # if: github.ref == 'refs/heads/develop'
+        if: github.ref == 'refs/heads/develop'
         with:
-          # push: true
-          # tags: ${{ env.IMAGE_REPOSITORY }}:develop-latest
+          push: true
+          tags: ${{ env.IMAGE_REPOSITORY }}:develop-latest
           build-args: |
               REVISION_HASH=${GITHUB_SHA}
           cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache-develop

From ce632e615c9ca1350e11c27d8767cb547728dc22 Mon Sep 17 00:00:00 2001
From: Kathryn Beaty <kathryn.beaty@voxmedia.com>
Date: Tue, 16 May 2023 10:08:48 -0400
Subject: [PATCH 62/72] update userCache when user is banned

---
 src/core/server/data/cache/userCache.ts | 9 +++++++++
 src/core/server/graph/mutators/Users.ts | 1 +
 src/core/server/services/users/users.ts | 8 ++++++++
 3 files changed, 18 insertions(+)

diff --git a/src/core/server/data/cache/userCache.ts b/src/core/server/data/cache/userCache.ts
index 66d492415e..042ed2b941 100644
--- a/src/core/server/data/cache/userCache.ts
+++ b/src/core/server/data/cache/userCache.ts
@@ -117,6 +117,15 @@ export class UserCache implements IDataCache {
     return user;
   }
 
+  public async update(user: Readonly<User>) {
+    const cmd = this.redis.multi();
+    const dataKey = this.computeDataKey(user.tenantID, user.id);
+    cmd.set(dataKey, this.serializeObject(user));
+    cmd.expire(dataKey, this.expirySeconds);
+    await cmd.exec();
+    this.usersByKey.set(dataKey, user);
+  }
+
   private serializeObject(comment: Readonly<User>) {
     const json = JSON.stringify(comment);
     return json;
diff --git a/src/core/server/graph/mutators/Users.ts b/src/core/server/graph/mutators/Users.ts
index a540a1a93f..34300c23bc 100644
--- a/src/core/server/graph/mutators/Users.ts
+++ b/src/core/server/graph/mutators/Users.ts
@@ -327,6 +327,7 @@ export const Users = (ctx: GraphContext) => ({
   }: GQLBanUserInput) =>
     ban(
       ctx.mongo,
+      ctx.cache,
       ctx.mailerQueue,
       ctx.rejectorQueue,
       ctx.tenant,
diff --git a/src/core/server/services/users/users.ts b/src/core/server/services/users/users.ts
index 19206ff84e..7ab4bfb609 100644
--- a/src/core/server/services/users/users.ts
+++ b/src/core/server/services/users/users.ts
@@ -15,6 +15,7 @@ import {
 } from "coral-common/permissions";
 import { PermissionsAction } from "coral-common/permissions/types";
 import { Config } from "coral-server/config";
+import { DataCache } from "coral-server/data/cache/dataCache";
 import { MongoContext } from "coral-server/data/context";
 import {
   DuplicateEmailError,
@@ -1337,6 +1338,7 @@ export async function destroyModeratorNote(
  * ban will ban a specific user from interacting with Coral.
  *
  * @param mongo mongo database to interact with
+ * @param cache the data cache
  * @param mailer the mailer
  * @param rejector the comment rejector queue
  * @param tenant Tenant where the User will be banned on
@@ -1348,6 +1350,7 @@ export async function destroyModeratorNote(
  */
 export async function ban(
   mongo: MongoContext,
+  cache: DataCache,
   mailer: MailerQueue,
   rejector: RejectorQueue,
   tenant: Tenant,
@@ -1443,6 +1446,11 @@ export async function ban(
       user = await removeUserWarning(mongo, tenant.id, userID, banner.id, now);
     }
 
+    const cacheAvailable = await cache.available(tenant.id);
+    if (cacheAvailable) {
+      await cache.users.update(user);
+    }
+
     if (rejectExistingComments) {
       await rejector.add({
         tenantID: tenant.id,

From 5fcc99834fa8a2d99d703488c17af7d2a71992f0 Mon Sep 17 00:00:00 2001
From: Kathryn Beaty <kathryn.beaty@voxmedia.com>
Date: Wed, 17 May 2023 09:19:56 -0400
Subject: [PATCH 63/72] update usercache for
 ban,premod,warning,suspend,bio,email,username

---
 src/core/server/graph/mutators/Users.ts |  43 +++++++-
 src/core/server/services/users/users.ts | 138 ++++++++++++++++++++++--
 2 files changed, 166 insertions(+), 15 deletions(-)

diff --git a/src/core/server/graph/mutators/Users.ts b/src/core/server/graph/mutators/Users.ts
index 34300c23bc..ba486a884b 100644
--- a/src/core/server/graph/mutators/Users.ts
+++ b/src/core/server/graph/mutators/Users.ts
@@ -210,6 +210,7 @@ export const Users = (ctx: GraphContext) => ({
   updateUsername: async (input: GQLUpdateUsernameInput) =>
     updateUsername(
       ctx.mongo,
+      ctx.cache,
       ctx.mailerQueue,
       ctx.tenant,
       ctx.user!,
@@ -231,6 +232,7 @@ export const Users = (ctx: GraphContext) => ({
   updateEmail: async (input: GQLUpdateEmailInput) =>
     updateEmail(
       ctx.mongo,
+      ctx.cache,
       ctx.tenant,
       ctx.mailerQueue,
       ctx.config,
@@ -349,6 +351,7 @@ export const Users = (ctx: GraphContext) => ({
     async () =>
       updateUserBan(
         ctx.mongo,
+        ctx.cache,
         ctx.mailerQueue,
         ctx.rejectorQueue,
         ctx.tenant,
@@ -363,6 +366,7 @@ export const Users = (ctx: GraphContext) => ({
   warn: async (input: GQLWarnUserInput) =>
     warn(
       ctx.mongo,
+      ctx.cache,
       ctx.tenant,
       ctx.user!,
       input.userID,
@@ -370,7 +374,14 @@ export const Users = (ctx: GraphContext) => ({
       ctx.now
     ),
   removeWarning: async (input: GQLRemoveUserWarningInput) =>
-    removeWarning(ctx.mongo, ctx.tenant, ctx.user!, input.userID, ctx.now),
+    removeWarning(
+      ctx.mongo,
+      ctx.cache,
+      ctx.tenant,
+      ctx.user!,
+      input.userID,
+      ctx.now
+    ),
   acknowledgeWarning: async () =>
     acknowledgeWarning(ctx.mongo, ctx.tenant, ctx.user!.id, ctx.now),
   sendModMessage: async (input: GQLSendModMessageInput) =>
@@ -385,10 +396,11 @@ export const Users = (ctx: GraphContext) => ({
   acknowledgeModMessage: async () =>
     acknowledgeModMessage(ctx.mongo, ctx.tenant, ctx.user!.id, ctx.now),
   premodUser: async (input: GQLPremodUserInput) =>
-    premod(ctx.mongo, ctx.tenant, ctx.user!, input.userID, ctx.now),
+    premod(ctx.mongo, ctx.cache, ctx.tenant, ctx.user!, input.userID, ctx.now),
   suspend: async (input: GQLSuspendUserInput) =>
     suspend(
       ctx.mongo,
+      ctx.cache,
       ctx.mailerQueue,
       ctx.tenant,
       ctx.user!,
@@ -398,11 +410,32 @@ export const Users = (ctx: GraphContext) => ({
       ctx.now
     ),
   removeBan: async (input: GQLRemoveUserBanInput) =>
-    removeBan(ctx.mongo, ctx.tenant, ctx.user!, input.userID, ctx.now),
+    removeBan(
+      ctx.mongo,
+      ctx.cache,
+      ctx.tenant,
+      ctx.user!,
+      input.userID,
+      ctx.now
+    ),
   removeSuspension: async (input: GQLRemoveUserSuspensionInput) =>
-    removeSuspension(ctx.mongo, ctx.tenant, ctx.user!, input.userID, ctx.now),
+    removeSuspension(
+      ctx.mongo,
+      ctx.cache,
+      ctx.tenant,
+      ctx.user!,
+      input.userID,
+      ctx.now
+    ),
   removeUserPremod: async (input: GQLRemovePremodUserInput) =>
-    removePremod(ctx.mongo, ctx.tenant, ctx.user!, input.userID, ctx.now),
+    removePremod(
+      ctx.mongo,
+      ctx.cache,
+      ctx.tenant,
+      ctx.user!,
+      input.userID,
+      ctx.now
+    ),
   ignore: async (input: GQLIgnoreUserInput) =>
     ignore(ctx.mongo, ctx.tenant, ctx.user!, input.userID, ctx.now),
   removeIgnore: async (input: GQLRemoveUserIgnoreInput) =>
diff --git a/src/core/server/services/users/users.ts b/src/core/server/services/users/users.ts
index 7ab4bfb609..6a430f54af 100644
--- a/src/core/server/services/users/users.ts
+++ b/src/core/server/services/users/users.ts
@@ -683,6 +683,7 @@ export async function updateSSOProfileID(
  */
 export async function updateUsername(
   mongo: MongoContext,
+  cache: DataCache,
   mailer: MailerQueue,
   tenant: Tenant,
   user: User,
@@ -749,6 +750,11 @@ export async function updateUsername(
     );
   }
 
+  const cacheAvailable = await cache.available(tenant.id);
+  if (cacheAvailable) {
+    await cache.users.update(updated);
+  }
+
   return updated;
 }
 
@@ -1192,6 +1198,7 @@ function canUpdateEmailAddress(tenant: Tenant, user: User): boolean {
  */
 export async function updateEmail(
   mongo: MongoContext,
+  cache: DataCache,
   tenant: Tenant,
   mailer: MailerQueue,
   config: Config,
@@ -1227,6 +1234,11 @@ export async function updateEmail(
     now
   );
 
+  const cacheAvailable = await cache.available(tenant.id);
+  if (cacheAvailable) {
+    await cache.users.update(updated);
+  }
+
   return updated;
 }
 
@@ -1253,7 +1265,7 @@ export async function updateEmailByID(
 }
 
 /**
- * updateBio will update the given User's avatar.
+ * updateBio will update the given User's bio.
  *
  * @param mongo mongo database to interact with
  * @param tenant Tenant where the User will be interacted with
@@ -1403,6 +1415,10 @@ export async function ban(
         siteIDs,
       });
     }
+    const cacheAvailable = await cache.available(tenant.id);
+    if (cacheAvailable) {
+      await cache.users.update(user);
+    }
   }
   // Otherwise, perform a regular ban
   else {
@@ -1502,6 +1518,7 @@ export async function ban(
  */
 export async function updateUserBan(
   mongo: MongoContext,
+  cache: DataCache,
   mailer: MailerQueue,
   rejector: RejectorQueue,
   tenant: Tenant,
@@ -1649,6 +1666,11 @@ export async function updateUserBan(
     });
   }
 
+  const cacheAvailable = await cache.available(tenant.id);
+  if (cacheAvailable) {
+    await cache.users.update(user);
+  }
+
   return user;
 }
 
@@ -1656,6 +1678,7 @@ export async function updateUserBan(
  * premod will premod a specific user.
  *
  * @param mongo mongo database to interact with
+ * @param cache the data cache
  * @param tenant Tenant where the User will be banned on
  * @param moderator the User that is banning the User
  * @param userID the ID of the User being banned
@@ -1663,6 +1686,7 @@ export async function updateUserBan(
  */
 export async function premod(
   mongo: MongoContext,
+  cache: DataCache,
   tenant: Tenant,
   moderator: User,
   userID: string,
@@ -1681,12 +1705,26 @@ export async function premod(
     throw new UserAlreadyPremoderated();
   }
 
-  // Ban the user.
-  return premodUser(mongo, tenant.id, userID, moderator.id, now);
+  // Premod the user.
+  const premoddedUser = await premodUser(
+    mongo,
+    tenant.id,
+    userID,
+    moderator.id,
+    now
+  );
+
+  const cacheAvailable = await cache.available(tenant.id);
+  if (cacheAvailable) {
+    await cache.users.update(premoddedUser);
+  }
+
+  return premoddedUser;
 }
 
 export async function removePremod(
   mongo: MongoContext,
+  cache: DataCache,
   tenant: Tenant,
   moderator: User,
   userID: string,
@@ -1708,13 +1746,27 @@ export async function removePremod(
   }
 
   // For each of the suspensions, remove it.
-  return removeUserPremod(mongo, tenant.id, userID, moderator.id, now);
+  const updatedUser = await removeUserPremod(
+    mongo,
+    tenant.id,
+    userID,
+    moderator.id,
+    now
+  );
+
+  const cacheAvailable = await cache.available(tenant.id);
+  if (cacheAvailable) {
+    await cache.users.update(updatedUser);
+  }
+
+  return updatedUser;
 }
 
 /**
  * warn will warn a specific user.
  *
  * @param mongo mongo database to interact with
+ * @param cache the data cache
  * @param tenant Tenant where the User will be warned on
  * @param moderator the User that is warning the User
  * @param userID the ID of the User being warned
@@ -1722,6 +1774,7 @@ export async function removePremod(
  */
 export async function warn(
   mongo: MongoContext,
+  cache: DataCache,
   tenant: Tenant,
   moderator: User,
   userID: string,
@@ -1741,12 +1794,27 @@ export async function warn(
     throw new Error("User already warned");
   }
 
-  // Ban the user.
-  return warnUser(mongo, tenant.id, userID, moderator.id, message, now);
+  // Warn the user.
+  const warnedUser = await warnUser(
+    mongo,
+    tenant.id,
+    userID,
+    moderator.id,
+    message,
+    now
+  );
+
+  const cacheAvailable = await cache.available(tenant.id);
+  if (cacheAvailable) {
+    await cache.users.update(warnedUser);
+  }
+
+  return warnedUser;
 }
 
 export async function removeWarning(
   mongo: MongoContext,
+  cache: DataCache,
   tenant: Tenant,
   moderator: User,
   userID: string,
@@ -1768,7 +1836,20 @@ export async function removeWarning(
   }
 
   // remove warning.
-  return removeUserWarning(mongo, tenant.id, userID, moderator.id, now);
+  const updatedUser = await removeUserWarning(
+    mongo,
+    tenant.id,
+    userID,
+    moderator.id,
+    now
+  );
+
+  const cacheAvailable = await cache.available(tenant.id);
+  if (cacheAvailable) {
+    await cache.users.update(updatedUser);
+  }
+
+  return updatedUser;
 }
 
 export async function acknowledgeWarning(
@@ -1858,6 +1939,7 @@ export async function acknowledgeModMessage(
  * suspend will suspend a give user from interacting with Coral.
  *
  * @param mongo mongo database to interact with
+ * @param cache the data cache
  * @param mailer the mailer
  * @param tenant Tenant where the User will be suspended on
  * @param user the User that is suspending the User
@@ -1868,6 +1950,7 @@ export async function acknowledgeModMessage(
  */
 export async function suspend(
   mongo: MongoContext,
+  cache: DataCache,
   mailer: MailerQueue,
   tenant: Tenant,
   user: User,
@@ -1905,6 +1988,11 @@ export async function suspend(
     now
   );
 
+  const cacheAvailable = await cache.available(tenant.id);
+  if (cacheAvailable) {
+    await cache.users.update(updatedUser);
+  }
+
   // If the user has an email address associated with their account, send them
   // a suspend notification email.
   if (updatedUser.email) {
@@ -1934,6 +2022,7 @@ export async function suspend(
 
 export async function removeSuspension(
   mongo: MongoContext,
+  cache: DataCache,
   tenant: Tenant,
   user: User,
   userID: string,
@@ -1958,11 +2047,24 @@ export async function removeSuspension(
   }
 
   // For each of the suspensions, remove it.
-  return removeActiveUserSuspensions(mongo, tenant.id, userID, user.id, now);
+  const updatedUser = await removeActiveUserSuspensions(
+    mongo,
+    tenant.id,
+    userID,
+    user.id,
+    now
+  );
+  const cacheAvailable = await cache.available(tenant.id);
+  if (cacheAvailable) {
+    await cache.users.update(updatedUser);
+  }
+
+  return updatedUser;
 }
 
 export async function removeBan(
   mongo: MongoContext,
+  cache: DataCache,
   tenant: Tenant,
   viewer: User,
   userID: string,
@@ -1979,11 +2081,22 @@ export async function removeBan(
 
   // Remove a regular ban
   if (banStatus.active) {
-    return removeUserBan(mongo, tenant.id, userID, viewer.id, now);
+    const updatedUser = await removeUserBan(
+      mongo,
+      tenant.id,
+      userID,
+      viewer.id,
+      now
+    );
+    const cacheAvailable = await cache.available(tenant.id);
+    if (cacheAvailable) {
+      await cache.users.update(updatedUser);
+    }
+    return updatedUser;
   }
   // Remove a site ban
   else if (banStatus.siteIDs && banStatus.siteIDs.length > 0) {
-    return removeUserSiteBan(
+    const updatedUser = await removeUserSiteBan(
       mongo,
       tenant.id,
       userID,
@@ -1991,6 +2104,11 @@ export async function removeBan(
       now,
       banStatus.siteIDs
     );
+    const cacheAvailable = await cache.available(tenant.id);
+    if (cacheAvailable) {
+      await cache.users.update(updatedUser);
+    }
+    return updatedUser;
   }
 
   // The user is not ban currently, just return the user because we don't

From 4539784b589199a7451ae047864bad7238b929fe Mon Sep 17 00:00:00 2001
From: Kathryn Beaty <kathryn.beaty@voxmedia.com>
Date: Wed, 17 May 2023 09:36:11 -0400
Subject: [PATCH 64/72] add mock DataCache to fix tests

---
 src/core/server/services/users/users.spec.ts | 15 ++++++++++++++-
 src/core/server/test/mocks.ts                |  6 ++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/core/server/services/users/users.spec.ts b/src/core/server/services/users/users.spec.ts
index 5e04c71e18..f2c63ca7f1 100644
--- a/src/core/server/services/users/users.spec.ts
+++ b/src/core/server/services/users/users.spec.ts
@@ -8,6 +8,7 @@ import {
   createUserFixture,
 } from "coral-server/test/fixtures";
 import {
+  createMockDataCache,
   createMockMailer,
   createMockMongoContex,
   createMockRejector,
@@ -21,6 +22,7 @@ import { demoteMember, promoteMember } from ".";
 describe("updateUserBan", () => {
   afterEach(jest.clearAllMocks);
 
+  const cache = createMockDataCache();
   const mailer = createMockMailer();
   const rejector = createMockRejector();
   const { ctx: mongo } = createMockMongoContex();
@@ -46,6 +48,7 @@ describe("updateUserBan", () => {
       async () =>
         await updateUserBan(
           mongo,
+          cache,
           mailer,
           rejector,
           tenant,
@@ -66,6 +69,7 @@ describe("updateUserBan", () => {
       async () =>
         await updateUserBan(
           mongo,
+          cache,
           mailer,
           rejector,
           tenant,
@@ -91,6 +95,7 @@ describe("updateUserBan", () => {
       async () =>
         await updateUserBan(
           mongo,
+          cache,
           mailer,
           rejector,
           tenant,
@@ -113,6 +118,7 @@ describe("updateUserBan", () => {
       async () =>
         await updateUserBan(
           mongo,
+          cache,
           mailer,
           rejector,
           tenant,
@@ -137,10 +143,13 @@ describe("updateUserBan", () => {
     });
 
     /* eslint-disable-next-line */
-    require("coral-server/models/user").retrieveUser.mockResolvedValue(bannedOnSiteA);
+    require("coral-server/models/user").retrieveUser.mockResolvedValue(
+      bannedOnSiteA
+    );
 
     const res = await updateUserBan(
       mongo,
+      cache,
       mailer,
       rejector,
       tenant,
@@ -174,6 +183,7 @@ describe("updateUserBan", () => {
 
     const res = await updateUserBan(
       mongo,
+      cache,
       mailer,
       rejector,
       tenant,
@@ -199,6 +209,7 @@ describe("updateUserBan", () => {
 
     const res = await updateUserBan(
       mongo,
+      cache,
       mailer,
       rejector,
       tenant,
@@ -224,6 +235,7 @@ describe("updateUserBan", () => {
 
     const dontRejectRes = await updateUserBan(
       mongo,
+      cache,
       mailer,
       rejector,
       tenant,
@@ -239,6 +251,7 @@ describe("updateUserBan", () => {
 
     const rejectRes = await updateUserBan(
       mongo,
+      cache,
       mailer,
       rejector,
       tenant,
diff --git a/src/core/server/test/mocks.ts b/src/core/server/test/mocks.ts
index f75064835b..ca9b485202 100644
--- a/src/core/server/test/mocks.ts
+++ b/src/core/server/test/mocks.ts
@@ -1,3 +1,4 @@
+import { DataCache } from "coral-server/data/cache/dataCache";
 import { MongoContext } from "coral-server/data/context";
 import { MailerQueue } from "coral-server/queue/tasks/mailer";
 import { RejectorQueue } from "coral-server/queue/tasks/rejector";
@@ -27,6 +28,11 @@ export const createMockTenantCache = (): TenantCache =>
     // add methods as nessecary
   } as unknown as TenantCache);
 
+export const createMockDataCache = (): DataCache =>
+  ({
+    available: jest.fn().mockResolvedValue(false),
+  } as unknown as DataCache);
+
 export const createMockMailer = () =>
   ({
     add: jest.fn().mockResolvedValue({}),

From cb657d7818c6ebc8a403f5af80155962677a8644 Mon Sep 17 00:00:00 2001
From: Tessa Thornton <tessathornton@gmail.com>
Date: Wed, 17 May 2023 10:11:39 -0400
Subject: [PATCH 65/72] resolve merge conflict in docs

---
 docs/docs/migrate-data.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/docs/migrate-data.md b/docs/docs/migrate-data.md
index 80b4fa2fce..57a07b8ca8 100644
--- a/docs/docs/migrate-data.md
+++ b/docs/docs/migrate-data.md
@@ -10,10 +10,7 @@ Before you start the data migration process, make sure you have the following:
 - a site ID for the new v7 coral instance (inspect the one record in the `sites` collection)
 - a mongo instance with a replica of your v4 production data set
 - a local machine or virtual machine with sufficient RAM and processing power to run `mongoexport` and `mongoimport` on your data set. In our experience, large data sets (10+ GB) will require a minimum of 16GB RAM and 8 cores.
-  <<<<<<< HEAD
-- # _before_ you start the migration process, it is a good idea to create several test users (one commenter, one moderator, one admin). Following the data migration, attempt to log in and comment/moderate as these users to verify that account and login related data was migrated correctly, and that authentication has been configured correctly.
 - _before_ you start the migration process, it is a good idea to create several test users (one commenter, one moderator, one admin). Following the data migration, attempt to log in and comment/moderate as these users to verify that account and login related data was migrated correctly, and that authentication has bee configured correctly.
-  > > > > > > > main
 
 ## 1. Obtain JSON files for v4 data
 

From 7d8bcf0874d1507f69137ded1f69f686d424ed0e Mon Sep 17 00:00:00 2001
From: Kathryn Beaty <kathryn.beaty@voxmedia.com>
Date: Wed, 17 May 2023 11:01:51 -0400
Subject: [PATCH 66/72] parse suspension history dates in userCache deserialize

---
 src/core/server/data/cache/userCache.ts | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/core/server/data/cache/userCache.ts b/src/core/server/data/cache/userCache.ts
index 042ed2b941..a9a0aa9814 100644
--- a/src/core/server/data/cache/userCache.ts
+++ b/src/core/server/data/cache/userCache.ts
@@ -133,9 +133,33 @@ export class UserCache implements IDataCache {
 
   private deserializeObject(data: string): Readonly<User> {
     const parsed = JSON.parse(data);
+    const parsedSuspensionHistory = parsed.status.suspension.history.map(
+      (suspension: {
+        createdAt: Date;
+        modifiedAt: Date;
+        from: { start: Date; finish: Date };
+      }) => {
+        return {
+          ...suspension,
+          createdAt: new Date(suspension.createdAt),
+          modifiedAt: new Date(suspension.modifiedAt),
+          from: {
+            start: new Date(suspension.from.start),
+            finish: new Date(suspension.from.finish),
+          },
+        };
+      }
+    );
+
     return {
       ...parsed,
       createdAt: new Date(parsed.createdAt),
+      status: {
+        ...parsed.status,
+        suspension: {
+          history: parsedSuspensionHistory,
+        },
+      },
     };
   }
 }

From bbbf40218c9a1da0cce81758c1a135c665cb52e3 Mon Sep 17 00:00:00 2001
From: Kathryn Beaty <kathryn.beaty@voxmedia.com>
Date: Wed, 17 May 2023 14:28:44 -0400
Subject: [PATCH 67/72] update userCache for bio, avatar, settings updates

---
 src/core/server/graph/mutators/Users.ts | 15 ++++--
 src/core/server/services/users/users.ts | 62 +++++++++++++++++++++----
 2 files changed, 63 insertions(+), 14 deletions(-)

diff --git a/src/core/server/graph/mutators/Users.ts b/src/core/server/graph/mutators/Users.ts
index ba486a884b..c0d48f83ba 100644
--- a/src/core/server/graph/mutators/Users.ts
+++ b/src/core/server/graph/mutators/Users.ts
@@ -226,7 +226,7 @@ export const Users = (ctx: GraphContext) => ({
       ctx.user!
     ),
   updateBio: async (input: GQLUpdateBioInput) =>
-    updateBio(ctx.mongo, ctx.tenant, ctx.user!, input.bio),
+    updateBio(ctx.mongo, ctx.cache, ctx.tenant, ctx.user!, input.bio),
   updateUserEmail: async (input: GQLUpdateUserEmailInput) =>
     updateEmailByID(ctx.mongo, ctx.tenant, input.userID, input.email),
   updateEmail: async (input: GQLUpdateEmailInput) =>
@@ -243,12 +243,19 @@ export const Users = (ctx: GraphContext) => ({
     ),
   updateNotificationSettings: async (
     input: WithoutMutationID<GQLUpdateNotificationSettingsInput>
-  ) => updateNotificationSettings(ctx.mongo, ctx.tenant, ctx.user!, input),
+  ) =>
+    updateNotificationSettings(
+      ctx.mongo,
+      ctx.cache,
+      ctx.tenant,
+      ctx.user!,
+      input
+    ),
   updateUserMediaSettings: async (
     input: WithoutMutationID<GQLUpdateUserMediaSettingsInput>
-  ) => updateMediaSettings(ctx.mongo, ctx.tenant, ctx.user!, input),
+  ) => updateMediaSettings(ctx.mongo, ctx.cache, ctx.tenant, ctx.user!, input),
   updateUserAvatar: async (input: GQLUpdateUserAvatarInput) =>
-    updateAvatar(ctx.mongo, ctx.tenant, input.userID, input.avatar),
+    updateAvatar(ctx.mongo, ctx.cache, ctx.tenant, input.userID, input.avatar),
   updateUserRole: async (input: GQLUpdateUserRoleInput) =>
     updateRole(
       ctx.mongo,
diff --git a/src/core/server/services/users/users.ts b/src/core/server/services/users/users.ts
index 6a430f54af..c2932db8cf 100644
--- a/src/core/server/services/users/users.ts
+++ b/src/core/server/services/users/users.ts
@@ -1274,6 +1274,7 @@ export async function updateEmailByID(
  */
 export async function updateBio(
   mongo: MongoContext,
+  cache: DataCache,
   tenant: Tenant,
   user: User,
   bio?: string
@@ -1282,7 +1283,14 @@ export async function updateBio(
     throw new UserBioTooLongError(user.id);
   }
 
-  return updateUserBio(mongo, tenant.id, user.id, bio);
+  const updatedUser = await updateUserBio(mongo, tenant.id, user.id, bio);
+
+  const cacheAvailable = await cache.available(tenant.id);
+  if (cacheAvailable) {
+    await cache.users.update(updatedUser);
+  }
+
+  return updatedUser;
 }
 
 /**
@@ -1295,11 +1303,19 @@ export async function updateBio(
  */
 export async function updateAvatar(
   mongo: MongoContext,
+  cache: DataCache,
   tenant: Tenant,
   userID: string,
   avatar?: string
 ) {
-  return updateUserAvatar(mongo, tenant.id, userID, avatar);
+  const updatedUser = await updateUserAvatar(mongo, tenant.id, userID, avatar);
+
+  const cacheAvailable = await cache.available(tenant.id);
+  if (cacheAvailable) {
+    await cache.users.update(updatedUser);
+  }
+
+  return updatedUser;
 }
 
 /**
@@ -1706,7 +1722,7 @@ export async function premod(
   }
 
   // Premod the user.
-  const premoddedUser = await premodUser(
+  const updatedUser = await premodUser(
     mongo,
     tenant.id,
     userID,
@@ -1716,10 +1732,10 @@ export async function premod(
 
   const cacheAvailable = await cache.available(tenant.id);
   if (cacheAvailable) {
-    await cache.users.update(premoddedUser);
+    await cache.users.update(updatedUser);
   }
 
-  return premoddedUser;
+  return updatedUser;
 }
 
 export async function removePremod(
@@ -1795,7 +1811,7 @@ export async function warn(
   }
 
   // Warn the user.
-  const warnedUser = await warnUser(
+  const updatedUser = await warnUser(
     mongo,
     tenant.id,
     userID,
@@ -1806,10 +1822,10 @@ export async function warn(
 
   const cacheAvailable = await cache.available(tenant.id);
   if (cacheAvailable) {
-    await cache.users.update(warnedUser);
+    await cache.users.update(updatedUser);
   }
 
-  return warnedUser;
+  return updatedUser;
 }
 
 export async function removeWarning(
@@ -2247,20 +2263,46 @@ export async function requestUserCommentsDownload(
 
 export async function updateNotificationSettings(
   mongo: MongoContext,
+  cache: DataCache,
   tenant: Tenant,
   user: User,
   settings: NotificationSettingsInput
 ) {
-  return updateUserNotificationSettings(mongo, tenant.id, user.id, settings);
+  const updatedUser = await updateUserNotificationSettings(
+    mongo,
+    tenant.id,
+    user.id,
+    settings
+  );
+
+  const cacheAvailable = await cache.available(tenant.id);
+  if (cacheAvailable) {
+    await cache.users.update(updatedUser);
+  }
+
+  return updatedUser;
 }
 
 export async function updateMediaSettings(
   mongo: MongoContext,
+  cache: DataCache,
   tenant: Tenant,
   user: User,
   settings: UpdateUserMediaSettingsInput
 ) {
-  return updateUserMediaSettings(mongo, tenant.id, user.id, settings);
+  const updatedUser = await updateUserMediaSettings(
+    mongo,
+    tenant.id,
+    user.id,
+    settings
+  );
+
+  const cacheAvailable = await cache.available(tenant.id);
+  if (cacheAvailable) {
+    await cache.users.update(updatedUser);
+  }
+
+  return updatedUser;
 }
 
 function userLastCommentIDKey(

From b3f1dc0f363162c108537fc8eafc12280927ca45 Mon Sep 17 00:00:00 2001
From: Kathryn Beaty <kathryn.beaty@voxmedia.com>
Date: Wed, 17 May 2023 14:33:00 -0400
Subject: [PATCH 68/72] update comment --> user

---
 src/core/server/data/cache/userCache.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/server/data/cache/userCache.ts b/src/core/server/data/cache/userCache.ts
index a9a0aa9814..e51e04a1ff 100644
--- a/src/core/server/data/cache/userCache.ts
+++ b/src/core/server/data/cache/userCache.ts
@@ -126,8 +126,8 @@ export class UserCache implements IDataCache {
     this.usersByKey.set(dataKey, user);
   }
 
-  private serializeObject(comment: Readonly<User>) {
-    const json = JSON.stringify(comment);
+  private serializeObject(user: Readonly<User>) {
+    const json = JSON.stringify(user);
     return json;
   }
 

From 4ce8c7f59f765cc820eada261cc9ee24d8d25832 Mon Sep 17 00:00:00 2001
From: Kathryn Beaty <kathryn.beaty@voxmedia.com>
Date: Thu, 18 May 2023 09:45:56 -0400
Subject: [PATCH 69/72] add check in remove user suspension mutation

---
 .../UserStatus/RemoveUserSuspensionMutation.ts     | 10 ++++++++--
 src/core/server/data/cache/userCache.ts            | 14 ++++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/core/client/admin/components/UserStatus/RemoveUserSuspensionMutation.ts b/src/core/client/admin/components/UserStatus/RemoveUserSuspensionMutation.ts
index e76eb75482..a47858d4b5 100644
--- a/src/core/client/admin/components/UserStatus/RemoveUserSuspensionMutation.ts
+++ b/src/core/client/admin/components/UserStatus/RemoveUserSuspensionMutation.ts
@@ -32,8 +32,14 @@ const RemoveUserSuspensionMutation = createMutation(
           "createdBy.username",
         ])
       ) as any;
-      newHistory[newHistory.length - 1].active = false;
-      newHistory[newHistory.length - 1].from.finish = new Date().toISOString();
+      if (
+        newHistory[newHistory.length - 1].active &&
+        newHistory[newHistory.length - 1].from
+      ) {
+        newHistory[newHistory.length - 1].active = false;
+        newHistory[newHistory.length - 1].from.finish =
+          new Date().toISOString();
+      }
     }
 
     return commitMutationPromiseNormalized<MutationTypes>(environment, {
diff --git a/src/core/server/data/cache/userCache.ts b/src/core/server/data/cache/userCache.ts
index e51e04a1ff..d4433059a8 100644
--- a/src/core/server/data/cache/userCache.ts
+++ b/src/core/server/data/cache/userCache.ts
@@ -136,13 +136,23 @@ export class UserCache implements IDataCache {
     const parsedSuspensionHistory = parsed.status.suspension.history.map(
       (suspension: {
         createdAt: Date;
-        modifiedAt: Date;
+        modifiedAt?: Date;
         from: { start: Date; finish: Date };
       }) => {
+        if (suspension.modifiedAt) {
+          return {
+            ...suspension,
+            createdAt: new Date(suspension.createdAt),
+            from: {
+              start: new Date(suspension.from.start),
+              finish: new Date(suspension.from.finish),
+            },
+            modifiedAt: new Date(suspension.modifiedAt),
+          };
+        }
         return {
           ...suspension,
           createdAt: new Date(suspension.createdAt),
-          modifiedAt: new Date(suspension.modifiedAt),
           from: {
             start: new Date(suspension.from.start),
             finish: new Date(suspension.from.finish),

From 3a37da5726b9f8fe4ef5da5730ce31694f7b3374 Mon Sep 17 00:00:00 2001
From: Kathryn Beaty <kathryn.beaty@voxmedia.com>
Date: Thu, 18 May 2023 10:09:44 -0400
Subject: [PATCH 70/72] refactor suspension deserialization

---
 src/core/server/data/cache/userCache.ts | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/core/server/data/cache/userCache.ts b/src/core/server/data/cache/userCache.ts
index d4433059a8..3ad5c1757b 100644
--- a/src/core/server/data/cache/userCache.ts
+++ b/src/core/server/data/cache/userCache.ts
@@ -139,18 +139,7 @@ export class UserCache implements IDataCache {
         modifiedAt?: Date;
         from: { start: Date; finish: Date };
       }) => {
-        if (suspension.modifiedAt) {
-          return {
-            ...suspension,
-            createdAt: new Date(suspension.createdAt),
-            from: {
-              start: new Date(suspension.from.start),
-              finish: new Date(suspension.from.finish),
-            },
-            modifiedAt: new Date(suspension.modifiedAt),
-          };
-        }
-        return {
+        const suspensionUpdated = {
           ...suspension,
           createdAt: new Date(suspension.createdAt),
           from: {
@@ -158,6 +147,13 @@ export class UserCache implements IDataCache {
             finish: new Date(suspension.from.finish),
           },
         };
+        if (suspension.modifiedAt) {
+          return {
+            ...suspensionUpdated,
+            modifiedAt: new Date(suspension.modifiedAt),
+          };
+        }
+        return suspensionUpdated;
       }
     );
 

From a9e0c53577b860ac6070fe595c60f3bd854f6893 Mon Sep 17 00:00:00 2001
From: Tessa Thornton <tessathornton@gmail.com>
Date: Wed, 24 May 2023 09:49:59 -0400
Subject: [PATCH 71/72] bump to 8.2.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e92d9f145a..0080820ebc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@coralproject/talk",
-  "version": "8.1.0",
+  "version": "8.2.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@coralproject/talk",
-      "version": "8.1.0",
+      "version": "8.2.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@ampproject/toolbox-cache-url": "^2.9.0",
diff --git a/package.json b/package.json
index f0573229de..a4014580c7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "8.1.0",
+  "version": "8.2.0",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [

From 6adbfc1f6ae2768bbafe4f1a720b2bdbc120944f Mon Sep 17 00:00:00 2001
From: Tessa Thornton <tessathornton@gmail.com>
Date: Wed, 24 May 2023 13:32:21 -0400
Subject: [PATCH 72/72] remove auth directive from tag.createdBy

---
 src/core/server/graph/schema/schema.graphql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/server/graph/schema/schema.graphql b/src/core/server/graph/schema/schema.graphql
index 16b7b62ba1..378fd4289b 100644
--- a/src/core/server/graph/schema/schema.graphql
+++ b/src/core/server/graph/schema/schema.graphql
@@ -3587,7 +3587,7 @@ type Tag {
   createdBy is the User that assigned the Tag. This is null when the Tag is
   assigned by the System.
   """
-  createdBy: User @auth(roles: [MODERATOR, ADMIN])
+  createdBy: User
 
   """
   createdAt is the time that the Tag was assigned on.