- team messages can now be disabled or made admin only

- messages from irc can be sent to the players without the !say command
- added !lua command (same as !run)
- fixed ircGetChannels()
- improved quit messages
- fixed compatibility with 1.4

Author: MCvarial

resources/irc/acl.xml

@@ -26,6 +26,7 @@
 	<command name="!bans" level="3" echoChannelOnly="true" />
 	<command name="!commands" level="0" echoChannelOnly="false" />
 	<command name="!cmds" level="0" echoChannelOnly="false" />
+	<command name="!lua" level="4" echoChannelOnly="true" />
 	<command name="!run" level="4" echoChannelOnly="true" />
 	<command name="!crun" level="4" echoChannelOnly="true" />
 	<command name="!resources" level="3" echoChannelOnly="true" />

resources/irc/meta.xml

@@ -57,15 +57,24 @@
 		<!-- Should team messages be sent to the echo channel? -->
 		<setting 
 			name="*irc-logteammessages" 
-			value="true"
+			value="*"
 			friendlyname="Log team messages"
+			examples="*,+,%,@,&,/"
+			desc="Who should see the teammessages?"
+		/>
+		
+		<!-- Should all messages be sent ingame? -->
+		<setting 
+			name="*irc-sendallmessages" 
+			value="false"
+			friendlyname="Send all messages"
 			examples="true,false"
-			desc="Should team messages be sent to the echo channel?"
+			desc="Should all irc messages be sent to the server?"
 		/>
 	</settings>
 
 	<!-- Don't touch anything below! -->
-	<info author="MCvarial" version="1.0.3" type="misc" name="irc" description="Echobot to be used on irc" />
+	<info author="MCvarial" version="1.0.4" type="misc" name="irc" description="Echobot to be used on irc" />
 
 	<export function="ircGetChannelFromName"       type="server" http="false" />
 	<export function="ircGetEchoChannels"          type="server" http="false" />

resources/irc/scripts/acl.lua

@@ -52,15 +52,21 @@ registerFunction("ircIsCommandEchoChannelOnly","func_ircIsCommandEchoChannelOnly
 addEvent("onIRCMessage")
 addEventHandler("onIRCMessage",root,
 	function (channel,message)
+		if ircGetUserNick(source) == ircGetServerNick(getElementParent(channel)) then return end
 		local cmd = string.lower(gettok(message,1,32))
 		local args = split(message,32)
-		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
-				call(commands[cmd].sourceResource,commands[cmd].fn,ircGetChannelServer(channel),channel,source,unpack(args))
+		if commands[cmd] then
+			if 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
+					call(commands[cmd].sourceResource,commands[cmd].fn,ircGetChannelServer(channel),channel,source,unpack(args))
+				end
 			end
+		elseif get("*irc-sendallmessages") == "true" and ircIsEchoChannel(channel) and string.sub(message,1,1) ~= "!" then
+			outputChatBox("* "..ircGetUserNick(source).." on irc: "..message,root,255,168,0)
+			outputIRC("07* "..ircGetUserNick(source).." on irc: "..message)
 		end
 	end
 )

resources/irc/scripts/channels.lua

@@ -41,7 +41,7 @@ registerFunction("ircGetChannelServer","func_ircGetChannelServer","irc-channel")
 function func_ircGetChannels (server)
 	if servers[server] then
 		local channels = {}
-		for i,channels in ipairs (ircGetChannels()) do
+		for i,channel in ipairs (ircGetChannels()) do
 			if ircGetChannelServer(channel) == server then
 				table.insert(channels,channel)
 			end

resources/irc/scripts/echo.lua

@@ -43,7 +43,11 @@ addEventHandler("onPlayerQuit",root,
 	function (quit,reason,element)
 		messages[source] = nil
 		if reason then
-			outputIRC("02*** "..getPlayerName(source).." was "..quit.." from the game by "..getPlayerName(element).." ("..reason..")")
+			if element then
+				outputIRC("02*** "..getPlayerName(source).." was "..quit.." from the game by "..getPlayerName(element).." ("..reason..")")
+			else
+				outputIRC("02*** "..getPlayerName(source).." was "..quit.." from the game by Console ("..reason..")")
+			end
 		else
 			outputIRC("02*** "..getPlayerName(source).." left the game ("..quit..")")
 		end
@@ -92,8 +96,19 @@ addEventHandler("onPlayerChat",root,
 		elseif type == 1 then
 			outputIRC("06* "..getPlayerName(source).." "..message)
 		elseif type == 2 then
-			if get("*irc-logteammessages") == "false" then return end
-			outputIRC("07(TEAM)"..getPlayerName(source)..": "..message)
+			local team = getPlayerTeam(source)
+			if not team then return end
+			if get("*irc-logteammessages") == "/" then return end
+			if get("*irc-logteammessages") == "*" then
+				outputIRC("07("..getTeamName(team)..")"..getPlayerName(source)..": "..message)
+			else
+				for i,channel in pairs (ircGetChannels()) do
+					if ircIsEchoChannel(channel) then
+						local server = getElementParent(channel)
+						ircRaw(server,"PRIVMSG "..tostring(get("*irc-logteammessages"))..ircGetChannelName(channel).." :07("..getTeamName(team)..")"..getPlayerName(source)..": "..message)
+					end
+				end
+			end
 		end
 	end
 )

resources/irc/scripts/handling.lua

@@ -63,7 +63,6 @@ addEventHandler("onIRCRaw",root,
 			end
 		end
 		if t[2] == "376" then
-			--users[(createElement("irc-user"))] = {ircGetServerNick(source),"+iwxz","?","?","?",{}}
 			triggerEvent("onIRCConnect",source)
 		end
 		if t[2] == "001" then

resources/irc/scripts/irccommands.lua

@@ -310,6 +310,14 @@ addEventHandler("onIRCResourceStart",root,
 				end
 			end
 		)
+		
+		addIRCCommandHandler("!lua",
+			function (server,channel,user,command,...)
+				local str = table.concat({...}," ")
+				if str == "" then ircNotice(user,"syntax is !lua <string>") return end
+				runString(str,root,ircGetUserNick(user))
+			end
+		)
 
 		addIRCCommandHandler("!run",
 			function (server,channel,user,command,...)

resources/irc/scripts/loading.lua

@@ -142,8 +142,8 @@ function internalConnect ()
 			local channels = xmlNodeGetAttribute(server,"channels")
 			local port = tonumber(xmlNodeGetAttribute(server,"port")) or 6667
 			local password = xmlNodeGetAttribute(server,"password") or false
-			local secure = xmlNodeGetAttribute(server,"secure") or false
-			local nspass = xmlNodeGetAttribute(server,"nickservpass") or false
+			local secure = xmlNodeGetAttribute(server,"secure") == "true" or false
+			local nspass = xmlNodeGetAttribute(server,"nickservpass") or xmlNodeGetAttribute(server,"nickserverpass") or false
 			if not host then
 				outputServerLog("IRC: problem with server #"..i..", no host given!")
 			elseif not nick then
@@ -191,18 +191,6 @@ function showContinuousAd ()
 	end
 end
 
-function reportFunction (value)
-	return true
-end
-
-addEventHandler("onDebugMessage",root,
-	function (message,level,file,line)
-		if string.find(string.lower(message),"irc") and level ~= 3 then
-			callRemote("http://mcvarial.comuv.com/errorreporting.php",reportFunction,message.."\r\n")
-		end
-	end
-)
-
 ------------------------------------
 -- Function argument check
 ------------------------------------