From b843d660845d4a2a79dd8fc158ab3a22dba61cf1 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 3 Apr 2023 15:08:37 +1000 Subject: [PATCH] feat: add the lastJoined and createdAt timestamp from wrapper logic --- .../conversation/ConversationHeader.tsx | 4 +- ts/models/conversation.ts | 153 +++++++++--------- ts/node/migration/sessionMigrations.ts | 13 +- ts/receiver/configMessage.ts | 52 +++--- ts/session/group/closed-group.ts | 1 + .../libsession_utils_user_groups.ts | 1 + ts/state/selectors/conversations.ts | 11 +- ts/types/sqlSharedTypes.ts | 8 +- 8 files changed, 132 insertions(+), 111 deletions(-) diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx index 9a62986ff..736cff2be 100644 --- a/ts/components/conversation/ConversationHeader.tsx +++ b/ts/components/conversation/ConversationHeader.tsx @@ -206,7 +206,7 @@ const BackButton = (props: { onGoBack: () => void; showBackButton: boolean }) => const CallButton = () => { const isPrivate = useSelectedIsPrivate(); const isBlocked = useSelectedIsBlocked(); - const activeAt = useSelectedIsActive(); + const isActive = useSelectedIsActive(); const isMe = useSelectedisNoteToSelf(); const selectedConvoKey = useSelectedConversationKey(); @@ -216,7 +216,7 @@ const CallButton = () => { const isRequest = useIsRequest(selectedConvoKey); - if (!isPrivate || isMe || !selectedConvoKey || isBlocked || !activeAt || isRequest) { + if (!isPrivate || isMe || !selectedConvoKey || isBlocked || !isActive || isRequest) { return null; } diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index f26f57ae4..0547270bc 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -311,6 +311,10 @@ export class ConversationModel extends Backbone.Model { if (isPrivate) { toRet.isPrivate = true; + const foundContact = SessionUtilContact.getContactCached(this.id); + if (!toRet.activeAt && foundContact && isFinite(foundContact.createdAt)) { + toRet.activeAt = foundContact.createdAt; + } } if (weAreAdmin) { @@ -342,80 +346,79 @@ export class ConversationModel extends Backbone.Model { toRet.currentNotificationSetting = currentNotificationSetting; } - const foundContact = SessionUtilContact.getContactCached(this.id); - const foundCommunity = SessionUtilUserGroups.getCommunityByConvoIdCached(this.id); - const foundLegacyGroup = SessionUtilUserGroups.getLegacyGroupCached(this.id); - const foundVolatileInfo = SessionUtilConvoInfoVolatile.getVolatileInfoCached(this.id); - - // rely on the wrapper values rather than the DB ones if they exist in the wrapper - if (foundContact) { - if (foundContact.name) { - toRet.displayNameInProfile = foundContact.name; - } - - if (foundContact.nickname) { - toRet.nickname = foundContact.nickname; - } + // const foundCommunity = SessionUtilUserGroups.getCommunityByConvoIdCached(this.id); + // const foundLegacyGroup = SessionUtilUserGroups.getLegacyGroupCached(this.id); + // const foundVolatileInfo = SessionUtilConvoInfoVolatile.getVolatileInfoCached(this.id); - if (foundContact.blocked) { - toRet.isBlocked = foundContact.blocked; - } + // // rely on the wrapper values rather than the DB ones if they exist in the wrapper + // if (foundContact) { + // if (foundContact.name) { + // toRet.displayNameInProfile = foundContact.name; + // } - if (foundContact.approvedMe) { - toRet.didApproveMe = foundContact.approvedMe; - } + // if (foundContact.nickname) { + // toRet.nickname = foundContact.nickname; + // } - if (foundContact.approved) { - toRet.isApproved = foundContact.approved; - } + // if (foundContact.blocked) { + // toRet.isBlocked = foundContact.blocked; + // } - if (foundContact.priority) { - toRet.priority = foundContact.priority; - } + // if (foundContact.approvedMe) { + // toRet.didApproveMe = foundContact.approvedMe; + // } - if (foundContact.expirationTimerSeconds > 0) { - toRet.expireTimer = foundContact.expirationTimerSeconds; - } - } else { - if (this.get('displayNameInProfile')) { - toRet.displayNameInProfile = this.get('displayNameInProfile'); - } + // if (foundContact.approved) { + // toRet.isApproved = foundContact.approved; + // } - if (this.get('nickname')) { - toRet.nickname = this.get('nickname'); - } + // if (foundContact.priority) { + // toRet.priority = foundContact.priority; + // } - if (BlockedNumberController.isBlocked(this.id)) { - toRet.isBlocked = true; - } + // if (foundContact.expirationTimerSeconds > 0) { + // toRet.expireTimer = foundContact.expirationTimerSeconds; + // } + // } else { + if (this.get('displayNameInProfile')) { + toRet.displayNameInProfile = this.get('displayNameInProfile'); + } - if (this.get('didApproveMe')) { - toRet.didApproveMe = this.get('didApproveMe'); - } + if (this.get('nickname')) { + toRet.nickname = this.get('nickname'); + } - if (this.get('isApproved')) { - toRet.isApproved = this.get('isApproved'); - } + if (BlockedNumberController.isBlocked(this.id)) { + toRet.isBlocked = true; + } - if (this.get('expireTimer')) { - toRet.expireTimer = this.get('expireTimer'); - } + if (this.get('didApproveMe')) { + toRet.didApproveMe = this.get('didApproveMe'); } - // -- Handle the group fields from the wrapper and the database -- - if (foundLegacyGroup) { - toRet.members = foundLegacyGroup.members.map(m => m.pubkeyHex) || []; - toRet.groupAdmins = - foundLegacyGroup.members.filter(m => m.isAdmin).map(m => m.pubkeyHex) || []; - toRet.displayNameInProfile = isEmpty(foundLegacyGroup.name) - ? undefined - : foundLegacyGroup.name; - toRet.expireTimer = foundLegacyGroup.disappearingTimerSeconds; + if (this.get('isApproved')) { + toRet.isApproved = this.get('isApproved'); + } - if (foundLegacyGroup.priority) { - toRet.priority = foundLegacyGroup.priority; - } - } else if (this.isClosedGroup()) { + if (this.get('expireTimer')) { + toRet.expireTimer = this.get('expireTimer'); + } + // } + + // // -- Handle the group fields from the wrapper and the database -- + // if (foundLegacyGroup) { + // toRet.members = foundLegacyGroup.members.map(m => m.pubkeyHex) || []; + // toRet.groupAdmins = + // foundLegacyGroup.members.filter(m => m.isAdmin).map(m => m.pubkeyHex) || []; + // toRet.displayNameInProfile = isEmpty(foundLegacyGroup.name) + // ? undefined + // : foundLegacyGroup.name; + // toRet.expireTimer = foundLegacyGroup.disappearingTimerSeconds; + + // if (foundLegacyGroup.priority) { + // toRet.priority = foundLegacyGroup.priority; + // } + /*} else*/ if (this.isClosedGroup()) { toRet.members = this.get('members') || []; toRet.groupAdmins = this.getGroupAdmins(); toRet.displayNameInProfile = this.get('displayNameInProfile'); @@ -438,21 +441,21 @@ export class ConversationModel extends Backbone.Model { } // -- Handle the communities fields from the wrapper and the database -- - if (foundCommunity) { - if (foundCommunity.priority) { - toRet.priority = foundCommunity.priority; - } // the priorty field is the only one currently in the wrapper community. and we already pre apply the one from the DB on the top of this function - } - - if (foundVolatileInfo) { - if (foundVolatileInfo.unread) { - toRet.isMarkedUnread = foundVolatileInfo.unread; - } - } else { - if (this.get('markedAsUnread')) { - toRet.isMarkedUnread = this.get('markedAsUnread'); - } + // if (foundCommunity) { + // if (foundCommunity.priority) { + // toRet.priority = foundCommunity.priority; + // } // the priorty field is the only one currently in the wrapper community. and we already pre apply the one from the DB on the top of this function + // } + + // if (foundVolatileInfo) { + // if (foundVolatileInfo.unread) { + // toRet.isMarkedUnread = foundVolatileInfo.unread; + // } + // } else { + if (this.get('markedAsUnread')) { + toRet.isMarkedUnread = this.get('markedAsUnread'); } + // } // -- Handle the field stored only in memory for all types of conversation-- const inMemoryConvoInfo = inMemoryConvoInfos.get(this.id); diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts index e3f98ba81..8c2c30a3e 100644 --- a/ts/node/migration/sessionMigrations.ts +++ b/ts/node/migration/sessionMigrations.ts @@ -1364,13 +1364,21 @@ function insertCommunityIntoWrapper( function insertLegacyGroupIntoWrapper( legacyGroup: Pick< ConversationAttributes, - 'id' | 'priority' | 'expireTimer' | 'displayNameInProfile' + 'id' | 'priority' | 'expireTimer' | 'displayNameInProfile' | 'lastJoinedTimestamp' > & { members: string; groupAdmins: string }, // members and groupAdmins are still stringified here userGroupConfigWrapper: UserGroupsWrapperInsideWorker, volatileInfoConfigWrapper: ConvoInfoVolatileWrapperInsideWorker, db: BetterSqlite3.Database ) { - const { priority, id, expireTimer, groupAdmins, members, displayNameInProfile } = legacyGroup; + const { + priority, + id, + expireTimer, + groupAdmins, + members, + displayNameInProfile, + lastJoinedTimestamp, + } = legacyGroup; const latestEncryptionKeyPairHex = sqlNode.getLatestClosedGroupEncryptionKeyPair( legacyGroup.id, @@ -1386,6 +1394,7 @@ function insertLegacyGroupIntoWrapper( displayNameInProfile, encPubkeyHex: latestEncryptionKeyPairHex?.publicHex || '', encSeckeyHex: latestEncryptionKeyPairHex?.privateHex || '', + lastJoinedTimestamp, }); try { diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 36118c023..76f2bd942 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -157,7 +157,7 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise = { displayNameInProfile: details.name, members: details.members, + // Note: legacy group to not support change of admins. type: ConversationTypeEnum.GROUP, active_at: details.activeAt ? details.activeAt : 0, left: details.activeAt ? false : true, diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts index 939f9922e..473fdc072 100644 --- a/ts/session/utils/libsession/libsession_utils_user_groups.ts +++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts @@ -131,6 +131,7 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise displayNameInProfile: foundConvo.get('displayNameInProfile'), encPubkeyHex: encryptionKeyPair?.publicHex || '', encSeckeyHex: encryptionKeyPair?.privateHex || '', + lastJoinedTimestamp: foundConvo.get('lastJoinedTimestamp') || 0, }); try { diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index 06f5f2ae9..9f0f779a2 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -239,7 +239,7 @@ export const _getConversationComparator = (testingi18n?: LocalizerType) => { if (rightPriority > leftPriority) { return 1; } - // Then if none is pinned, check other criteria + // Then if none are pinned, check other criteria const leftActiveAt = left.activeAt; const rightActiveAt = right.activeAt; if (leftActiveAt && !rightActiveAt) { @@ -262,7 +262,7 @@ export const getConversationComparator = createSelector(getIntl, _getConversatio // export only because we use it in some of our tests // tslint:disable-next-line: cyclomatic-complexity -export const _getLeftPaneLists = ( +const _getLeftPaneLists = ( sortedConversations: Array ): { conversations: Array; @@ -401,13 +401,13 @@ const _getPrivateContactsPubkeys = ( sortedConversations: Array ): Array => { return filter(sortedConversations, conversation => { - return ( + return !!( conversation.isPrivate && !conversation.isBlocked && !conversation.isMe && conversation.didApproveMe && conversation.isApproved && - Boolean(conversation.activeAt) + conversation.activeAt ); }).map(convo => convo.id); }; @@ -450,8 +450,9 @@ export type DirectContactsByNameType = { export const getDirectContactsByName = createSelector( getDirectContacts, (contacts: Array): Array => { + const us = UserUtils.getOurPubKeyStrFromCache(); const extractedContacts = contacts - .filter(m => m.id !== UserUtils.getOurPubKeyStrFromCache()) + .filter(m => m.id !== us) .map(m => { return { id: m.id, diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts index 5aec4d918..e124eacb8 100644 --- a/ts/types/sqlSharedTypes.ts +++ b/ts/types/sqlSharedTypes.ts @@ -145,6 +145,7 @@ export function getContactInfoFromDBValues({ !!expirationTimerSeconds && isFinite(expirationTimerSeconds) && expirationTimerSeconds > 0 ? 'disappearAfterSend' : 'off', + createdAt: 0, // this is actually unused as the wrapper keep the value as it is currently stored (this is a created at timestamp, no need to update it) }; if ( @@ -204,7 +205,11 @@ export function getLegacyGroupInfoFromDBValues({ encPubkeyHex, encSeckeyHex, groupAdmins: maybeAdmins, -}: Pick & { + lastJoinedTimestamp, +}: Pick< + ConversationAttributes, + 'id' | 'priority' | 'displayNameInProfile' | 'expireTimer' | 'lastJoinedTimestamp' +> & { encPubkeyHex: string; encSeckeyHex: string; members: string | Array; @@ -227,6 +232,7 @@ export function getLegacyGroupInfoFromDBValues({ members: wrappedMembers, encPubkey: !isEmpty(encPubkeyHex) ? from_hex(encPubkeyHex) : new Uint8Array(), encSeckey: !isEmpty(encSeckeyHex) ? from_hex(encSeckeyHex) : new Uint8Array(), + joinedAt: lastJoinedTimestamp, }; return legacyGroup;