jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't forget to cleanup in-memory sticker pack

This commit is contained in:
Fedor Indutny 2021-07-29 11:59:26 -07:00 committed by GitHub
parent d4a30a0165
commit 93f60ee5a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ts/sql/Client.ts
View File

@ -1497,9 +1497,7 @@ async function addStickerPackReference(messageId: string, packId: string) {
await channels.addStickerPackReference(messageId, packId);
}
async function deleteStickerPackReference(messageId: string, packId: string) {
const paths = await channels.deleteStickerPackReference(messageId, packId);
return paths;
return channels.deleteStickerPackReference(messageId, packId);
}
async function deleteStickerPack(packId: string) {
const paths = await channels.deleteStickerPack(packId);

2
ts/sql/Interface.ts
View File

@ -390,7 +390,7 @@ export type DataInterface = {
deleteStickerPackReference: (
messageId: string,
packId: string
) => Promise<Array<string>>;
) => Promise<ReadonlyArray<string> | undefined>;
getStickerCount: () => Promise<number>;
deleteStickerPack: (packId: string) => Promise<Array<string>>;
getAllStickerPacks: () => Promise<Array<StickerPackType>>;

8
ts/sql/Server.ts
View File

@ -5058,7 +5058,7 @@ async function addStickerPackReference(
async function deleteStickerPackReference(
messageId: string,
packId: string
): Promise<Array<string>> {
): Promise<ReadonlyArray<string> | undefined> {
const db = getInstance();
if (!messageId) {
@ -5110,7 +5110,7 @@ async function deleteStickerPackReference(
}
const count = countRow['count(*)'];
if (count > 0) {
return [];
return undefined;
}
const packRow: { status: StickerPackStatusType } = db
@ -5123,12 +5123,12 @@ async function deleteStickerPackReference(
.get({ packId });
if (!packRow) {
console.log('deleteStickerPackReference: did not find referenced pack');
return [];
return undefined;
}
const { status } = packRow;
if (status === 'installed') {
return [];
return undefined;
}
const stickerPathRows: Array<{ path: string }> = db

2
ts/types/Stickers.ts
View File

@ -796,7 +796,7 @@ export async function deletePackReference(
const paths = await Data.deleteStickerPackReference(messageId, packId);
// If we don't get a list of paths back, then the sticker pack was not deleted
if (!paths || !paths.length) {
if (!paths) {
return;
}