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

diff --git a/src/irc.lua b/src/irc.lua
index b63a08cd9aae26f8a8d4431395d7a6573fe0c175..49a11d3a0d32117a59e9798d27f8ee74542af245 100644 (file)
--- a/src/irc.lua
+++ b/src/irc.lua
@@ -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])

diff --git a/src/irc/misc.lua b/src/irc/misc.lua
index bf4a671415c55ccb6a14b0a2e90aef078ea78d86..92c3ac4edc4d6e27cc19e56141387f8ddb348594 100644 (file)
--- a/src/irc/misc.lua
+++ b/src/irc/misc.lua
@@ -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)