Improvements to the media editor

This commit is contained in:
Josh Perez 2023-09-14 13:04:48 -04:00 committed by GitHub
parent e8eb7638c4
commit d0296ececa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
61 changed files with 1124 additions and 969 deletions

View file

@ -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

View file

@ -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,