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

fix: comment out user config disappearing messages stuff for now

Browse Source
pull/2861/head
William Grant 2 years ago
parent 5762342e03
commit d794b0a0d4
8 changed files with 56 additions and 49 deletions
Show Stats Download Patch File Download Diff File

12
ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx
Unescape Escape View File

@ -110,12 +110,12 @@ export const OverlayDisappearingMessages = ({ unlockNewModes }: { unlockNewModes
dispatch(closeRightPanel()); dispatch(closeRightPanel());
dispatch(resetRightOverlayMode()); dispatch(resetRightOverlayMode());
} }
} else { return;
if (selectedConversationKey && modeSelected) { }
await setDisappearingMessagesByConvoId(selectedConversationKey, modeSelected, timeSelected); if (selectedConversationKey && modeSelected) {
dispatch(closeRightPanel()); await setDisappearingMessagesByConvoId(selectedConversationKey, modeSelected, timeSelected);
dispatch(resetRightOverlayMode()); dispatch(closeRightPanel());
} dispatch(resetRightOverlayMode());
} }
}; };

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

@ -1224,7 +1224,7 @@ function insertContactIntoContactWrapper(
const dbApprovedMe = !!contact.didApproveMe || false; const dbApprovedMe = !!contact.didApproveMe || false;
const dbBlocked = blockedNumbers.includes(contact.id); const dbBlocked = blockedNumbers.includes(contact.id);
const priority = contact.priority || CONVERSATION_PRIORITIES.default; const priority = contact.priority || CONVERSATION_PRIORITIES.default;
const expirationTimerSeconds = contact.expireTimer || 0; // const expirationTimerSeconds = contact.expireTimer || 0;
const wrapperContact = getContactInfoFromDBValues({ const wrapperContact = getContactInfoFromDBValues({
id: contact.id, id: contact.id,
@ -1237,7 +1237,7 @@ function insertContactIntoContactWrapper(
dbProfileUrl: contact.avatarPointer || undefined, dbProfileUrl: contact.avatarPointer || undefined,
priority, priority,
dbCreatedAtSeconds: Math.floor((contact.active_at || Date.now()) / 1000), dbCreatedAtSeconds: Math.floor((contact.active_at || Date.now()) / 1000),
expirationTimerSeconds, // FIXME WILL add expirationMode here // expirationTimerSeconds, // FIXME WILL add expirationMode here
}); });
try { try {
@ -1262,7 +1262,7 @@ function insertContactIntoContactWrapper(
dbProfileUrl: undefined, dbProfileUrl: undefined,
priority: CONVERSATION_PRIORITIES.default, priority: CONVERSATION_PRIORITIES.default,
dbCreatedAtSeconds: Math.floor(Date.now() / 1000), dbCreatedAtSeconds: Math.floor(Date.now() / 1000),
expirationTimerSeconds: 0, // FIXME WILL add expirationMode here // expirationTimerSeconds: 0, // FIXME WILL add expirationMode here
}) })
); );
} catch (err2) { } catch (err2) {
@ -1385,7 +1385,7 @@ function insertLegacyGroupIntoWrapper(
const { const {
priority, priority,
id, id,
expireTimer, // expireTimer,
groupAdmins, groupAdmins,
members, members,
displayNameInProfile, displayNameInProfile,
@ -1400,7 +1400,7 @@ function insertLegacyGroupIntoWrapper(
const wrapperLegacyGroup = getLegacyGroupInfoFromDBValues({ const wrapperLegacyGroup = getLegacyGroupInfoFromDBValues({
id, id,
priority, priority,
expireTimer, // FIXME WILL add expirationMode here // expireTimer, // FIXME WILL add expirationMode here
groupAdmins, groupAdmins,
members, members,
displayNameInProfile, displayNameInProfile,
@ -1628,7 +1628,8 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
const ourDbProfileUrl = ourConversation.avatarPointer || ''; const ourDbProfileUrl = ourConversation.avatarPointer || '';
const ourDbProfileKey = fromHexToArray(ourConversation.profileKey || ''); const ourDbProfileKey = fromHexToArray(ourConversation.profileKey || '');
const ourConvoPriority = ourConversation.priority; const ourConvoPriority = ourConversation.priority;
const ourConvoExpire = ourConversation.expireTimer || 0; // const ourConvoExpire = ourConversation.expireTimer || 0;
if (ourDbProfileUrl && !isEmpty(ourDbProfileKey)) { if (ourDbProfileUrl && !isEmpty(ourDbProfileKey)) {
userProfileWrapper.setUserInfo( userProfileWrapper.setUserInfo(
ourDbName, ourDbName,
@ -1636,8 +1637,8 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
{ {
url: ourDbProfileUrl, url: ourDbProfileUrl,
key: ourDbProfileKey, key: ourDbProfileKey,
}, }
ourConvoExpire // , ourConvoExpire
); );
} }
@ -1861,6 +1862,8 @@ function updateToSessionSchemaVersion33(currentVersion: number, db: BetterSqlite
return; return;
} }
// TODO we actually want to update the config wrappers that relate to disappearing messages with the type and seconds
console.log(`updateToSessionSchemaVersion${targetVersion}: starting...`); console.log(`updateToSessionSchemaVersion${targetVersion}: starting...`);
db.transaction(() => { db.transaction(() => {
// Conversation changes // Conversation changes

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

@ -331,17 +331,17 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
changes = true; changes = true;
} }
// FIXME Will unsure // FIXME Will unsure
if (wrapperConvo.expirationTimerSeconds !== contactConvo.get('expireTimer')) { // if (wrapperConvo.expirationTimerSeconds !== contactConvo.get('expireTimer')) {
await contactConvo.updateExpireTimer({ // await contactConvo.updateExpireTimer({
providedExpireTimer: wrapperConvo.expirationTimerSeconds, // providedExpireTimer: wrapperConvo.expirationTimerSeconds,
fromSync: true, // fromSync: true,
providedExpirationType: wrapperConvo.expirationMode, // providedExpirationType: wrapperConvo.expirationMode,
shouldCommit: false, // shouldCommit: false,
providedChangeTimestamp: result.latestEnvelopeTimestamp, // providedChangeTimestamp: result.latestEnvelopeTimestamp,
fromConfigMessage: true, // fromConfigMessage: true,
}); // });
changes = true; // changes = true;
} // }
// 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. // 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) { if (!contactConvo.get('active_at') && wrapperConvo.createdAtSeconds) {
@ -567,18 +567,18 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) {
} }
// FIXME Will unsure // FIXME Will unsure
if (legacyGroupConvo.get('expireTimer') !== fromWrapper.disappearingTimerSeconds) { // if (legacyGroupConvo.get('expireTimer') !== fromWrapper.disappearingTimerSeconds) {
await legacyGroupConvo.updateExpireTimer({ // await legacyGroupConvo.updateExpireTimer({
providedExpireTimer: fromWrapper.disappearingTimerSeconds, // providedExpireTimer: fromWrapper.disappearingTimerSeconds,
shouldCommit: false, // shouldCommit: false,
fromSync: true, // fromSync: true,
providedChangeTimestamp: latestEnvelopeTimestamp, // providedChangeTimestamp: latestEnvelopeTimestamp,
fromConfigMessage: true, // fromConfigMessage: true,
providedExpirationType: // providedExpirationType:
fromWrapper.disappearingTimerSeconds === 0 ? 'off' : 'deleteAfterSend', // fromWrapper.disappearingTimerSeconds === 0 ? 'off' : 'deleteAfterSend',
}); // });
changes = true; // changes = true;
} // }
// start polling for this group if we haven't left it yet. The wrapper does not store this info for legacy group so we check from the DB entry instead // start polling for this group if we haven't left it yet. The wrapper does not store this info for legacy group so we check from the DB entry instead
if (!legacyGroupConvo.get('isKickedFromGroup') && !legacyGroupConvo.get('left')) { if (!legacyGroupConvo.get('isKickedFromGroup') && !legacyGroupConvo.get('left')) {

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

@ -36,7 +36,6 @@ function isContactToStoreInWrapper(convo: ConversationModel): boolean {
* Fetches the specified convo and updates the required field in the wrapper. * Fetches the specified convo and updates the required field in the wrapper.
* If that contact does not exist in the wrapper, it is created before being updated. * If that contact does not exist in the wrapper, it is created before being updated.
*/ */
async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<void> { async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<void> {
const foundConvo = getConversationController().get(id); const foundConvo = getConversationController().get(id);
if (!foundConvo) { if (!foundConvo) {
@ -55,7 +54,7 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
const dbApprovedMe = !!foundConvo.get('didApproveMe') || false; const dbApprovedMe = !!foundConvo.get('didApproveMe') || false;
const dbBlocked = !!foundConvo.isBlocked() || false; const dbBlocked = !!foundConvo.isBlocked() || false;
const priority = foundConvo.get('priority') || 0; const priority = foundConvo.get('priority') || 0;
const expirationTimerSeconds = foundConvo.get('expireTimer') || 0; // const expirationTimerSeconds = foundConvo.get('expireTimer') || 0;
const wrapperContact = getContactInfoFromDBValues({ const wrapperContact = getContactInfoFromDBValues({
id, id,
@ -68,7 +67,7 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
dbProfileUrl, dbProfileUrl,
priority, priority,
dbCreatedAtSeconds: 0, // just give 0, now() will be used internally by the wrapper if the contact does not exist yet. dbCreatedAtSeconds: 0, // just give 0, now() will be used internally by the wrapper if the contact does not exist yet.
expirationTimerSeconds, //FIXME WILL add expirationMode here // expirationTimerSeconds, // FIXME WILL add expirationMode here
}); });
try { try {
window.log.debug('inserting into contact wrapper: ', JSON.stringify(wrapperContact)); window.log.debug('inserting into contact wrapper: ', JSON.stringify(wrapperContact));

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

@ -116,7 +116,7 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
priority: foundConvo.get('priority'), priority: foundConvo.get('priority'),
members: foundConvo.get('members') || [], members: foundConvo.get('members') || [],
groupAdmins: foundConvo.get('groupAdmins') || [], groupAdmins: foundConvo.get('groupAdmins') || [],
expireTimer: foundConvo.get('expireTimer'), // FIXME WILL add expirationMode here // expireTimer: foundConvo.get('expireTimer'), // FIXME WILL add expirationMode here
displayNameInProfile: foundConvo.get('displayNameInProfile'), displayNameInProfile: foundConvo.get('displayNameInProfile'),
encPubkeyHex: encryptionKeyPair?.publicHex || '', encPubkeyHex: encryptionKeyPair?.publicHex || '',
encSeckeyHex: encryptionKeyPair?.privateHex || '', encSeckeyHex: encryptionKeyPair?.privateHex || '',

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

@ -26,7 +26,7 @@ async function insertUserProfileIntoWrapper(convoId: string) {
{ url: dbProfileUrl, key: dbProfileKey } { url: dbProfileUrl, key: dbProfileKey }
)} ` )} `
); );
const expirySeconds = ourConvo.get('expireTimer') || 0; // const expirySeconds = ourConvo.get('expireTimer') || 0;
if (dbProfileUrl && !isEmpty(dbProfileKey)) { if (dbProfileUrl && !isEmpty(dbProfileKey)) {
await UserConfigWrapperActions.setUserInfo( await UserConfigWrapperActions.setUserInfo(
dbName, dbName,
@ -34,11 +34,16 @@ async function insertUserProfileIntoWrapper(convoId: string) {
{ {
url: dbProfileUrl, url: dbProfileUrl,
key: dbProfileKey, key: dbProfileKey,
}, }
expirySeconds // expirySeconds
); );
} else { } else {
await UserConfigWrapperActions.setUserInfo(dbName, priority, null, expirySeconds); await UserConfigWrapperActions.setUserInfo(
dbName,
priority,
null
// , expirySeconds
);
} }
} }

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

@ -131,7 +131,7 @@ export function getContactInfoFromDBValues({
dbCreatedAtSeconds: number; dbCreatedAtSeconds: number;
dbProfileUrl: string | undefined; dbProfileUrl: string | undefined;
dbProfileKey: string | undefined; dbProfileKey: string | undefined;
expirationTimerSeconds: number | undefined; // expirationTimerSeconds: number | undefined;
}): ContactInfoSet { }): ContactInfoSet {
const wrapperContact: ContactInfoSet = { const wrapperContact: ContactInfoSet = {
id, id,

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

@ -106,8 +106,8 @@ export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = {
setUserInfo: async ( setUserInfo: async (
name: string, name: string,
priority: number, priority: number,
profilePic: { url: string; key: Uint8Array } | null, profilePic: { url: string; key: Uint8Array } | null
expireSeconds: number // expireSeconds: number
) => ) =>
callLibSessionWorker([ callLibSessionWorker([
'UserConfig', 'UserConfig',
@ -115,7 +115,7 @@ export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = {
name, name,
priority, priority,
profilePic, profilePic,
expireSeconds, // expireSeconds,
]) as Promise<ReturnType<UserConfigWrapperActionsCalls['setUserInfo']>>, ]) as Promise<ReturnType<UserConfigWrapperActionsCalls['setUserInfo']>>,
}; };

Write Preview
Loading…
Cancel
Save