Improvements to the media editor

ts/types/BodyRange.ts

@@ -17,7 +17,7 @@ import {
 } from '../util/search';
 import { assertDev } from '../util/assert';
 import type { AciString } from './ServiceId';
-import { normalizeAci } from './ServiceId';
+import { normalizeAci } from '../util/normalizeAci';
 
 // Cold storage of body ranges
 

ts/types/ServiceId.ts

@@ -8,6 +8,7 @@ import { Aci, Pni, ServiceId } from '@signalapp/libsignal-client';
 import { isValidUuid } from '../util/isValidUuid';
 import * as log from '../logging/log';
 import type { LoggerType } from './Logging';
+import { isAciString } from '../util/isAciString';
 
 export enum ServiceIdKind {
   ACI = 'ACI',
@@ -26,10 +27,6 @@ export function isServiceIdString(
   return isAciString(value) || isPniString(value);
 }
 
-export function isAciString(value?: string | null): value is AciString {
-  return isValidUuid(value);
-}
-
 export function isPniString(value?: string | null): value is PniString {
   if (value == null) {
     return false;
@@ -87,41 +84,6 @@ export function normalizeServiceId(
   return result;
 }
 
-export function normalizeAci(
-  rawAci: string,
-  context: string,
-  logger?: Pick<LoggerType, 'warn'>
-): AciString;
-
-export function normalizeAci(
-  rawAci: string | undefined | null,
-  context: string,
-  logger?: Pick<LoggerType, 'warn'>
-): AciString | undefined;
-
-export function normalizeAci(
-  rawAci: string | undefined | null,
-  context: string,
-  logger: Pick<LoggerType, 'warn'> = log
-): AciString | undefined {
-  if (rawAci == null) {
-    return undefined;
-  }
-
-  const result = rawAci.toLowerCase();
-
-  if (!isAciString(result)) {
-    logger.warn(
-      `Normalizing invalid serviceId: ${rawAci} to ${result} in context "${context}"`
-    );
-
-    // Cast anyway we don't want to throw here
-    return result as AciString;
-  }
-
-  return result;
-}
-
 export function normalizePni(
   rawPni: string,
   context: string,