From 1d0480adba0ef433fb384819ce2523387e557e9e Mon Sep 17 00:00:00 2001
From: ShadowNinja <noreply@gmail.com>
Date: Mon, 17 Jun 2013 11:29:52 -0400
Subject: [PATCH 1/5] Add PreRegister hook

This is useful for CAP commands and SASL.
---
 doc/irc.luadoc | 1 +
 init.lua       | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/doc/irc.luadoc b/doc/irc.luadoc
index 85dc229..ff5bbee 100644
--- a/doc/irc.luadoc
+++ b/doc/irc.luadoc
@@ -125,6 +125,7 @@ function irc:shutdown()
 
 --- List of hooks you can use with irc:hook. The parameter list describes the parameters passed to the callback function.
 -- <ul>
+-- <li><code>PreRegister(connection)</code>Useful for CAP commands and SASL.</li>
 -- <li><code>OnRaw(line) - (any non false/nil return value assumes line handled and will not be further processed)</code></li>
 -- <li><code>OnDisconnect(message, errorOccurred)</code></li>
 -- <li><code>OnChat(user, channel, message)</code></li>
diff --git a/init.lua b/init.lua
index 3c8aec3..6571740 100644
--- a/init.lua
+++ b/init.lua
@@ -116,6 +116,9 @@ function meta_preconnect:connect(_host, _port)
 
 	self.socket = s
 	setmetatable(self, meta)
+	
+	self:invoke("PreRegister", self)
+	self:send("CAP END")
 
 	if password then
 		self:send("PASS %s", password)

From ddb788883e56915366fd6f603e686bd6102af7f1 Mon Sep 17 00:00:00 2001
From: ShadowNinja <noreply@gmail.com>
Date: Mon, 17 Jun 2013 11:38:13 -0400
Subject: [PATCH 2/5] Interpret format codes passed to meta:send() literally if
 there are no format arguments

---
 asyncoperations.lua | 8 ++++++--
 doc/irc.luadoc      | 6 +++---
 init.lua            | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/asyncoperations.lua b/asyncoperations.lua
index bd0c652..a3536f0 100644
--- a/asyncoperations.lua
+++ b/asyncoperations.lua
@@ -1,12 +1,16 @@
 local table = table
 local assert = assert
+local select = select
 
 module "irc"
 
 local meta = _META
 
-function meta:send(fmt, ...)
-	local bytes, err = self.socket:send(fmt:format(...) .. "\r\n")
+function meta:send(msg, ...)
+	if select("#", ...) > 0 then
+		msg = msg:format(...)
+	end
+	local bytes, err = self.socket:send(msg .. "\r\n")
 
 	if not bytes and err ~= "timeout" and err ~= "wantwrite" then
 		self:invoke("OnDisconnect", err, true)
diff --git a/doc/irc.luadoc b/doc/irc.luadoc
index ff5bbee..70b4206 100644
--- a/doc/irc.luadoc
+++ b/doc/irc.luadoc
@@ -71,9 +71,9 @@ function irc:whois(nick)
 function irc:topic(channel)
 
 --- Send a raw line of IRC to the server.
--- @param fmt Line to be sent, excluding newline characters.
--- @param ... Format parameters for <code>fmt</code>, with <code>string.format</code> semantics.
-function irc:send(fmt, ...)
+-- @param msg Line to be sent, excluding newline characters.
+-- @param ... Format parameters for <code>msg</code>, with <code>string.format</code> semantics. [optional]
+function irc:send(msg, ...)
 
 --- Send a message to a channel or user.
 -- @param target Nick or channel to send to.
diff --git a/init.lua b/init.lua
index 6571740..4f0f0da 100644
--- a/init.lua
+++ b/init.lua
@@ -26,7 +26,7 @@ function meta_preconnect.__index(o, k)
 	local v = rawget(meta_preconnect, k)
 
 	if not v and meta[k] then
-		error("field '"..k.."' is not accessible before connecting", 2)
+		error(("field '%s' is not accessible before connecting"):format(k), 2)
 	end
 	return v
 end

