*insert something useful here*

Author: MCvarial

resources/irc/acl.xml

@@ -40,4 +40,10 @@
 	<command name="!modules" level="3" echoChannelOnly="true" />
     <command name="!changemap" level="3" echoChannelOnly="true" />
     <command name="!map" level="0" echoChannelOnly="true" />
+    <command name="!shutdown" level="5" echoChannelOnly="true" />
+    <command name="!password" level="4" echoChannelOnly="true" />
+    <command name="!gravity" level="3" echoChannelOnly="true" />
+    <command name="!weather" level="3" echoChannelOnly="true" />
+    <command name="!server" level="0" echoChannelOnly="false" />
+    <command name="!zone" level="0" echoChannelOnly="false" />
 </acl>

resources/irc/logs.html

@@ -6,8 +6,14 @@
 		<* 
 		local file = fileOpen(":irc/irc.log",true) 
 
-		for i,line in pairs (split(tostring(fileRead(file,fileGetSize(file))),10)) do
-			httpWrite(tostring(line)..'<br>')
+		if file then
+		
+			for i,line in pairs (split(tostring(fileRead(file,fileGetSize(file))),10)) do
+				httpWrite(tostring(line)..'<br>')
+			end
+		
+		else
+			httpWrite("File could not be opened!");
 		end
 
 		fileClose(file) 

resources/irc/meta.xml

@@ -4,7 +4,7 @@
 		<setting 
 			name="*irc-client" 
 			value="false"
-			friendlyname="Ungame irc client"
+			friendlyname="Ingame irc client"
 			examples="true,false"
 			desc="Activate ingame irc client?"
 		/>

resources/irc/scripts/echo.lua

@@ -9,11 +9,18 @@
 ------------------------------------
 -- Echo
 ------------------------------------
+local messages = {}
+
 addEventHandler("onResourceStart",root,
 	function (resource)
 		if getResourceInfo(resource,"type") ~= "map" then
 			outputIRC("07* Resource '"..getResourceName(resource).."' started!")
 		end
+		if resource == getThisResource() then
+			for i,player in ipairs (getElementsByType("player")) do
+				messages[player] = 0
+			end
+		end
 	end
 )
 
@@ -27,12 +34,14 @@ addEventHandler("onResourceStop",root,
 
 addEventHandler("onPlayerJoin",root,
 	function ()
+		messages[source] = 0
 		outputIRC("03*** "..getPlayerName(source).." joined the game.")
 	end
 )
 
 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..")")
 		else
