From 7846891359c608e78fc14a3042a9d0c18ab54383 Mon Sep 17 00:00:00 2001 From: warrickct Date: Wed, 22 Dec 2021 13:48:19 +1100 Subject: [PATCH] Fix linting errors --- app/sql.js | 36 ++++++++++++++++++- ts/components/search/MessageSearchResults.tsx | 4 +-- .../settings/section/CategoryAppearance.tsx | 4 +-- ts/data/data.ts | 17 ++++----- 4 files changed, 48 insertions(+), 13 deletions(-) diff --git a/app/sql.js b/app/sql.js index 8733a2717..14abeeba1 100644 --- a/app/sql.js +++ b/app/sql.js @@ -73,6 +73,8 @@ module.exports = { getMessagesByConversation, getFirstUnreadMessageIdInConversation, hasConversationOutgoingMessage, + trimMessages, + fillWithTestData, getUnprocessedCount, getAllUnprocessed, @@ -3019,7 +3021,39 @@ function fillWithTestData(numConvosToAdd, numMsgsToAdd) { .get()['count(*)']; const lipsum = - 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis ac ornare lorem, non suscipit purus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse cursus aliquet velit a dignissim. Integer at nisi sed velit consequat dictum. Phasellus congue tellus ante. Ut rutrum hendrerit dapibus. Fusce luctus, ante nec interdum molestie, purus urna volutpat turpis, eget mattis lectus velit at velit. Praesent vel tellus turpis. Praesent eget purus at nisl blandit pharetra. Cras dapibus sem vitae rutrum dapibus. Vivamus vitae mi ante. Donec aliquam porta nibh, vel scelerisque orci condimentum sed. Proin in mattis ipsum, ac euismod sem. Donec malesuada sem nisl, at vehicula ante efficitur sed. Curabitur in sapien eros. Morbi tempor ante ut metus scelerisque condimentum. Integer sit amet tempus nulla. Vivamus imperdiet dui ac luctus vulputate. Sed a accumsan risus. Nulla facilisi. Nulla mauris dui, luctus in sagittis at, sodales id mauris. Integer efficitur viverra ex, ut dignissim eros tincidunt placerat. Sed facilisis gravida mauris in luctus. Fusce dapibus, est vitae tincidunt eleifend, justo odio porta dui, sed ultrices mi arcu vitae ante. Mauris ut libero erat. Nam ut mi quis ante tincidunt facilisis sit amet id enim. Vestibulum in molestie mi. In ac felis est. Vestibulum vel blandit ex. Morbi vitae viverra augue. Ut turpis quam, cursus quis ex a, convallis ullamcorper purus. Nam eget libero arcu. Integer fermentum enim nunc, non consequat urna fermentum condimentum. Nulla vitae malesuada est. Donec imperdiet tortor interdum malesuada feugiat. Integer pulvinar dui ex, eget tristique arcu mattis at. Nam eu neque eget mauris varius suscipit. Quisque ac enim vitae mauris laoreet congue nec sed justo. Curabitur fermentum quam eget est tincidunt, at faucibus lacus maximus. Donec auctor enim dolor, faucibus egestas diam consectetur sed. Donec eget rutrum arcu, at tempus mi. Fusce quis volutpat sapien. In aliquet fringilla purus. Ut eu nunc non augue lacinia ultrices at eget tortor. Maecenas pulvinar odio sit amet purus elementum, a vehicula lorem maximus. Pellentesque eu lorem magna. Vestibulum ut facilisis lorem. Proin et enim cursus, vulputate neque sit amet, posuere enim. Praesent faucibus tellus vel mi tincidunt, nec malesuada nibh malesuada. In laoreet sapien vitae aliquet sollicitudin.'; + // eslint:disable-next-line max-line-length + `Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis ac ornare lorem, + non suscipit purus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Suspendisse cursus aliquet velit a dignissim. Integer at nisi sed velit consequat + dictum. Phasellus congue tellus ante. Ut rutrum hendrerit dapibus. Fusce + luctus, ante nec interdum molestie, purus urna volutpat turpis, eget mattis + lectus velit at velit. Praesent vel tellus turpis. Praesent eget purus at + nisl blandit pharetra. Cras dapibus sem vitae rutrum dapibus. Vivamus vitae mi + ante. Donec aliquam porta nibh, vel scelerisque orci condimentum sed. + Proin in mattis ipsum, ac euismod sem. Donec malesuada sem nisl, at + vehicula ante efficitur sed. Curabitur in sapien eros. Morbi tempor ante ut + metus scelerisque condimentum. Integer sit amet tempus nulla. Vivamus + imperdiet dui ac luctus vulputate. Sed a accumsan risus. Nulla facilisi. + Nulla mauris dui, luctus in sagittis at, sodales id mauris. Integer efficitur + viverra ex, ut dignissim eros tincidunt placerat. Sed facilisis gravida + mauris in luctus . Fusce dapibus, est vitae tincidunt eleifend, justo + odio porta dui, sed ultrices mi arcu vitae ante. Mauris ut libero + erat. Nam ut mi quis ante tincidunt facilisis sit amet id enim. + Vestibulum in molestie mi. In ac felis est. Vestibulum vel blandit ex. Morbi vitae + viverra augue . Ut turpis quam, cursus quis ex a, convallis + ullamcorper purus. Nam eget libero arcu. Integer fermentum enim nunc, non consequat urna + fermentum condimentum. Nulla vitae malesuada est. Donec imperdiet tortor interdum + malesuada feugiat. Integer pulvinar dui ex, eget tristique arcu mattis at. Nam eu neque + eget mauris varius suscipit. Quisque ac enim vitae mauris laoreet congue nec sed + justo. Curabitur fermentum quam eget est tincidunt, at faucibus lacus maximus. Donec + auctor enim dolor, faucibus egestas diam consectetur sed. Donec eget rutrum arcu, at + tempus mi. Fusce quis volutpat sapien. In aliquet fringilla purus. Ut eu nunc non + augue lacinia ultrices at eget tortor. Maecenas pulvinar odio sit amet purus + elementum, a vehicula lorem maximus. Pellentesque eu lorem magna. Vestibulum ut facilisis + lorem. Proin et enim cursus, vulputate neque sit amet, posuere enim. Praesent + faucibus tellus vel mi tincidunt, nec malesuada nibh malesuada. In laoreet sapien vitae + aliquet sollicitudin. + `; const msgBeforeCount = globalInstance.prepare(`SELECT count(*) from ${MESSAGES_TABLE};`).get()[ 'count(*)' diff --git a/ts/components/search/MessageSearchResults.tsx b/ts/components/search/MessageSearchResults.tsx index 6d645166d..198d69223 100644 --- a/ts/components/search/MessageSearchResults.tsx +++ b/ts/components/search/MessageSearchResults.tsx @@ -116,8 +116,8 @@ export const MessageSearchResult = (props: Props) => { return (
{ - openConversationWithMessages({ + onClick={async () => { + await openConversationWithMessages({ conversationKey: conversationId, messageId: id, }); diff --git a/ts/components/settings/section/CategoryAppearance.tsx b/ts/components/settings/section/CategoryAppearance.tsx index 81d6e34e0..8bac7a476 100644 --- a/ts/components/settings/section/CategoryAppearance.tsx +++ b/ts/components/settings/section/CategoryAppearance.tsx @@ -172,14 +172,14 @@ export const SettingsCategoryAppearance = (props: { hasPassword: boolean | null /> { - fillWithTestData(100, 2000000); + await fillWithTestData(100, 2000000); }} buttonColor={SessionButtonColor.Primary} buttonText={'Spam fill DB'} /> { - fillWithTestData2(100, 1000); + await fillWithTestData2(100, 1000); }} buttonColor={SessionButtonColor.Primary} buttonText={'Spam fill DB using cached'} diff --git a/ts/data/data.ts b/ts/data/data.ts index 2e7c76825..410865fa0 100644 --- a/ts/data/data.ts +++ b/ts/data/data.ts @@ -204,8 +204,7 @@ export function init() { /** * When IPC arguments are prepared for the cross-process send, they are JSON.stringified. * We can't send ArrayBuffers or BigNumbers (what we get from proto library for dates). - * @param data - * @returns + * @param data - data to be cleaned */ function _cleanData(data: any): any { const keys = Object.keys(data); @@ -776,7 +775,7 @@ export async function getMessagesByConversation( * @returns Returns count of all messages in the database */ export async function getMessageCount() { - return await channels.getMessageCount(); + return channels.getMessageCount(); } export async function getFirstUnreadMessageIdInConversation( @@ -1005,7 +1004,7 @@ export async function fillWithTestData( return; } const ids = await channels.fillWithTestData(numConvosToAdd, numMsgsToAdd); - ids.map(async (id: string) => { + ids.map((id: string) => { const convo = getConversationController().get(id); const convoMsg = 'x'; convo.set('lastMessage', convoMsg); @@ -1015,7 +1014,7 @@ export async function fillWithTestData( export const fillWithTestData2 = async (convs: number, msgs: number) => { const newConvos = []; for (let convsAddedCount = 0; convsAddedCount < convs; convsAddedCount++) { - const convoId = Date.now() + convsAddedCount + ''; + const convoId = `${Date.now()} + ${convsAddedCount}`; const newConvo = await getConversationController().getOrCreateAndWait( convoId, ConversationTypeEnum.PRIVATE @@ -1024,15 +1023,17 @@ export const fillWithTestData2 = async (convs: number, msgs: number) => { } for (let msgsAddedCount = 0; msgsAddedCount < msgs; msgsAddedCount++) { - if (msgsAddedCount % 100 == 0) { + if (msgsAddedCount % 100 === 0) { console.warn(msgsAddedCount); } + // tslint:disable: insecure-random const convoToChoose = newConvos[Math.floor(Math.random() * newConvos.length)]; - convoToChoose.addSingleMessage({ + await convoToChoose.addSingleMessage({ source: convoToChoose.id, type: MessageDirection.outgoing, conversationId: convoToChoose.id, - body: 'spongebob ' + new Date().toString(), + body: `spongebob ${new Date().toString()}`, + // tslint:disable: insecure-random direction: Math.random() > 0.5 ? 'outgoing' : 'incoming', }); }