Fix linting

pull/550/head
Beaudan Brown 6 years ago
parent 399c54452e
commit 9ed3ec5dec

@ -595,7 +595,7 @@ class LokiPublicChannelAPI {
} }
} }
getSigData(sigVer, noteValue, adnMessage) { static getSigData(sigVer, noteValue, adnMessage) {
let sigString = ''; let sigString = '';
sigString += adnMessage.text.trim(); sigString += adnMessage.text.trim();
sigString += noteValue.timestamp; sigString += noteValue.timestamp;
@ -637,15 +637,11 @@ class LokiPublicChannelAPI {
const annoCopy = [...adnMessage.annotations]; const annoCopy = [...adnMessage.annotations];
// strip out sig and sigver // strip out sig and sigver
annoCopy[0] = _.omit(annoCopy[0], ['value.sig', 'value.sigver']); annoCopy[0] = _.omit(annoCopy[0], ['value.sig', 'value.sigver']);
const verifyObj = { const sigData = LokiPublicChannelAPI.getSigData(
text: adnMessage.text, sigver,
version: sigver, noteValue,
annotations: annoCopy, adnMessage
}; );
if (adnMessage.reply_to) {
verifyObj.reply_to = adnMessage.reply_to;
}
const sigData = this.getSigData(sigver, noteValue, adnMessage);
const pubKeyBin = StringView.hexToArrayBuffer(adnMessage.user.username); const pubKeyBin = StringView.hexToArrayBuffer(adnMessage.user.username);
const sigBin = StringView.hexToArrayBuffer(sig); const sigBin = StringView.hexToArrayBuffer(sig);
@ -725,10 +721,6 @@ class LokiPublicChannelAPI {
? adnMessage.id ? adnMessage.id
: Math.max(this.lastGot, adnMessage.id); : Math.max(this.lastGot, adnMessage.id);
if (!adnMessage.user.name) {
adnMessage.user.name = 'Anonymous';
}
if ( if (
!adnMessage.id || !adnMessage.id ||
!adnMessage.user || !adnMessage.user ||
@ -777,7 +769,7 @@ class LokiPublicChannelAPI {
}, },
].splice(-5); ].splice(-5);
const from = adnMessage.user.name; // profileName const from = adnMessage.user.name || 'Anonymous'; // profileName
const messageData = { const messageData = {
serverId: adnMessage.id, serverId: adnMessage.id,
@ -859,11 +851,11 @@ class LokiPublicChannelAPI {
} }
const privKey = await this.serverAPI.chatAPI.getPrivateKey(); const privKey = await this.serverAPI.chatAPI.getPrivateKey();
const sigVer = 1; const sigVer = 1;
let mockAdnMessage = { text }; const mockAdnMessage = { text };
if (payload.reply_to) { if (payload.reply_to) {
mockAdnMessage.reply_to = payload.reply_to; mockAdnMessage.reply_to = payload.reply_to;
} }
const sigData = this.getSigData( const sigData = LokiPublicChannelAPI.getSigData(
sigVer, sigVer,
payload.annotations[0].value, payload.annotations[0].value,
mockAdnMessage mockAdnMessage

Loading…
Cancel
Save