From 9206f01b880a004b6997abf31ff68c90d3f876a5 Mon Sep 17 00:00:00 2001
From: ShadowNinja <noreply@gmail.com>
Date: Mon, 17 Jun 2013 11:38:48 -0400
Subject: [PATCH 3/5] Add OnSend hook

---
 asyncoperations.lua | 2 ++
 doc/irc.luadoc      | 1 +
 2 files changed, 3 insertions(+)

diff --git a/asyncoperations.lua b/asyncoperations.lua
index a3536f0..a8ea2dd 100644
--- a/asyncoperations.lua
+++ b/asyncoperations.lua
@@ -10,6 +10,8 @@ function meta:send(msg, ...)
 	if select("#", ...) > 0 then
 		msg = msg:format(...)
 	end
+	self:invoke("OnSend", msg)
+
 	local bytes, err = self.socket:send(msg .. "\r\n")
 
 	if not bytes and err ~= "timeout" and err ~= "wantwrite" then
diff --git a/doc/irc.luadoc b/doc/irc.luadoc
index 70b4206..44c035e 100644
--- a/doc/irc.luadoc
+++ b/doc/irc.luadoc
@@ -127,6 +127,7 @@ function irc:shutdown()
 -- <ul>
 -- <li><code>PreRegister(connection)</code>Useful for CAP commands and SASL.</li>
 -- <li><code>OnRaw(line) - (any non false/nil return value assumes line handled and will not be further processed)</code></li>
+-- <li><code>OnSend(line)</code></li>
 -- <li><code>OnDisconnect(message, errorOccurred)</code></li>
 -- <li><code>OnChat(user, channel, message)</code></li>
 -- <li><code>OnNotice(user, channel, message)</code></li>

From ac2a9d03fc23980f5ce344f602101e8c72400604 Mon Sep 17 00:00:00 2001
From: ShadowNinja <noreply@gmail.com>
Date: Mon, 17 Jun 2013 11:39:46 -0400
Subject: [PATCH 4/5] Send mode options to the OnModeChange hook

---
 doc/irc.luadoc | 2 +-
 handlers.lua   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/irc.luadoc b/doc/irc.luadoc
index 44c035e..18fd3b6 100644
--- a/doc/irc.luadoc
+++ b/doc/irc.luadoc
@@ -141,7 +141,7 @@ function irc:shutdown()
 -- <li><code>OnKick(channel, nick, kicker, reason)</code>* (kicker is a <code>user</code> table)</li>
 -- <li><code>OnUserMode(modes)</code></li>
 -- <li><code>OnChannelMode(user, channel, modes)</code></li>
--- <li><code>OnModeChange(user, target, modes)</code>*</li>
+-- <li><code>OnModeChange(user, target, modes, ...)</code>* ('...' contains mode options such as banmasks)</li>
 -- </ul>
 -- * Event also invoked for yourself.
 -- † Channel passed only when user tracking is enabled
diff --git a/handlers.lua b/handlers.lua
index 39d6777..74ace38 100644
--- a/handlers.lua
+++ b/handlers.lua
@@ -130,8 +130,8 @@ handlers["324"] = function(o, prefix, user, channel, modes)
 	o:invoke("OnChannelMode", channel, modes)
 end
 
-handlers["MODE"] = function(o, prefix, target, modes)
-	o:invoke("OnModeChange", parsePrefix(prefix), target, modes)
+handlers["MODE"] = function(o, prefix, target, modes, ...)
+	o:invoke("OnModeChange", parsePrefix(prefix), target, modes, ...)
 end
 
 handlers["ERROR"] = function(o, prefix, message)

From d443e2eeeb85521c6a80c9bac318125d422b0ba3 Mon Sep 17 00:00:00 2001
From: ShadowNinja <noreply@gmail.com>
Date: Tue, 25 Jun 2013 18:17:52 -0400
Subject: [PATCH 5/5] Track user access changing and enable multi-prefix

This also changes the format of user.access.
---
 doc/irc.luadoc |  2 +-
 handlers.lua   | 21 ++++++++++++++++++++-
 init.lua       |  4 +++-
 util.lua       | 17 +++++++++++++++--
 4 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/doc/irc.luadoc b/doc/irc.luadoc
