mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

background.ts: Introduce types for redux initialState

Browse source
This commit is contained in:
Scott Nonnenberg 2022-02-23 10:48:40 -08:00 • committed by GitHub
parent 3673b6d101
commit 4763831d3e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 315 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ts/types/EmbeddedContact.ts
View file

@ -1,4 +1,4 @@
// Copyright 2019-2021 Signal Messenger, LLC
// Copyright 2019-2022 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
import { omit } from 'lodash';
@ -86,7 +86,7 @@ const DEFAULT_ADDRESS_TYPE = Proto.DataMessage.Contact.PostalAddress.Type.HOME;
export function embeddedContactSelector(
contact: EmbeddedContactType,
options: {
regionCode: string;
regionCode?: string;
firstNumber?: string;
isNumberOnSignal?: boolean;
getAbsoluteAttachmentPath: (path: string) => string;

14
ts/types/Stickers.ts
View file

@ -1,4 +1,4 @@
// Copyright 2019-2021 Signal Messenger, LLC
// Copyright 2019-2022 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
import { isNumber, pick, reject, groupBy, values } from 'lodash';
@ -23,6 +23,7 @@ import type {
import Data from '../sql/Client';
import { SignalService as Proto } from '../protobuf';
import * as log from '../logging/log';
import type { StickersStateType } from '../state/ducks/stickers';
export type RecentStickerType = Readonly<{
stickerId: number;
@ -31,12 +32,6 @@ export type RecentStickerType = Readonly<{
export type BlessedType = Pick<StickerPackType, 'key' | 'status'>;
export type InitialState = {
packs: Record<string, StickerPackType>;
recentStickers: Array<RecentStickerType>;
blessedPacks: Record<string, boolean>;
};
export type DownloadMap = Record<
string,
{
@ -85,7 +80,7 @@ const STICKER_PACK_DEFAULTS: StickerPackType = {
const VALID_PACK_ID_REGEXP = /^[0-9a-f]{32}$/i;
let initialState: InitialState | undefined;
let initialState: StickersStateType | undefined;
let packsToDownload: DownloadMap | undefined;
const downloadQueue = new Queue({ concurrency: 1, timeout: 1000 * 60 * 2 });
@ -104,6 +99,7 @@ export async function load(): Promise<void> {
packs,
recentStickers,
blessedPacks,
installedPack: null,
};
packsToDownload = capturePacksToDownload(packs);
@ -269,7 +265,7 @@ async function getRecentStickersForRedux(): Promise<Array<RecentStickerType>> {
}));
}
export function getInitialState(): InitialState {
export function getInitialState(): StickersStateType {
strictAssert(initialState !== undefined, 'Stickers not initialized');
return initialState;
}