Allow hooking to any IRC command

doc/irc.luadoc

@@ -155,7 +155,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. A table containing boolean fields for each access mode that the server supports. Eg: 'o', and 'v'.</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

handlers.lua

@@ -86,22 +86,6 @@ handlers["432"] = needNewNick
 -- ERR_NICKNAMEINUSE
 handlers["433"] = needNewNick
 
--- RPL_ISUPPORT
-handlers["005"] = function(o, prefix, nick, ...)
-	local list = {...}
-	local listlen = #list
-	-- Skip last parameter (info)
-	for i = 1, listlen - 1 do
-		local item = list[i]
-		local pos = item:find("=")
-		if pos then
-			o.supports[item:sub(1, pos - 1)] = item:sub(pos + 1)
-		else
-			o.supports[item] = true
-		end
-	end
-end
-
 --NAMES list
 handlers["353"] = function(o, user, me, chanType, channel, names)
 	if o.track_users then
@@ -109,7 +93,7 @@ handlers["353"] = function(o, user, me, chanType, channel, names)
 
 		local users = o.channels[channel].users
 		for nick in names:gmatch("(%S+)") do
-			local access, name = parseNick(o, nick)
+			local access, name = parseNick(nick)
 			users[name] = {access = access}
 		end
 	end
@@ -161,17 +145,18 @@ handlers["MODE"] = function(o, user, target, modes, ...)
 	if o.track_users and target ~= o.nick then
 		local add = true
 		local optList = {...}
-		updatePrefixModes(o)
 		for c in modes:gmatch(".") do
 			if     c == "+" then add = true
 			elseif c == "-" then add = false
-			elseif o.modeprefix[c] then
+			elseif c == "o" then
-				local nick = table.remove(optList, 1)
+				local user = table.remove(optList, 1)
-				local access = o.channels[target].users[nick].access
+				o.channels[target].users[user].access.op = add
-				access[o.modeprefix[c]] = add
+			elseif c == "h" then
-				if     c == "o" then access.op = add
+				local user = table.remove(optList, 1)
-				elseif c == "v" then access.voice = add
+				o.channels[target].users[user].access.halfop = add
-				end
+			elseif c == "v" then
+				local user = table.remove(optList, 1)
+				o.channels[target].users[user].access.voice = add
 			end
 		end
 	end

init.lua

@@ -39,7 +39,6 @@ function new(data)
 		nickGenerator = data.nickGenerator or defaultNickGenerator;
 		hooks = {};
 		track_users = true;
-		supports = {};
 	}
 	assert(checkNick(o.nick), "Erroneous nickname passed to irc.new")
 	return setmetatable(o, meta_preconnect)

util.lua

@@ -50,51 +50,29 @@ function parse(line)
 	return prefix, cmd, params
 end
 
-function parseNick(conn, nick)
+function parseNick(nick)
-	local access = {}
+	local access, name = nick:match("^([%+@]*)(.+)$")
-	updatePrefixModes(conn)
+	return parseAccess(access or ""), name
-	local namestart = 1
-	for i = 1, #nick - 1 do
-		local c = nick:sub(i, i)
-		if conn.prefixmode[c] then
-			access[conn.prefixmode[c]] = true
-		else
-			namestart = i
-			break
-		end
-	end
-	access.op = access.o
-	access.voice = access.v
-	local name = nick:sub(namestart)
-	return access, name
 end
 
 function parsePrefix(prefix)
 	local user = {}
 	if prefix then
-		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 updatePrefixModes(conn)
+function parseAccess(accessString)
-	if conn.prefixmode and conn.modeprefix then
+	local access = {op = false, halfop = false, voice = false}
-		return
+	for c in accessString:gmatch(".") do
-	end
+		if     c == "@" then access.op = true
-	conn.prefixmode = {}
+		elseif c == "%" then access.halfop = true
-	conn.modeprefix = {}
+		elseif c == "+" then access.voice = true
-	if conn.supports.PREFIX then
-		local modes, prefixes = conn.supports.PREFIX:match("%(([^%)]*)%)(.*)")
-		for i = 1, #modes do
-			conn.prefixmode[prefixes:sub(i, i)] =    modes:sub(i, i)
-			conn.modeprefix[   modes:sub(i, i)] = prefixes:sub(i, i)
 		end
-	else
-		conn.prefixmode['@'] = 'o'
-		conn.prefixmode['+'] = 'v'
-		conn.modeprefix['o'] = '@'
-		conn.modeprefix['v'] = '+'
 	end
+	return access
 end
 
 --mIRC markup scheme (de-facto standard)