From 7db3dc537dd0b66f0291926aa3d5d506efb8a760 Mon Sep 17 00:00:00 2001
From: BFlat <bombayapirat@gmail.com>
Date: Sun, 24 Jul 2022 01:50:54 +0100
Subject: [PATCH 1/3] tts model view moderation section fix

---
 .../tts/tts_model_view/TtsModelViewFc.tsx     | 141 +++++++++---------
 1 file changed, 72 insertions(+), 69 deletions(-)

diff --git a/packages/fakeyou/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx b/packages/fakeyou/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx
index d31e09ccce..06d1d509bb 100644
--- a/packages/fakeyou/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx
+++ b/packages/fakeyou/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx
@@ -235,58 +235,6 @@ function TtsModelViewFc(props: Props) {
 
   let moderatorRows = null;
 
-  if (
-    props.sessionWrapper.canDeleteOtherUsersTtsResults() ||
-    props.sessionWrapper.canDeleteOtherUsersTtsModels()
-  ) {
-    moderatorRows = (
-      <>
-        <tr>
-          <th>Creator is banned</th>
-          <td>
-            {ttsModel?.maybe_moderator_fields?.creator_is_banned
-              ? "banned"
-              : "good standing"}
-          </td>
-        </tr>
-        <tr>
-          <th>Creation IP address</th>
-          <td>
-            {ttsModel?.maybe_moderator_fields?.creator_ip_address_creation ||
-              "server error"}
-          </td>
-        </tr>
-        <tr>
-          <th>Update IP address</th>
-          <td>
-            {ttsModel?.maybe_moderator_fields?.creator_ip_address_last_update ||
-              "server error"}
-          </td>
-        </tr>
-        <tr>
-          <th>Mod deleted at (UTC)</th>
-          <td>
-            {ttsModel?.maybe_moderator_fields?.mod_deleted_at || "not deleted"}
-          </td>
-        </tr>
-        <tr>
-          <th>User deleted at (UTC)</th>
-          <td>
-            {ttsModel?.maybe_moderator_fields?.user_deleted_at || "not deleted"}
-          </td>
-        </tr>
-        <tr>
-          <th>Is Front Page Featured?</th>
-          <td>{ttsModel?.is_front_page_featured ? "yes" : "no"}</td>
-        </tr>
-        <tr>
-          <th>Is Twitch Featured?</th>
-          <td>{ttsModel?.is_twitch_featured ? "yes" : "no"}</td>
-        </tr>
-      </>
-    );
-  }
-
   let canEditModel = props.sessionWrapper.canEditTtsModelByUserToken(
     ttsModel?.creator_user_token
   );
@@ -486,6 +434,77 @@ function TtsModelViewFc(props: Props) {
     textPipelineName = `Not set; using default of ${configuredName}`;
   }
 
+  if (
+    props.sessionWrapper.canDeleteOtherUsersTtsResults() ||
+    props.sessionWrapper.canDeleteOtherUsersTtsModels()
+  ) {
+    moderatorRows = (
+      <>
+        <div className="container-panel pt-3 pb-5">
+          <div className="panel p-3 p-lg-4">
+            <h2 className="panel-title fw-bold">Moderator Details</h2>
+            <div className="py-6">
+              <table className="table">
+                <tbody>
+                  <tr>
+                    <th>Creator is banned</th>
+                    <td>
+                      {ttsModel?.maybe_moderator_fields?.creator_is_banned
+                        ? "banned"
+                        : "good standing"}
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>Creation IP address</th>
+                    <td>
+                      {ttsModel?.maybe_moderator_fields
+                        ?.creator_ip_address_creation || "server error"}
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>Update IP address</th>
+                    <td>
+                      {ttsModel?.maybe_moderator_fields
+                        ?.creator_ip_address_last_update || "server error"}
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>Mod deleted at (UTC)</th>
+                    <td>
+                      {ttsModel?.maybe_moderator_fields?.mod_deleted_at ||
+                        "not deleted"}
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>User deleted at (UTC)</th>
+                    <td>
+                      {ttsModel?.maybe_moderator_fields?.user_deleted_at ||
+                        "not deleted"}
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>Is Front Page Featured?</th>
+                    <td>{ttsModel?.is_front_page_featured ? "yes" : "no"}</td>
+                  </tr>
+                  <tr>
+                    <th>Is Twitch Featured?</th>
+                    <td>{ttsModel?.is_twitch_featured ? "yes" : "no"}</td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+          </div>
+        </div>
+        <div className="container pb-5">
+          <div className="d-flex flex-column flex-md-row gap-3">
+            {editModelButton}
+            {deleteModelButton}
+          </div>
+        </div>
+      </>
+    );
+  }
+
   return (
     <div>
       <div className="container py-5">
@@ -564,23 +583,7 @@ function TtsModelViewFc(props: Props) {
           </div>
         </div>
 
-        <div className="container-panel pt-3 pb-5">
-          <div className="panel p-3 p-lg-4">
-            <h2 className="panel-title fw-bold">Moderator Details</h2>
-            <div className="py-6">
-              <table className="table">
-                <tbody>{moderatorRows}</tbody>
-              </table>
-            </div>
-          </div>
-        </div>
-
-        <div className="container pb-5">
-          <div className="d-flex flex-column flex-md-row gap-3">
-            {editModelButton}
-            {deleteModelButton}
-          </div>
-        </div>
+        <div>{moderatorRows}</div>
 
         <div className="container-panel py-5">
           <div className="panel p-3 p-lg-4">

From a569a5e17b2ce3e61c0adc3e9f46cdebfe0a1cf3 Mon Sep 17 00:00:00 2001
From: BFlat <bombayapirat@gmail.com>
Date: Sun, 24 Jul 2022 01:51:07 +0100
Subject: [PATCH 2/3] git ignore .env file

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 52c8514677..b1b0fc42ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ yarn-error.log
 # Project-specific
 templates/storyteller-stream-green
 
+packages/fakeyou/.env

From ced99d37c1ff4dd31c780fdd83b22545501d01e5 Mon Sep 17 00:00:00 2001
From: BFlat <bombayapirat@gmail.com>
Date: Sun, 24 Jul 2022 15:41:58 +0100
Subject: [PATCH 3/3] moved buttons out of moderator row

---
 .../v2/view/tts/tts_model_view/TtsModelViewFc.tsx   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/fakeyou/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx b/packages/fakeyou/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx
index 06d1d509bb..66543a9fa0 100644
--- a/packages/fakeyou/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx
+++ b/packages/fakeyou/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx
@@ -495,12 +495,6 @@ function TtsModelViewFc(props: Props) {
             </div>
           </div>
         </div>
-        <div className="container pb-5">
-          <div className="d-flex flex-column flex-md-row gap-3">
-            {editModelButton}
-            {deleteModelButton}
-          </div>
-        </div>
       </>
     );
   }
@@ -585,6 +579,13 @@ function TtsModelViewFc(props: Props) {
 
         <div>{moderatorRows}</div>
 
+        <div className="container pb-5">
+          <div className="d-flex flex-column flex-md-row gap-3">
+            {editModelButton}
+            {deleteModelButton}
+          </div>
+        </div>
+
         <div className="container-panel py-5">
           <div className="panel p-3 p-lg-4">
             <h2 className="panel-title fw-bold">Use Model</h2>