Skip to content

Commit

Permalink
Switch to Lua 5.2 module format
Browse files Browse the repository at this point in the history
  • Loading branch information
ShadowNinja committed Jun 3, 2014
1 parent 3308471 commit b1382c9
Show file tree
Hide file tree
Showing 7 changed files with 318 additions and 350 deletions.
20 changes: 7 additions & 13 deletions asyncoperations.lua
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
local table = table
local assert = assert
local select = select
local pairs = pairs
local type = type
local irc = require("irc.main")

module "irc"

local meta = _META
local meta = irc.meta

function meta:send(msg, ...)
if type(msg) == "table" then
Expand Down Expand Up @@ -42,26 +36,26 @@ end
function meta:sendChat(target, msg)
-- Split the message into segments if it includes newlines.
for line in msg:gmatch("([^\r\n]+)") do
self:queue(msgs.privmsg(verify(target, 3), line))
self:queue(irc.msgs.privmsg(verify(target, 3), line))
end
end

function meta:sendNotice(target, msg)
-- Split the message into segments if it includes newlines.
for line in msg:gmatch("([^\r\n]+)") do
self:queue(msgs.notice(verify(target, 3), line))
self:queue(irc.msgs.notice(verify(target, 3), line))
end
end

function meta:join(channel, key)
self:queue(msgs.join(
self:queue(irc.msgs.join(
verify(channel, 3),
key and verify(key, 3) or nil))
end

function meta:part(channel, reason)
channel = verify(channel, 3)
self:queue(msgs.part(channel, reason))
self:queue(irc.msgs.part(channel, reason))
if self.track_users then
self.channels[channel] = nil
end
Expand Down Expand Up @@ -91,6 +85,6 @@ function meta:setMode(t)
mode = table.concat{mode, "-", verify(rem, 3)}
end

self:queue(msgs.mode(verify(target, 3), mode))
self:queue(irc.msgs.mode(verify(target, 3), mode))
end

23 changes: 10 additions & 13 deletions handlers.lua
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
local pairs = pairs
local error = error
local tonumber = tonumber
local table = table
local unpack = unpack
local irc = require("irc.main")

module "irc"

handlers = {}
irc.handlers = {}
local handlers = irc.handlers

handlers["PING"] = function(conn, msg)
conn:send(Message("PONG", msg.args))
conn:send(irc.Message({command="PONG", args=msg.args}))
end

handlers["001"] = function(conn, msg)
Expand Down Expand Up @@ -127,7 +122,7 @@ handlers["353"] = function(conn, msg)

local users = conn.channels[channel].users
for nick in names:gmatch("(%S+)") do
local access, name = parseNick(conn, nick)
local access, name = irc.parseNick(conn, nick)
users[name] = {access = access}
end
end
Expand Down Expand Up @@ -184,15 +179,17 @@ handlers["MODE"] = function(conn, msg)
if conn.track_users and target ~= conn.nick then
local add = true
local argNum = 1
updatePrefixModes(conn)
irc.updatePrefixModes(conn)
for c in modes:gmatch(".") do
if c == "+" then add = true
elseif c == "-" then add = false
elseif conn.modeprefix[c] then
local nick = optList[argNum]
argNum = argNum + 1
local access = conn.channels[target].users[nick].access
access[conn.modeprefix[c]] = add
local user = conn.channels[target].users[nick]
user.access = user.access or {}
local access = user.access
access[c] = add
if c == "o" then access.op = add
elseif c == "v" then access.voice = add
end
Expand Down
258 changes: 6 additions & 252 deletions init.lua
Original file line number Diff line number Diff line change
@@ -1,255 +1,9 @@
local socket = require "socket"

local error = error
local setmetatable = setmetatable
local rawget = rawget
local unpack = unpack
local pairs = pairs
local assert = assert
local require = require
local tonumber = tonumber
local type = type
local pcall = pcall
local remove = table.remove
local irc = require("irc.main")
require("irc.util")
require("irc.asyncoperations")
require("irc.handlers")
require("irc.messages")

module "irc"

local meta = {}
meta.__index = meta
_META = meta

require "irc.util"
require "irc.asyncoperations"
require "irc.handlers"
require "irc.messages"

local meta_preconnect = {}
function meta_preconnect.__index(o, k)
local v = rawget(meta_preconnect, k)

if not v and meta[k] then
error(("field '%s' is not accessible before connecting"):format(k), 2)
end
return v
end

function new(data)
local o = {
nick = assert(data.nick, "Field 'nick' is required");
username = data.username or "lua";
realname = data.realname or "Lua owns";
nickGenerator = data.nickGenerator or defaultNickGenerator;
hooks = {};
track_users = true;
supports = {};
messageQueue = {};
lastThought = 0;
recentMessages = 0;
}
assert(checkNick(o.nick), "Erroneous nickname passed to irc.new")
return setmetatable(o, meta_preconnect)
end

function meta:hook(name, id, f)
f = f or id
self.hooks[name] = self.hooks[name] or {}
self.hooks[name][id] = f
return id or f
end
meta_preconnect.hook = meta.hook


function meta:unhook(name, id)
local hooks = self.hooks[name]

assert(hooks, "no hooks exist for this event")
assert(hooks[id], "hook ID not found")

hooks[id] = nil
end
meta_preconnect.unhook = meta.unhook

function meta:invoke(name, ...)
local hooks = self.hooks[name]
if hooks then
for id, f in pairs(hooks) do
if f(...) then
return true
end
end
end
end

function meta_preconnect:connect(_host, _port)
local host, port, password, secure, timeout

if type(_host) == "table" then
host = _host.host
port = _host.port
timeout = _host.timeout
password = _host.password
secure = _host.secure
else
host = _host
port = _port
end

host = host or error("host name required to connect", 2)
port = port or 6667

local s = socket.tcp()

s:settimeout(timeout or 30)
assert(s:connect(host, port))

if secure then
local work, ssl = pcall(require, "ssl")
if not work then
error("LuaSec required for secure connections", 2)
end

local params
if type(secure) == "table" then
params = secure
else
params = {mode = "client", protocol = "tlsv1"}
end

s = ssl.wrap(s, params)
success, errmsg = s:dohandshake()
if not success then
error(("could not make secure connection: %s"):format(errmsg), 2)
end
end

self.socket = s
setmetatable(self, meta)

self:queue(Message({command="CAP", args={"REQ", "multi-prefix"}}))

self:invoke("PreRegister", self)
self:queue(Message({command="CAP", args={"END"}}))

if password then
self:queue(Message({command="PASS", args={password}}))
end

self:queue(msgs.nick(self.nick))
self:queue(Message({command="USER", args={self.username, "0", "*", self.realname}}))

self.channels = {}

s:settimeout(0)

repeat
self:think()
socket.sleep(0.1)
until self.authed
end

function meta:disconnect(message)
message = message or "Bye!"

self:invoke("OnDisconnect", message, false)
self:send(msgs.quit(message))

self:shutdown()
end

function meta:shutdown()
self.socket:close()
setmetatable(self, nil)
end

local function getline(self, errlevel)
local line, err = self.socket:receive("*l")

if not line and err ~= "timeout" and err ~= "wantread" then
self:invoke("OnDisconnect", err, true)
self:shutdown()
error(err, errlevel)
end

return line
end

function meta:think()
while true do
local line = getline(self, 3)
if line and #line > 0 then
if not self:invoke("OnRaw", line) then
self:handle(Message({raw=line}))
end
else
break
end
end

-- Handle outgoing message queue
local diff = socket.gettime() - self.lastThought
self.recentMessages = self.recentMessages - (diff * 2)
if self.recentMessages < 0 then
self.recentMessages = 0
end
for i = 1, #self.messageQueue do
if self.recentMessages > 4 then
break
end
self:send(remove(self.messageQueue, 1))
self.recentMessages = self.recentMessages + 1
end
self.lastThought = socket.gettime()
end

local handlers = handlers

function meta:handle(msg)
local handler = handlers[msg.command]
if handler then
handler(self, msg)
end
self:invoke("Do"..capitalize(msg.command), msg)
end

local whoisHandlers = {
["311"] = "userinfo";
["312"] = "node";
["319"] = "channels";
["330"] = "account"; -- Freenode
["307"] = "registered"; -- Unreal
}

function meta:whois(nick)
self:send(msgs.whois(nick))

local result = {}

while true do
local line = getline(self, 3)
if line then
local msg = Message({raw=line})

local handler = whoisHandlers[msg.command]
if handler then
result[handler] = msg.args
elseif cmd == "318" then
break
else
self:handle(msg)
end
end
end

if result.account then
result.account = result.account[3]
elseif result.registered then
result.account = result.registered[2]
end

return result
end

function meta:topic(channel)
self:queue(msgs.topic(channel))
end
return irc

Loading

0 comments on commit b1382c9

Please sign in to comment.