Merge remote-tracking branch 'upstream/master' into node-side-in-ts

package.json

@@ -56,7 +56,7 @@
     "abort-controller": "3.0.0",
     "auto-bind": "^4.0.0",
     "backbone": "1.3.3",
-    "better-sqlite3": "https://github.com/signalapp/better-sqlite3#4f66ee7b85477016dd0b2c3d2f13dcb60abd452e",
+    "better-sqlite3": "https://github.com/signalapp/better-sqlite3#b287153a5c6a5ac77f1e70df75d245e7a6e2286d",
     "blob-util": "2.0.2",
     "blueimp-canvas-to-blob": "^3.29.0",
     "blueimp-load-image": "5.14.0",

ts/components/conversation/H5AudioPlayer.tsx

@@ -7,6 +7,7 @@ import { setNextMessageToPlayId } from '../../state/ducks/conversations';
 import {
   getNextMessageToPlayId,
   getSortedMessagesOfSelectedConversation,
+  isMessageSelectionMode,
 } from '../../state/selectors/conversations';
 import { getAudioAutoplay } from '../../state/selectors/userConfig';
 import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
@@ -25,6 +26,7 @@ export const AudioPlayerWithEncryptedFile = (props: {
   const autoPlaySetting = useSelector(getAudioAutoplay);
   const messageProps = useSelector(getSortedMessagesOfSelectedConversation);
   const nextMessageToPlayId = useSelector(getNextMessageToPlayId);
+  const multiSelectMode = useSelector(isMessageSelectionMode);
 
   useEffect(() => {
     // updates playback speed to value selected in context menu
@@ -82,6 +84,7 @@ export const AudioPlayerWithEncryptedFile = (props: {
     <H5AudioPlayer
       src={urlToLoad}
       preload="metadata"
+      style={{ pointerEvents: multiSelectMode ? 'none' : 'inherit' }}
       layout="horizontal-reverse"
       showSkipControls={false}
       showJumpControls={false}

ts/components/conversation/message/message-content/MessageAttachment.tsx

@@ -134,7 +134,11 @@ export const MessageAttachment = (props: Props) => {
       <div
         role="main"
         onClick={(e: any) => {
+          if (multiSelectMode) {
+            dispatch(toggleSelectedMessageId(messageId));
+          }
           e.stopPropagation();
+          e.preventDefault();
         }}
         style={{ padding: '5px 10px' }}
       >

ts/session/apis/open_group_api/utils/OpenGroupUtils.ts

@@ -82,7 +82,7 @@ export function getOpenGroupV2ConversationId(serverUrl: string, roomId: string)
   if (!roomId.match(`^${roomIdV2Regex}$`)) {
     throw new Error('getOpenGroupV2ConversationId: Invalid roomId');
   }
-  if (!serverUrl.match(`${openGroupV2ServerUrlRegex}`)) {
+  if (!serverUrl.match(openGroupV2ServerUrlRegex)) {
     throw new Error('getOpenGroupV2ConversationId: Invalid serverUrl');
   }
   return `${openGroupPrefix}${roomId}@${serverUrl}`;

yarn.lock

@@ -2355,9 +2355,9 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-"better-sqlite3@https://github.com/signalapp/better-sqlite3#4f66ee7b85477016dd0b2c3d2f13dcb60abd452e":
-  version "7.1.4"
-  resolved "https://github.com/signalapp/better-sqlite3#4f66ee7b85477016dd0b2c3d2f13dcb60abd452e"
+"better-sqlite3@https://github.com/signalapp/better-sqlite3#b287153a5c6a5ac77f1e70df75d245e7a6e2286d":
+  version "7.5.0"
+  resolved "https://github.com/signalapp/better-sqlite3#b287153a5c6a5ac77f1e70df75d245e7a6e2286d"
   dependencies:
     bindings "^1.5.0"
     tar "^6.1.0"