Merge pull request #1057 from ccoenen/eslint

switching to eslint for code checking

4 files changed, 5 insertions, 3 deletions

diff --git a/lib/models/index.js b/lib/models/index.js
index 0a44ca87..ef70475e 100644
--- a/lib/models/index.js
+++ b/lib/models/index.js
@@ -25,6 +25,7 @@ if (config.dbURL) {
 // https://github.com/sequelize/sequelize/issues/6485
 function stripNullByte (value) {
   value = '' + value
+  // eslint-disable-next-line no-control-regex
   return value ? value.replace(/\u0000/g, '') : value
 }
 sequelize.stripNullByte = stripNullByte
diff --git a/lib/models/user.js b/lib/models/user.js
index 1bd8c745..2ebf6d06 100644
--- a/lib/models/user.js
+++ b/lib/models/user.js
@@ -50,7 +50,7 @@ module.exports = function (sequelize, DataTypes) {
   }, {
     instanceMethods: {
       verifyPassword: function (attempt) {
-        if (scrypt.verifyKdfSync(new Buffer(this.password, 'hex'), attempt)) {
+        if (scrypt.verifyKdfSync(Buffer.from(this.password, 'hex'), attempt)) {
           return this
         } else {
           return false
diff --git a/lib/realtime.js b/lib/realtime.js
index 8541bafa..d04ffdc2 100644
--- a/lib/realtime.js
+++ b/lib/realtime.js
@@ -242,6 +242,7 @@ function getStatus (callback) {
       }
     })
     models.User.count().then(function (regcount) {
+      // eslint-disable-next-line standard/no-callback-literal
       return callback ? callback({
         onlineNotes: Object.keys(notes).length,
         onlineUsers: Object.keys(users).length,
@@ -283,7 +284,7 @@ function extractNoteIdFromSocket (socket) {
     if (!referer) {
       return false
     }
-    var hostUrl = url.parse(referer)
+    var hostUrl = url.URL.parse(referer)
     var noteId = config.urlPath ? hostUrl.pathname.slice(config.urlPath.length + 1, hostUrl.pathname.length).split('/')[1] : hostUrl.pathname.split('/')[1]
     return noteId
   } else {
diff --git a/lib/web/imageRouter/filesystem.js b/lib/web/imageRouter/filesystem.js
index 8c432b0c..a2f8700d 100644
--- a/lib/web/imageRouter/filesystem.js
+++ b/lib/web/imageRouter/filesystem.js
@@ -16,5 +16,5 @@ exports.uploadImage = function (imagePath, callback) {
     return
   }
 
-  callback(null, url.resolve(config.serverURL + '/uploads/', path.basename(imagePath)))
+  callback(null, url.URL.resolve(config.serverURL + '/uploads/', path.basename(imagePath)))
 }