diff options
| -rw-r--r-- | include/inspircd.h | 4 | ||||
| -rw-r--r-- | src/commands/cmd_motd.cpp | 65 | ||||
| -rw-r--r-- | src/commands/cmd_rehash.cpp | 1 |
3 files changed, 68 insertions, 2 deletions
diff --git a/include/inspircd.h b/include/inspircd.h index dde562561..8a1c3455d 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -456,6 +456,10 @@ class CoreExport InspIRCd */ LocalStringExt OperQuit; + /** Holds whether the MOTD has been parsed for color codes + */ + bool ProcessedMotdEscapes; + /** Get the current time * Because this only calls time() once every time around the mainloop, * it is much faster than calling time() directly. diff --git a/src/commands/cmd_motd.cpp b/src/commands/cmd_motd.cpp index 6e8bda045..80838bcbf 100644 --- a/src/commands/cmd_motd.cpp +++ b/src/commands/cmd_motd.cpp @@ -30,7 +30,7 @@ class CommandMotd : public Command public: /** Constructor for motd. */ - CommandMotd ( Module* parent) : Command(parent,"MOTD",0,1) { syntax = "[<servername>]"; } + CommandMotd ( Module* parent) : Command(parent,"MOTD",0,1) { ServerInstance->ProcessedMotdEscapes = false; syntax = "[<servername>]"; } /** Handle command. * @param parameters The parameters to the comamnd * @param pcnt The number of parameters passed to teh command @@ -46,6 +46,61 @@ class CommandMotd : public Command } }; +inline std::string replace_all(const std::string &str, const std::string &orig, const std::string &repl) +{ + std::string new_str = str; + std::string::size_type pos = new_str.find(orig), orig_length = orig.length(), repl_length = repl.length(); + while (pos != std::string::npos) + { + new_str = new_str.substr(0, pos) + repl + new_str.substr(pos + orig_length); + pos = new_str.find(orig, pos + repl_length); + } + return new_str; +} + +/* + * Replace all color codes from the special[] array to actual + * color code chars using C++ style escape sequences. You + * can append other chars to replace if you like (such as %U + * being underline). -- Justasic + */ +void ProcessColors(ConfigFileCache::iterator &file) +{ + static struct special_chars + { + std::string character; + std::string replace; + special_chars(const std::string &c, const std::string &r) : character(c), replace(r) { } + } + + special[] = { + special_chars("\\002", "\002"), // Bold + special_chars("\\037", "\037"), // underline + special_chars("\\003", "\003"), // Color + special_chars("\\0017", "\017"), // Stop colors + special_chars("\\u", "\037"), // Alias for underline + special_chars("\\b", "\002"), // Alias for Bold + special_chars("\\x", "\017"), // Alias for stop + special_chars("\\c", "\003"), // Alias for color + special_chars("", "") + }; + + for(file_cache::iterator it = file->second.begin(); it != file->second.end(); it++) + { + std::string ret = *it; + for(int i = 0; special[i].character.empty() == false; ++i) + { + std::string::size_type pos = ret.find(special[i].character); + if(pos != std::string::npos && ret[pos-1] == '\\' && ret[pos] == '\\') + continue; // Skip double slashes. + + ret = replace_all(ret, special[i].character, special[i].replace); + } + // Replace double slashes with a single slash before we return + *it = replace_all(ret, "\\\\", "\\"); + } +} + /** Handle /MOTD */ CmdResult CommandMotd::Handle (const std::vector<std::string>& parameters, User *user) @@ -65,11 +120,17 @@ CmdResult CommandMotd::Handle (const std::vector<std::string>& parameters, User return CMD_SUCCESS; } + if(!ServerInstance->ProcessedMotdEscapes) + { + ProcessColors(motd); + ServerInstance->ProcessedMotdEscapes = true; + } + user->SendText(":%s %03d %s :%s message of the day", ServerInstance->Config->ServerName.c_str(), RPL_MOTDSTART, user->nick.c_str(), ServerInstance->Config->ServerName.c_str()); for (file_cache::iterator i = motd->second.begin(); i != motd->second.end(); i++) - user->SendText(":%s %03d %s :- %s", ServerInstance->Config->ServerName.c_str(), RPL_MOTD, user->nick.c_str(),i->c_str()); + user->SendText(":%s %03d %s :- %s", ServerInstance->Config->ServerName.c_str(), RPL_MOTD, user->nick.c_str(), i->c_str()); user->SendText(":%s %03d %s :End of message of the day.", ServerInstance->Config->ServerName.c_str(), RPL_ENDOFMOTD, user->nick.c_str()); diff --git a/src/commands/cmd_rehash.cpp b/src/commands/cmd_rehash.cpp index 07486c78e..ff326faf2 100644 --- a/src/commands/cmd_rehash.cpp +++ b/src/commands/cmd_rehash.cpp @@ -89,6 +89,7 @@ CmdResult CommandRehash::Handle (const std::vector<std::string>& parameters, Use * after the config thread has completed. */ + ServerInstance->ProcessedMotdEscapes = false; // Reprocess our motd file --Justasic ServerInstance->RehashUsersAndChans(); FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect()); |