there shouldn't ever be a reason to not want to strip ctcp quoting off when splitting...

diff --git a/src/irc.lua b/src/irc.lua
index 3d7d68faa0b7fedce8e86d4583c37541c45e88fe..761039b45e331fcb3d976aa7ce54f7dc23686265 100644 (file)
--- a/src/irc.lua
+++ b/src/irc.lua
@@ -225,7 +225,7 @@ end
 
 -- on_privmsg {{{
 function handlers.on_privmsg(from, to, msg)
-    local msgs = ctcp._ctcp_split(msg, true)
+    local msgs = ctcp._ctcp_split(msg)
     for _, v in base.ipairs(msgs) do
         if base.type(v) == "string" then
             -- normal message {{{
@@ -258,7 +258,7 @@ end
 
 -- on_notice {{{
 function handlers.on_notice(from, to, msg)
-    local msgs = ctcp._ctcp_split(msg, true)
+    local msgs = ctcp._ctcp_split(msg)
     for _, v in base.ipairs(msgs) do
         if base.type(v) == "string" then
             -- normal message {{{

diff --git a/src/irc/ctcp.lua b/src/irc/ctcp.lua
index 97b880d60423da8104b1a9573f53e2dc682bd6c1..18661221562667ed0ee931ff074d586cc039f11f 100644 (file)
--- a/src/irc/ctcp.lua
+++ b/src/irc/ctcp.lua
@@ -73,12 +73,12 @@ end
 -- _ctcp_split {{{
 -- TODO: again with this string/table thing... it's ugly!
 --
--- Splits a low level dequoted string into normal text and CTCP messages.
+-- Splits a low level dequoted string into normal text and unquoted CTCP
+-- messages.
 -- @param str Low level dequoted string
--- @param dequote If true, the CTCP messages will also be CTCP dequoted
 -- @return Array, where string values correspond to plain text, and table
 --         values have t[1] as the CTCP message
-function _ctcp_split(str, dequote)
+function _ctcp_split(str)
     local ret = {}
     local iter = 1
     while true do
@@ -97,11 +97,7 @@ function _ctcp_split(str, dequote)
         end
         if not s then break end
         if ctcp_string ~= "" then
-            if dequote then
-                table.insert(ret, {_ctcp_dequote(ctcp_string)})
-            else
-                table.insert(ret, {ctcp_string})
-            end
+            table.insert(ret, {_ctcp_dequote(ctcp_string)})
         end
 
         iter = e + 1