Added team message command and new irc client

Author: MCvarial

resources/irc/acl.xml

@@ -6,6 +6,7 @@
 	<command name="!m" level="0" echoChannelOnly="true" />
 	<command name="!players" level="0" echoChannelOnly="true" />
 	<command name="!pm" level="0" echoChannelOnly="true" />
+	<command name="!ts" level="0" echoChannelOnly="true" />
 	<command name="!getip" level="2" echoChannelOnly="true" />
 	<command name="!getserial" level="2" echoChannelOnly="true" />
 	<command name="!mute" level="2" echoChannelOnly="true" />

resources/irc/meta.xml

@@ -90,6 +90,7 @@
 	<export function="ircGetServerChannels"        type="server" http="false" />
 	<export function="ircSetUserMode"              type="server" http="false" />
 	<export function="ircGetUserMode"              type="server" http="false" />
+	<export function="ircGetUserChannels"          type="server" http="false" />
 	<export function="ircGetUserNick"              type="server" http="false" />
 	<export function="ircGetUserServer"            type="server" http="false" />
 	<export function="ircGetUsers"                 type="server" http="false" />

resources/irc/scripts/handling.lua

@@ -146,6 +146,7 @@ addEventHandler("onIRCRaw",root,
 					user = createElement("irc-user")
 					users[user] = {nick,"+iwxz","?","?","?",{channel}}
 					setElementParent(user,source)
+					table.insert(channels[channel][4],user)
 				end
 				if not userlevels[channel] then
 					userlevels[channel] = {}

resources/irc/scripts/ircclient_client.lua

@@ -6,210 +6,178 @@
 -- Date: 31.10.2010
 ---------------------------------------------------------------------
 
-local tabs = {}
-local edits = {}
-local memos = {}
-local messages = {}
-local gridlists = {}
-local memolines = {}
 local x,y = guiGetScreenSize()
+local g_channels = {}
+local window
 
 ------------------------------------
 -- Irc client
 ------------------------------------
-addCommandHandler("irc",
-	function ()
-		if window then
-			guiGridListSetSortingEnabled(gridlist,true)
-			guiSetInputEnabled(true)
-			guiSetVisible(window,true)
-			guiSetVisible(exitbutton,true)
-			showCursor(true)
-		else
-			triggerServerEvent("startIRCClient",getLocalPlayer())
-		end
-	end,false,false
-)
-
-addEvent("showIrcClient",true)
-addEventHandler("showIrcClient",root,
-	function (info)
-		window = guiCreateWindow(0.25,0.3,0.5,0.6,"Internet Relay Chat",true)
-		exitbutton = guiCreateButton(0.95,0.03,0.2,0.03,"Close",true,window)
-		tabpanel = guiCreateTabPanel(0,0.08,1,0.9,true,window)
-		guiSetProperty(exitbutton,"AlwaysOnTop","True")
-		--guiWindowSetMovable(window,false)
-		--guiWindowSetSizable(window,false)
-		for i,inf in ipairs (info) do
-			local chantitle = inf[1]
-			local tab = guiCreateTab(chantitle,tabpanel)
-			local edit = guiCreateEdit(0.005,0.915,0.74,0.07,"",true,tab)
-			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
+addEvent("ircStartClient",true)
+addEventHandler("ircStartClient",root,
+	function (channels)
+		window = guiCreateWindow((x/2)-320,(y/2)-240,640,480,"Internet Relay Chat",false)
+		local tabpanel = guiCreateTabPanel(0.01,0.05,0.98,0.95,true,window)
+		for i,channel in ipairs (channels) do
+			local tab = guiCreateTab(channel.name,tabpanel)
+			local memo = guiCreateMemo(0.01,0.01,0.75,0.90,"* Topic is: "..channel.topic.."\n",true,tab)
+			local edit = guiCreateEdit(0.01,0.92,0.75,0.07,"",true,tab)
+			local gridlist = guiCreateGridList(0.76,0.01,0.23,0.90,true,tab)
+			local hidebtn = guiCreateButton(0.76,0.92,0.11,0.07,"Hide",true,tab)
+			local closebtn = guiCreateButton(0.88,0.92,0.11,0.07,"Close",true,tab)
+			guiGridListAddColumn(gridlist,"users",0.88)
+			guiMemoSetReadOnly(memo,true)
+			for i,user in ipairs (channel.users) do
 				local row = guiGridListAddRow(gridlist)
-				guiGridListSetItemText(gridlist,row,column,getIconFromLevel(user[2])..user[1],false,false)
+				guiGridListSetItemText(gridlist,row,1,getIconFromLevel(user.level)..user.name,false,false)
+				guiGridListSetItemData(gridlist,row,1,user.name)
 			end
-			tabs[chantitle] = tab
-			edits[chantitle] = edit
-			memos[chantitle] = memo
-			gridlists[chantitle] = gridlist
-			memolines[memo] = {}
+			guiGridListSetSortingEnabled(gridlist,true)
+			addEventHandler("onClientGUIClick",closebtn,ircStopClient,false)
+			addEventHandler("onClientGUIClick",hidebtn,ircHideClient,false)
+			addEventHandler("onClientGUIAccepted",edit,
+				function (edit)
+					local text = guiGetText(edit)
+					if text and text ~= "" then
+						triggerServerEvent("ircSendMessage",resourceRoot,localPlayer,channel.name,text)
+						guiSetText(edit,"")
+					end
+				end
+			)
+			g_channels[channel.name] = {memo=memo,edit=edit,gridlist=gridlist}
 		end
-		guiBringToFront(exitbutton)
 		guiSetInputEnabled(true)
-		showCursor(true)
 	end
 )
 
-addEventHandler("onClientGUIAccepted",root,
-	function (editbox)
-		for chantitle,edit in pairs (edits) do
-			if edit == editbox then
-				triggerServerEvent("ircSay",getLocalPlayer(),chantitle,guiGetText(editbox))
-				guiSetText(editbox,"")
-				return
-			end
-		end
-	end
-)
-
-addEventHandler("onClientGUIClick",root,
-	function (btn)
-		if btn ~= "left" then return end
-		if source == exitbutton then
-			guiSetInputEnabled(false)
-			guiSetVisible(window,false)
-			guiSetVisible(exitbutton,false)
+addEventHandler("onClientResourceStop",resourceRoot,
+	function ()
+		if window then
 			showCursor(false)
+			guiSetInputEnabled(false)
 		end
 	end
 )
 
-addEvent("onClientIRCMessage",true)
-addEventHandler("onClientIRCMessage",root,
-	function (user,chantitle,message)
-		memoAddLine(memos[chantitle],user..": "..message)
-	end
-)
+function ircStopClient ()
+	destroyElement(window)
+	window = nil
+	channels = {}
+	showCursor(false)
+	guiSetInputEnabled(false)
+	triggerServerEvent("ircStopClient",resourceRoot,localPlayer)
+end
 
-addEvent("onClientIRCUserJoin",true)
-addEventHandler("onClientIRCUserJoin",root,
-	function (user,chantitle,vhost)
-		local row = guiGridListAddRow(gridlists[chantitle])
-		guiGridListSetItemText(gridlists[chantitle],row,1,user,false,false)
-		memoAddLine(memos[chantitle],"* "..user.." ("..vhost..") joined")
-	end
-)
+function ircHideClient ()
+	guiSetVisible(window,false)
+	showCursor(false)
+	guiSetInputEnabled(false)
+end
 
-addEvent("onClientIRCUserPart",true)
-addEventHandler("onClientIRCUserPart",root,
-	function (user,chantitle,reason)
-		for i=1,guiGridListGetRowCount(gridlists[chantitle]) do
-			if guiGridListGetItemText(gridlists[chantitle],i,1) == user then
-				guiGridListRemoveRow(gridlists[chantitle],i)
-				break
-			end
-			if string.sub(guiGridListGetItemText(gridlists[chantitle],i,1),2) == user then
-				guiGridListRemoveRow(gridlists[chantitle],i)
-				break
-			end
+addCommandHandler("irc",
+	function ()
+		if window then
+			guiSetVisible(window,true)
+			showCursor(true)
+			guiSetInputEnabled(true)
 		end
-		memoAddLine(memos[chantitle],"* "..user.." parted ("..(reason or "")..")")
-	end
+	end,false
 )
 
-addEvent("onClientIRCUserQuit",true)
-addEventHandler("onClientIRCUserQuit",root,
-	function (user,reason)
-		for i,gridlist in pairs (gridlists) do
-			for i=1,guiGridListGetRowCount(gridlist) do
-				if guiGridListGetItemText(gridlist,i,1) == user then
-					guiGridListRemoveRow(gridlist,i)
-					break
-				end
-			end
-		end
-		for i,memo in pairs (memos) do
-			memoAddLine(memo,"* "..user.." ("..vhost..") quit ("..reason..")")
+local icons = {"+","%","@","&","~"}
+function getIconFromLevel (level)
+	return icons[level] or ""
+end
+
+function getLevelFromIcon (ico)
+	for i,icon in ipairs (icons) do
+		if icon == ico then
+			return i
 		end
 	end
-)
+	return false
+end
+
+function addMessage (channel,message)
+	guiSetText(g_channels[channel].memo,guiGetText(g_channels[channel].memo)..""..message)
+end
 
-addEvent("onClientIRCNotice",true)
-addEventHandler("onClientIRCNotice",root,
-	function (user,chantitle,message)
-		memoAddLine(memos[chantitle],"<notice> "..user..": "..message)
+addEvent("onIRCMessage",true)
+addEventHandler("onIRCMessage",root,
+	function (user,channel,message)
+		if g_channels[channel] then
+			addMessage(channel,"<"..user.."> "..message)
+		end
 	end
 )
 
-addEvent("onClientIRCUserMode",true)
-addEventHandler("onClientIRCUserMode",root,
-	function (user,chantitle,positive,mode,setter,newlevel)
-		if positive then
-			memoAddLine(memos[chantitle],"* "..(setter or "Server").." sets mode: +"..mode.." "..user)
-		else
-			memoAddLine(memos[chantitle],"* "..(setter or "Server").." sets mode: -"..mode.." "..user)
+addEvent("onIRCUserJoin",true)
+addEventHandler("onIRCUserJoin",root,
+	function (user,channel,vhost)
+		if g_channels[channel] then
+			addMessage(channel,"* "..user.." joined ("..vhost..")")
+			local row = guiGridListAddRow(g_channels[channel].gridlist)
+			guiGridListSetItemText(g_channels[channel].gridlist,row,1,user,false,false)
+			guiGridListSetItemData(g_channels[channel].gridlist,row,1,user)
 		end
 	end
 )
 
-addEvent("onClientIRCChannelMode",true)
-addEventHandler("onClientIRCChannelMode",root,
-	function (chantitle,positive,mode,setter)
-		if positive then
-			memoAddLine(memos[chantitle],"* "..(setter or "Server").." sets mode: +"..mode)
-		else
-			memoAddLine(memos[chantitle],"* "..(setter or "Server").." sets mode: -"..mode)
+addEvent("onIRCUserPart",true)
+addEventHandler("onIRCUserPart",root,
+	function (user,channel,reason)
+		if g_channels[channel] then
+			addMessage(channel,"* "..user.." parted ("..reason..")")
+			for i=0,guiGridListGetRowCount(g_channels[channel].gridlist)-1 do
+				if guiGridListGetItemData(g_channels[channel].gridlist,i,1) == user then
+					guiGridListRemoveRow(g_channels[channel].gridlist,i)
+				end
+			end
 		end
 	end
 )
 
-addEvent("onClientIRCLevelChange",true)
-addEventHandler("onClientIRCLevelChange",root,
-	function (user,chantitle,oldlevel,newlevel)
-		for i=1,guiGridListGetRowCount(gridlists[chantitle]) do
-			if guiGridListGetItemText(gridlists[chantitle],i,1) == user then
-				guiGridListSetItemText(gridlists[chantitle],i,1,getIconFromLevel(newlevel)..user,false,false)
-				break
-			end
-			if string.sub(guiGridListGetItemText(gridlists[chantitle],i,1),2) == user then
-				guiGridListSetItemText(gridlists[chantitle],i,1,getIconFromLevel(newlevel)..user,false,false)
-				break
+addEvent("onIRCUserQuit",true)
+addEventHandler("onIRCUserQuit",root,
+	function (user,reason)
+		for channel,info in pairs (g_channels) do
+			for i=0,guiGridListGetRowCount(info.gridlist)-1 do
+				if guiGridListGetItemData(info.gridlist,i,1) == user then
+					guiGridListRemoveRow(info.gridlist,i)
+					addMessage(channel,"* "..user.." quit ("..reason..")")
+				end
 			end
 		end
 	end
 )
 
-addEvent("onClientIRCUserChangeNick",true)
-addEventHandler("onClientIRCUserChangeNick",root,
-	function (oldnick,newnick)
-		for i,gridlist in pairs (gridlists) do
-			for i=1,guiGridListGetRowCount(gridlist) do
-				if guiGridListGetItemText(gridlist,i,1) == oldnick then
-					guiGridListSetItemText(gridlist,i,1,newnick,false,false)
-					break
-				end
-				if string.sub(guiGridListGetItemText(gridlist,i,1),2) == oldnick then
-					guiGridListSetItemText(gridlist,i,1,string.sub(guiGridListGetItemText(gridlist,i,1),1,1)..newnick,false,false)
-					break
+addEvent("onIRCLevelChange",true)
+addEventHandler("onIRCLevelChange",root,
+	function (user,channel,oldlevel,newlevel)
+		if g_channels[channel] then
+			addMessage(channel,"* "..user.." changed level from "..tostring(oldlevel).." to "..tostring(newlevel))
+			for i=0,guiGridListGetRowCount(g_channels[channel].gridlist)-1 do
+				if guiGridListGetItemData(g_channels[channel].gridlist,i,1) == user then
+					guiGridListSetItemText(g_channels[channel].gridlist,i,1,getIconFromLevel(newlevel)..user,false,false)
 				end
 			end
 		end
 	end
 )
 
-function memoAddLine (memo,line)
-	if #memolines[memo] > 16 then
-		table.remove(memolines[memo],1)
+addEvent("onIRCUserChangeNick",true)
+addEventHandler("onIRCUserChangeNick",root,
+	function (user,oldnick,newnick)
+		for channel,info in pairs (g_channels) do
+			for i=0,guiGridListGetRowCount(info.gridlist)-1 do
+				if guiGridListGetItemData(info.gridlist,i,1) == oldnick then
+					addMessage(channel,"* "..oldnick.." is now know as "..newnick)
+					local oldIcon = string.sub(guiGridListGetItemText(info.gridlist,i,1),1,1)
+					if not getLevelFromIcon(oldIcon) then oldIcon = "" end
+					guiGridListSetItemText(info.gridlist,i,1,oldIcon..newnick,false,false)
+					guiGridListSetItemData(info.gridlist,i,1,newnick)
+				end
+			end
+		end
 	end
-	table.insert(memolines[memo],line)
-	return guiSetText(memo,table.concat(memolines[memo],"\n"))
-end
-
-local icons = {"+","%","@","&","~"}
-function getIconFromLevel (level)
-	return icons[level] or ""
-end
+)