index 18fd3b6..c8c5d8e 100644
--- a/doc/irc.luadoc
+++ b/doc/irc.luadoc
@@ -154,7 +154,7 @@ function irc:shutdown()
 -- <li><code>username</code> - User username.</li>
 -- <li><code>host</code> - User hostname.</li>
 -- <li><code>realname</code> - User real name.</li>
--- <li><code>access</code> - User access, available in channel-oriented callbacks. Can be '+', '@', and others, depending on the server.</li>
+-- <li><code>access</code> - User access, available in channel-oriented callbacks. A table containing the boolean fields 'op', 'halfop', and 'voice'.</li>
 -- </ul>
 -- Apart from <code>nick</code>, fields may be missing. To fill them in, enable user tracking and use irc:whois.
 -- @name User
diff --git a/handlers.lua b/handlers.lua
index 74ace38..6b892f9 100644
--- a/handlers.lua
+++ b/handlers.lua
@@ -1,6 +1,7 @@
 local pairs = pairs
 local error = error
 local tonumber = tonumber
+local table = table
 
 module "irc"
 
@@ -83,7 +84,7 @@ handlers["353"] = function(o, prefix, me, chanType, channel, names)
 		local users = o.channels[channel].users
 		for nick in names:gmatch("(%S+)") do
 			local access, name = parseNick(nick)
-			users[name] = {type = access}
+			users[name] = {access = access}
 		end
 	end
 end
@@ -131,6 +132,24 @@ handlers["324"] = function(o, prefix, user, channel, modes)
 end
 
 handlers["MODE"] = function(o, prefix, target, modes, ...)
+	if o.track_users and target ~= o.nick then
+		local add = true
+		local optList = {...}
+		for c in modes:gmatch(".") do
+			if     c == "+" then add = true
+			elseif c == "-" then add = false
+			elseif c == "o" then
+				local user = table.remove(optList, 1)
+				o.channels[target].users[user].access.op = add
+			elseif c == "h" then
+				local user = table.remove(optList, 1)
+				o.channels[target].users[user].access.halfop = add
+			elseif c == "v" then
+				local user = table.remove(optList, 1)
+				o.channels[target].users[user].access.voice = add
+			end
+		end
+	end
 	o:invoke("OnModeChange", parsePrefix(prefix), target, modes, ...)
 end
 
diff --git a/init.lua b/init.lua
index 4f0f0da..e94aa24 100644
--- a/init.lua
+++ b/init.lua
@@ -116,7 +116,9 @@ function meta_preconnect:connect(_host, _port)
 
 	self.socket = s
 	setmetatable(self, meta)
-	
+
+	self:send("CAP REQ multi-prefix")
+
 	self:invoke("PreRegister", self)
 	self:send("CAP END")
 
diff --git a/util.lua b/util.lua
index 91b9ad4..232ffd6 100644
--- a/util.lua
+++ b/util.lua
@@ -48,17 +48,30 @@ function parse(line)
 end
 
 function parseNick(nick)
-	return nick:match("^([%+@]?)(.+)$")
+	local access, name = nick:match("^([%+@]*)(.+)$")
+	return parseAccess(access or ""), name
 end
 
 function parsePrefix(prefix)
 	local user = {}
 	if prefix then
-		user.access, user.nick, user.username, user.host = prefix:match("^([%+@]?)(.+)!(.+)@(.+)$")
+		user.access, user.nick, user.username, user.host = prefix:match("^([%+@]*)(.+)!(.+)@(.+)$")
 	end
+	user.access = parseAccess(user.access or "")
 	return user
 end
 
+function parseAccess(accessString)
+	local access = {op = false, halfop = false, voice = false}
+	for c in accessString:gmatch(".") do
+		if     c == "@" then access.op = true
+		elseif c == "%" then access.halfop = true
+		elseif c == "+" then access.voice = true
+		end
+	end
+	return access
+end
+
 --mIRC markup scheme (de-facto standard)
 color = {
 	black = 1,