Permalink
Browse files

Merge pull request #96 from Justasic/insp20

[2.0] Process escape sequences for MOTD for issue #23
  • Loading branch information...
2 parents 553a8da + a2d85a0 commit fcacc8e0306382bc3f938073092c3729d77e2b41 @rburchell rburchell committed May 3, 2012
Showing with 68 additions and 2 deletions.
  1. +4 −0 include/inspircd.h
  2. +63 −2 src/commands/cmd_motd.cpp
  3. +1 −0 src/commands/cmd_rehash.cpp
View
4 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.
View
65 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());
View
1 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());

0 comments on commit fcacc8e

Please sign in to comment.