Skip to content
Permalink
Browse files

Move chat command handling code from C++ to Lua (#5528)

  • Loading branch information
red-001 authored and SmallJoker committed Apr 8, 2017
1 parent fb4c730 commit d4e9dd4643607192f5adebeecda86f25074f02cd
Showing with 18 additions and 20 deletions.
  1. +12 −3 builtin/game/chatcommands.lua
  2. +6 −17 src/server.cpp
@@ -7,13 +7,22 @@
core.chatcommands = core.registered_chatcommands -- BACKWARDS COMPATIBILITY

core.register_on_chat_message(function(name, message)
if message:sub(1,1) ~= "/" then
return
end

local cmd, param = string.match(message, "^/([^ ]+) *(.*)")
if not param then
param = ""
if not cmd then
core.chat_send_player(name, "-!- Empty command")
return true
end

param = param or ""

local cmd_def = core.registered_chatcommands[cmd]
if not cmd_def then
return false
core.chat_send_player(name, "-!- Invalid command: " .. cmd)
return true
end
local has_privs, missing_privs = core.check_player_privs(name, cmd_def.privs)
if has_privs then
@@ -2820,25 +2820,14 @@ std::wstring Server::handleChat(const std::string &name, const std::wstring &wna
// Whether to send line to the player that sent the message, or to all players
bool broadcast_line = true;

// Commands are implemented in Lua, so only catch invalid
// commands that were not "eaten" and send an error back
if (wmessage[0] == L'/') {
std::wstring wcmd = wmessage.substr(1);
if (check_shout_priv && !checkPriv(name, "shout")) {
line += L"-!- You don't have permission to shout.";
broadcast_line = false;
if (wcmd.length() == 0)
line += L"-!- Empty command";
else
line += L"-!- Invalid command: " + str_split(wcmd, L' ')[0];
} else {
if (check_shout_priv && !checkPriv(name, "shout")) {
line += L"-!- You don't have permission to shout.";
broadcast_line = false;
} else {
line += L"<";
line += wname;
line += L"> ";
line += wmessage;
}
line += L"<";
line += wname;
line += L"> ";
line += wmessage;
}

/*

0 comments on commit d4e9dd4

Please sign in to comment.
You can’t perform that action at this time.