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

Display user tag in exchange request modal

This commit is contained in:
Jiiks 2018-08-14 13:27:20 +03:00
parent 36408d74ad
commit 3e57d0092a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,7 +121,7 @@ export default new class E2EE extends BuiltinModule {
} }
} }
// TODO Bug: If exchange is done fast enough it sometimes ask you to accept your own sent key // TODO Bug: If exchange is done fast enough it sometimes ask you to accept your own sent key. Should move this to socket event anyways.
async handlePublicKey(component) { async handlePublicKey(component) {
if (!component.props.channel || component.props.channel.type !== 1) return; if (!component.props.channel || component.props.channel.type !== 1) return;
if (component.props.message.author.id === DiscordApi.currentUser.id) return; if (component.props.message.author.id === DiscordApi.currentUser.id) return;
@ -138,7 +138,8 @@ export default new class E2EE extends BuiltinModule {
const [tagstart, begin, key, end, tagend] = splitContent; const [tagstart, begin, key, end, tagend] = splitContent;
try { try {
await Modals.confirm('Key Exhchange', 'Public key received. Accept?', 'Accept', 'Reject').promise; console.log(component.props.message.author);
await Modals.confirm('Key Exhchange', `Key exchange request from: ${component.props.message.author.tag}`, 'Accept', 'Reject').promise;
// We already sent our key // We already sent our key
if (!ECDH_STORAGE.hasOwnProperty(channelId)) { if (!ECDH_STORAGE.hasOwnProperty(channelId)) {
const publicKeyMessage = `\`\`\`\n-----BEGIN PUBLIC KEY-----\n${this.createKeyExchange(channelId)}\n-----END PUBLIC KEY-----\n\`\`\``; const publicKeyMessage = `\`\`\`\n-----BEGIN PUBLIC KEY-----\n${this.createKeyExchange(channelId)}\n-----END PUBLIC KEY-----\n\`\`\``;