Use binary proto fields in staging

indutny-signal · web-flow · commit 4436184f95db · 2025-11-03T10:41:49.000-08:00
diff --git a/ts/components/CompositionArea.dom.tsx b/ts/components/CompositionArea.dom.tsx
@@ -252,8 +252,6 @@ export const CompositionArea = memo(function CompositionArea({
   theme,
   setMuteExpiration,
 
-  // MediaEditor
-  conversationSelector,
   // AttachmentList
   draftAttachments,
   onClearAttachments,
@@ -967,7 +965,9 @@ export const CompositionArea = memo(function CompositionArea({
             isCreatingStory={false}
             isFormattingEnabled={isFormattingEnabled}
             isSending={false}
-            conversationSelector={conversationSelector}
+            convertDraftBodyRangesIntoHydrated={
+              convertDraftBodyRangesIntoHydrated
+            }
             onClose={() => setAttachmentToEdit(undefined)}
             onDone={({
               caption,
diff --git a/ts/components/CompositionTextArea.dom.tsx b/ts/components/CompositionTextArea.dom.tsx
@@ -5,10 +5,9 @@ import React, { useRef, useCallback, useState } from 'react';
 import type { LocalizerType } from '../types/I18N.std.js';
 import type { InputApi } from './CompositionInput.dom.js';
 import { CompositionInput } from './CompositionInput.dom.js';
-import {
-  hydrateRanges,
-  type DraftBodyRanges,
-  type HydratedBodyRangesType,
+import type {
+  DraftBodyRanges,
+  HydratedBodyRangesType,
 } from '../types/BodyRange.std.js';
 import type { ThemeType } from '../types/Util.std.js';
 import type { PreferredBadgeSelectorType } from '../state/selectors/badges.preload.js';
@@ -17,7 +16,6 @@ import { FunEmojiPicker } from './fun/FunEmojiPicker.dom.js';
 import type { FunEmojiSelection } from './fun/panels/FunPanelEmojis.dom.js';
 import type { EmojiSkinTone } from './fun/data/emojis.std.js';
 import { FunEmojiPickerButton } from './fun/FunButton.dom.js';
-import type { GetConversationByIdType } from '../state/selectors/conversations.dom.js';
 
 export type CompositionTextAreaProps = {
   bodyRanges: HydratedBodyRangesType | null;
@@ -47,7 +45,9 @@ export type CompositionTextAreaProps = {
   getPreferredBadge: PreferredBadgeSelectorType;
   draftText: string;
   theme: ThemeType;
-  conversationSelector: GetConversationByIdType;
+  convertDraftBodyRangesIntoHydrated: (
+    bodyRanges: DraftBodyRanges | undefined
+  ) => HydratedBodyRangesType | undefined;
 };
 
 /**
@@ -76,7 +76,7 @@ export function CompositionTextArea({
   emojiSkinToneDefault,
   theme,
   whenToShowRemainingCount = Infinity,
-  conversationSelector,
+  convertDraftBodyRangesIntoHydrated,
 }: CompositionTextAreaProps): JSX.Element {
   const inputApiRef = useRef<InputApi | undefined>();
   const [characterCount, setCharacterCount] = useState(
@@ -132,7 +132,7 @@ export function CompositionTextArea({
       );
 
       const hydratedBodyRanges =
-        hydrateRanges(updatedBodyRanges, conversationSelector) ?? [];
+        convertDraftBodyRangesIntoHydrated(updatedBodyRanges) ?? [];
 
       if (maxLength !== undefined) {
         // if we had to truncate
@@ -150,7 +150,7 @@ export function CompositionTextArea({
       setCharacterCount(newCharacterCount);
       onChange(newValue, hydratedBodyRanges, caretLocation);
     },
-    [maxLength, onChange, conversationSelector]
+    [maxLength, onChange, convertDraftBodyRangesIntoHydrated]
   );
 
   return (
diff --git a/ts/components/DraftGifMessageSendModal.dom.stories.tsx b/ts/components/DraftGifMessageSendModal.dom.stories.tsx
@@ -14,7 +14,6 @@ import { EmojiSkinTone } from './fun/data/emojis.std.js';
 import { LoadingState } from '../util/loadable.std.js';
 import { VIDEO_MP4 } from '../types/MIME.std.js';
 import { drop } from '../util/drop.std.js';
-import { getDefaultConversation } from '../test-helpers/getDefaultConversation.std.js';
 
 const { i18n } = window.SignalContext;
 
@@ -39,7 +38,7 @@ function RenderCompositionTextArea(props: SmartCompositionTextAreaProps) {
       ourConversationId="me"
       platform="darwin"
       emojiSkinToneDefault={EmojiSkinTone.None}
-      conversationSelector={() => getDefaultConversation()}
+      convertDraftBodyRangesIntoHydrated={() => []}
     />
   );
 }
diff --git a/ts/components/ForwardMessagesModal.dom.stories.tsx b/ts/components/ForwardMessagesModal.dom.stories.tsx
@@ -70,7 +70,7 @@ const useProps = (overrideProps: Partial<PropsType> = {}): PropsType => ({
       ourConversationId="me"
       platform="darwin"
       emojiSkinToneDefault={EmojiSkinTone.None}
-      conversationSelector={() => getDefaultConversation()}
+      convertDraftBodyRangesIntoHydrated={() => []}
     />
   ),
   showToast: action('showToast'),
diff --git a/ts/components/MediaEditor.dom.stories.tsx b/ts/components/MediaEditor.dom.stories.tsx
@@ -31,6 +31,7 @@ export default {
     onTextTooLong: action('onTextTooLong'),
     platform: 'darwin',
     emojiSkinToneDefault: EmojiSkinTone.None,
+    convertDraftBodyRangesIntoHydrated: () => undefined,
   },
 } satisfies Meta<PropsType>;
 
diff --git a/ts/components/MediaEditor.dom.tsx b/ts/components/MediaEditor.dom.tsx
@@ -13,7 +13,10 @@ import classNames from 'classnames';
 import { createPortal } from 'react-dom';
 import { fabric } from 'fabric';
 import lodash from 'lodash';
-import type { DraftBodyRanges } from '../types/BodyRange.std.js';
+import type {
+  DraftBodyRanges,
+  HydratedBodyRangesType,
+} from '../types/BodyRange.std.js';
 import type { ImageStateType } from '../mediaEditor/ImageStateType.std.js';
 import type {
   InputApi,
@@ -47,7 +50,6 @@ import { ThemeType } from '../types/Util.std.js';
 import { arrow } from '../util/keyboard.dom.js';
 import { canvasToBytes } from '../util/canvasToBytes.std.js';
 import { loadImage } from '../util/loadImage.std.js';
-import { hydrateRanges } from '../types/BodyRange.std.js';
 import { useConfirmDiscard } from '../hooks/useConfirmDiscard.dom.js';
 import { useFabricHistory } from '../mediaEditor/useFabricHistory.dom.js';
 import { usePortal } from '../hooks/usePortal.dom.js';
@@ -62,7 +64,6 @@ import type { FunStickerSelection } from './fun/panels/FunPanelStickers.dom.js';
 import { drop } from '../util/drop.std.js';
 import type { FunTimeStickerStyle } from './fun/constants.dom.js';
 import * as Errors from '../types/errors.std.js';
-import type { GetConversationByIdType } from '../state/selectors/conversations.dom.js';
 
 const { get, has, noop } = lodash;
 
@@ -85,7 +86,9 @@ export type PropsType = {
   imageToBlurHash: typeof imageToBlurHash;
   onClose: () => unknown;
   onDone: (result: MediaEditorResultType) => unknown;
-  conversationSelector: GetConversationByIdType;
+  convertDraftBodyRangesIntoHydrated: (
+    bodyRanges: DraftBodyRanges | undefined
+  ) => HydratedBodyRangesType | undefined;
 } & Pick<
   CompositionInputProps,
   | 'draftText'
@@ -168,7 +171,7 @@ export function MediaEditor({
   ourConversationId,
   platform,
   sortedGroupMembers,
-  conversationSelector,
+  convertDraftBodyRangesIntoHydrated,
   imageToBlurHash,
 }: PropsType): JSX.Element | null {
   const [fabricCanvas, setFabricCanvas] = useState<fabric.Canvas | undefined>();
@@ -181,8 +184,8 @@ export function MediaEditor({
     useState<DraftBodyRanges | null>(draftBodyRanges);
 
   const hydratedBodyRanges = useMemo(
-    () => hydrateRanges(captionBodyRanges ?? undefined, conversationSelector),
-    [captionBodyRanges, conversationSelector]
+    () => convertDraftBodyRangesIntoHydrated(captionBodyRanges ?? undefined),
+    [captionBodyRanges, convertDraftBodyRangesIntoHydrated]
   );
 
   const inputApiRef = useRef<InputApi | undefined>();
diff --git a/ts/components/StoryCreator.dom.tsx b/ts/components/StoryCreator.dom.tsx
@@ -93,12 +93,12 @@ export type PropsType = {
     | 'onTextTooLong'
     | 'platform'
     | 'sortedGroupMembers'
-    | 'conversationSelector'
+    | 'convertDraftBodyRangesIntoHydrated'
   >;
 
 export function StoryCreator({
   candidateConversations,
-  conversationSelector,
+  convertDraftBodyRangesIntoHydrated,
   debouncedMaybeGrabLinkPreview,
   distributionLists,
   file,
@@ -265,7 +265,9 @@ export function StoryCreator({
               isCreatingStory
               isFormattingEnabled={isFormattingEnabled}
               isSending={isSending}
-              conversationSelector={conversationSelector}
+              convertDraftBodyRangesIntoHydrated={
+                convertDraftBodyRangesIntoHydrated
+              }
               onClose={onClose}
               onDone={({
                 contentType,
diff --git a/ts/services/backups/import.preload.ts b/ts/services/backups/import.preload.ts
@@ -107,10 +107,8 @@ import {
   convertBackupMessageAttachmentToAttachment,
   convertFilePointerToAttachment,
 } from './util/filePointers.preload.js';
-import {
-  filterAndClean,
-  trimMessageWhitespace,
-} from '../../types/BodyRange.std.js';
+import { trimMessageWhitespace } from '../../types/BodyRange.std.js';
+import { filterAndClean } from '../../util/BodyRange.node.js';
 import {
   APPLICATION_OCTET_STREAM,
   stringToMIMEType,
diff --git a/ts/services/storageRecordOps.preload.ts b/ts/services/storageRecordOps.preload.ts
@@ -96,7 +96,7 @@ import {
   fromAciUuidBytesOrString,
   fromPniUuidBytesOrUntaggedString,
 } from '../util/ServiceId.node.js';
-import { isProtoBinaryEncodingEnabled } from '../util/isProtoBinaryEncodingEnabled.std.js';
+import { isProtoBinaryEncodingEnabled } from '../util/isProtoBinaryEncodingEnabled.dom.js';
 import {
   getLinkPreviewSetting,
   getReadReceiptSetting,
diff --git a/ts/state/ducks/globalModals.preload.ts b/ts/state/ducks/globalModals.preload.ts
@@ -44,7 +44,7 @@ import { isPermanentlyUndownloadable } from '../../jobs/AttachmentDownloadManage
 import type { ButtonVariant } from '../../components/Button.dom.js';
 import type { MessageRequestState } from '../../components/conversation/MessageRequestActionsConfirmation.dom.js';
 import type { MessageForwardDraft } from '../../types/ForwardDraft.std.js';
-import { hydrateRanges } from '../../types/BodyRange.std.js';
+import { hydrateRanges } from '../../util/BodyRange.node.js';
 import {
   getConversationSelector,
   type GetConversationByIdType,
diff --git a/ts/state/ducks/search.preload.ts b/ts/state/ducks/search.preload.ts
@@ -30,7 +30,7 @@ import {
   getIsActivelySearching,
   getQuery,
   getSearchConversation,
-} from '../selectors/search.dom.js';
+} from '../selectors/search.preload.js';
 import { getAllConversations } from '../selectors/conversations.dom.js';
 import {
   getIntl,
diff --git a/ts/state/selectors/message.preload.ts b/ts/state/selectors/message.preload.ts
@@ -57,7 +57,7 @@ import type {
 import type { EmbeddedContactForUIType } from '../../types/EmbeddedContact.std.js';
 import { embeddedContactSelector } from '../../types/EmbeddedContact.std.js';
 import type { HydratedBodyRangesType } from '../../types/BodyRange.std.js';
-import { hydrateRanges } from '../../types/BodyRange.std.js';
+import { hydrateRanges } from '../../util/BodyRange.node.js';
 import type { AssertProps } from '../../types/Util.std.js';
 import type { LinkPreviewForUIType } from '../../types/message/LinkPreviews.std.js';
 import { getMentionsRegex } from '../../types/Message.std.js';
diff --git a/ts/state/selectors/search.preload.ts b/ts/state/selectors/search.preload.ts
@@ -29,7 +29,7 @@ import {
   getSelectedConversationId,
 } from './conversations.dom.js';
 
-import { hydrateRanges } from '../../types/BodyRange.std.js';
+import { hydrateRanges } from '../../util/BodyRange.node.js';
 import { createLogger } from '../../logging/log.std.js';
 import { getOwn } from '../../util/getOwn.std.js';
 
diff --git a/ts/state/selectors/stories.preload.ts b/ts/state/selectors/stories.preload.ts
@@ -43,7 +43,8 @@ import {
   reduceStorySendStatus,
   resolveStorySendStatus,
 } from '../../util/resolveStorySendStatus.std.js';
-import { BodyRange, hydrateRanges } from '../../types/BodyRange.std.js';
+import { BodyRange } from '../../types/BodyRange.std.js';
+import { hydrateRanges } from '../../util/BodyRange.node.js';
 import { getStoriesEnabled } from './items.dom.js';
 
 const { pick } = lodash;
diff --git a/ts/state/smart/CompositionArea.preload.tsx b/ts/state/smart/CompositionArea.preload.tsx
@@ -9,7 +9,7 @@ import type {
   DraftBodyRanges,
   HydratedBodyRangesType,
 } from '../../types/BodyRange.std.js';
-import { hydrateRanges } from '../../types/BodyRange.std.js';
+import { hydrateRanges } from '../../util/BodyRange.node.js';
 import { strictAssert } from '../../util/assert.std.js';
 import { getAddedByForOurPendingInvitation } from '../../util/getAddedByForOurPendingInvitation.preload.js';
 import { AutoSubstituteAsciiEmojis } from '../../quill/auto-substitute-ascii-emojis/index.dom.js';
diff --git a/ts/state/smart/CompositionTextArea.preload.tsx b/ts/state/smart/CompositionTextArea.preload.tsx
@@ -1,9 +1,14 @@
 // Copyright 2022 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
-import React, { memo } from 'react';
+import React, { memo, useCallback } from 'react';
 import { useSelector } from 'react-redux';
 import type { CompositionTextAreaProps } from '../../components/CompositionTextArea.dom.js';
 import { CompositionTextArea } from '../../components/CompositionTextArea.dom.js';
+import type {
+  DraftBodyRanges,
+  HydratedBodyRangesType,
+} from '../../types/BodyRange.std.js';
+import { hydrateRanges } from '../../util/BodyRange.node.js';
 import {
   getIntl,
   getPlatform,
@@ -46,6 +51,15 @@ export const SmartCompositionTextArea = memo(function SmartCompositionTextArea(
   const isFormattingEnabled = useSelector(getTextFormattingEnabled);
   const conversationSelector = useSelector(getConversationSelector);
 
+  const convertDraftBodyRangesIntoHydrated = useCallback(
+    (
+      bodyRanges: DraftBodyRanges | undefined
+    ): HydratedBodyRangesType | undefined => {
+      return hydrateRanges(bodyRanges, conversationSelector);
+    },
+    [conversationSelector]
+  );
+
   return (
     <CompositionTextArea
       {...props}
@@ -58,7 +72,7 @@ export const SmartCompositionTextArea = memo(function SmartCompositionTextArea(
       onTextTooLong={onTextTooLong}
       platform={platform}
       ourConversationId={ourConversationId}
-      conversationSelector={conversationSelector}
+      convertDraftBodyRangesIntoHydrated={convertDraftBodyRangesIntoHydrated}
     />
   );
 });
diff --git a/ts/state/smart/LeftPane.preload.tsx b/ts/state/smart/LeftPane.preload.tsx
@@ -86,7 +86,7 @@ import {
   getSearchConversation,
   getSearchResults,
   getStartSearchCounter,
-} from '../selectors/search.dom.js';
+} from '../selectors/search.preload.js';
 import {
   isUpdateDownloaded as getIsUpdateDownloaded,
   isOSUnsupported,
diff --git a/ts/state/smart/LeftPaneConversationListItemContextMenu.preload.tsx b/ts/state/smart/LeftPaneConversationListItemContextMenu.preload.tsx
@@ -22,7 +22,7 @@ import { useNavActions } from '../ducks/nav.std.js';
 import { NavTab, SettingsPage } from '../../types/Nav.std.js';
 import type { ChatFolderParams } from '../../types/ChatFolder.std.js';
 import { getSelectedLocation } from '../selectors/nav.preload.js';
-import { getIsActivelySearching } from '../selectors/search.dom.js';
+import { getIsActivelySearching } from '../selectors/search.preload.js';
 
 export const SmartLeftPaneConversationListItemContextMenu: FC<RenderConversationListItemContextMenuProps> =
   memo(function SmartLeftPaneConversationListItemContextMenu(props) {
diff --git a/ts/state/smart/MessageSearchResult.preload.tsx b/ts/state/smart/MessageSearchResult.preload.tsx
@@ -5,7 +5,7 @@ import { useSelector } from 'react-redux';
 import { MessageSearchResult } from '../../components/conversationList/MessageSearchResult.dom.js';
 import { getPreferredBadgeSelector } from '../selectors/badges.preload.js';
 import { getIntl, getTheme } from '../selectors/user.std.js';
-import { getMessageSearchResultSelector } from '../selectors/search.dom.js';
+import { getMessageSearchResultSelector } from '../selectors/search.preload.js';
 import { createLogger } from '../../logging/log.std.js';
 import { useConversationsActions } from '../ducks/conversations.preload.js';
 
diff --git a/ts/state/smart/StoryCreator.preload.tsx b/ts/state/smart/StoryCreator.preload.tsx
@@ -1,10 +1,14 @@
 // Copyright 2022 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
-import React, { memo, useMemo } from 'react';
+import React, { memo, useMemo, useCallback } from 'react';
 import { useSelector } from 'react-redux';
 import { ThemeType } from '../../types/Util.std.js';
 import { LinkPreviewSourceType } from '../../types/LinkPreview.std.js';
+import type {
+  DraftBodyRanges,
+  HydratedBodyRangesType,
+} from '../../types/BodyRange.std.js';
 import { StoryCreator } from '../../components/StoryCreator.dom.js';
 import {
   getCandidateContactsForNewGroup,
@@ -31,6 +35,7 @@ import {
 } from '../selectors/items.dom.js';
 import { imageToBlurHash } from '../../util/imageToBlurHash.dom.js';
 import { processAttachment } from '../../util/processAttachment.preload.js';
+import { hydrateRanges } from '../../util/BodyRange.node.js';
 import { useEmojisActions } from '../ducks/emojis.preload.js';
 import { useAudioPlayerActions } from '../ducks/audioPlayer.preload.js';
 import { useComposerActions } from '../ducks/composer.preload.js';
@@ -103,10 +108,19 @@ export const SmartStoryCreator = memo(function SmartStoryCreator() {
     return linkPreviewForSource(LinkPreviewSourceType.StoryCreator);
   }, [linkPreviewForSource]);
 
+  const convertDraftBodyRangesIntoHydrated = useCallback(
+    (
+      bodyRanges: DraftBodyRanges | undefined
+    ): HydratedBodyRangesType | undefined => {
+      return hydrateRanges(bodyRanges, conversationSelector);
+    },
+    [conversationSelector]
+  );
+
   return (
     <StoryCreator
       candidateConversations={candidateConversations}
-      conversationSelector={conversationSelector}
+      convertDraftBodyRangesIntoHydrated={convertDraftBodyRangesIntoHydrated}
       debouncedMaybeGrabLinkPreview={debouncedMaybeGrabLinkPreview}
       distributionLists={distributionLists}
       file={file}
diff --git a/ts/test-node/state/selectors/search_test.preload.ts b/ts/test-node/state/selectors/search_test.preload.ts
@@ -19,7 +19,7 @@ import {
   getIsSearchingInAConversation,
   getMessageSearchResultSelector,
   getSearchResults,
-} from '../../../state/selectors/search.dom.js';
+} from '../../../state/selectors/search.preload.js';
 import { makeLookup } from '../../../util/makeLookup.std.js';
 import { generateAci } from '../../../types/ServiceId.std.js';
 import {
diff --git a/ts/textsecure/MessageReceiver.preload.ts b/ts/textsecure/MessageReceiver.preload.ts
diff --git a/ts/textsecure/SendMessage.preload.ts b/ts/textsecure/SendMessage.preload.ts
diff --git a/ts/textsecure/processDataMessage.preload.ts b/ts/textsecure/processDataMessage.preload.ts
diff --git a/ts/types/BodyRange.std.ts b/ts/types/BodyRange.std.ts
diff --git a/ts/util/BodyRange.node.ts b/ts/util/BodyRange.node.ts
diff --git a/ts/util/getDraftPreview.preload.ts b/ts/util/getDraftPreview.preload.ts
diff --git a/ts/util/getLastMessage.preload.ts b/ts/util/getLastMessage.preload.ts
diff --git a/ts/util/getNotificationTextForMessage.preload.ts b/ts/util/getNotificationTextForMessage.preload.ts
diff --git a/ts/util/isProtoBinaryEncodingEnabled.dom.ts b/ts/util/isProtoBinaryEncodingEnabled.dom.ts
