Add eslint (#741)

This commit is contained in:
Calvin Montgomery 2018-04-07 15:30:30 -07:00 committed by GitHub
parent 953428cad5
commit 62417f7fb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
72 changed files with 305 additions and 323 deletions

View file

@ -199,7 +199,7 @@ module.exports = {
" VALUES " +
"(?, ?, ?, ?, '', ?, ?, ?)",
[name, hash, 1, email, ip, Date.now(), module.exports.dedupeUsername(name)],
function (err, res) {
function (err, _res) {
delete registrationLock[lname];
if (err) {
callback(err, null);
@ -292,7 +292,7 @@ module.exports = {
db.query("UPDATE `users` SET password=? WHERE name=?",
[hash, name],
function (err, result) {
function (err, _result) {
callback(err, err ? null : true);
});
});
@ -347,7 +347,7 @@ module.exports = {
}
db.query("UPDATE `users` SET global_rank=? WHERE name=?", [rank, name],
function (err, result) {
function (err, _result) {
callback(err, err ? null : true);
});
},
@ -427,7 +427,7 @@ module.exports = {
}
db.query("UPDATE `users` SET email=? WHERE name=?", [email, name],
function (err, result) {
function (err, _result) {
callback(err, err ? null : true);
});
},
@ -509,7 +509,7 @@ module.exports = {
});
db.query("UPDATE `users` SET profile=? WHERE name=?", [profilejson, name],
function (err, result) {
function (err, _result) {
callback(err, err ? null : true);
});
},

View file

@ -2,7 +2,6 @@ var db = require("../database");
var valid = require("../utilities").isValidChannelName;
var fs = require("fs");
var path = require("path");
var tables = require("./tables");
var Flags = require("../flags");
var util = require("../utilities");
import { createMySQLDuplicateKeyUpdate } from '../util/on-duplicate-key-update';
@ -12,18 +11,6 @@ const LOGGER = require('@calzoneman/jsli')('database/channels');
var blackHole = function () { };
function dropTable(name, callback) {
db.query("DROP TABLE `" + name + "`", callback);
}
function initTables(name, owner, callback) {
if (!valid(name)) {
callback("Invalid channel name", null);
return;
}
}
module.exports = {
init: function () {
},
@ -152,7 +139,7 @@ module.exports = {
db.query("INSERT INTO `channels` " +
"(`name`, `owner`, `time`, `last_loaded`) VALUES (?, ?, ?, ?)",
[name, owner, Date.now(), new Date()],
function (err, res) {
function (err, _res) {
if (err) {
callback(err, null);
return;
@ -220,7 +207,7 @@ module.exports = {
}
});
callback(err, !Boolean(err));
callback(err, !err);
});
},

View file

@ -1,3 +1,5 @@
const LOGGER = require('@calzoneman/jsli')('database/tables');
const TBL_USERS = "" +
"CREATE TABLE IF NOT EXISTS `users` (" +
"`id` INT NOT NULL AUTO_INCREMENT," +
@ -134,7 +136,11 @@ module.exports.init = function (queryfn, cb) {
aq.queue(function (lock) {
queryfn(tables[tbl], function (err) {
if (err) {
console.log(err);
LOGGER.error(
'Failed to create table %s: %s',
tbl,
err.stack
);
hasError = true;
}
lock.release();

View file

@ -17,7 +17,7 @@ module.exports.checkVersion = function () {
"db_version=" + DB_VERSION);
db.query("INSERT INTO `meta` (`key`, `value`) VALUES ('db_version', ?)",
[DB_VERSION],
function (err) {
function (_err) {
});
} else {
var v = parseInt(rows[0].value);
@ -89,7 +89,7 @@ function populateUsernameDedupeColumn(cb) {
cb();
}).catch(error => {
LOGGER.error("Unable to perform database upgrade to add dedupe column: " + (error.stack ? error.stack : error));
})
});
});
}