Fix a buttload of things

lib/channel-new.js

@@ -2608,7 +2608,7 @@ Channel.prototype.handleChat = function (user, data) {
         }
     } else {
         if (msg.indexOf(">") === 0) {
-            data.meta.addClass = "greentext";
+            meta.addClass = "greentext";
         }
         this.sendMessage(user, msg, meta);
     }

lib/chatcommand.js

@@ -38,9 +38,10 @@ var handlers = {
         if (user.global_rank < 255) {
             return false;
         }
+
         var superadminflair = {
-            labelclass: "label-important",
-            icon: "icon-globe"
+            labelclass: "label-danger",
+            icon: "glyphicon-globe"
         };
 
         var args = msg.split(" ");
@@ -48,7 +49,7 @@ var handlers = {
         for (var i = 0; i < args.length; i++) {
             var a = args[i];
             if (a.indexOf("!icon-") === 0) {
-                superadminflair.icon = a.substring(1);
+                superadminflair.icon = "glyph" + a.substring(1);
             } else if (a.indexOf("!label-") === 0) {
                 superadminflair.labelclass = a.substring(1);
             } else {

lib/config.js

@@ -30,7 +30,7 @@ var defaults = {
     https: {
         enabled: false,
         port: 8443,
-        domain: "https://localhost:8443",
+        domain: "https://localhost",
         keyfile: "localhost.key",
         passphrase: "",
         certfile: "localhost.cert"
@@ -131,6 +131,9 @@ exports.load = function (file) {
         cfg.debug = false;
     }
 
+    cfg.http.domain = cfg.http.domain.replace(/\/*$/, "");
+    cfg.https.domain = cfg.https.domain.replace(/\/*$/, "");
+
     Logger.syslog.log("Loaded configuration from " + file);
 };
 

lib/database/channels.js

@@ -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));
                     });
                 });

lib/server.js

@@ -189,7 +189,7 @@ Server.prototype.packChannelList = function (publicOnly) {
             return true;
         }
 
-        return c.opts.show_public && !c.opts.password;
+        return c.opts.show_public;
     });
 
     return channels.map(this.packChannel.bind(this));

lib/web/account.js

@@ -295,6 +295,16 @@ function handleDeleteChannel(req, res) {
         }
 
         db.channels.lookup(name, function (err, channel) {
+            if (err) {
+                sendJade(res, "account-channels", {
+                    loggedIn: true,
+                    loginName: loginName,
+                    channels: [],
+                    deleteChannelError: err
+                });
+                return;
+            }
+
             if (channel.owner !== user.name && user.global_rank < 255) {
                 db.channels.listUserChannels(loginName, function (err2, channels) {
                     sendJade(res, "account-channels", {

lib/web/webserver.js

@@ -1,9 +1,3 @@
-/**
- * web/webserver.js - functions for serving web content
- *
- * @author Calvin Montgomery <cyzon@cyzon.us>
- */
-
 var path = require("path");
 var net = require("net");
 var express = require("express");
@@ -179,8 +173,6 @@ function handleSocketConfig(req, res) {
 module.exports = {
     /**
      * Initializes webserver callbacks
-     *
-     * @param app - The express instance to initialize
      */
     init: function (app) {
         app.use(express.json());