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

fix: reset invite state to "not sent" on resend

Browse Source
pull/3281/head
Audric Ackermann 5 months ago
parent 5d9dd85342
commit d12acc601f
No known key found for this signature in database
6 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File

2
package.json
Unescape Escape View File

@ -91,7 +91,7 @@
"fs-extra": "9.0.0", "fs-extra": "9.0.0",
"glob": "10.3.10", "glob": "10.3.10",
"image-type": "^4.1.0", "image-type": "^4.1.0",
"libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.9/libsession_util_nodejs-v0.4.9.tar.gz", "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.10/libsession_util_nodejs-v0.4.10.tar.gz",
"libsodium-wrappers-sumo": "^0.7.9", "libsodium-wrappers-sumo": "^0.7.9",
"linkify-it": "^4.0.1", "linkify-it": "^4.0.1",
"lodash": "^4.17.21", "lodash": "^4.17.21",

2
preload.js
Unescape Escape View File

@ -41,7 +41,7 @@ window.sessionFeatureFlags = {
useOnionRequests: true, useOnionRequests: true,
useTestNet: isTestNet() || isTestIntegration(), useTestNet: isTestNet() || isTestIntegration(),
useClosedGroupV2: true, // TODO DO NOT MERGE Remove after QA useClosedGroupV2: true, // TODO DO NOT MERGE Remove after QA
useClosedGroupV2QAButtons: true, // TODO DO NOT MERGE Remove after QA useClosedGroupV2QAButtons: false, // TODO DO NOT MERGE Remove after QA
replaceLocalizedStringsWithKeys: false, replaceLocalizedStringsWithKeys: false,
debug: { debug: {
debugLogging: !_.isEmpty(process.env.SESSION_DEBUG), debugLogging: !_.isEmpty(process.env.SESSION_DEBUG),

2
ts/components/MemberListItem.tsx
Unescape Escape View File

@ -259,6 +259,8 @@ const ResendButton = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: GroupP
window.log.warn('tried to resend invite but we do not have correct details'); window.log.warn('tried to resend invite but we do not have correct details');
return; return;
} }
await MetaGroupWrapperActions.memberSetInviteNotSent(groupPk, pubkey);
// if we tried to invite that member as admin right away, let's retry it as such. // if we tried to invite that member as admin right away, let's retry it as such.
const inviteAsAdmin = member.nominatedAdmin; const inviteAsAdmin = member.nominatedAdmin;
await GroupInvite.addJob({ await GroupInvite.addJob({

6
ts/state/ducks/metaGroups.ts
Unescape Escape View File

@ -524,7 +524,8 @@ async function handleWithHistoryMembers({
memberPubkey: member, memberPubkey: member,
profileKeyHex, profileKeyHex,
}); });
await MetaGroupWrapperActions.memberSetInviteSent(groupPk, member); // a group invite job will be added to the queue
await MetaGroupWrapperActions.memberSetInviteNotSent(groupPk, member);
} }
const encryptedSupplementKeys = withHistory.length const encryptedSupplementKeys = withHistory.length
? await MetaGroupWrapperActions.generateSupplementKeys(groupPk, withHistory) ? await MetaGroupWrapperActions.generateSupplementKeys(groupPk, withHistory)
@ -554,7 +555,8 @@ async function handleWithoutHistoryMembers({
displayName, displayName,
profileKeyHex, profileKeyHex,
}); });
await MetaGroupWrapperActions.memberSetInviteSent(groupPk, member); // a group invite job will be added to the queue
await MetaGroupWrapperActions.memberSetInviteNotSent(groupPk, member);
} }
if (!isEmpty(withoutHistory)) { if (!isEmpty(withoutHistory)) {

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

@ -638,6 +638,12 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = {
'memberSetInviteSent', 'memberSetInviteSent',
pubkeyHex, pubkeyHex,
]) as Promise<ReturnType<MetaGroupWrapperActionsCalls['memberSetInviteSent']>>, ]) as Promise<ReturnType<MetaGroupWrapperActionsCalls['memberSetInviteSent']>>,
memberSetInviteNotSent: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) =>
callLibSessionWorker([
`MetaGroupConfig-${groupPk}`,
'memberSetInviteNotSent',
pubkeyHex,
]) as Promise<ReturnType<MetaGroupWrapperActionsCalls['memberSetInviteNotSent']>>,
memberSetInviteFailed: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => memberSetInviteFailed: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) =>
callLibSessionWorker([ callLibSessionWorker([
`MetaGroupConfig-${groupPk}`, `MetaGroupConfig-${groupPk}`,

6
yarn.lock
Unescape Escape View File

@ -4944,9 +4944,9 @@ levn@~0.3.0:
prelude-ls "~1.1.2" prelude-ls "~1.1.2"
type-check "~0.3.2" type-check "~0.3.2"
"libsession_util_nodejs@https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.9/libsession_util_nodejs-v0.4.9.tar.gz": "libsession_util_nodejs@https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.10/libsession_util_nodejs-v0.4.10.tar.gz":
version "0.4.9" version "0.4.10"
resolved "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.9/libsession_util_nodejs-v0.4.9.tar.gz#239ddfb4a8a688b924ba0f1e4e1c9b573407e176" resolved "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.10/libsession_util_nodejs-v0.4.10.tar.gz#9a420fa0ad4dc9067de17b2ec9fa3676a1c10056"
dependencies: dependencies:
cmake-js "7.2.1" cmake-js "7.2.1"
node-addon-api "^6.1.0" node-addon-api "^6.1.0"

Write Preview
Loading…
Cancel
Save