Fix bug with audio playing if adding new input

Nonhuman-Nonsense · Apr 25, 2024 · ce22340 · ce22340
1 parent 16a8ef9
commit ce22340
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/client/src/components/AudioOutput.jsx b/client/src/components/AudioOutput.jsx
@@ -7,6 +7,8 @@ function AudioOutput({ currentAudioMessage, onFinishedPlaying, stopAudio }) {
 
   useEffect(() => {
     audioRef.current && audioRef.current.pause();
+
+    console.log("Stopping audio...");
   }, [stopAudio]);
 
   useEffect(() => {

diff --git a/client/src/components/ConversationControls.jsx b/client/src/components/ConversationControls.jsx
@@ -5,6 +5,7 @@ function ConversationControls({
   onPauseResume,
   onSkipForward,
   onRaiseHandOrNevermind,
+  onSubmit,
   isRaisedHand,
   humanInterjection,
 }) {
@@ -14,6 +15,7 @@ function ConversationControls({
       {!humanInterjection && (
         <button onClick={onSkipForward}>Skip forward</button>
       )}
+      {humanInterjection && <button onClick={onSubmit}>Submit</button>}
       <button onClick={onRaiseHandOrNevermind}>
         {isRaisedHand ? "Nevermind" : "Raise hand"}
       </button>

diff --git a/client/src/components/Council.jsx b/client/src/components/Council.jsx
@@ -77,6 +77,10 @@ function Council({ options }) {
     setSkipForward(!skipForward);
   }
 
+  function handleOnSubmit() {
+    console.log("Submitting new issue");
+  }
+
   function handleOnRaiseHandOrNevermind() {
     setIsRaisedHand((prev) => !prev);
   }
@@ -120,6 +124,7 @@ function Council({ options }) {
             <ConversationControls
               onSkipForward={handleOnSkipForward}
               onRaiseHandOrNevermind={handleOnRaiseHandOrNevermind}
+              onSubmit={handleOnSubmit}
               isRaisedHand={isRaisedHand}
               humanInterjection={humanInterjection}
             />

diff --git a/client/src/components/Output.jsx b/client/src/components/Output.jsx
@@ -19,18 +19,18 @@ function Output({
 
   useEffect(() => {
     if (currentTextMessage && currentAudioMessage) {
-      console.log("Skipping forward");
       proceedToNextMessage();
     }
   }, [skipForward]);
 
   // useEffect for checking for raised hand when changing message index (inbetween food talking)
   useEffect(() => {
-    if (!isRaisedHand) {
-      tryFindTextAndAudio();
-    } else {
+    // Check to see if the hand is raised
+    if (isRaisedHand) {
       setStopAudio(!stopAudio);
       onHumanInterjection(true);
+    } else {
+      findTextAndAudio();
     }
   }, [currentMessageIndex]);
 
@@ -42,15 +42,15 @@ function Output({
       currentAudioMessage === null
     ) {
       onHumanInterjection(false);
-      tryFindTextAndAudio();
+      findTextAndAudio();
     }
   }, [isRaisedHand]);
 
   useEffect(() => {
-    tryFindTextAndAudio();
+    findTextAndAudio();
   }, [textMessages, audioMessages]);
 
-  function tryFindTextAndAudio() {
+  function findTextAndAudio() {
     const textMessage = textMessages[currentMessageIndex];
     const audioMessage = audioMessages.find(
       (a) => a.message_index === currentMessageIndex
@@ -60,10 +60,12 @@ function Output({
       textMessage &&
       audioMessage &&
       !currentTextMessage &&
-      !currentAudioMessage
+      !currentAudioMessage &&
+      !isRaisedHand
     ) {
       console.log("Both found!");
 
+      // Set isReady to true in the parent component to render the controls (for skipping forward et.c.)
       onIsReady();
 
       setCurrentTextMessage((prev) => textMessage);
@@ -72,8 +74,8 @@ function Output({
   }
 
   function proceedToNextMessage() {
-    setCurrentTextMessage((prev) => null);
-    setCurrentAudioMessage((prev) => null);
+    setCurrentTextMessage(() => null);
+    setCurrentAudioMessage(() => null);
     setCurrentMessageIndex((prev) => prev + 1);
   }