lightcordwarez
/
BetterDiscordApp-v2
mirror of https://github.com/JsSucks/BetterDiscordApp
1
0
Fork 0
Code Issues 3 Releases Wiki Activity

Typo and set preExchangeState

This commit is contained in:
Jiiks 2018-08-14 12:51:57 +03:00
parent ac1e4ad9a2
commit 27fee8e10c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/builtin/E2EE.js
View File

@ -131,20 +131,21 @@ export default new class E2EE extends BuiltinModule {
const splitContent = component.props.message.content.split('\n');
if (splitContent.length < 5) return;
const [tagstart, begin, key, end, tagend] = splitContent;
console.log(component);
try {
await Modals.confirm('Key Exhcange', 'Public key received. Accept?').promise;
// We already sent our key
if (!ECDH_STORAGE.hasOwnProperty(channelId)) {
const publicKeyMessage = `\`\`\`\n-----BEGIN PUBLIC KEY-----\n${this.createKeyExchange(channelId)}\n-----END PUBLIC KEY-----\n\`\`\``;
this.preExchangeState = this.encryptNewMessages;
if (this.encryptNewMessages) this.encryptNewMessages = false;
WebpackModules.getModuleByName('DraftActions').saveDraft(channelId, publicKeyMessage);
}
const secret = this.computeSecret(channelId, key);
this.setKey(channelId, secret);
Toasts.success('Key exchange complete!');
if (this.preEchangeState) this.encryptNewMessages = this.preEchangeState;
this.preEchangeState = null;
if (this.preExchangeState) this.encryptNewMessages = this.preExchangeState;
this.preExchangeState = null;
} catch (err) {
return;
}

2
client/src/builtin/E2EEComponent.vue
View File

@ -92,7 +92,7 @@
Toasts.warning('Key exchange for channel already in progress!');
return;
}
E2EE.preEchangeState = E2EE.encryptNewMessages;
E2EE.preExchangeState = E2EE.encryptNewMessages;
E2EE.encryptNewMessages = false; // Disable encrypting new messages so we won't encrypt public keys
const publicKeyMessage = `\`\`\`\n-----BEGIN PUBLIC KEY-----\n${keyExchange}\n-----END PUBLIC KEY-----\n\`\`\``;
WebpackModules.getModuleByName('DraftActions').saveDraft(DiscordApi.currentChannel.id, publicKeyMessage);