diff --git a/package.json b/package.json index bc2955de3..283adc168 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,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.1.14/libsession_util_nodejs-v0.1.14.tar.gz", + "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.15/libsession_util_nodejs-v0.1.15.tar.gz", "libsodium-wrappers-sumo": "^0.7.9", "linkify-it": "3.0.2", "lodash": "^4.17.20", diff --git a/ts/components/menu/ConversationHeaderMenu.tsx b/ts/components/menu/ConversationHeaderMenu.tsx index 36a149ba2..8250e8b60 100644 --- a/ts/components/menu/ConversationHeaderMenu.tsx +++ b/ts/components/menu/ConversationHeaderMenu.tsx @@ -42,6 +42,7 @@ import { DeletePrivateConversationMenuItem, } from './Menu'; import { ContextConversationProvider } from '../leftpane/conversation-list-item/ConvoIdContext'; +import { isSearching } from '../../state/selectors/search'; export type PropsConversationHeaderMenu = { triggerId: string; @@ -53,10 +54,14 @@ export const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => { const convoId = useSelectedConversationKey(); const isPrivateFriend = useSelectedIsPrivateFriend(); const isPrivate = useSelectedIsPrivate(); + const isSearchingMode = useSelector(isSearching); if (!convoId) { throw new Error('convoId must be set for a header to be visible!'); } + if (isSearchingMode) { + return null; + } // we do not want the triple dots menu at all if this is not a friend at all if (isPrivate && !isPrivateFriend) { diff --git a/ts/components/menu/ConversationListItemContextMenu.tsx b/ts/components/menu/ConversationListItemContextMenu.tsx index f91e03c32..c8cbeda5e 100644 --- a/ts/components/menu/ConversationListItemContextMenu.tsx +++ b/ts/components/menu/ConversationListItemContextMenu.tsx @@ -28,6 +28,7 @@ import { UnbanMenuItem, DeletePrivateConversationMenuItem, } from './Menu'; +import { isSearching } from '../../state/selectors/search'; export type PropsContextConversationItem = { triggerId: string; @@ -35,7 +36,11 @@ export type PropsContextConversationItem = { const ConversationListItemContextMenu = (props: PropsContextConversationItem) => { const { triggerId } = props; + const isSearchingMode = useSelector(isSearching); + if (isSearchingMode) { + return null; + } return ( diff --git a/ts/mains/main_renderer.tsx b/ts/mains/main_renderer.tsx index b4bac9a83..f67e06b3b 100644 --- a/ts/mains/main_renderer.tsx +++ b/ts/mains/main_renderer.tsx @@ -198,7 +198,6 @@ Storage.onready(async () => { } await initialiseEmojiData(nativeEmojiData); await AttachmentDownloads.initAttachmentPaths(); - await startJobRunners(); await Promise.all([ getConversationController().load(), @@ -206,6 +205,7 @@ Storage.onready(async () => { OpenGroupData.opengroupRoomsLoad(), loadKnownBlindedKeys(), ]); + await startJobRunners(); } catch (error) { window.log.error( 'main_renderer: ConversationController failed to load:', diff --git a/ts/models/message.ts b/ts/models/message.ts index 842d64db8..c0281c84a 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -447,10 +447,12 @@ export class MessageModel extends Backbone.Model { return 'read'; } const sent = this.get('sent'); - // control messages we've sent, synced from the network appear to just have the sent_at field set. - const sentAt = this.get('sent_at'); + // control messages we've sent, synced from the network appear to just have the sent_at field set, but our current devices also have this field set when we are just sending it... So idk how to have behavior work fine., + // TODOLATER + // const sentAt = this.get('sent_at'); const sentTo = this.get('sent_to') || []; - if (sent || sentTo.length > 0 || sentAt) { + + if (sent || sentTo.length > 0) { return 'sent'; } diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts index abc67ceaa..be682b929 100644 --- a/ts/node/migration/sessionMigrations.ts +++ b/ts/node/migration/sessionMigrations.ts @@ -34,7 +34,9 @@ import { import { getIdentityKeys, sqlNode } from '../sql'; -// tslint:disable: no-console quotemark one-variable-per-declaration +const hasDebugEnvVariable = Boolean(process.env.SESSION_DEBUG); + +// tslint:disable: no-console quotemark one-variable-per-declaration no-unused-expression function getSessionSchemaVersion(db: BetterSqlite3.Database) { const result = db @@ -1237,7 +1239,7 @@ function insertContactIntoContactWrapper( }); try { - console.info('Inserting contact into wrapper: ', wrapperContact); + hasDebugEnvVariable && console.info('Inserting contact into wrapper: ', wrapperContact); contactsConfigWrapper.set(wrapperContact); } catch (e) { console.error( @@ -1245,7 +1247,7 @@ function insertContactIntoContactWrapper( ); // the wrapper did not like something. Try again with just the boolean fields as it's most likely the issue is with one of the strings (which could be recovered) try { - console.info('Inserting edited contact into wrapper: ', contact.id); + hasDebugEnvVariable && console.info('Inserting edited contact into wrapper: ', contact.id); contactsConfigWrapper.set( getContactInfoFromDBValues({ id: contact.id, @@ -1286,7 +1288,8 @@ function insertContactIntoContactWrapper( const maxRead = rows?.max_sent_at; const lastRead = isNumber(maxRead) && isFinite(maxRead) ? maxRead : 0; - console.info(`Inserting contact into volatile wrapper maxread: ${contact.id} :${lastRead}`); + hasDebugEnvVariable && + console.info(`Inserting contact into volatile wrapper maxread: ${contact.id} :${lastRead}`); volatileConfigWrapper.set1o1(contact.id, lastRead, false); } catch (e) { console.error( @@ -1305,6 +1308,7 @@ function insertCommunityIntoWrapper( const convoId = community.id; // the id of a conversation has the prefix, the serverUrl and the roomToken already present, but not the pubkey const roomDetails = sqlNode.getV2OpenGroupRoom(convoId, db); + hasDebugEnvVariable && console.info('insertCommunityIntoWrapper: ', community); if ( !roomDetails || @@ -1320,9 +1324,10 @@ function insertCommunityIntoWrapper( ); return; } - console.info( - `building fullUrl from serverUrl:"${roomDetails.serverUrl}" roomId:"${roomDetails.roomId}" pubkey:"${roomDetails.serverPublicKey}"` - ); + hasDebugEnvVariable ?? + console.info( + `building fullUrl from serverUrl:"${roomDetails.serverUrl}" roomId:"${roomDetails.roomId}" pubkey:"${roomDetails.serverPublicKey}"` + ); const fullUrl = userGroupConfigWrapper.buildFullUrlFromDetails( roomDetails.serverUrl, @@ -1335,7 +1340,7 @@ function insertCommunityIntoWrapper( }); try { - console.info('Inserting community into group wrapper: ', wrapperComm); + hasDebugEnvVariable && console.info('Inserting community into group wrapper: ', wrapperComm); userGroupConfigWrapper.setCommunityByFullUrl(wrapperComm.fullUrl, wrapperComm.priority); const rows = db .prepare( @@ -1353,7 +1358,10 @@ function insertCommunityIntoWrapper( const maxRead = rows?.max_sent_at; const lastRead = isNumber(maxRead) && isFinite(maxRead) ? maxRead : 0; - console.info(`Inserting community into volatile wrapper: ${wrapperComm.fullUrl} :${lastRead}`); + hasDebugEnvVariable && + console.info( + `Inserting community into volatile wrapper: ${wrapperComm.fullUrl} :${lastRead}` + ); volatileConfigWrapper.setCommunityByFullUrl(wrapperComm.fullUrl, lastRead, false); } catch (e) { console.error( @@ -1399,7 +1407,8 @@ function insertLegacyGroupIntoWrapper( }); try { - console.info('Inserting legacy group into wrapper: ', wrapperLegacyGroup); + hasDebugEnvVariable && + console.info('Inserting legacy group into wrapper: ', wrapperLegacyGroup); userGroupConfigWrapper.setLegacyGroup(wrapperLegacyGroup); const rows = db @@ -1418,7 +1427,8 @@ function insertLegacyGroupIntoWrapper( const maxRead = rows?.max_sent_at; const lastRead = isNumber(maxRead) && isFinite(maxRead) ? maxRead : 0; - console.info(`Inserting legacy group into volatile wrapper maxread: ${id} :${lastRead}`); + hasDebugEnvVariable && + console.info(`Inserting legacy group into volatile wrapper maxread: ${id} :${lastRead}`); volatileInfoConfigWrapper.setLegacyGroup(id, lastRead, false); } catch (e) { console.error( @@ -1434,7 +1444,7 @@ function getBlockedNumbersDuringMigration(db: BetterSqlite3.Database) { return []; } const foundBlocked = blockedItem?.value; - console.info('foundBlockedNumbers during migration', foundBlocked); + hasDebugEnvVariable && console.info('foundBlockedNumbers during migration', foundBlocked); if (isArray(foundBlocked)) { return foundBlocked; } @@ -1557,6 +1567,13 @@ function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite ).run({ newId, oldConvoId: convoDetails.oldConvoId }); }); + // priority was isPinned before. Make sure that it was set to something, rather than allowing null values. + db.prepare( + `UPDATE ${CONVERSATIONS_TABLE} SET + priority = ${CONVERSATION_PRIORITIES.default} + WHERE priority IS NULL;` + ).run({}); + writeSessionSchemaVersion(targetVersion, db); })(); @@ -1657,12 +1674,7 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite if (isArray(contactsToWriteInWrapper) && contactsToWriteInWrapper.length) { console.info( - '===================== Starting contact inserting into wrapper =======================' - ); - - console.info( - 'Writing contacts to wrapper during migration. length: ', - contactsToWriteInWrapper?.length + `===================== Starting contact inserting into wrapper ${contactsToWriteInWrapper?.length} =======================` ); contactsToWriteInWrapper.forEach(contact => { @@ -1743,7 +1755,8 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite legacyGroupsToWriteInWrapper.forEach(legacyGroup => { try { - console.info('Writing legacy group: ', JSON.stringify(legacyGroup)); + hasDebugEnvVariable && + console.info('Writing legacy group: ', JSON.stringify(legacyGroup)); insertLegacyGroupIntoWrapper( legacyGroup, diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index a2474de8d..b7393741c 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -298,7 +298,6 @@ export async function handleNewClosedGroup( members: members, admins, activeAt: envelopeTimestamp, - weWereJustAdded: true, }; // be sure to call this before sending the message. diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 3498a32a1..dbf842190 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -1,9 +1,10 @@ +import { ContactInfo } from 'libsession_util_nodejs'; import { compact, difference, isEmpty, isNumber, toNumber } from 'lodash'; import { ConfigDumpData } from '../data/configDump/configDump'; import { Data } from '../data/data'; import { SettingsKey } from '../data/settings-key'; import { ConversationInteraction } from '../interactions'; -import { ConversationTypeEnum } from '../models/conversationAttributes'; +import { CONVERSATION_PRIORITIES, ConversationTypeEnum } from '../models/conversationAttributes'; import { SignalService } from '../protobuf'; import { ClosedGroup } from '../session'; import { @@ -22,9 +23,11 @@ import { UserUtils } from '../session/utils'; import { toHex } from '../session/utils/String'; import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob'; import { IncomingConfResult, LibSessionUtil } from '../session/utils/libsession/libsession_utils'; +import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts'; import { SessionUtilConvoInfoVolatile } from '../session/utils/libsession/libsession_utils_convo_info_volatile'; import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups'; import { configurationMessageReceived, trigger } from '../shims/events'; +import { getCurrentlySelectedConversationOutsideRedux } from '../state/selectors/conversations'; import { assertUnreachable } from '../types/sqlSharedTypes'; import { BlockedNumberController } from '../util'; import { Registration } from '../util/registration'; @@ -47,9 +50,7 @@ import { addKeyPairToCacheAndDBIfNeeded, handleNewClosedGroup } from './closedGr import { HexKeyPair } from './keypairs'; import { queueAllCachedFromSource } from './receiver'; import { EnvelopePlus } from './types'; -import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts'; -import { ContactInfo } from 'libsession_util_nodejs'; -import { getCurrentlySelectedConversationOutsideRedux } from '../state/selectors/conversations'; +import { deleteAllMessagesByConvoIdNoConfirmation } from '../interactions/conversationInteractions'; function groupByVariant( incomingConfigs: Array> @@ -228,7 +229,14 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise