keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

feat: add the lastJoined and createdAt timestamp from wrapper logic

Browse Source
pull/2620/head
Audric Ackermann 2 years ago
parent 51e4f1dd48
commit b843d66084
8 changed files with 132 additions and 111 deletions
Show Stats Download Patch File Download Diff File

4
ts/components/conversation/ConversationHeader.tsx
Unescape Escape View File

@ -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;
}

153
ts/models/conversation.ts
Unescape Escape View File

@ -311,6 +311,10 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
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<ConversationAttributes> {
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<ConversationAttributes> {
}
// -- 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);

13
ts/node/migration/sessionMigrations.ts
Unescape Escape View File

@ -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 {

52
ts/receiver/configMessage.ts
Unescape Escape View File

@ -157,7 +157,7 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
}
if (wrapperConvo.priority !== contactConvo.get('priority')) {
contactConvo.set({ priority: wrapperConvo.priority });
await contactConvo.setPriorityFromWrapper(wrapperConvo.priority);
changes = true;
}
@ -171,8 +171,8 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
changes = true;
}
if (Boolean(wrapperConvo.approvedMe) !== Boolean(contactConvo.didApproveMe())) {
await contactConvo.setDidApproveMe(Boolean(wrapperConvo.approvedMe), false);
if (wrapperConvo.expirationTimerSeconds !== contactConvo.get('expireTimer')) {
await contactConvo.updateExpireTimer(wrapperConvo.expirationTimerSeconds);
changes = true;
}
@ -382,8 +382,6 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
// save the encryption keypair if needed
if (!isEmpty(fromWrapper.encPubkey) && !isEmpty(fromWrapper.encSeckey)) {
try {
// TODO we need to store the encryption keypair if needed
const inWrapperKeypair: HexKeyPair = {
publicHex: toHex(fromWrapper.encPubkey),
privateHex: toHex(fromWrapper.encSeckey),
@ -428,30 +426,32 @@ async function applyConvoVolatileUpdateFromWrapper(
lastReadMessageTimestamp: number
) {
const foundConvo = getConversationController().get(convoId);
if (foundConvo) {
try {
window.log.debug(
`applyConvoVolatileUpdateFromWrapper: ${convoId}: forcedUnread:${forcedUnread}, lastReadMessage:${lastReadMessageTimestamp}`
);
// this should mark all the messages sent before fromWrapper.lastRead as read and update the unreadCount
await foundConvo.markReadFromConfigMessage(lastReadMessageTimestamp);
// this commits to the DB, if needed
await foundConvo.markAsUnread(forcedUnread, true);
if (SessionUtilConvoInfoVolatile.isConvoToStoreInWrapper(foundConvo)) {
await SessionUtilConvoInfoVolatile.refreshConvoVolatileCached(
foundConvo.id,
foundConvo.isClosedGroup(),
false
);
if (!foundConvo) {
return;
}
await foundConvo.refreshInMemoryDetails();
}
} catch (e) {
window.log.warn(
`applyConvoVolatileUpdateFromWrapper of "${convoId}" failed with error ${e.message}`
try {
window.log.debug(
`applyConvoVolatileUpdateFromWrapper: ${convoId}: forcedUnread:${forcedUnread}, lastReadMessage:${lastReadMessageTimestamp}`
);
// this should mark all the messages sent before fromWrapper.lastRead as read and update the unreadCount
await foundConvo.markReadFromConfigMessage(lastReadMessageTimestamp);
// this commits to the DB, if needed
await foundConvo.markAsUnread(forcedUnread, true);
if (SessionUtilConvoInfoVolatile.isConvoToStoreInWrapper(foundConvo)) {
await SessionUtilConvoInfoVolatile.refreshConvoVolatileCached(
foundConvo.id,
foundConvo.isClosedGroup(),
false
);
await foundConvo.refreshInMemoryDetails();
}
} catch (e) {
window.log.warn(
`applyConvoVolatileUpdateFromWrapper of "${convoId}" failed with error ${e.message}`
);
}
}

1
ts/session/group/closed-group.ts
Unescape Escape View File

@ -224,6 +224,7 @@ export async function updateOrCreateClosedGroup(details: GroupInfo) {
> = {
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,

1
ts/session/utils/libsession/libsession_utils_user_groups.ts
Unescape Escape View File

@ -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 {

11
ts/state/selectors/conversations.ts
Unescape Escape View File

@ -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<ReduxConversationType>
): {
conversations: Array<ReduxConversationType>;
@ -401,13 +401,13 @@ const _getPrivateContactsPubkeys = (
sortedConversations: Array<ReduxConversationType>
): Array<string> => {
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<ReduxConversationType>): Array<DirectContactsByNameType> => {
const us = UserUtils.getOurPubKeyStrFromCache();
const extractedContacts = contacts
.filter(m => m.id !== UserUtils.getOurPubKeyStrFromCache())
.filter(m => m.id !== us)
.map(m => {
return {
id: m.id,

8
ts/types/sqlSharedTypes.ts
Unescape Escape View File

@ -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<ConversationAttributes, 'id' | 'priority' | 'displayNameInProfile' | 'expireTimer'> & {
lastJoinedTimestamp,
}: Pick<
ConversationAttributes,
'id' | 'priority' | 'displayNameInProfile' | 'expireTimer' | 'lastJoinedTimestamp'
> & {
encPubkeyHex: string;
encSeckeyHex: string;
members: string | Array<string>;
@ -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;

Write Preview
Loading…
Cancel
Save