From 2a1502a25e7e373efe279e3f7151575d249e5227 Mon Sep 17 00:00:00 2001 From: yflory Date: Wed, 5 Jun 2019 18:25:00 +0200 Subject: [PATCH] lint compliance --- www/common/migrate-user-object.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/www/common/migrate-user-object.js b/www/common/migrate-user-object.js index d63edb9c9..6bc2dae0c 100644 --- a/www/common/migrate-user-object.js +++ b/www/common/migrate-user-object.js @@ -189,7 +189,7 @@ define([ Feedback.send('Migrate-8', true); userObject.version = version = 8; } - }).nThen(function (waitFor) { + }).nThen(function () { // Migration 9: send our mailbox channel to existing friends var migrateFriends = function () { var network = store.network; @@ -220,8 +220,8 @@ define([ // History cleared while we were offline // ==> we asked for an invalid last known hash if (parsed.error && parsed.error === "EINVAL") { - var msg = ['GET_HISTORY', parsed.channel, {}]; - network.sendto(network.historyKeeper, JSON.stringify(msg)) + var histMsg = ['GET_HISTORY', parsed.channel, {}]; + network.sendto(network.historyKeeper, JSON.stringify(histMsg)) .then(function () {}, function () {}); return; } @@ -245,15 +245,15 @@ define([ var chan = parsed[3]; if (!chan || !channels[chan]) { return; } var channel = channels[chan]; - var msg = channel.decrypt(parsed[4]); - var parsedMsg = JSON.parse(msg); + var msgIn = channel.decrypt(parsed[4]); + var parsedMsg = JSON.parse(msgIn); if (parsedMsg[0] === 'UPDATE') { if (parsedMsg[1] === myData.curvePublic) { return; } var data = parsedMsg[3]; // If it doesn't contain the mailbox channel, ignore the message if (!data.notifications) { return; } // Otherwise we know their channel, we can send them our own - channel.friend.notifications = data.notifications + channel.friend.notifications = data.notifications; myData.channel = chan; Mailbox.sendTo(ctx, 'UPDATE_DATA', myData, { channel: data.notifications,