More fixes

Author: MCvarial

resources/irc/meta.xml

@@ -89,7 +89,7 @@
 	<export function="ircGetChannelUsers"          type="server" http="false" />
 	<export function="ircGetChannelTopic"          type="server" http="false" />
 	<export function="ircGetChannelFromName"       type="server" http="false" />
-	<export function="ircIsEchoChannels"           type="server" http="false" />
+	<export function="ircIsEchoChannel"           type="server" http="false" />
 
 	<export function="ircSetUserMode"              type="server" http="false" />
 	<export function="ircGetUserMode"              type="server" http="false" />

resources/irc/scripts/acl.lua

@@ -6,42 +6,39 @@
 -- Date: 31.10.2010
 ---------------------------------------------------------------------
 
-acl = {}
-local commands = {}
+commands = {}
 
 ------------------------------------
 -- Acl
 ------------------------------------
-function func_addIRCCommandHandler (cmd,fn,level,echochanonly)
+function func_addIRCCommandHandler (cmd,fn,level,echoChannelOnly)
 	if not level then level = 0 end
-	if not echochanonly then echochanonly = true end
-	if not acl[string.lower(cmd)] then
-		acl[string.lower(cmd)] = {name = string.lower(cmd),level = level,echoChannelOnly = echochannelonly}
-	end
-	commands[string.lower(cmd)] = fn
+	if not echoChannelOnly then echoChannelOnly = true end
+	if commands[string.lower(cmd)] and commands[string.lower(cmd)].fn then return false end
+	commands[string.lower(cmd)] = {fn=fn,level=level,echoChannelOnly=echoChannelOnly,sourceResource=sourceResource}
 	return true
 end
-registerFunction("addIRCCommandHandler","func_addIRCCommandHandler","string","function","(number)","(boolean)")
+registerFunction("addIRCCommandHandler","func_addIRCCommandHandler","string","function/string","(number)","(boolean)")
 
 function ircGetCommands ()
 	local cmds = {}
-	for cmd,fn in pairs (commands) do
+	for cmd,_ in pairs (commands) do
 		table.insert(cmds,cmd)
 	end
 	return cmds
 end
 
 function func_ircGetCommandLevel (cmd)
-	if acl[cmd] then
-		return tonumber(acl[cmd].level) or 0
+	if commands[cmd] then
+		return tonumber(commands[cmd].level)
 	end
 	return false
 end
 registerFunction("ircGetCommandLevel","func_ircGetCommandLevel","string")
 
 function func_ircIsCommandEchoChannelOnly (cmd)
-	if acl[cmd] then
-		return acl[cmd].echoChannelOnly
+	if commands[cmd] then
+		return commands[cmd].echoChannelOnly
 	end
 	return false
 end
@@ -52,13 +49,12 @@ addEventHandler("onIRCMessage",root,
 	function (channel,message)
 		local cmd = string.lower(gettok(message,1,32))
 		local args = split(message,32)
-		if commands[cmd] and acl[cmd] and acl[cmd].level and (tonumber(acl[cmd].level) or 0) <= (tonumber(ircGetUserLevel(source,channel)) or 0) then
-			if ircIsCommandEchoChannelOnly(cmd) then
-				if ircIsEchoChannel(channel) then
-					commands[cmd](ircGetChannelServer(channel),channel,source,unpack(args))
-				end
+		if commands[cmd] and commands[cmd].level <= (tonumber(ircGetUserLevel(source,channel)) or 0) then
+			if commands[cmd].echoChannelOnly and not ircIsEchoChannel(channel) then return end
+			if type(commands[cmd].fn) == "function" then
+				commands[cmd].fn(ircGetChannelServer(channel),channel,source,unpack(args))
 			else
-				commands[cmd](ircGetChannelServer(channel),channel,source,unpack(args))
+				call(commands[cmd].sourceResource,commands[cmd].fn,ircGetChannelServer(channel),channel,source,unpack(args))
 			end
 		end
 	end

resources/irc/scripts/irccommands.lua

@@ -188,8 +188,8 @@ addEventHandler("onIRCResourceStart",root,
 				if player then
 					setElementVelocity((getPedOccupiedVehicle(player) or player),0,0,hp*0.01)
 					setElementHealth((getPedOccupiedVehicle(player) or player),(getElementHealth((getPedOccupiedVehicle(player) or player)) - hp))
-					outputChatBox(getPlayerName(player).." was slaped by "..ircGetUserNick(user).." ("..reason..")("..hp.."HP)",root,255,0,0)
-					ircSay(channel,"12* "..getPlayerName(player).." was slaped by "..ircGetUserNick(user).." ("..reason..")("..hp.."HP)")
+					outputChatBox(getPlayerName(player).." was slapped by "..ircGetUserNick(user).." ("..reason..")("..hp.."HP)",root,255,0,0)
+					ircSay(channel,"12* "..getPlayerName(player).." was slapped by "..ircGetUserNick(user).." ("..reason..")("..hp.."HP)")
 				else
 					ircNotice(user,"'"..name.."' no such player")
 				end

resources/irc/scripts/loading.lua

@@ -85,7 +85,12 @@ addEventHandler("onResourceStart",resourceRoot,
 			while(xmlFindChild(aclFile,"command",i)) do
 				local child = xmlFindChild(aclFile,"command",i)
 				local attrs = xmlNodeGetAttributes(child)
-				acl[attrs.name] = attrs
+				if commands[string.lower(attrs.name)] then
+					commands[string.lower(attrs.name)].level = tonumber(attrs.level)
+					commands[string.lower(attrs.name)].echoChannelOnly = attrs.echoChannelOnly
+				else
+					commands[string.lower(attrs.name)] = {level = tonumber(attrs.level),echoChannelOnly = attrs.echoChannelOnly}
+				end
 				i = i + 1
 			end
 			xmlUnloadFile(aclFile)
@@ -206,9 +211,17 @@ function registerFunction (name,ft,...)
 	local arguments = {...}
 	for i,arg in ipairs (arguments) do
 		if string.sub(arg,1,1) == "(" and string.sub(arg,-1) == ")" then
-			arguments[i] = "if args["..i.."] and type(args["..i.."]) ~= '"..string.sub(arg,2,-2).."' then return not outputDebugString('bad argument at "..name.." "..arg.." expected, got '..type(args["..i.."])) end"
+			arguments[i] = "if args["..i.."] and type(args["..i.."]) ~= '"..string.sub(arg,2,-2).."' then return not outputDebugString('bad argument #"..i.." at "..name.." "..arg.." expected, got '..type(args["..i.."])) end"
+		elseif string.find(arg,"/") then
+			local args = split(arg,"/")
+			local str = ""
+			for k,arg in ipairs (args) do
+				str = str.."type(args["..i.."]) ~= '"..arg.."' and "
+			end
+			str = string.sub(str,1,-5)
+			arguments[i] = "if "..str.." then return not outputDebugString('bad argument #"..i.." at "..name.." "..arg.." expected, got '..type(args["..i.."])) end"
 		else
-			arguments[i] = "if type(args["..i.."]) ~= '"..arg.."' then return not outputDebugString('bad argument at "..name.." "..arg.." expected, got '..type(args["..i.."])) end"
+			arguments[i] = "if type(args["..i.."]) ~= '"..arg.."' then return not outputDebugString('bad argument #"..i.." at "..name.." "..arg.." expected, got '..type(args["..i.."])) end"
 		end
 	end
 	loadstring("function "..name.." (...) local args = {...} "..table.concat(arguments," ").." return "..ft.."(...) end")()