Fix a buttload of things

This commit is contained in:
calzoneman 2014-01-26 00:01:36 -06:00
parent bedf3afb61
commit 6570c3da6c
12 changed files with 59 additions and 51 deletions

View file

@ -1,5 +1,8 @@
var db = require("../database");
var valid = require("../utilities").isValidChannelName;
var fs = require("fs");
var path = require("path");
var Logger = require("../logger");
var blackHole = function () { };
@ -48,29 +51,38 @@ function initTables(name, owner, callback) {
return;
}
module.exports.setRank(name, owner, 4, function (err) {
db.users.getGlobalRank(owner, function (err, rank) {
if (err) {
dropTable("chan_" + name + "_ranks");
callback(err, null);
return;
}
createLibraryTable(name, function (err) {
rank = Math.max(rank, 4);
module.exports.setRank(name, owner, rank, function (err) {
if (err) {
dropTable("chan_" + name + "_ranks");
callback(err, null);
return;
}
createBansTable(name, function (err) {
createLibraryTable(name, function (err) {
if (err) {
dropTable("chan_" + name + "_ranks");
dropTable("chan_" + name + "_library");
callback(err, null);
return;
}
callback(null, true);
createBansTable(name, function (err) {
if (err) {
dropTable("chan_" + name + "_ranks");
dropTable("chan_" + name + "_library");
callback(err, null);
return;
}
callback(null, true);
});
});
});
});
@ -194,9 +206,9 @@ module.exports = {
}
db.query("INSERT INTO `channels` " +
"(`name`, `owner`, `time`) VALUES (?, ?, ?)",
[name, owner, Date.now()],
function (err, res) {
"(`name`, `owner`, `time`) VALUES (?, ?, ?)",
[name, owner, Date.now()],
function (err, res) {
if (err) {
callback(err, null);
return;
@ -252,6 +264,15 @@ module.exports = {
err = e4;
}
console.log(path.join(__dirname, "..", "..", "chandump", name));
fs.unlink(path.join(__dirname, "..", "..", "chandump", name),
function (err) {
if (err) {
Logger.errlog.log("Deleting chandump failed:");
Logger.errlog.log(err);
}
});
callback(err, !Boolean(err));
});
});