From 4cc635e18221f8d432cd7d7ce1e7cdbb5c7f319e Mon Sep 17 00:00:00 2001 From: Caitlyn Date: Fri, 24 Nov 2017 02:17:56 -0600 Subject: [PATCH] Make actions work in the IRC client again.. (#2544) disables printing CTCPs for now.. as this makes actions appear twice. better fix? --- .../assets/opencomputers/loot/irc/usr/bin/irc.lua | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/resources/assets/opencomputers/loot/irc/usr/bin/irc.lua b/src/main/resources/assets/opencomputers/loot/irc/usr/bin/irc.lua index bd3018aa5..86ef4b144 100644 --- a/src/main/resources/assets/opencomputers/loot/irc/usr/bin/irc.lua +++ b/src/main/resources/assets/opencomputers/loot/irc/usr/bin/irc.lua @@ -217,7 +217,7 @@ local function handleCommand(prefix, command, args, message) elseif command == "PRIVMSG" then local ctcp = message:match("^\1(.-)\1$") if ctcp then - print("[" .. name(prefix) .. "] CTCP " .. ctcp) + --print("[" .. name(prefix) .. "] CTCP " .. ctcp) local ctcp, param = ctcp:match("^(%S+) ?(.-)$") ctcp = ctcp:upper() if ctcp == "TIME" then @@ -229,16 +229,14 @@ local function handleCommand(prefix, command, args, message) elseif ctcp == "PING" then sock:write("NOTICE " .. name(prefix) .. " :\001PING " .. param .. "\001\r\n") sock:flush() + elseif ctcp == "ACTION" then + print("[" .. args[1] .. "] * " .. name(prefix) .. string.gsub(string.gsub(message, "\001ACTION", ""), "\001", "")) end else if string.find(message, nick) then computer.beep() end - if string.find(message, "\001ACTION") then - print("[" .. args[1] .. "] " .. name(prefix) .. string.gsub(string.gsub(message, "\001ACTION", ""), "\001", "")) - else - print("[" .. args[1] .. "] " .. name(prefix) .. ": " .. message) - end + print("[" .. args[1] .. "] " .. name(prefix) .. ": " .. message) end elseif command == "NOTICE" then print("[NOTICE] " .. message)