Move chat message parsing code to separate mod

diff --git a/bot.lua b/bot.lua
index cc95bb3731087bf79ed0d02144c670e997d7c49a..517132767554ef745ae0fc9e43a3a3a07780fc63 100644 (file)
--- a/bot.lua
+++ b/bot.lua
@@ -37,30 +37,26 @@ function furrybot.error_message(player, error, detail)
 end
 
 function furrybot.recieve(rawmsg)
-       local msg = minetest.strip_colors(rawmsg)
-       local nameidx = msg:find("<")
-       local first_byte = rawmsg:byte(1)
-       if nameidx and (first_byte == 60 or first_byte == 27) then
-               local idx = msg:find(">")
-               local player = msg:sub(nameidx + 1, idx - 1)
-               local sidx = idx + 2
-               if msg:sub(idx + 1, idx + 1) == ":" then
-                       sidx = sidx + 1
-               end
-               local message = msg:sub(sidx, #msg)
-               if message:find("!") == 1 then
-                       local args = message:sub(2, #message):split(" ")
-                       local cmd = table.remove(args, 1)
-                       local func = furrybot.commands[cmd]
-                       if func then
-                               if furrybot.unsafe_commands[cmd] and first_byte == 27 and rawmsg:sub(2, 12) == "(c@#63d269)" and nameidx == 1 then
-                                       furrybot.error_message(player, "Sorry, you cannot run this command from discord", cmd)
-                               else
-                                       func(player, unpack(args))
-                               end
+       local message_info = libclamity.parse_chat_message(rawmsg)
+
+       if not message_info then
+               return
+       end
+
+       local player, message, discord = message_info.player, message_info.message, message_info.discord
+
+       if message:find("!") == 1 then
+               local args = message:sub(2, #message):split(" ")
+               local cmd = table.remove(args, 1)
+               local func = furrybot.commands[cmd]
+               if func then
+                       if furrybot.unsafe_commands[cmd] and discord then
+                               furrybot.error_message(player, "Sorry, you cannot run this command from discord", cmd)
                        else
-                               furrybot.error_message(player, "Invalid command", cmd)
+                               func(player, unpack(args))
                        end
+               else
+                       furrybot.error_message(player, "Invalid command", cmd)
                end
        end
 end

diff --git a/mod.conf b/mod.conf
index 82f7a7c911121748abca10f133644c795cafda09..aaa3c0aa41ba7cd678da54d9ac1eb69ca5f37199 100644 (file)
--- a/mod.conf
+++ b/mod.conf
@@ -1,3 +1,4 @@
 name = furrybot
 author = Fleckenstein
 description = A lewd furry dating bot for Clamity anarchy (trololololol)
+depends = libclamity