diff --git a/ts/sql/Client.ts b/ts/sql/Client.ts index 12545be60e..eeb5ae7501 100644 --- a/ts/sql/Client.ts +++ b/ts/sql/Client.ts @@ -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); diff --git a/ts/sql/Interface.ts b/ts/sql/Interface.ts index 35ec507984..39e1b3683a 100644 --- a/ts/sql/Interface.ts +++ b/ts/sql/Interface.ts @@ -390,7 +390,7 @@ export type DataInterface = { deleteStickerPackReference: ( messageId: string, packId: string - ) => Promise>; + ) => Promise | undefined>; getStickerCount: () => Promise; deleteStickerPack: (packId: string) => Promise>; getAllStickerPacks: () => Promise>; diff --git a/ts/sql/Server.ts b/ts/sql/Server.ts index cdc74e6a34..58b286a43d 100644 --- a/ts/sql/Server.ts +++ b/ts/sql/Server.ts @@ -5058,7 +5058,7 @@ async function addStickerPackReference( async function deleteStickerPackReference( messageId: string, packId: string -): Promise> { +): Promise | 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 diff --git a/ts/types/Stickers.ts b/ts/types/Stickers.ts index 35cb37092f..eec2c2f6a0 100644 --- a/ts/types/Stickers.ts +++ b/ts/types/Stickers.ts @@ -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; }