convert parse_user to an internal function, since apparently that's how i've been using it

master
jluehrs2 2007-09-04 21:58:27 -05:00
parent 9e7fab4e4c
commit 16a65213dc
2 changed files with 5 additions and 7 deletions

View File

@ -103,7 +103,7 @@ local function incoming_message(sock)
local msg = message._parse(raw_msg)
misc._try_call_warn("Unhandled server message: " .. msg.command,
handlers["on_" .. msg.command:lower()],
(misc.parse_user(msg.from)), base.unpack(msg.args))
(misc._parse_user(msg.from)), base.unpack(msg.args))
return true
end
-- }}}
@ -207,7 +207,7 @@ function handlers.on_topic(from, chan, new_topic)
base.assert(serverinfo.channels[chan],
"Received topic message for unknown channel: " .. chan)
serverinfo.channels[chan]._topic.text = new_topic
serverinfo.channels[chan]._topic.user = (misc.parse_user(from))
serverinfo.channels[chan]._topic.user = from
serverinfo.channels[chan]._topic.time = os.time()
if serverinfo.channels[chan].join_complete then
callback("topic_change", serverinfo.channels[chan])

View File

@ -273,17 +273,15 @@ function _value_iter(state, arg, pred)
return val
end
-- }}}
-- }}}
-- public functions {{{
-- parse_user {{{
---
-- _parse_user {{{
--
-- Gets the various parts of a full username.
-- @param user A usermask (i.e. returned in the from field of a callback)
-- @return nick
-- @return username (if it exists)
-- @return hostname (if it exists)
function parse_user(user)
function _parse_user(user)
local found, bang, nick = user:find("^([^!]*)!")
if found then
user = user:sub(bang + 1)