diff --git a/lib/channel-new.js b/lib/channel-new.js
index b696aa43..1b8a4d37 100644
--- a/lib/channel-new.js
+++ b/lib/channel-new.js
@@ -663,7 +663,7 @@ Channel.prototype.handleNameBan = function (actor, name, reason) {
if (err) {
actor.socket.emit("errorMsg", {
- msg: "Internal error " + err
+ msg: "Internal error: " + err
});
return;
}
diff --git a/lib/chatcommand.js b/lib/chatcommand.js
index d0bbdb17..0ab45e3b 100644
--- a/lib/chatcommand.js
+++ b/lib/chatcommand.js
@@ -295,13 +295,25 @@ function handleKick(chan, user, args) {
}
function handleIPBan(chan, user, args) {
- chan.handleBanAllIP(user, args[0], "", args[1]);
+ var name = args.shift();
+ var range = args.shift();
+ var reason;
+ if (range !== "range") {
+ reason = range + " " + args.join(" ");
+ range = false;
+ } else {
+ reason = args.join(" ");
+ range = true;
+ }
+ chan.handleBanAllIP(user, name, reason, range);
// Ban the name too for good measure
- chan.handleNameBan(user, args[0], "");
+ chan.handleNameBan(user, name, reason);
}
function handleBan(chan, user, args) {
- chan.handleNameBan(user, args[0], "");
+ var name = args.shift();
+ var reason = args.join(" ");
+ chan.handleNameBan(user, name, reason);
}
function handleUnban(chan, user, args) {
diff --git a/www/assets/js/util.js b/www/assets/js/util.js
index 10117bbc..78b30b57 100644
--- a/www/assets/js/util.js
+++ b/www/assets/js/util.js
@@ -216,8 +216,9 @@ function addUserDropdown(entry) {
$("").addClass("btn btn-xs btn-default")
.text("Kick")
.click(function () {
+ var reason = prompt("Enter kick reason (optional)");
socket.emit("chatMsg", {
- msg: "/kick " + name
+ msg: "/kick " + name + " " + reason
});
})
.appendTo(btngroup);
@@ -271,16 +272,18 @@ function addUserDropdown(entry) {
$("").addClass("btn btn-xs btn-default")
.text("Name Ban")
.click(function () {
+ var reason = prompt("Enter ban reason (optional)");
socket.emit("chatMsg", {
- msg: "/ban " + name
+ msg: "/ban " + name + " " + reason
});
})
.appendTo(btngroup);
$("").addClass("btn btn-xs btn-default")
.text("IP Ban")
.click(function () {
+ var reason = prompt("Enter ban reason (optional)");
socket.emit("chatMsg", {
- msg: "/ipban " + name
+ msg: "/ipban " + name + " " + reason
});
})
.appendTo(btngroup);