From bfeaeee8735c926f9a8309d1fe980ca7c4b946bd Mon Sep 17 00:00:00 2001 From: Pavel Djundik Date: Sat, 8 Oct 2016 18:11:18 +0300 Subject: [PATCH 1/2] Fix /mode command to correctly assume target --- src/plugins/inputs/mode.js | 68 +++++++++++++++++++++++++++----------- 1 file changed, 49 insertions(+), 19 deletions(-) diff --git a/src/plugins/inputs/mode.js b/src/plugins/inputs/mode.js index 37bc490c..b6ee5d80 100644 --- a/src/plugins/inputs/mode.js +++ b/src/plugins/inputs/mode.js @@ -2,30 +2,60 @@ exports.commands = ["mode", "op", "voice", "deop", "devoice"]; +var Chan = require("../../models/chan"); +var Msg = require("../../models/msg"); + +exports.commands = [ + "mode", + "op", + "deop", + "hop", + "dehop", + "voice", + "devoice", +]; + exports.input = function(network, chan, cmd, args) { - if (args.length === 0) { + if (cmd !== "mode") { + 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 (args.length === 0) { + chan.pushMessage(this, new Msg({ + type: Msg.Type.ERROR, + text: `Usage: /${cmd} [...nick]` + })); + + return; + } + + const mode = { + op: "+o", + hop: "+h", + voice: "+v", + deop: "-o", + dehop: "-h", + devoice: "-v" + }[cmd]; + + args.forEach(function(target) { + network.irc.raw("MODE", chan.name, mode, target); + }); + return; } - var mode; - var user; - if (cmd !== "mode") { - user = args[0]; - mode = { - op: "+o", - voice: "+v", - deop: "-o", - devoice: "-v" - }[cmd]; - } else if (args.length === 1) { - return true; - } else { - mode = args[0]; - user = args[1]; + if (args.length === 0 || args[0][0] === "+" || args[0][0] === "-") { + args.unshift(chan.type === Chan.Type.CHANNEL || chan.type === Chan.Type.QUERY ? chan.name : network.nick); } - var irc = network.irc; - irc.raw("MODE", chan.name, mode, user); + args.unshift("MODE"); - return true; + network.irc.raw.apply(network.irc, args); }; From 93053d497de38b563a289bb4dbe0ca4291ee2883 Mon Sep 17 00:00:00 2001 From: Pavel Djundik Date: Sat, 8 Oct 2016 18:56:41 +0300 Subject: [PATCH 2/2] Add mode command test suite --- test/commands/mode.js | 90 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 test/commands/mode.js diff --git a/test/commands/mode.js b/test/commands/mode.js new file mode 100644 index 00000000..b54301a3 --- /dev/null +++ b/test/commands/mode.js @@ -0,0 +1,90 @@ +"use strict"; + +var expect = require("chai").expect; + +var Chan = require("../../src/models/chan"); +var ModeCommand = require("../../src/plugins/inputs/mode"); + +describe("Commands", function() { + describe("/mode", function() { + const channel = new Chan({ + name: "#thelounge" + }); + + const lobby = new Chan({ + name: "Network Lobby", + type: Chan.Type.LOBBY + }); + + const testableNetwork = { + lastCommand: null, + nick: "xPaw", + irc: { + raw: function() { + testableNetwork.lastCommand = Array.prototype.join.call(arguments, " "); + } + } + }; + + it("should not mess with the given target", function() { + const test = function(expected, args) { + ModeCommand.input(testableNetwork, channel, "mode", Array.from(args)); + expect(testableNetwork.lastCommand).to.equal(expected); + + ModeCommand.input(testableNetwork, lobby, "mode", Array.from(args)); + expect(testableNetwork.lastCommand).to.equal(expected); + }; + + test("MODE xPaw +i", ["xPaw", "+i"]); + test("MODE xPaw -w", ["xPaw", "-w"]); + test("MODE #thelounge +o xPaw", ["#thelounge", "+o", "xPaw"]); + test("MODE #thelounge -v xPaw", ["#thelounge", "-v", "xPaw"]); + test("MODE #thelounge +o-o xPaw Max-P", ["#thelounge", "+o-o", "xPaw", "Max-P"]); + test("MODE #thelounge", ["#thelounge"]); + }); + + it("should assume target if none given", function() { + ModeCommand.input(testableNetwork, channel, "mode", []); + expect(testableNetwork.lastCommand).to.equal("MODE #thelounge"); + + ModeCommand.input(testableNetwork, lobby, "mode", []); + expect(testableNetwork.lastCommand).to.equal("MODE xPaw"); + + ModeCommand.input(testableNetwork, channel, "mode", ["+b"]); + expect(testableNetwork.lastCommand).to.equal("MODE #thelounge +b"); + + ModeCommand.input(testableNetwork, lobby, "mode", ["+b"]); + expect(testableNetwork.lastCommand).to.equal("MODE xPaw +b"); + + ModeCommand.input(testableNetwork, channel, "mode", ["-o", "hey"]); + expect(testableNetwork.lastCommand).to.equal("MODE #thelounge -o hey"); + + ModeCommand.input(testableNetwork, lobby, "mode", ["-i", "idk"]); + expect(testableNetwork.lastCommand).to.equal("MODE xPaw -i idk"); + }); + + it("should support shorthand commands", function() { + ModeCommand.input(testableNetwork, channel, "op", ["xPaw"]); + expect(testableNetwork.lastCommand).to.equal("MODE #thelounge +o xPaw"); + + ModeCommand.input(testableNetwork, channel, "deop", ["xPaw"]); + expect(testableNetwork.lastCommand).to.equal("MODE #thelounge -o xPaw"); + + ModeCommand.input(testableNetwork, channel, "hop", ["xPaw"]); + expect(testableNetwork.lastCommand).to.equal("MODE #thelounge +h xPaw"); + + ModeCommand.input(testableNetwork, channel, "dehop", ["xPaw"]); + expect(testableNetwork.lastCommand).to.equal("MODE #thelounge -h xPaw"); + + ModeCommand.input(testableNetwork, channel, "voice", ["xPaw"]); + expect(testableNetwork.lastCommand).to.equal("MODE #thelounge +v xPaw"); + + ModeCommand.input(testableNetwork, channel, "devoice", ["xPaw"]); + expect(testableNetwork.lastCommand).to.equal("MODE #thelounge -v xPaw"); + + // Multiple arguments are supported, sent as separate commands + ModeCommand.input(testableNetwork, channel, "devoice", ["xPaw", "Max-P"]); + expect(testableNetwork.lastCommand).to.equal("MODE #thelounge -v Max-P"); + }); + }); +});