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

feat: use the lastJoinedAt and createdAt from the wrapper

Browse Source
pull/2620/head
Audric Ackermann 2 years ago
parent b843d66084
commit 760642e149
13 changed files with 89 additions and 85 deletions
Show Stats Download Patch File Download Diff File

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

@ -287,8 +287,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
const isPrivate = this.isPrivate();
const weAreAdmin = this.isAdmin(ourNumber);
const weAreModerator = this.isModerator(ourNumber); // only used for sogs
const isMe = this.isMe();
const isTyping = !!this.typingTimer;
const currentNotificationSetting = this.get('triggerNotificationsFor');
const priorityFromDb = this.get('priority');
@ -311,9 +309,17 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
if (isPrivate) {
toRet.isPrivate = true;
if (this.typingTimer) {
toRet.isTyping = true;
}
if (this.isMe()) {
toRet.isMe = true;
}
const foundContact = SessionUtilContact.getContactCached(this.id);
if (!toRet.activeAt && foundContact && isFinite(foundContact.createdAt)) {
toRet.activeAt = foundContact.createdAt;
if (!toRet.activeAt && foundContact && isFinite(foundContact.createdAtSeconds)) {
toRet.activeAt = foundContact.createdAtSeconds * 1000; // active at is in ms
}
}
@ -325,15 +331,9 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
toRet.weAreModerator = true;
}
if (isMe) {
toRet.isMe = true;
}
if (isPublic) {
toRet.isPublic = true;
}
if (isTyping) {
toRet.isTyping = true;
}
if (avatarPath) {
toRet.avatarPath = avatarPath;
@ -346,6 +346,28 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
toRet.currentNotificationSetting = currentNotificationSetting;
}
if (this.get('displayNameInProfile')) {
toRet.displayNameInProfile = this.get('displayNameInProfile');
}
if (this.get('nickname')) {
toRet.nickname = this.get('nickname');
}
if (BlockedNumberController.isBlocked(this.id)) {
toRet.isBlocked = true;
}
if (this.get('didApproveMe')) {
toRet.didApproveMe = this.get('didApproveMe');
}
if (this.get('isApproved')) {
toRet.isApproved = this.get('isApproved');
}
if (this.get('expireTimer')) {
toRet.expireTimer = this.get('expireTimer');
}
if (this.get('markedAsUnread')) {
toRet.isMarkedUnread = this.get('markedAsUnread');
}
// const foundCommunity = SessionUtilUserGroups.getCommunityByConvoIdCached(this.id);
// const foundLegacyGroup = SessionUtilUserGroups.getLegacyGroupCached(this.id);
// const foundVolatileInfo = SessionUtilConvoInfoVolatile.getVolatileInfoCached(this.id);
@ -380,30 +402,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
// toRet.expireTimer = foundContact.expirationTimerSeconds;
// }
// } else {
if (this.get('displayNameInProfile')) {
toRet.displayNameInProfile = this.get('displayNameInProfile');
}
if (this.get('nickname')) {
toRet.nickname = this.get('nickname');
}
if (BlockedNumberController.isBlocked(this.id)) {
toRet.isBlocked = true;
}
if (this.get('didApproveMe')) {
toRet.didApproveMe = this.get('didApproveMe');
}
if (this.get('isApproved')) {
toRet.isApproved = this.get('isApproved');
}
if (this.get('expireTimer')) {
toRet.expireTimer = this.get('expireTimer');
}
// }
// // -- Handle the group fields from the wrapper and the database --
// if (foundLegacyGroup) {
@ -418,22 +416,23 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
// if (foundLegacyGroup.priority) {
// toRet.priority = foundLegacyGroup.priority;
// }
/*} else*/ if (this.isClosedGroup()) {
// }
// those are values coming only from both the DB or the wrapper. Currently we display the data from the DB
if (this.isClosedGroup()) {
toRet.members = this.get('members') || [];
toRet.groupAdmins = this.getGroupAdmins();
toRet.displayNameInProfile = this.get('displayNameInProfile');
toRet.expireTimer = this.get('expireTimer');
}
// those are values coming only from the DB when this is a closed group
if (this.isClosedGroup()) {
if (this.get('isKickedFromGroup')) {
toRet.isKickedFromGroup = !!this.get('isKickedFromGroup');
toRet.isKickedFromGroup = this.get('isKickedFromGroup');
}
if (this.get('left')) {
toRet.left = !!this.get('left');
toRet.left = this.get('left');
}
// to be dropped once we get rid of the legacy closed groups
const zombies = this.get('zombies') || [];
if (zombies?.length) {
toRet.zombies = uniq(zombies);
@ -451,10 +450,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
// 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--
@ -468,7 +463,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
}
}
// -- Handle the last message status, if needed --
// -- Handle the last message status, if present --
const lastMessageText = this.get('lastMessage');
if (lastMessageText && lastMessageText.length) {
const lastMessageStatus = this.get('lastMessageStatus');
@ -2273,13 +2268,11 @@ export async function commitConversationAndRefreshWrapper(id: string) {
await SessionUtilUserGroups.insertGroupsFromDBIntoWrapperAndRefresh(convo.id);
}
break;
case 'ConvoInfoVolatileConfig':
if (SessionUtilConvoInfoVolatile.isConvoToStoreInWrapper(convo)) {
await SessionUtilConvoInfoVolatile.insertConvoFromDBIntoWrapperAndRefresh(convo.id);
}
break;
default:
assertUnreachable(
variant,

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

@ -161,12 +161,12 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
changes = true;
}
if (Boolean(wrapperConvo.approved) !== Boolean(contactConvo.isApproved())) {
if (Boolean(wrapperConvo.approved) !== contactConvo.isApproved()) {
await contactConvo.setIsApproved(Boolean(wrapperConvo.approved), false);
changes = true;
}
if (Boolean(wrapperConvo.approvedMe) !== Boolean(contactConvo.didApproveMe())) {
if (Boolean(wrapperConvo.approvedMe) !== contactConvo.didApproveMe()) {
await contactConvo.setDidApproveMe(Boolean(wrapperConvo.approvedMe), false);
changes = true;
}
@ -175,6 +175,17 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
await contactConvo.updateExpireTimer(wrapperConvo.expirationTimerSeconds);
changes = true;
}
console.warn(
`contactConvo.id: ${contactConvo}; wrapperConvo.createdAtSeconds:${
wrapperConvo.createdAtSeconds
}; current:${contactConvo.get('active_at')}`
);
// we want to set the active_at to the created_at timestamp if active_at is unset, so that it shows up in our list.
if (!contactConvo.get('active_at') && wrapperConvo.createdAtSeconds) {
contactConvo.set({ active_at: wrapperConvo.createdAtSeconds * 1000 });
changes = true;
}
const convoBlocked = wrapperConvo.blocked || false;
await BlockedNumberController.setBlocked(wrapperConvo.id, convoBlocked);
@ -363,6 +374,12 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
legacyGroupConvo.set({ priority: fromWrapper.priority });
changes = true;
}
const existingTimestampMs = legacyGroupConvo.get('lastJoinedTimestamp');
if (Math.floor(existingTimestampMs / 1000) !== fromWrapper.joinedAtSeconds) {
legacyGroupConvo.set({ lastJoinedTimestamp: fromWrapper.joinedAtSeconds * 1000 });
changes = true;
}
if (legacyGroupConvo.get('expireTimer') !== fromWrapper.disappearingTimerSeconds) {
await legacyGroupConvo.updateExpireTimer(
fromWrapper.disappearingTimerSeconds,

1
ts/session/apis/snode_api/storeMessage.ts
Unescape Escape View File

@ -68,7 +68,6 @@ async function storeOnNode(
}
const firstResult = result[0];
console.warn('we should probably check other results code');
if (firstResult.code !== 200) {
window?.log?.warn('first result status is not 200 for storeOnNode but: ', firstResult.code);

2
ts/session/utils/job_runners/JobRunner.ts
Unescape Escape View File

@ -258,7 +258,7 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
private deleteJobsByIdentifier(identifiers: Array<string>) {
identifiers.forEach(identifier => {
const jobIndex = this.jobsScheduled.findIndex(f => f.persistedData.identifier === identifier);
window.log.info(
window.log.debug(
`removing job ${jobToLogId(
this.jobRunnerType,
this.jobsScheduled[jobIndex]

14
ts/session/utils/job_runners/jobs/ConfigurationSyncDumpJob.ts
Unescape Escape View File

@ -15,6 +15,10 @@ import {
PersistedJob,
RunJobResult,
} from '../PersistedJob';
import { SessionUtilUserProfile } from '../../libsession/libsession_utils_user_profile';
import { SessionUtilContact } from '../../libsession/libsession_utils_contacts';
import { SessionUtilUserGroups } from '../../libsession/libsession_utils_user_groups';
import { SessionUtilConvoInfoVolatile } from '../../libsession/libsession_utils_convo_info_volatile';
const defaultMsBetweenRetries = DURATION.SECONDS * 5;
const defaultMaxAttempts = 2;
@ -93,7 +97,6 @@ class ConfigurationSyncDumpJob extends PersistedJob<ConfigurationSyncDumpPersist
}
// refresh all the data stored by the wrappers we need to store.
// so when we call needsDump(), we know for sure that we are up to date
console.time('ConfigurationSyncDumpJob insertAll');
// TODOLATER we need to add the dump of the wrappers of other destination than ourself once we had the closed group handling of config sync job
@ -101,22 +104,21 @@ class ConfigurationSyncDumpJob extends PersistedJob<ConfigurationSyncDumpPersist
const variant = LibSessionUtil.requiredUserVariants[index];
switch (variant) {
case 'UserConfig':
await LibSessionUtil.insertUserProfileIntoWrapper(us);
await SessionUtilUserProfile.insertUserProfileIntoWrapper(us);
break;
case 'ContactsConfig':
await LibSessionUtil.insertAllContactsIntoContactsWrapper();
await SessionUtilContact.insertAllContactsIntoContactsWrapper();
break;
case 'UserGroupsConfig':
await LibSessionUtil.insertAllUserGroupsIntoWrapper();
await SessionUtilUserGroups.insertAllUserGroupsIntoWrapper();
break;
case 'ConvoInfoVolatileConfig':
await LibSessionUtil.insertAllConvoInfoVolatileIntoWrapper();
await SessionUtilConvoInfoVolatile.insertAllConvoInfoVolatileIntoWrapper();
break;
default:
assertUnreachable(variant, `ConfigurationSyncDumpJob unhandled variant: "${variant}"`);
}
}
console.timeEnd('ConfigurationSyncDumpJob insertAll');
await saveDumpsNeededToDB();
return RunJobResult.Success;
} catch (e) {

12
ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
Unescape Escape View File

@ -17,6 +17,10 @@ import {
PersistedJob,
RunJobResult,
} from '../PersistedJob';
import { SessionUtilUserProfile } from '../../libsession/libsession_utils_user_profile';
import { SessionUtilContact } from '../../libsession/libsession_utils_contacts';
import { SessionUtilUserGroups } from '../../libsession/libsession_utils_user_groups';
import { SessionUtilConvoInfoVolatile } from '../../libsession/libsession_utils_convo_info_volatile';
const defaultMsBetweenRetries = 3000;
const defaultMaxAttempts = 3;
@ -166,16 +170,16 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
const variant = LibSessionUtil.requiredUserVariants[index];
switch (variant) {
case 'UserConfig':
await LibSessionUtil.insertUserProfileIntoWrapper(us);
await SessionUtilUserProfile.insertUserProfileIntoWrapper(us);
break;
case 'ContactsConfig':
await LibSessionUtil.insertAllContactsIntoContactsWrapper();
await SessionUtilContact.insertAllContactsIntoContactsWrapper();
break;
case 'UserGroupsConfig':
await LibSessionUtil.insertAllUserGroupsIntoWrapper();
await SessionUtilUserGroups.insertAllUserGroupsIntoWrapper();
break;
case 'ConvoInfoVolatileConfig':
await LibSessionUtil.insertAllConvoInfoVolatileIntoWrapper();
await SessionUtilConvoInfoVolatile.insertAllConvoInfoVolatileIntoWrapper();
break;
default:
assertUnreachable(variant, `ConfigurationSyncDumpJob unhandled variant: "${variant}"`);

13
ts/session/utils/libsession/libsession_utils.ts
Unescape Escape View File

@ -10,10 +10,6 @@ import { GetNetworkTime } from '../../apis/snode_api/getNetworkTime';
import { SnodeNamespaces } from '../../apis/snode_api/namespaces';
import { SharedConfigMessage } from '../../messages/outgoing/controlMessage/SharedConfigMessage';
import { ConfigurationSync } from '../job_runners/jobs/ConfigurationSyncJob';
import { SessionUtilContact } from './libsession_utils_contacts';
import { SessionUtilConvoInfoVolatile } from './libsession_utils_convo_info_volatile';
import { SessionUtilUserGroups } from './libsession_utils_user_groups';
import { SessionUtilUserProfile } from './libsession_utils_user_profile';
const requiredUserVariants: Array<ConfigWrapperObjectTypes> = [
'UserConfig',
@ -107,8 +103,9 @@ async function pendingChangesForPubkey(pubkey: string): Promise<Array<OutgoingCo
const dump = dumps[index];
const variant = dump.variant;
const needsPush = await GenericWrapperActions.needsPush(variant);
window.log.debug(`needsPush ${needsPush} for variant: ${variant}`);
if (!needsPush) {
console.info('needsPush false for ', variant);
continue;
}
@ -181,12 +178,6 @@ export const LibSessionUtil = {
initializeLibSessionUtilWrappers,
requiredUserVariants,
pendingChangesForPubkey,
insertUserProfileIntoWrapper: SessionUtilUserProfile.insertUserProfileIntoWrapper,
insertAllContactsIntoContactsWrapper: SessionUtilContact.insertAllContactsIntoContactsWrapper,
insertAllUserGroupsIntoWrapper: SessionUtilUserGroups.insertAllUserGroupsIntoWrapper,
insertAllConvoInfoVolatileIntoWrapper:
SessionUtilConvoInfoVolatile.insertAllConvoInfoVolatileIntoWrapper,
removeCommunityFromWrapper: SessionUtilUserGroups.removeCommunityFromWrapper,
kindToVariant,
variantToKind,
markAsPushed,

2
ts/session/utils/libsession/libsession_utils_contacts.ts
Unescape Escape View File

@ -34,7 +34,7 @@ async function insertAllContactsIntoContactsWrapper() {
.filter(isContactToStoreInContactsWrapper)
.map(m => m.id);
window.log.debug(`ContactsWrapper keep tracks of ${idsToInsert.length} contacts`);
window.log.debug(`ContactsWrapper keep tracks of ${idsToInsert.length} contacts: ${idsToInsert}`);
for (let index = 0; index < idsToInsert.length; index++) {
const id = idsToInsert[index];

2
ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts
Unescape Escape View File

@ -98,7 +98,7 @@ async function insertConvoFromDBIntoWrapperAndRefresh(convoId: string): Promise<
? timestampFromDbMs
: 0;
console.info(
window.log.debug(
`convoInfoVolatile:insert "${convoId}";lastMessageReadTimestamp:${lastReadMessageTimestamp};forcedUnread:${isForcedUnread}...`
);

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

@ -107,7 +107,7 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
});
try {
console.info(`inserting into usergroup wrapper "${wrapperComm.fullUrl}"...`);
window.log.debug(`inserting into usergroup wrapper "${wrapperComm.fullUrl}"...`);
// this does the create or the update of the matching existing community
await UserGroupsWrapperActions.setCommunityByFullUrl(
wrapperComm.fullUrl,
@ -135,7 +135,7 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
});
try {
console.info(`inserting into usergroup wrapper "${foundConvo.id}"... }`);
window.log.debug(`inserting into usergroup wrapper "${foundConvo.id}"... }`);
// this does the create or the update of the matching existing legacy group
await UserGroupsWrapperActions.setLegacyGroup(wrapperLegacyGroup);

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

@ -1,6 +1,6 @@
import { from_hex } from 'libsodium-wrappers-sumo';
import { isArray, isEmpty, isEqual } from 'lodash';
import { ContactInfo, LegacyGroupInfo, LegacyGroupMemberInfo } from 'session_util_wrapper';
import { ContactInfoSet, LegacyGroupInfo, LegacyGroupMemberInfo } from 'session_util_wrapper';
import { OpenGroupV2Room } from '../data/opengroups';
import { ConversationAttributes } from '../models/conversationAttributes';
import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/opengroupV2/ApiUtil';
@ -40,7 +40,6 @@ export type ConfigDumpRow = {
variant: ConfigWrapperObjectTypes; // the variant this entry is about. (user pr, contacts, ...)
publicKey: string; // either our pubkey if a dump for our own swarm or the closed group pubkey
data: Uint8Array; // the blob returned by libsession.dump() call
// we might need to add a `seqno` field here.
};
export type ConfigDumpRowWithoutData = Pick<ConfigDumpRow, 'publicKey' | 'variant'>;
@ -128,8 +127,8 @@ export function getContactInfoFromDBValues({
dbProfileUrl: string | undefined;
dbProfileKey: string | undefined;
expirationTimerSeconds: number | undefined;
}): ContactInfo {
const wrapperContact: ContactInfo = {
}): ContactInfoSet {
const wrapperContact: ContactInfoSet = {
id,
approved: !!dbApproved,
approvedMe: !!dbApprovedMe,
@ -145,7 +144,6 @@ 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 (
@ -232,7 +230,7 @@ export function getLegacyGroupInfoFromDBValues({
members: wrappedMembers,
encPubkey: !isEmpty(encPubkeyHex) ? from_hex(encPubkeyHex) : new Uint8Array(),
encSeckey: !isEmpty(encSeckeyHex) ? from_hex(encSeckeyHex) : new Uint8Array(),
joinedAt: lastJoinedTimestamp,
joinedAtSeconds: Math.floor(lastJoinedTimestamp / 1000),
};
return legacyGroup;

2
ts/util/logging.ts
Unescape Escape View File

@ -110,7 +110,7 @@ const development = window && window?.getEnvironment && window?.getEnvironment()
// The Bunyan API: https://github.com/trentm/node-bunyan#log-method-api
function logAtLevel(level: string, prefix: string, ...args: any) {
if (prefix === 'DEBUG' && window.sessionFeatureFlags.useDebugLogging) {
if (prefix === 'DEBUG' && !window.sessionFeatureFlags.useDebugLogging) {
return;
}
if (development) {

4
ts/webworker/workers/browser/libsession_worker_interface.ts
Unescape Escape View File

@ -5,7 +5,7 @@ import { ConfigWrapperObjectTypes, LibSessionWorkerFunctions } from './libsessio
import {
BaseWrapperActionsCalls,
ContactInfo,
ContactInfoSet,
ContactsWrapperActionsCalls,
ConvoInfoVolatileWrapperActionsCalls,
LegacyGroupInfo,
@ -139,7 +139,7 @@ export const ContactsWrapperActions: ContactsWrapperActionsCalls = {
ReturnType<ContactsWrapperActionsCalls['erase']>
>,
set: async (contact: ContactInfo) =>
set: async (contact: ContactInfoSet) =>
callLibSessionWorker(['ContactsConfig', 'set', contact]) as Promise<
ReturnType<ContactsWrapperActionsCalls['set']>
>,

Write Preview
Loading…
Cancel
Save