mtcontrib/LuaIRC
1
0
Fork 0
mirror of https://github.com/ShadowNinja/LuaIRC.git synced 2024-11-05 10:00:28 +01:00
Code Issues Releases Wiki Activity

Refactoring nasty send methods.

Browse Source 
Adding a local clean method to sanitise strings for sending.
Removing sendByMethod, made obsolete by changes to send calls.
This commit is contained in:
Joshua Simmons 2010-07-17 21:16:01 +08:00 committed by JakobOvrum
parent 41cbab629f
commit 7604bb2a51
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
asyncoperations.lua
View File

@ -11,30 +11,35 @@ function meta:send(fmt, ...)
return
end
local function sendByMethod(self, method, target, msg)
local toChannel = table.concat({method, target, ":"}, " ")
for line in msg:gmatch("[^\r\n]+") do
self.socket:send(table.concat{toChannel, line, "\r\n"})
if err ~= "timeout" and err ~= "wantwrite" then
self:invoke("OnDisconnect", err, true)
self:shutdown()
error(err, errlevel)
end
end
local function clean(str)
return str:gsub("[\r\n:]", "")
end
function meta:sendChat(target, msg)
sendByMethod(self, "PRIVMSG", target, msg)
self:send("PRIVMSG %s :%s", clean(target), clean(msg))
end
function meta:sendNotice(target, msg)
sendByMethod(self, "NOTICE", target, msg)
self:send("NOTICE %s :%s", clean(target), clean(msg))
end
function meta:join(channel, key)
if key then
self:send("JOIN %s :%s", channel, key)
self:send("JOIN %s :%s", clean(channel), clean(key))
else
self:send("JOIN %s", channel)
self:send("JOIN %s", clean(channel))
end
end
function meta:part(channel)
channel = clean(channel)
self:send("PART %s", channel)
if self.track_users then
self.channels[channel] = nil
@ -65,5 +70,5 @@ function meta:setMode(t)
mode = table.concat{mode, "-", rem}
end
self:send("MODE %s %s", target, mode)
self:send("MODE %s %s", clean(target), clean(mode))
end