Fixed temp banning

Author: MCvarial

resources/irc/scripts/irccommands.lua

@@ -56,18 +56,9 @@ addEventHandler("onIRCResourceStart",root,
 			function (server,channel,user,command,name,...)
 				if not name then ircNotice(user,"syntax is !ban <name> [reason] (time)") return end
 				local reason = table.concat({...}," ") or ""
-				local t = split(reason,40)
-				local time
-				if #t > 1 then
-					time = "("..t[#t]
-				end
 				local player = getPlayerFromPartialName(name)
 				if player then
-					if time then
-						addBan(getPlayerIP(player),nil,getPlayerSerial(player),ircGetUserNick(user),reason,toMs(time)/1000)
-					else
-						addBan(getPlayerIP(player),nil,getPlayerSerial(player),ircGetUserNick(user),reason)
-					end
+					addBan(getPlayerIP(player),nil,getPlayerSerial(player),ircGetUserNick(user),reason,getTimeFromString(reason)/1000)
 				else
 					ircNotice(user,"'"..name.."' no such player")
 				end
@@ -257,50 +248,23 @@ addEventHandler("onIRCResourceStart",root,
 			function (server,channel,user,command,name,...)
 				if not name then ircNotice(user,"syntax is !banname <name> (<reason>)") return end
 				local reason = table.concat({...}," ") or ""
-				local t = split(reason,40)
-				local time
-				if #t > 1 then
-					time = "("..t[#t]
-				end
-				if time then
-					addBan(nil,name,nil,ircGetUserNick(user),reason,toMs(time)/1000)
-				else
-					addBan(nil,name,nil,ircGetUserNick(user),reason)
-				end
+				addBan(nil,name,nil,ircGetUserNick(user),reason,getTimeFromString(reason)/1000)
 			end
 		)
 
 		addIRCCommandHandler("!banserial",
 			function (server,channel,user,command,serial,...)
 				if not serial then ircNotice(user,"syntax is !banserial <name> (<reason>)") return end
 				local reason = table.concat({...}," ") or ""
-				local t = split(reason,40)
-				local time
-				if #t > 1 then
-					time = "("..t[#t]
-				end
-				if time then
-					addBan(nil,nil,serial,ircGetUserNick(user),reason,toMs(time)/1000)
-				else
-					addBan(nil,nil,serial,ircGetUserNick(user),reason)
-				end
+				addBan(nil,nil,serial,ircGetUserNick(user),reason,getTimeFromString(reason)/1000)
 			end
 		)
 
 		addIRCCommandHandler("!banip",
 			function (server,channel,user,command,ip,...)
 				if not ip then ircNotice(user,"syntax is !banname <name> (<reason>)") return end
 				local reason = table.concat({...}," ") or ""
-				local t = split(reason,40)
-				local time
-				if #t > 1 then
-					time = "("..t[#t]
-				end
-				if time then
-					addBan(ip,nil,nil,ircGetUserNick(user),reason,toMs(time)/1000)
-				else
-					addBan(ip,nil,nil,ircGetUserNick(user),reason)
-				end
+				addBan(ip,nil,nil,ircGetUserNick(user),reason,getTimeFromString(reason)/1000)
 			end
 		)
 

resources/irc/scripts/mutes.lua

@@ -118,15 +118,13 @@ times["month"] = 2592000000
 times["months"] = 2592000000
 function getTimeFromString (string)
 	if type(string) ~= "string" then return false end
+	string = string.gsub(string,"[%(%)]"," ") -- support for old syntax
+
 	local time = 0
-	for i,v in pairs (times) do
-		local start,stop = string.find(string,i)
-		if start then
-			local number = string.sub(string,start-2,start-1)
-			if number and tonumber(number) then
-				number = tonumber(number)
-				time = time + number*v
-			end
+	local words = split(string,32)
+	for i,word in ipairs (words) do
+		if times[word] and words[i-1] then
+			time = time + tonumber(words[i-1])*times[word]
 		end
 	end
 	return time