From b03d01b6eb83fe7f5519706f0ad4c428a39672bb Mon Sep 17 00:00:00 2001
From: Alistair McKinlay <github@10people.co.uk>
Date: Mon, 24 Apr 2017 11:40:53 +0100
Subject: [PATCH] Add ban/unban command

Fixes #1073
---
 client/index.html                 | 20 ++++++++++++++
 client/js/constants.js            |  2 ++
 src/client.js                     |  1 +
 src/plugins/inputs/ban.js         | 44 +++++++++++++++++++++++++++++++
 src/plugins/inputs/mode.js        | 11 +-------
 src/plugins/irc-events/banlist.js |  2 +-
 6 files changed, 69 insertions(+), 11 deletions(-)
 create mode 100644 src/plugins/inputs/ban.js

diff --git a/client/index.html b/client/index.html
index 362688ba..1b40bfce 100644
--- a/client/index.html
+++ b/client/index.html
@@ -554,6 +554,16 @@
 							</div>
 						</div>
 
+						<div class="help-item">
+							<div class="subject">
+								<code>/ban nick</code>
+							</div>
+							<div class="description">
+								<p>Ban (<code>+b</code>) a user from the current channel.
+								This can be a nickname or a hostmask.</p>
+							</div>
+						</div>
+
 						<div class="help-item">
 							<div class="subject">
 								<code>/banlist</code>
@@ -799,6 +809,16 @@
 							</div>
 						</div>
 
+						<div class="help-item">
+							<div class="subject">
+								<code>/unban nick</code>
+							</div>
+							<div class="description">
+								<p>Unban (<code>-b</code>) a user from the current channel.</p>
+									This can be a nickname or a hostmask.</p>
+							</div>
+						</div>
+
 						<div class="help-item">
 							<div class="subject">
 								<code>/voice nick [...nick]</code>
diff --git a/client/js/constants.js b/client/js/constants.js
index 546637fd..c9587709 100644
--- a/client/js/constants.js
+++ b/client/js/constants.js
@@ -3,6 +3,7 @@
 const commands = [
 	"/away",
 	"/back",
+	"/ban",
 	"/banlist",
 	"/close",
 	"/connect",
@@ -28,6 +29,7 @@ const commands = [
 	"/server",
 	"/slap",
 	"/topic",
+	"/unban",
 	"/voice",
 	"/whois"
 ];
diff --git a/src/client.js b/src/client.js
index 0d3caffa..aa3b7045 100644
--- a/src/client.js
+++ b/src/client.js
@@ -36,6 +36,7 @@ var events = [
 	"whois"
 ];
 var inputs = [
+	"ban",
 	"ctcp",
 	"msg",
 	"part",
diff --git a/src/plugins/inputs/ban.js b/src/plugins/inputs/ban.js
new file mode 100644
index 00000000..b6745652
--- /dev/null
+++ b/src/plugins/inputs/ban.js
@@ -0,0 +1,44 @@
+"use strict";
+
+var Chan = require("../../models/chan");
+var Msg = require("../../models/msg");
+
+exports.commands = [
+	"ban",
+	"unban",
+	"banlist"
+];
+
+exports.input = function(network, chan, cmd, args) {
+	if (chan.type !== Chan.Type.CHANNEL) {
+		chan.pushMessage(this, new Msg({
+			type: Msg.Type.ERROR,
+			text: `${cmd} command can only be used in channels.`
+		}));
+
+		return;
+	}
+
+	if (cmd !== "banlist" && args.length === 0) {
+		if (args.length === 0) {
+			chan.pushMessage(this, new Msg({
+				type: Msg.Type.ERROR,
+				text: `Usage: /${cmd} <nick>`
+			}));
+
+			return;
+		}
+	}
+
+	switch (cmd) {
+	case "ban":
+		network.irc.ban(chan.name, args[0]);
+		break;
+	case "unban":
+		network.irc.unban(chan.name, args[0]);
+		break;
+	case "banlist":
+		network.irc.banlist(chan.name);
+		break;
+	}
+};
diff --git a/src/plugins/inputs/mode.js b/src/plugins/inputs/mode.js
index 8395da15..4e1227ad 100644
--- a/src/plugins/inputs/mode.js
+++ b/src/plugins/inputs/mode.js
@@ -4,7 +4,6 @@ var Chan = require("../../models/chan");
 var Msg = require("../../models/msg");
 
 exports.commands = [
-	"banlist",
 	"mode",
 	"op",
 	"deop",
@@ -14,10 +13,6 @@ exports.commands = [
 	"devoice",
 ];
 
-const chanCommands = [
-	"banlist"
-];
-
 exports.input = function(network, chan, cmd, args) {
 	if (cmd !== "mode") {
 		if (chan.type !== Chan.Type.CHANNEL) {
@@ -29,7 +24,7 @@ exports.input = function(network, chan, cmd, args) {
 			return;
 		}
 
-		if (args.length === 0 && chanCommands.indexOf(cmd) === -1) {
+		if (args.length === 0) {
 			chan.pushMessage(this, new Msg({
 				type: Msg.Type.ERROR,
 				text: `Usage: /${cmd} <nick> [...nick]`
@@ -39,7 +34,6 @@ exports.input = function(network, chan, cmd, args) {
 		}
 
 		const mode = {
-			banlist: "+b",
 			op: "+o",
 			hop: "+h",
 			voice: "+v",
@@ -48,9 +42,6 @@ exports.input = function(network, chan, cmd, args) {
 			devoice: "-v"
 		}[cmd];
 
-		if (chanCommands.indexOf(cmd) > -1 && args.length === 0) {
-			network.irc.raw("MODE", chan.name, mode);
-		}
 		args.forEach(function(target) {
 			network.irc.raw("MODE", chan.name, mode, target);
 		});
diff --git a/src/plugins/irc-events/banlist.js b/src/plugins/irc-events/banlist.js
index d45d81cc..fa5993ea 100644
--- a/src/plugins/irc-events/banlist.js
+++ b/src/plugins/irc-events/banlist.js
@@ -9,7 +9,7 @@ module.exports = function(irc, network) {
 	irc.on("banlist", function(banlist) {
 		const channel = banlist.channel;
 		const bans = banlist.bans;
-		if (!bans) {
+		if (!bans || bans.length === 0) {
 			const msg = new Msg({
 				time: Date.now(),
 				type: Msg.Type.ERROR,