diff --git a/ts/data/data.ts b/ts/data/data.ts index 8ec5f5e34..e554717e1 100644 --- a/ts/data/data.ts +++ b/ts/data/data.ts @@ -142,7 +142,6 @@ export const Data = { removeMessagesByIds, getMessageIdsFromServerIds, getMessageById, - getMessageBySenderAndSentAt, getMessageByServerId, filterAlreadyFetchedOpengroupMessage, getMessageBySenderAndTimestamp, @@ -427,24 +426,6 @@ async function getMessageById( return new MessageModel(message); } -async function getMessageBySenderAndSentAt({ - source, - sentAt, -}: { - source: string; - sentAt: number; -}): Promise { - const messages = await channels.getMessageBySenderAndSentAt({ - source, - sentAt, - }); - if (!messages || !messages.length) { - return null; - } - - return new MessageModel(messages[0]); -} - async function getMessageByServerId( conversationId: string, serverId: number, diff --git a/ts/data/dataInit.ts b/ts/data/dataInit.ts index 71db245ab..e0f7eb794 100644 --- a/ts/data/dataInit.ts +++ b/ts/data/dataInit.ts @@ -45,7 +45,6 @@ const channelsToMake = new Set([ 'getMessageCountByType', 'removeAllMessagesInConversation', 'getMessageCount', - 'getMessageBySenderAndSentAt', 'filterAlreadyFetchedOpengroupMessage', 'getMessageBySenderAndTimestamp', 'getMessageIdsFromServerIds', diff --git a/ts/node/sql.ts b/ts/node/sql.ts index 2bd0164ce..f79f43db6 100644 --- a/ts/node/sql.ts +++ b/ts/node/sql.ts @@ -1025,21 +1025,6 @@ function getMessageById(id: string) { return jsonToObject(row.json); } -function getMessageBySenderAndSentAt({ source, sentAt }: { source: string; sentAt: number }) { - const rows = assertGlobalInstance() - .prepare( - `SELECT json FROM ${MESSAGES_TABLE} WHERE - source = $source AND - sent_at = $sent_at;` - ) - .all({ - source, - sent_at: sentAt, - }); - - return map(rows, row => jsonToObject(row.json)); -} - // serverIds are not unique so we need the conversationId function getMessageByServerId(conversationId: string, serverId: number) { const row = assertGlobalInstance() @@ -2474,7 +2459,6 @@ export const sqlNode = { getUnreadCountByConversation, getMessageCountByType, - getMessageBySenderAndSentAt, filterAlreadyFetchedOpengroupMessage, getMessageBySenderAndTimestamp, getMessageIdsFromServerIds, diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts index ebd86af01..fb9a95b50 100644 --- a/ts/receiver/dataMessage.ts +++ b/ts/receiver/dataMessage.ts @@ -258,9 +258,9 @@ export async function isSwarmMessageDuplicate({ sentAt: number; }) { try { - const result = await Data.getMessageBySenderAndSentAt({ + const result = await Data.getMessageBySenderAndTimestamp({ source, - sentAt, + timestamp: sentAt, }); return Boolean(result);