@@ -43,24 +52,30 @@ addEventHandler("onPlayerQuit",root,
 
 addEventHandler("onPlayerChangeNick",root,
 	function (oldNick,newNick)
-		outputIRC("13* "..oldNick.." is now known as "..newNick)
+		setTimer(function (player,oldNick)
+			local newNick = getPlayerName(player)
+			if newNick ~= oldNick then
+				outputIRC("13* "..oldNick.." is now known as "..newNick)
+			end
+		end,100,1,source,oldNick)
 	end
 )
 
-addEvent("onPlayerMute",root,
+addEventHandler("onPlayerMute",root,
 	function ()
 		outputIRC("12* "..getPlayerName(source).." has been muted")
 	end
 )
 
-addEvent("onPlayerUnmute",root,
+addEventHandler("onPlayerUnmute",root,
 	function ()
 		outputIRC("12* "..getPlayerName(source).." has been unmuted")
 	end
 )
 
 addEventHandler("onPlayerChat",root,
 	function (message,type)
+		messages[source] = messages[source] + 1
 		if type == 0 then
 			outputIRC("07"..getPlayerName(source)..": "..message)
 		elseif type == 1 then
@@ -71,6 +86,25 @@ addEventHandler("onPlayerChat",root,
 	end
 )
 
+-- anti-spam
+setTimer(function ()
+	for player,number in pairs (messages) do
+		if number >= 2 then
+			muteSerial(getPlayerSerial(player),"Antispam triggered",180000)
+			setPlayerMuted(player,true)
+			outputChatBox("* "..getPlayerName(player).." was muted by irc (Antispam triggered)",root,0,0,255)
+			ircSay(channel,"12* "..getPlayerName(player).." was muted by irc (Antispam triggered)")
+		end
+		messages[player] = 0
+	end
+end,3000,0)
+
+addEventHandler("onSettingChange",root,
+	function (setting,oldValue,newValue)
+		outputIRC("6Setting '"..tostring(setting).."' changed: "..tostring(oldValue).." -> "..tostring(newValue))
+	end
+)
+
 local bodyparts = {nil,nil,"Torso","Ass","Left Arm","Right Arm","Left Leg","Right Leg","Head"}
 local weapons = {}
 weapons[19] = "Rockets"

resources/irc/scripts/functions.txt

@@ -9,7 +9,7 @@ boolean ircNotice userdata string,
 boolean outputIRC string,
 boolean ircConnect string string (number) (string) (boolean),
 boolean ircIdentify userdata string,
-boolean ircReconnect userdata,
+boolean ircReconnect userdata (string),
 boolean ircDisconnect userdata string,
 boolean ircChangeNick userdata string,
 table ircGetServers,

resources/irc/scripts/handling.lua

@@ -43,12 +43,9 @@ addEventHandler("onSockData",root,
 addEvent("onIRCRaw")
 addEventHandler("onIRCRaw",root,
 	function (data)
-		-- resetTimer(servers[source][12])
-		local t = split(data,32)
+		servers[source][11] = getTickCount()
 
-		if type(servers[source][12]) == "number" then
-			servers[source][12] = getTickCount()
-		end
+		local t = split(data,32)
 		if t[1] == "PING" then
 			if t[2] then
 				ircRaw(source,"PONG "..string.sub(t[2],2))
@@ -62,9 +59,10 @@ addEventHandler("onIRCRaw",root,
 		end
 		if t[2] == "001" then
 			servers[source][2] = t[7]
+			servers[source][15] = true
 		end
 		if t[2] == "002" then
-			servers[source][3] = t[7]
+			servers[source][3] = string.sub(t[7],1,-2)
 		end
 		if t[2] == "JOIN" then
 			local nick = getNickFromRaw(data)
@@ -73,6 +71,7 @@ addEventHandler("onIRCRaw",root,
 			local vhost = gettok(gettok(data,1,32),2,33)
 			if nick == ircGetServerNick(source) then
 				if not channel then
+					table.insert(servers[source][14],getMessageFromRaw(data))
 					channel = createElement("irc-channel")
 					channels[channel] = {getMessageFromRaw(data),"+nst","Unknown",{},false,true,false}
 					setElementParent(channel,source)
@@ -205,7 +204,16 @@ addEventHandler("onIRCConnect",root,
 			ircRaw(source,raw)
 		end
 		servers[source][16] = {}
-		-- killTimer(servers[source][12])
-		-- servers[source][12] = setTimer(ircReconnect,600000,0,source,"Connection timed out!")
 	end
-)
+)
+
+setTimer(function ()
+	for i,server in ipairs (ircGetServers()) do
+		if (getTickCount() - servers[server][11]) > 180000 then
+			servers[server][11] = getTickCount()
+			ircReconnect(server,"Connection timed out")
+		elseif (getTickCount() - servers[server][11]) > 120000 then
+			ircRaw(server,"PING")
+		end
+	end
+end,30000,0)

resources/irc/scripts/ircclient_client.lua

@@ -47,6 +47,7 @@ addEventHandler("showIrcClient",root,
 			local memo = guiCreateMemo(0.005,0.01,0.74,0.9,"",true,tab)
 			local gridlist = guiCreateGridList(0.75,0.01,0.245,0.99,true,tab)
 			local column = guiGridListAddColumn(gridlist,"Users",0.8)
+			guiGridListSetSortingEnabled(gridlist,true)
 			for i,user in ipairs (inf[2]) do
 				local row = guiGridListAddRow(gridlist)
 				guiGridListSetItemText(gridlist,row,column,getIconFromLevel(user[2])..user[1],false,false)
@@ -57,7 +58,6 @@ addEventHandler("showIrcClient",root,
 			gridlists[chantitle] = gridlist
 			memolines[memo] = {}
 		end
-		guiGridListSetSortingEnabled(gridlist,true)
 		guiBringToFront(exitbutton)
 		guiSetInputEnabled(true)
 		showCursor(true)

resources/irc/scripts/irccommands.lua

@@ -11,7 +11,7 @@ function addIRCCommands ()
 
 function say (server,channel,user,command,...)
 	local message = table.concat({...}," ")
-	if not message then ircNotice(user,"syntax is !s <message>") return end
+	if message == "" then ircNotice(user,"syntax is !s <message>") return end
 	outputChatBox("* "..ircGetUserNick(user).." on irc: "..message,root,255,168,0)
 	outputIRC("07* "..ircGetUserNick(user).." on irc: "..message)
 end
@@ -23,7 +23,7 @@ addIRCCommandHandler("!pm",
 	function (server,channel,user,command,name,...)
 		local message = table.concat({...}," ")
 		if not name then ircNotice(user,"syntax is !pm <name> <message>") return end
-		if not message then ircNotice(user,"syntax is !pm <name> <message>") return end
+		if message == "" then ircNotice(user,"syntax is !pm <name> <message>") return end
 		local player = getPlayerFromPartialName(name)
 		if player then
 			outputChatBox("* PM from "..ircGetUserNick(user).." on irc: "..message,player,255,168,0)
@@ -130,8 +130,8 @@ addIRCCommandHandler("!unmute",
 addIRCCommandHandler("!freeze",
 	function (server,channel,user,command,name,...)
 		if not name then ircNotice(user,"syntax is !freeze <name> [reason]") return end
-		local reason = table.concat({...}," ") or ""
-		local reason = table.concat({...}," ") or ""
+		local reason = table.concat({...}," ")
+		local reason = table.concat({...}," ")
 		local t = split(reason,40)
 		local time
 		if #t > 1 then
@@ -172,8 +172,8 @@ addIRCCommandHandler("!unfreeze",
 
 addIRCCommandHandler("!slap",
 	function (server,channel,user,command,name,hp,...)
-		if not name then ircNotice(user,"syntax is !slap <name> <hp> [reason]") return end
-		if not hp then ircNotice(user,"syntax is !slap <name> <hp> [reason]") return end
+		if not name then ircNotice(user,"syntax is !slap <name> <hp> (<reason>)") return end
+		if not hp then ircNotice(user,"syntax is !slap <name> <hp> (<reason>)") return end
 		local reason = table.concat({...}," ") or ""
 		local player = getPlayerFromPartialName(name)
 		if player then
@@ -324,7 +324,7 @@ addIRCCommandHandler("!players",
 addIRCCommandHandler("!run",
 	function (server,channel,user,command,...)
 		local str = table.concat({...}," ")
-		if not str then ircNotice(user,"syntax is !run <string>") return end
+		if str == "" then ircNotice(user,"syntax is !run <string>") return end
 		runString(str,root,ircGetUserNick(user))
 	end
 )
@@ -333,15 +333,23 @@ addIRCCommandHandler("!crun",
 	function (server,channel,user,command,...)
 		local t = {...}
 		local str = table.concat(t," ")
-		if not str then ircNotice(user,"syntax is !crun <string>") return end
-		if #getElementsByType("player") == 0 then
-			ircNotice(user,"No player ingame!")
-		end
-		for i,player in ipairs (getElementsByType("player")) do
-			if i == 1 then
-				triggerClientEvent(player,"doCrun",root,str,false)
-			else
-				triggerClientEvent(player,"doCrun",root,str,false)
+		if str == "" then ircNotice(user,"syntax is !crun (<name>) <string>") return end
+		local player = getPlayerFromPartialName(tostring(t[1]))
+		if player then
+			table.remove(t,1)
+			str = table.concat(t," ")
+			triggerClientEvent(player,"doCrun",root,str,true)
+		else
+			if #getElementsByType("player") == 0 then
+				ircNotice(user,"No player ingame!")
+				return
+			end
+			for i,player in ipairs (getElementsByType("player")) do
+				if i == 1 then
+					triggerClientEvent(player,"doCrun",root,str,true)
+				else
+					triggerClientEvent(player,"doCrun",root,str,false)
+				end
 			end
 		end
 	end
@@ -552,4 +560,73 @@ addIRCCommandHandler("!modules",
 	end
 )
 
+addIRCCommandHandler("!shutdown",
+	function (server,channel,user,command,...)
+		local reason = table.concat({...}," ")
+		if not reason then reason = "Shutdown from irc" end
+		shutdown(reason)
+	end
+)
+
+addIRCCommandHandler("!password",
+	function (server,channel,user,command,...)
+		local newpass = table.concat({...}," ")
+		if newpass ~= "" then
+			if setServerPassword(newpass) then
+				ircNotice(user,"New server pass: "..tostring(getServerPassword()))
+			end
+		else
+			ircNotice(user,"Current server pass: "..tostring(getServerPassword()).." use !password <newpass> to change it")
+		end
+	end
+)
+
+addIRCCommandHandler("!gravity",
+	function (server,channel,user,command,...)
+		local newgravity = table.concat({...}," ")
+		if tonumber(newgravity) then
+			if setGravity(tonumber(newgravity)) then
+				ircNotice(user,"New gravity: "..tostring(getGravity()))
+			end
+		else
+			ircNotice(user,"Current gravity: "..tostring(getWeather()).." use !gravity <new gravity> to change it")
+		end
+	end
+)
+
+addIRCCommandHandler("!weather",
+	function (server,channel,user,command,...)
+		local newweather = table.concat({...}," ")
+		if newweather then
+			if setWeather(tonumber(newweather)) then
+				ircNotice(user,"New weather: "..tostring(getWeather()))
+			end
+		else
+			ircNotice(user,"Current weather: "..tostring(getWeather()).." use !weather <new weather> to change it")
+		end
+	end
+)
+
+addIRCCommandHandler("!server",
+	function (server,channel,user,command,...)
+		ircSay(channel,"Server: "..tostring(getServerName()).." Port: "..tostring(getServerPort()))
+	end
+)
+
+addIRCCommandHandler("!zone",
+	function (server,channel,user,command,name)
+		if not name then ircNotice(user,"syntax is !zone <name>") return end
+		local player = getPlayerFromPartialName(name)
+		if player then
+			local x,y,z = getElementPosition(player)
+			if not x then return end
+			local zone = getZoneName(x,y,z,false)
+			local city = getZoneName(x,y,z,true)
+			ircSay(channel,tostring(getPlayerName(player)).."'s zone: "..tostring(zone).." ("..tostring(city)..")")
+		else
+			ircSay(channel,"'"..name.."' no such player")
+		end
+	end
+)
+
 end