From c08dcc7ec6c3bc97158eafe98c55b57b561874a6 Mon Sep 17 00:00:00 2001 From: William Grant Date: Tue, 11 Jul 2023 11:40:03 +1000 Subject: [PATCH 1/7] fix: when we receive and make a quote message do an in-memory lookup before looking in the db this can fix original message not found errors when there are lot of unread messages and one of them is quoted --- .../message/message-content/MessageQuote.tsx | 7 ++- ts/receiver/queuedJob.ts | 53 ++++++++++++++----- ts/state/ducks/conversations.ts | 1 + 3 files changed, 48 insertions(+), 13 deletions(-) diff --git a/ts/components/conversation/message/message-content/MessageQuote.tsx b/ts/components/conversation/message/message-content/MessageQuote.tsx index e6889fb2b..fc196f39e 100644 --- a/ts/components/conversation/message/message-content/MessageQuote.tsx +++ b/ts/components/conversation/message/message-content/MessageQuote.tsx @@ -64,8 +64,13 @@ export const MessageQuote = (props: Props) => { // If the quote is not found in memory, we try to find it in the DB if (quoteNotFound && quote.id && quote.author) { + // We always look for the quote by sentAt timestamp, for opengroups, closed groups and session chats + // this will return an array of sent messages by id that we have locally. const quotedMessagesCollection = await Data.getMessagesBySenderAndSentAt([ - { timestamp: toNumber(quote.id), source: quote.author }, + { + timestamp: toNumber(quote.id), + source: quote.author, + }, ]); if (quotedMessagesCollection?.length) { diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts index 4f7b16610..004f72327 100644 --- a/ts/receiver/queuedJob.ts +++ b/ts/receiver/queuedJob.ts @@ -16,6 +16,7 @@ import { getHideMessageRequestBannerOutsideRedux } from '../state/selectors/user import { GoogleChrome } from '../util'; import { LinkPreviews } from '../util/linkPreviews'; import { ReleasedFeatures } from '../util/releaseFeature'; +import { PropsForMessageWithoutConvoProps, lookupQuote } from '../state/ducks/conversations'; function contentTypeSupported(type: string): boolean { const Chrome = GoogleChrome; @@ -48,26 +49,48 @@ async function copyFromQuotedMessage( const id = _.toNumber(quoteId); - // We always look for the quote by sentAt timestamp, for opengroups, closed groups and session chats - // this will return an array of sent message by id we have locally. - - const collection = await Data.getMessagesBySentAt(id); - // we now must make sure this is the sender we expect - const found = collection.find(message => { - return Boolean(author === message.get('source')); - }); + // First we try to look for the quote in memory + const stateConversations = window.inboxStore?.getState().conversations; + const { messages, quotes } = stateConversations; + let quotedMessage: PropsForMessageWithoutConvoProps | MessageModel | undefined = lookupQuote( + quotes, + messages, + id, + quote.author + )?.propsForMessage; + + // If the quote is not found in memory, we try to find it in the DB + if (!quotedMessage) { + // We always look for the quote by sentAt timestamp, for opengroups, closed groups and session chats + // this will return an array of sent messages by id that we have locally. + const quotedMessagesCollection = await Data.getMessagesBySenderAndSentAt([ + { + timestamp: id, + source: quote.author, + }, + ]); + + if (quotedMessagesCollection?.length) { + quotedMessage = quotedMessagesCollection.at(0); + } + } - if (!found) { + if (!quotedMessage) { window?.log?.warn(`We did not found quoted message ${id} with author ${author}.`); quoteLocal.referencedMessageNotFound = true; msg.set({ quote: quoteLocal }); return; } + const isMessageModelType = Boolean((quotedMessage as MessageModel).get !== undefined); + window?.log?.info(`Found quoted message id: ${id}`); quoteLocal.referencedMessageNotFound = false; // NOTE we send the entire body to be consistent with the other platforms - quoteLocal.text = found.get('body') || ''; + quoteLocal.text = + (isMessageModelType + ? (quotedMessage as MessageModel).get('body') + : (quotedMessage as PropsForMessageWithoutConvoProps).text) || ''; // no attachments, just save the quote with the body if ( @@ -81,7 +104,10 @@ async function copyFromQuotedMessage( firstAttachment.thumbnail = null; - const queryAttachments = found.get('attachments') || []; + const queryAttachments = + (isMessageModelType + ? (quotedMessage as MessageModel).get('attachments') + : (quotedMessage as PropsForMessageWithoutConvoProps).attachments) || []; if (queryAttachments.length > 0) { const queryFirst = queryAttachments[0]; @@ -95,7 +121,10 @@ async function copyFromQuotedMessage( } } - const queryPreview = found.get('preview') || []; + const queryPreview = + (isMessageModelType + ? (quotedMessage as MessageModel).get('preview') + : (quotedMessage as PropsForMessageWithoutConvoProps).previews) || []; if (queryPreview.length > 0) { const queryFirst = queryPreview[0]; const { image } = queryFirst; diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index e480a448a..5108cdfd0 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -1161,6 +1161,7 @@ export async function openConversationToSpecificMessage(args: { /** * Look for quote matching the timestamp and author in the quote lookup map * @param quotes - the lookup map of the selected conversations quotes + * @param messages - the messages in memory for the selected conversation * @param author - the pubkey of the quoted author * @param timestamp - usually the id prop on the quote object of a message * @returns - the message model if found, undefined otherwise From 8f58edc63c1f12c8651fde28dea26f59f75568aa Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 12 Jul 2023 06:15:50 +0200 Subject: [PATCH 2/7] chore: update libsession-util-nodejs to latest v0.2.1 --- package.json | 6 +++--- yarn.lock | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 45b2e452d..4515bae7d 100644 --- a/package.json +++ b/package.json @@ -102,10 +102,10 @@ "glob": "7.1.2", "image-type": "^4.1.0", "ip2country": "1.0.1", - "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.20/libsession_util_nodejs-v0.1.20.tar.gz", + "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.1/libsession_util_nodejs-v0.2.1.tar.gz", "libsodium-wrappers-sumo": "^0.7.9", - "lodash": "^4.17.21", "linkify-it": "^4.0.1", + "lodash": "^4.17.21", "long": "^4.0.0", "mic-recorder-to-mp3": "^2.2.2", "moment": "^2.29.4", @@ -161,8 +161,8 @@ "@types/firstline": "^2.0.2", "@types/fs-extra": "5.0.5", "@types/libsodium-wrappers-sumo": "^0.7.5", - "@types/lodash": "^4.14.194", "@types/linkify-it": "^3.0.2", + "@types/lodash": "^4.14.194", "@types/mocha": "5.0.0", "@types/mustache": "^4.1.2", "@types/node-fetch": "^2.5.7", diff --git a/yarn.lock b/yarn.lock index 36871a5c1..3726f8516 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5155,9 +5155,9 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.20/libsession_util_nodejs-v0.1.20.tar.gz": - version "0.1.20" - resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.20/libsession_util_nodejs-v0.1.20.tar.gz#4ff8331e4efb1725cf8bba0ef1af7496ebd8533d" +"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.1/libsession_util_nodejs-v0.2.1.tar.gz": + version "0.2.1" + resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.1/libsession_util_nodejs-v0.2.1.tar.gz#904a9cbb84a042c5b5db6d041070d892b2b37c04" dependencies: cmake-js "^7.2.1" node-addon-api "^6.1.0" From 873a2d5ad54b02d7ce08ebf2aa28dd49ce4991a5 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 12 Jul 2023 06:58:48 +0200 Subject: [PATCH 3/7] chore: update libsession util to 0.2.2 --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 4515bae7d..3ea27b617 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "glob": "7.1.2", "image-type": "^4.1.0", "ip2country": "1.0.1", - "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.1/libsession_util_nodejs-v0.2.1.tar.gz", + "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.2/libsession_util_nodejs-v0.2.2.tar.gz", "libsodium-wrappers-sumo": "^0.7.9", "linkify-it": "^4.0.1", "lodash": "^4.17.21", diff --git a/yarn.lock b/yarn.lock index 3726f8516..228194988 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5155,9 +5155,9 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.1/libsession_util_nodejs-v0.2.1.tar.gz": - version "0.2.1" - resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.1/libsession_util_nodejs-v0.2.1.tar.gz#904a9cbb84a042c5b5db6d041070d892b2b37c04" +"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.2/libsession_util_nodejs-v0.2.2.tar.gz": + version "0.2.2" + resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.2/libsession_util_nodejs-v0.2.2.tar.gz#129071c4d8f46c2ef25f364351284f76f51379ee" dependencies: cmake-js "^7.2.1" node-addon-api "^6.1.0" From 97647d4dc79b296c8f01f50873b03b891f3cbe63 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 12 Jul 2023 09:21:49 +0200 Subject: [PATCH 4/7] fix: padding for messagebox + onclick drop while selecting msgs --- .../SessionMessagesListContainer.tsx | 1 + .../MessageContentWithStatus.tsx | 2 ++ .../message-content/MessageLinkPreview.tsx | 14 +++++++------- .../message/message-content/quote/Quote.tsx | 14 ++++++++++---- .../message-item/GenericReadableMessage.tsx | 3 +-- .../message/reactions/Reaction.tsx | 19 ++++++++++++------- ts/state/selectors/selectedConversation.ts | 6 +++++- 7 files changed, 38 insertions(+), 21 deletions(-) diff --git a/ts/components/conversation/SessionMessagesListContainer.tsx b/ts/components/conversation/SessionMessagesListContainer.tsx index efadb4958..53401c118 100644 --- a/ts/components/conversation/SessionMessagesListContainer.tsx +++ b/ts/components/conversation/SessionMessagesListContainer.tsx @@ -54,6 +54,7 @@ type Props = SessionMessageListProps & { const StyledMessagesContainer = styled.div<{}>` display: flex; flex-grow: 1; + gap: var(--margins-xxs); flex-direction: column-reverse; position: relative; overflow-x: hidden; diff --git a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx index d83616b02..9296ee1c9 100644 --- a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx +++ b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx @@ -46,6 +46,8 @@ const StyledMessageContentContainer = styled.div<{ direction: 'left' | 'right' } const StyledMessageWithAuthor = styled.div<{ isIncoming: boolean }>` max-width: ${props => (props.isIncoming ? '100%' : 'calc(100% - 17px)')}; + display: flex; + flex-direction: column; `; export const MessageContentWithStatuses = (props: Props) => { diff --git a/ts/components/conversation/message/message-content/MessageLinkPreview.tsx b/ts/components/conversation/message/message-content/MessageLinkPreview.tsx index 164721ca2..2c55150e5 100644 --- a/ts/components/conversation/message/message-content/MessageLinkPreview.tsx +++ b/ts/components/conversation/message/message-content/MessageLinkPreview.tsx @@ -1,17 +1,17 @@ import classNames from 'classnames'; import React from 'react'; -import { isImageAttachment } from '../../../../types/Attachment'; -import { Image } from '../../Image'; +import { useDispatch } from 'react-redux'; import { MessageRenderingProps } from '../../../../models/messageType'; -import { useDispatch, useSelector } from 'react-redux'; -import { getIsMessageSelectionMode } from '../../../../state/selectors/conversations'; -import { SessionIcon } from '../../../icon'; -import { showLinkVisitWarningDialog } from '../../../dialog/SessionConfirm'; import { useMessageAttachments, useMessageDirection, useMessageLinkPreview, } from '../../../../state/selectors'; +import { useIsMessageSelectionMode } from '../../../../state/selectors/selectedConversation'; +import { isImageAttachment } from '../../../../types/Attachment'; +import { showLinkVisitWarningDialog } from '../../../dialog/SessionConfirm'; +import { SessionIcon } from '../../../icon'; +import { Image } from '../../Image'; export type MessageLinkPreviewSelectorProps = Pick< MessageRenderingProps, @@ -30,7 +30,7 @@ export const MessageLinkPreview = (props: Props) => { const direction = useMessageDirection(props.messageId); const attachments = useMessageAttachments(props.messageId); const previews = useMessageLinkPreview(props.messageId); - const isMessageSelectionMode = useSelector(getIsMessageSelectionMode); + const isMessageSelectionMode = useIsMessageSelectionMode(); if (!props.messageId) { return null; diff --git a/ts/components/conversation/message/message-content/quote/Quote.tsx b/ts/components/conversation/message/message-content/quote/Quote.tsx index 079fc6500..76ddbe79c 100644 --- a/ts/components/conversation/message/message-content/quote/Quote.tsx +++ b/ts/components/conversation/message/message-content/quote/Quote.tsx @@ -2,11 +2,12 @@ import React, { MouseEvent, useState } from 'react'; import * as MIME from '../../../../../types/MIME'; +import { isEmpty } from 'lodash'; +import styled from 'styled-components'; +import { useIsMessageSelectionMode } from '../../../../../state/selectors/selectedConversation'; import { QuoteAuthor } from './QuoteAuthor'; -import { QuoteText } from './QuoteText'; import { QuoteIconContainer } from './QuoteIconContainer'; -import styled from 'styled-components'; -import { isEmpty } from 'lodash'; +import { QuoteText } from './QuoteText'; const StyledQuoteContainer = styled.div` min-width: 300px; // if the quoted content is small it doesn't look very good so we set a minimum @@ -69,6 +70,7 @@ export interface QuotedAttachmentType { } export const Quote = (props: QuoteProps) => { + const isSelectionMode = useIsMessageSelectionMode(); const { isIncoming, attachment, text, referencedMessageNotFound, onClick } = props; const [imageBroken, setImageBroken] = useState(false); @@ -81,7 +83,11 @@ export const Quote = (props: QuoteProps) => { { + if (onClick && !isSelectionMode) { + onClick(e); + } + }} > ` display: flex; @@ -68,6 +69,8 @@ export const Reaction = (props: ReactionProps): ReactElement => { handlePopupReaction, handlePopupClick, } = props; + + const isMessageSelection = useIsMessageSelectionMode(); const reactionsMap = (reactions && Object.fromEntries(reactions)) || {}; const senders = reactionsMap[emoji]?.senders || []; const count = reactionsMap[emoji]?.count; @@ -93,7 +96,9 @@ export const Reaction = (props: ReactionProps): ReactElement => { }; const handleReactionClick = () => { - onClick(emoji); + if (!isMessageSelection) { + onClick(emoji); + } }; return ( @@ -104,7 +109,7 @@ export const Reaction = (props: ReactionProps): ReactElement => { inModal={inModal} onClick={handleReactionClick} onMouseEnter={() => { - if (inGroup) { + if (inGroup && !isMessageSelection) { const { innerWidth: windowWidth } = window; if (handlePopupReaction) { // overflow on far right means we shift left diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts index de5563aec..ad79c090f 100644 --- a/ts/state/selectors/selectedConversation.ts +++ b/ts/state/selectors/selectedConversation.ts @@ -5,7 +5,7 @@ import { PubKey } from '../../session/types'; import { UserUtils } from '../../session/utils'; import { StateType } from '../reducer'; import { getCanWrite, getModerators, getSubscriberCount } from './sogsRoomInfo'; -import { getSelectedConversation } from './conversations'; +import { getIsMessageSelectionMode, getSelectedConversation } from './conversations'; /** * Returns the formatted text for notification setting. @@ -269,3 +269,7 @@ export function useSelectedWeAreModerator() { const weAreModerator = mods.includes(us); return isPublic && isString(selectedConvoKey) && weAreModerator; } + +export function useIsMessageSelectionMode() { + return useSelector(getIsMessageSelectionMode); +} From 77acd1396bc3746cf7ed095fe8ee4a84203b18ef Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 14 Jul 2023 11:38:39 +0200 Subject: [PATCH 5/7] feat: add support for blinded25 receipt of messages for later impl --- .../message/message-content/MessageAvatar.tsx | 9 ++++++-- ts/components/menu/Menu.tsx | 4 ++-- ts/hooks/useParamSelector.ts | 2 +- ts/models/conversation.ts | 10 ++++---- ts/models/message.ts | 2 +- ts/node/migration/sessionMigrations.ts | 2 +- .../open_group_api/sogsv3/knownBlindedkeys.ts | 22 +++++++++--------- .../open_group_api/sogsv3/sogsBlinding.ts | 6 +++-- .../conversations/ConversationController.ts | 2 +- ts/session/sending/MessageQueue.ts | 3 ++- ts/session/types/PubKey.ts | 23 ++++++++++++------- .../libsession/libsession_utils_contacts.ts | 4 +--- ts/session/utils/sync/syncUtils.ts | 2 +- ts/state/selectors/conversations.ts | 2 +- .../unit/sogsv3/knownBlindedKeys_test.ts | 2 +- ts/webworker/workers/node/util/util.worker.ts | 3 ++- 16 files changed, 56 insertions(+), 42 deletions(-) diff --git a/ts/components/conversation/message/message-content/MessageAvatar.tsx b/ts/components/conversation/message/message-content/MessageAvatar.tsx index 220091961..85e71eb6c 100644 --- a/ts/components/conversation/message/message-content/MessageAvatar.tsx +++ b/ts/components/conversation/message/message-content/MessageAvatar.tsx @@ -6,7 +6,7 @@ import { MessageRenderingProps } from '../../../../models/messageType'; import { findCachedBlindedMatchOrLookItUp } from '../../../../session/apis/open_group_api/sogsv3/knownBlindedkeys'; import { getConversationController } from '../../../../session/conversations'; import { getSodiumRenderer } from '../../../../session/crypto'; -import { PubKey } from '../../../../session/types'; +import { KeyPrefixType, PubKey } from '../../../../session/types'; import { openConversationWithMessages } from '../../../../state/ducks/conversations'; import { updateUserDetailsModal } from '../../../../state/ducks/modalDialog'; import { @@ -61,7 +61,7 @@ export const MessageAvatar = (props: Props) => { const userName = authorName || authorProfileName || sender; const onMessageAvatarClick = useCallback(async () => { - if (isPublic && !PubKey.hasBlindedPrefix(sender)) { + if (isPublic && !PubKey.isBlinded(sender)) { // public chat but session id not blinded. disable showing user details if we do not have an active convo with that user. // an unactive convo with that user means that we never chatted with that id directyly, but only through a sogs const convoWithSender = getConversationController().get(sender); @@ -84,6 +84,11 @@ export const MessageAvatar = (props: Props) => { } if (isPublic && selectedConvoKey) { + if (sender.startsWith(KeyPrefixType.blinded25)) { + window.log.info('onMessageAvatarClick: blinded25 convo click are disabled currently...'); + + return; + } const convoOpen = getConversationController().get(selectedConvoKey); const room = OpenGroupData.getV2OpenGroupRoom(convoOpen.id); let privateConvoToOpen = sender; diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx index 695d0acf9..f00ae0b7a 100644 --- a/ts/components/menu/Menu.tsx +++ b/ts/components/menu/Menu.tsx @@ -357,7 +357,7 @@ export const CopyMenuItem = (): JSX.Element | null => { export const MarkAllReadMenuItem = (): JSX.Element | null => { const convoId = useConvoIdFromContext(); const isIncomingRequest = useIsIncomingRequest(convoId); - if (!isIncomingRequest && !PubKey.hasBlindedPrefix(convoId)) { + if (!isIncomingRequest && !PubKey.isBlinded(convoId)) { return ( markAllReadByConvoId(convoId)}>{window.i18n('markAllAsRead')} ); @@ -379,7 +379,7 @@ export const BlockMenuItem = (): JSX.Element | null => { const isPrivate = useIsPrivate(convoId); const isIncomingRequest = useIsIncomingRequest(convoId); - if (!isMe && isPrivate && !isIncomingRequest && !PubKey.hasBlindedPrefix(convoId)) { + if (!isMe && isPrivate && !isIncomingRequest && !PubKey.isBlinded(convoId)) { const blockTitle = isBlocked ? window.i18n('unblock') : window.i18n('block'); const blockHandler = isBlocked ? () => unblockConvoById(convoId) diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index 74ef78556..ba26cf208 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -101,7 +101,7 @@ export function useIsBlinded(convoId?: string) { if (!convoId) { return false; } - return Boolean(PubKey.hasBlindedPrefix(convoId)); + return Boolean(PubKey.isBlinded(convoId)); } export function useHasNickname(convoId?: string) { diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 9c745ac1f..1e793508e 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -532,8 +532,8 @@ export class ConversationModel extends Backbone.Model { ); const hasIncomingMessages = incomingMessageCount > 0; - if (this.id.startsWith('15')) { - window.log.info('Sending a blinded message to this user: ', this.id); + if (PubKey.isBlinded(this.id)) { + window.log.info('Sending a blinded message react to this user: ', this.id); await this.sendBlindedMessageRequest(chatMessageParams); return; } @@ -1674,7 +1674,7 @@ export class ConversationModel extends Backbone.Model { ); const hasIncomingMessages = incomingMessageCount > 0; - if (this.id.startsWith('15')) { + if (PubKey.isBlinded(this.id)) { window.log.info('Sending a blinded message to this user: ', this.id); await this.sendBlindedMessageRequest(chatMessageParams); return; @@ -1778,7 +1778,7 @@ export class ConversationModel extends Backbone.Model { const ourSignKeyBytes = await UserUtils.getUserED25519KeyPairBytes(); const groupUrl = this.getSogsOriginMessage(); - if (!PubKey.hasBlindedPrefix(this.id)) { + if (!PubKey.isBlinded(this.id)) { window?.log?.warn('sendBlindedMessageRequest - convo is not a blinded one'); return; } @@ -1826,7 +1826,7 @@ export class ConversationModel extends Backbone.Model { } this.set({ active_at: Date.now(), isApproved: true }); - + // TODO we need to add support for sending blinded25 message request in addition to the legacy blinded15 await getMessageQueue().sendToOpenGroupV2BlindedRequest({ encryptedContent: encryptedMsg, roomInfos: roomInfo, diff --git a/ts/models/message.ts b/ts/models/message.ts index f11167efd..592839993 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -1279,7 +1279,7 @@ export function findAndFormatContact(pubkey: string): FindAndFormatContactType { if ( pubkey === UserUtils.getOurPubKeyStrFromCache() || - (pubkey && pubkey.startsWith('15') && isUsAnySogsFromCache(pubkey)) + (pubkey && PubKey.isBlinded(pubkey) && isUsAnySogsFromCache(pubkey)) ) { profileName = window.i18n('you'); isMe = true; diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts index 382cf9c18..365de0f9d 100644 --- a/ts/node/migration/sessionMigrations.ts +++ b/ts/node/migration/sessionMigrations.ts @@ -1676,7 +1676,7 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite // this filter is based on the `isContactToStoreInWrapper` function. Note, blocked contacts won't be added to the wrapper at first, but will on the first start const contactsToWriteInWrapper = db .prepare( - `SELECT * FROM ${CONVERSATIONS_TABLE} WHERE type = 'private' AND active_at > 0 AND priority <> ${CONVERSATION_PRIORITIES.hidden} AND (didApproveMe OR isApproved) AND id <> '$us' AND id NOT LIKE '15%' ;` + `SELECT * FROM ${CONVERSATIONS_TABLE} WHERE type = 'private' AND active_at > 0 AND priority <> ${CONVERSATION_PRIORITIES.hidden} AND (didApproveMe OR isApproved) AND id <> '$us' AND id NOT LIKE '15%' AND id NOT LIKE '25%' ;` ) .all({ us: publicKeyHex, diff --git a/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts b/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts index bc23882ce..89297d34d 100644 --- a/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts +++ b/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts @@ -145,8 +145,8 @@ export function tryMatchBlindWithStandardKey( throw new Error('standardKey must be a standard key (starting with 05)'); } - if (!blindedSessionId.startsWith(KeyPrefixType.blinded)) { - throw new Error('blindedKey must be a blinded key (starting with 15)'); + if (!PubKey.isBlinded(blindedSessionId)) { + throw new Error('blindedKey must be a blinded key (starting with 15 or 25)'); } // We don't want to stop iterating even if an error happens while looking for a blind/standard match. @@ -204,7 +204,7 @@ function findNotCachedBlindingMatch( // we iterate only over the convos private, approved, and which have an unblinded id. const foundConvoMatchingBlindedPubkey = getConversationController() .getConversations() - .filter(m => m.isPrivate() && m.isApproved() && !PubKey.hasBlindedPrefix(m.id)) + .filter(m => m.isPrivate() && m.isApproved() && !PubKey.isBlinded(m.id)) .find(m => { return tryMatchBlindWithStandardKey(m.id, blindedId, serverPublicKey, sodium); }); @@ -214,13 +214,13 @@ function findNotCachedBlindingMatch( /** * This function returns true if the given blindedId matches our own blinded id on any pysogs. - * If the given pubkey is not blinded, it returns true if it is our naked SessionID. + * If the given pubkey is not blinded, it returns true if it is our naked SessionID. * It can be used to replace mentions with the @You syntax and for the quotes too */ export function isUsAnySogsFromCache(blindedOrNakedId: string): boolean { const usUnblinded = UserUtils.getOurPubKeyStrFromCache(); - if (!PubKey.hasBlindedPrefix(blindedOrNakedId)) { + if (!PubKey.isBlinded(blindedOrNakedId)) { return blindedOrNakedId === usUnblinded; } const found = assertLoaded().find( @@ -268,7 +268,7 @@ function findNotCachedBlindedConvoFromUnblindedKey( serverPublicKey: string, sodium: LibSodiumWrappers ): Array { - if (PubKey.hasBlindedPrefix(unblindedID)) { + if (PubKey.isBlinded(unblindedID)) { throw new Error( 'findNotCachedBlindedConvoFromUnblindedKey unblindedID is supposed to be unblinded!' ); @@ -279,7 +279,7 @@ function findNotCachedBlindedConvoFromUnblindedKey( const foundConvosForThisServerPk = getConversationController() .getConversations() - .filter(m => m.isPrivate() && PubKey.hasBlindedPrefix(m.id) && m.isActive()) + .filter(m => m.isPrivate() && PubKey.isBlinded(m.id) && m.isActive()) .filter(m => { return tryMatchBlindWithStandardKey(unblindedID, m.id, serverPublicKey, sodium); }) || []; @@ -302,7 +302,7 @@ export async function findCachedBlindedMatchOrLookItUp( serverPubKey: string, sodium: LibSodiumWrappers ): Promise { - if (!PubKey.hasBlindedPrefix(blindedId)) { + if (!PubKey.isBlinded(blindedId)) { return blindedId; } const found = getCachedNakedKeyFromBlinded(blindedId, serverPubKey); @@ -333,7 +333,7 @@ export function findCachedBlindedIdFromUnblinded( unblindedId: string, serverPubKey: string ): string | undefined { - if (PubKey.hasBlindedPrefix(unblindedId)) { + if (PubKey.isBlinded(unblindedId)) { throw new Error('findCachedBlindedIdFromUnblinded needs an unblindedID'); } const found = assertLoaded().find( @@ -351,7 +351,7 @@ export async function findCachedOurBlindedPubkeyOrLookItUp( ): Promise { const ourNakedSessionID = UserUtils.getOurPubKeyStrFromCache(); - if (PubKey.hasBlindedPrefix(ourNakedSessionID)) { + if (PubKey.isBlinded(ourNakedSessionID)) { throw new Error('findCachedBlindedIdFromUnblindedOrLookItUp needs a unblindedID'); } let found = findCachedBlindedIdFromUnblinded(ourNakedSessionID, serverPubKey); @@ -402,7 +402,7 @@ export function findCachedBlindedMatchOrLookupOnAllServers( unblindedId: string, sodium: LibSodiumWrappers ): Array { - if (PubKey.hasBlindedPrefix(unblindedId)) { + if (PubKey.isBlinded(unblindedId)) { throw new Error('findCachedBlindedMatchOrLookupOnAllServers needs an unblindedId'); } diff --git a/ts/session/apis/open_group_api/sogsv3/sogsBlinding.ts b/ts/session/apis/open_group_api/sogsv3/sogsBlinding.ts index 8e4aba24e..2f3318a6d 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsBlinding.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsBlinding.ts @@ -63,7 +63,8 @@ async function getOpenGroupHeaders(data: { const blindingValues = getBlindingValues(serverPK, signingKeys, sodium); ka = blindingValues.secretKey; kA = blindingValues.publicKey; - pubkey = `${KeyPrefixType.blinded}${toHex(kA)}`; + // TODO we will need to add the support of blinded25 here + pubkey = `${KeyPrefixType.blinded15}${toHex(kA)}`; } else { pubkey = `${KeyPrefixType.unblinded}${toHex(signingKeys.pubKeyBytes)}`; } @@ -151,7 +152,8 @@ const getBlindedPubKey = ( sodium: LibSodiumWrappers ): string => { const blindedPubKeyBytes = getBlindingValues(serverPK, signingKeys, sodium); - return `${KeyPrefixType.blinded}${to_hex(blindedPubKeyBytes.publicKey)}`; + // TODO we will need to add the support of blinded25 here + return `${KeyPrefixType.blinded15}${to_hex(blindedPubKeyBytes.publicKey)}`; }; const getBlindingValues = ( diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 6257b5599..b4b41d294 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -187,7 +187,7 @@ export class ConversationController { 'getConversationController().deleteBlindedContact() needs complete initial fetch' ); } - if (!PubKey.hasBlindedPrefix(blindedId)) { + if (!PubKey.isBlinded(blindedId)) { throw new Error('deleteBlindedContact allow accepts blinded id'); } window.log.info(`deleteBlindedContact with ${blindedId}`); diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index b7401fb78..af20d5391 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -139,7 +139,8 @@ export class MessageQueue { recipientBlindedId: string; }) { try { - if (!PubKey.hasBlindedPrefix(recipientBlindedId)) { + // TODO we will need to add the support for blinded25 messages requests + if (!PubKey.isBlinded(recipientBlindedId)) { throw new Error('sendToOpenGroupV2BlindedRequest needs a blindedId'); } const { serverTimestamp, serverId } = await MessageSender.sendToOpenGroupV2BlindedRequest( diff --git a/ts/session/types/PubKey.ts b/ts/session/types/PubKey.ts index 44654ebfb..987250d1c 100644 --- a/ts/session/types/PubKey.ts +++ b/ts/session/types/PubKey.ts @@ -10,9 +10,15 @@ export enum KeyPrefixType { */ standard = '05', /** - * used for participants in open groups + * used for participants in open groups (legacy blinding logic) */ - blinded = '15', + blinded15 = '15', + + /** + * used for participants in open groups (new blinding logic) + */ + blinded25 = '25', + /** * used for participants in open groups */ @@ -32,7 +38,7 @@ export class PubKey { public static readonly PREFIX_GROUP_TEXTSECURE = '__textsecure_group__!'; // prettier-ignore private static readonly regex: RegExp = new RegExp( - `^(${PubKey.PREFIX_GROUP_TEXTSECURE})?(${KeyPrefixType.standard}|${KeyPrefixType.blinded}|${KeyPrefixType.unblinded}|${KeyPrefixType.groupV3})?(${PubKey.HEX}{64}|${PubKey.HEX}{32})$` + `^(${PubKey.PREFIX_GROUP_TEXTSECURE})?(${KeyPrefixType.standard}|${KeyPrefixType.blinded15}|${KeyPrefixType.blinded25}|${KeyPrefixType.unblinded}|${KeyPrefixType.groupV3})?(${PubKey.HEX}{64}|${PubKey.HEX}{32})$` ); /** * If you want to update this regex. Be sure that those are matches ; @@ -146,18 +152,19 @@ export class PubKey { /** * @param keyWithOrWithoutPrefix Key with or without prefix - * @returns If key is the correct length and has a supported prefix 05 or 15 + * @returns If key is the correct length and has a supported prefix 05, 15, 25 */ public static isValidPrefixAndLength(keyWithOrWithoutPrefix: string): boolean { return ( keyWithOrWithoutPrefix.length === 66 && - (keyWithOrWithoutPrefix.startsWith(KeyPrefixType.blinded) || + (keyWithOrWithoutPrefix.startsWith(KeyPrefixType.blinded15) || + keyWithOrWithoutPrefix.startsWith(KeyPrefixType.blinded25) || keyWithOrWithoutPrefix.startsWith(KeyPrefixType.standard)) ); } /** - * This removes the 05 or 15 prefix from a Pubkey which have it and have a length of 66 + * This removes the 05, 15 or 25 prefix from a Pubkey which have it and have a length of 66 * @param keyWithOrWithoutPrefix the key with or without the prefix */ public static removePrefixIfNeeded(keyWithOrWithoutPrefix: string): string { @@ -230,8 +237,8 @@ export class PubKey { return fromHexToArray(PubKey.removePrefixIfNeeded(this.key)); } - public static hasBlindedPrefix(key: string) { - return key.startsWith(KeyPrefixType.blinded); + public static isBlinded(key: string) { + return key.startsWith(KeyPrefixType.blinded15) || key.startsWith(KeyPrefixType.blinded25); } public static isClosedGroupV3(key: string) { diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts index a5d16d5df..00186a241 100644 --- a/ts/session/utils/libsession/libsession_utils_contacts.ts +++ b/ts/session/utils/libsession/libsession_utils_contacts.ts @@ -29,9 +29,7 @@ const mappedContactWrapperValues = new Map(); * We want to sync the message request status so we need to allow a contact even if it's not approved, did not approve us and is not blocked. */ function isContactToStoreInWrapper(convo: ConversationModel): boolean { - return ( - !convo.isMe() && convo.isPrivate() && convo.isActive() && !PubKey.hasBlindedPrefix(convo.id) - ); + return !convo.isMe() && convo.isPrivate() && convo.isActive() && !PubKey.isBlinded(convo.id); } /** diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts index cf0d7f3d9..e1d3ace6c 100644 --- a/ts/session/utils/sync/syncUtils.ts +++ b/ts/session/utils/sync/syncUtils.ts @@ -204,7 +204,7 @@ const getValidContacts = (convos: Array) => { c.getRealSessionUsername() && c.isPrivate() && c.isApproved() && - !PubKey.hasBlindedPrefix(c.get('id')) + !PubKey.isBlinded(c.get('id')) ); const contacts = contactsModels.map(c => { diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index c7c1a3d61..97a4f4904 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -785,7 +785,7 @@ export const getMessageQuoteProps = createSelector( const isFromMe = isUsAnySogsFromCache(author) || false; // NOTE the quote lookup map always stores our messages using the unblinded pubkey - if (isFromMe && PubKey.hasBlindedPrefix(author)) { + if (isFromMe && PubKey.isBlinded(author)) { author = UserUtils.getOurPubKeyStrFromCache(); } diff --git a/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts b/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts index 3618c0eb4..022848ae7 100644 --- a/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts +++ b/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts @@ -418,7 +418,7 @@ describe('knownBlindedKeys', () => { it('throws if blindedSessionId is not standard', () => { expect(() => { tryMatchBlindWithStandardKey(realSessionId, realSessionId, serverPublicKey, sodium); - }).to.throw('blindedKey must be a blinded key (starting with 15)'); + }).to.throw('blindedKey must be a blinded key (starting with 15 or 25)'); }); it('returns true if those keys are not matching blind & naked', () => { diff --git a/ts/webworker/workers/node/util/util.worker.ts b/ts/webworker/workers/node/util/util.worker.ts index 54e4daf54..f0ab356e9 100644 --- a/ts/webworker/workers/node/util/util.worker.ts +++ b/ts/webworker/workers/node/util/util.worker.ts @@ -141,7 +141,8 @@ async function verifySignature( } const messageData = fromBase64ToUint8Array(messageBase64); const signature = fromBase64ToUint8Array(signatureBase64); - const isBlindedSender = senderPubKey.startsWith('15'); + // blinded15 or blinded25 are the same for the verifySignature logic + const isBlindedSender = senderPubKey.startsWith('15') || senderPubKey.startsWith('25'); const pubkeyWithoutPrefix = senderPubKey.slice(2); const pubkeyBytes = fromHexToArray(pubkeyWithoutPrefix); From b4482ec2d4c50825c43e67737ab95549a3531f58 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 14 Jul 2023 12:54:52 +0200 Subject: [PATCH 6/7] fix: enable userconfig release to be 31st July 31st July, 10am Melbourne time --- ts/util/releaseFeature.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ts/util/releaseFeature.ts b/ts/util/releaseFeature.ts index ceb98a59b..602f3b553 100644 --- a/ts/util/releaseFeature.ts +++ b/ts/util/releaseFeature.ts @@ -46,10 +46,8 @@ function getFeatureReleaseTimestamp(featureName: FeatureNameTracked) { return 1706778000000; // unix 01/02/2024 09:00; // return 1677488400000; // testing: unix 27/02/2023 09:00 case 'user_config_libsession': - // TODO update to agreed value between platforms for `user_config_libsession` - // FIXME once we are done with testing the user config over libsession feature - // return (window as any).user_config_libsession || 1706778000000; // unix 01/02/2024 09:00; - return 1677488400000; // testing: unix 27/02/2023 09:00 + return 1690761600000; // Monday July 31st at 10am Melbourne time + // return 1677488400000; // testing: unix 27/02/2023 09:00 default: assertUnreachable(featureName, 'case not handled for getFeatureReleaseTimestamp'); @@ -81,8 +79,7 @@ async function checkIsFeatureReleased(featureName: FeatureNameTracked): Promise< // Is it time to release the feature based on the network timestamp? if ( !featureAlreadyReleased && - (GetNetworkTime.getNowWithNetworkOffset() >= getFeatureReleaseTimestamp(featureName) || - featureName === 'user_config_libsession') // we want to make a build which has user config enabled by default for internal testing // TODO to remove for official build + GetNetworkTime.getNowWithNetworkOffset() >= getFeatureReleaseTimestamp(featureName) ) { window.log.info(`[releaseFeature]: It is time to release ${featureName}. Releasing it now`); await Storage.put(featureStorageItemId(featureName), true); From 83c7de8b889382a5d86bbb539b98eac663e336c4 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 14 Jul 2023 13:57:57 +0200 Subject: [PATCH 7/7] test: fix test with feature flag userconfig off for now --- .../unit/swarm_polling/SwarmPolling_test.ts | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts index f1be4f069..06a56bc2f 100644 --- a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts @@ -207,7 +207,7 @@ describe('SwarmPolling', () => { await swarmPolling.start(true); expect(pollOnceForKeySpy.callCount).to.eq(1); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]); }); it('does run for our pubkey even if activeAt is recent ', async () => { @@ -219,7 +219,7 @@ describe('SwarmPolling', () => { await swarmPolling.start(true); expect(pollOnceForKeySpy.callCount).to.eq(1); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]); }); describe('legacy group', () => { @@ -236,7 +236,7 @@ describe('SwarmPolling', () => { // our pubkey will be polled for, hence the 2 expect(pollOnceForKeySpy.callCount).to.eq(2); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]); expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); }); @@ -262,7 +262,7 @@ describe('SwarmPolling', () => { // our pubkey will be polled for, hence the 2 expect(pollOnceForKeySpy.callCount).to.eq(2); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]); expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); getItemByIdStub.restore(); getItemByIdStub = TestUtils.stubData('getItemById'); @@ -288,9 +288,9 @@ describe('SwarmPolling', () => { await swarmPolling.pollForAllKeys(); expect(pollOnceForKeySpy.callCount).to.eq(3); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]); expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); - expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); + expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]); }); it('does run twice if activeAt less than one hour ', async () => { @@ -307,7 +307,7 @@ describe('SwarmPolling', () => { swarmPolling.addGroupId(groupConvoPubkey); await swarmPolling.start(true); expect(pollOnceForKeySpy.callCount).to.eq(2); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]); expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); pollOnceForKeySpy.resetHistory(); clock.tick(9000); @@ -322,7 +322,7 @@ describe('SwarmPolling', () => { await sleepFor(10); expect(pollOnceForKeySpy.callCount).to.eq(2); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]); expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); }); @@ -352,9 +352,9 @@ describe('SwarmPolling', () => { await sleepFor(10); // we should have two more calls here, so 4 total. expect(pollOnceForKeySpy.callCount).to.eq(4); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]); expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); - expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); + expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]); expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]); }); @@ -379,7 +379,7 @@ describe('SwarmPolling', () => { // we should have only one more call here, the one for our direct pubkey fetch expect(pollOnceForKeySpy.callCount).to.eq(3); expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); // this one comes from the swarmPolling.start - expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); + expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]); }); describe('multiple runs', () => { @@ -421,10 +421,10 @@ describe('SwarmPolling', () => { // we have 4 calls total. 2 for our direct promises run each 5 seconds, and 2 for the group pubkey active (so run every 5 sec too) expect(pollOnceForKeySpy.callCount).to.eq(4); // first two calls are our pubkey - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]); expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); - expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); + expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]); expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]); }); @@ -445,9 +445,9 @@ describe('SwarmPolling', () => { expect(pollOnceForKeySpy.callCount).to.eq(4); // first two calls are our pubkey - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0]]); expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); - expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); + expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0]]); expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]); }); });