From 9a9c92d360a4fe607cad9db0e5c2686a4ea44412 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 30 Jul 2020 16:04:28 +0000
Subject: [PATCH] Site Moderator Fixes (#3054)

* fix: disable banning for site moderators

* fix: fixed redirect issue for site moderators
---
 .../client/admin/routes/Moderate/ModerateContainer.tsx   | 9 +++++++--
 .../ModerationDropdown/ModerationActionsContainer.tsx    | 5 ++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/core/client/admin/routes/Moderate/ModerateContainer.tsx b/src/core/client/admin/routes/Moderate/ModerateContainer.tsx
index 7a651dabf..d21a8ce68 100644
--- a/src/core/client/admin/routes/Moderate/ModerateContainer.tsx
+++ b/src/core/client/admin/routes/Moderate/ModerateContainer.tsx
@@ -84,8 +84,13 @@ const ModerateContainer: FunctionComponent<Props> = ({
 
     // If we've loaded a specific story, we'll have the site on that story too,
     // so check if we're allowed to moderate it.
-    if (data.story && !data.story.site.canModerate) {
-      redirect();
+    if (data.story) {
+      if (!data.story.site.canModerate) {
+        redirect();
+        return;
+      }
+
+      // The viewer can moderate this site on the story!
       return;
     }
 
diff --git a/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/ModerationActionsContainer.tsx b/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/ModerationActionsContainer.tsx
index 5877c26bf..eab160782 100644
--- a/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/ModerationActionsContainer.tsx
+++ b/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/ModerationActionsContainer.tsx
@@ -90,7 +90,7 @@ const ModerationActionsContainer: FunctionComponent<Props> = ({
   const showBanOption =
     !comment.author || !comment.author.id || viewer === null
       ? false
-      : comment.author.id !== viewer.id;
+      : comment.author.id !== viewer.id && !viewer.moderationScopes?.scoped;
   const isQA = story.settings.mode === GQLSTORY_MODE.QA;
 
   return (
@@ -285,6 +285,9 @@ const enhanced = withFragmentContainer<Props>({
   viewer: graphql`
     fragment ModerationActionsContainer_viewer on User {
       id
+      moderationScopes {
+        scoped
+      }
     }
   `,
 })(ModerationActionsContainer);