From 0db3c76756fcabf8c9bd2144f6f06a98a12c3235 Mon Sep 17 00:00:00 2001 From: warrickct Date: Tue, 15 Feb 2022 13:59:58 +1100 Subject: [PATCH] Fixing linting errors --- .../conversation/ConversationRequestButtons.tsx | 2 +- ts/interactions/conversationInteractions.ts | 9 ++++----- ts/receiver/configMessage.ts | 2 +- ts/receiver/contentMessage.ts | 9 +++++---- .../outgoing/controlMessage/ConfigurationMessage.ts | 4 ++-- ts/test/test-utils/utils/message.ts | 1 + 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ts/components/conversation/ConversationRequestButtons.tsx b/ts/components/conversation/ConversationRequestButtons.tsx index 0f5a1f5a9..334687aeb 100644 --- a/ts/components/conversation/ConversationRequestButtons.tsx +++ b/ts/components/conversation/ConversationRequestButtons.tsx @@ -17,7 +17,7 @@ export const ConversationMessageRequestButtons = (props: { const { isApproved, type } = selectedConversation; const showMsgRequestUI = !isApproved && type === 'private'; - const handleDeclineConversationRequest = async () => { + const handleDeclineConversationRequest = () => { window.inboxStore?.dispatch( updateConfirmModal({ okText: window.i18n('decline'), diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index d39beb8d3..d418047cf 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -131,11 +131,10 @@ export const acceptConversation = async (conversationId: string, syncToDevices: return; } - Promise.all([ - await convoToApprove.setIsApproved(true, false), - await convoToApprove.setDidApproveMe(true, false), - ]); - convoToApprove.commit(); + await convoToApprove.setIsApproved(true, false); + await convoToApprove.setDidApproveMe(true, false); + + await convoToApprove.commit(); await convoToApprove.sendMessageRequestResponse(true); // Conversation was not approved before so a sync is needed diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 1b3f7822c..60d7dc43f 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -147,7 +147,7 @@ const handleContactReceived = async ( if (contactReceived.didApproveMe) { // TODO: add message search in convo for pre-existing msgRequestResponse msg only happens once per convo // if source of the sync matches conversationId - contactConvo.addSingleMessage({ + await contactConvo.addSingleMessage({ conversationId: contactConvo.get('id'), source: envelope.source, type: 'outgoing', // mark it as outgoing just so it appears below our sent attachment diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index 1cf793d08..7961b9ab2 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -303,7 +303,7 @@ function shouldDropBlockedUserMessage(content: SignalService.Content): boolean { // first check that dataMessage is the only field set in the Content let msgWithoutDataMessage = Lodash.pickBy( content, - (_, key) => key !== 'dataMessage' && key !== 'toJSON' + (_value, key) => key !== 'dataMessage' && key !== 'toJSON' ); msgWithoutDataMessage = Lodash.pickBy(msgWithoutDataMessage, Lodash.identity); @@ -322,6 +322,7 @@ function shouldDropBlockedUserMessage(content: SignalService.Content): boolean { return !isControlDataMessageOnly; } +// tslint:disable-next-line: cyclomatic-complexity export async function innerHandleSwarmContentMessage( envelope: EnvelopePlus, plaintext: ArrayBuffer, @@ -386,9 +387,9 @@ export async function innerHandleSwarmContentMessage( // For edge case when messaging a client that's unable to explicitly send request approvals if (!convo.didApproveMe() && convo.isPrivate() && convo.isApproved()) { - convo.setDidApproveMe(true); + await convo.setDidApproveMe(true); // Conversation was not approved before so a sync is needed - convo.addSingleMessage({ + await convo.addSingleMessage({ conversationId: convo.get('id'), source: envelope.source, type: 'outgoing', // mark it as outgoing just so it appears below our sent attachment @@ -609,7 +610,7 @@ async function handleMessageRequestResponse( await conversationToApprove.setDidApproveMe(isApproved); if (isApproved === true) { // Conversation was not approved before so a sync is needed - conversationToApprove.addSingleMessage({ + await conversationToApprove.addSingleMessage({ conversationId: conversationToApprove.get('id'), source: envelope.source, type: 'outgoing', // mark it as outgoing just so it appears below our sent attachment diff --git a/ts/session/messages/outgoing/controlMessage/ConfigurationMessage.ts b/ts/session/messages/outgoing/controlMessage/ConfigurationMessage.ts index 90c9ef373..00ec330c3 100644 --- a/ts/session/messages/outgoing/controlMessage/ConfigurationMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/ConfigurationMessage.ts @@ -104,7 +104,7 @@ export class ConfigurationMessageContact { profileKey, isApproved, isBlocked, - didApproveMe + didApproveMe, }: { publicKey: string; displayName: string; @@ -145,7 +145,7 @@ export class ConfigurationMessageContact { profileKey: this.profileKey, isApproved: this.isApproved, isBlocked: this.isBlocked, - didApproveMe: this.didApproveMe + didApproveMe: this.didApproveMe, }); } } diff --git a/ts/test/test-utils/utils/message.ts b/ts/test/test-utils/utils/message.ts index 5b087df95..d1e2d9d7c 100644 --- a/ts/test/test-utils/utils/message.ts +++ b/ts/test/test-utils/utils/message.ts @@ -96,6 +96,7 @@ export class MockConversation { isTrustedForAttachmentDownload: false, isPinned: false, isApproved: false, + didApproveMe: false, }; }