From 83b44d0abff675a13399362306bd6bc04678cdcb Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 19 May 2022 13:03:24 +1000
Subject: [PATCH] fix: disable auto play of audio messages on message first
 load

---
 ts/components/conversation/H5AudioPlayer.tsx | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/ts/components/conversation/H5AudioPlayer.tsx b/ts/components/conversation/H5AudioPlayer.tsx
index ce3658ad0..ed4bfb6fb 100644
--- a/ts/components/conversation/H5AudioPlayer.tsx
+++ b/ts/components/conversation/H5AudioPlayer.tsx
@@ -18,9 +18,10 @@ export const AudioPlayerWithEncryptedFile = (props: {
   contentType: string;
   messageId: string;
 }) => {
+  const { messageId, contentType, src } = props;
   const dispatch = useDispatch();
   const [playbackSpeed, setPlaybackSpeed] = useState(1.0);
-  const { urlToLoad } = useEncryptedFileFetch(props.src, props.contentType, false);
+  const { urlToLoad } = useEncryptedFileFetch(src, contentType, false);
   const player = useRef<H5AudioPlayer | null>(null);
 
   const autoPlaySetting = useSelector(getAudioAutoplay);
@@ -30,16 +31,19 @@ export const AudioPlayerWithEncryptedFile = (props: {
 
   useEffect(() => {
     // updates playback speed to value selected in context menu
-    if (player.current?.audio.current?.playbackRate) {
+    if (
+      player.current?.audio.current &&
+      player.current?.audio.current?.playbackRate !== playbackSpeed
+    ) {
       player.current.audio.current.playbackRate = playbackSpeed;
     }
   }, [playbackSpeed, player]);
 
   useEffect(() => {
-    if (props.messageId === nextMessageToPlayId) {
+    if (messageId !== undefined && messageId === nextMessageToPlayId) {
       player.current?.audio.current?.play();
     }
-  }, [props.messageId, nextMessageToPlayId, player]);
+  }, [messageId, nextMessageToPlayId, player]);
 
   const triggerPlayNextMessageIfNeeded = (endedMessageId: string) => {
     const justEndedMessageIndex = messageProps.findIndex(
@@ -75,8 +79,8 @@ export const AudioPlayerWithEncryptedFile = (props: {
   const onEnded = () => {
     // if audio autoplay is enabled, call method to start playing
     // the next playable message
-    if (autoPlaySetting === true && props.messageId) {
-      triggerPlayNextMessageIfNeeded(props.messageId);
+    if (autoPlaySetting === true && messageId) {
+      triggerPlayNextMessageIfNeeded(messageId);
     }
   };
 
@@ -87,6 +91,8 @@ export const AudioPlayerWithEncryptedFile = (props: {
       style={{ pointerEvents: multiSelectMode ? 'none' : 'inherit' }}
       layout="horizontal-reverse"
       showSkipControls={false}
+      autoPlay={false}
+      autoPlayAfterSrcChange={false}
       showJumpControls={false}
       showDownloadProgress={false}
       listenInterval={100}