Updated colors for privmsg.

irc.cpp

@@ -439,12 +439,12 @@ void ircClient::receive(std::string &text) {
           ch.second.insert(msg_to);
         }
       }
-
-      find_max_nick_length();
-      channels_lock.unlock();
       // Is this us?  If so, change our nick.
       if (source == nick)
         nick = msg_to;
+
+      find_max_nick_length();
+      channels_lock.unlock();
     }
 
     if (cmd == "PRIVMSG") {

render.cpp

@@ -1,35 +1,42 @@
 #include "render.h"
 
+#include <boost/lexical_cast.hpp>
 #include <iomanip>
 
 std::string timestamp_format = "%T";
 
 void stamp(std::time_t &stamp, door::Door &door) {
-  door << std::put_time(std::localtime(&stamp), timestamp_format.c_str())
-       << " ";
+  std::string output = boost::lexical_cast<std::string>(
+      std::put_time(std::localtime(&stamp), timestamp_format.c_str()));
+  if (output.find('A') != std::string::npos)
+    door << door::ANSIColor(door::COLOR::YELLOW, door::ATTR::BOLD);
+  else
+    door << door::ANSIColor(door::COLOR::BROWN);
+
+  door << output << door::reset << " ";
+  // door << std::put_time(std::localtime(&stamp), timestamp_format.c_str())
 }
 
 void render(message_stamp &msg_stamp, door::Door &door, ircClient &irc) {
   // std::vector<std::string> irc_msg = *msg;
   std::vector<std::string> &irc_msg = msg_stamp.buffer;
 
-  {
-    ofstream &log = door.log();
-
-    log << "render: ";
-    for (auto text : irc_msg) {
-      log << "[" << text << "] ";
-    }
-    log << std::endl;
-  }
+  door::ANSIColor info{door::COLOR::CYAN};
+  door::ANSIColor error{door::COLOR::RED, door::ATTR::BOLD};
 
   if (irc_msg.size() == 1) {
     // system message
     stamp(msg_stamp.stamp, door);
-    door << "(" << irc_msg[0] << ")" << door::nl;
+    door << info << "(" << irc_msg[0] << ")" << door::reset << door::nl;
     return;
   }
 
+  door::ANSIColor nick_color{door::COLOR::CYAN, door::ATTR::BOLD};
+  door::ANSIColor channel_color{door::COLOR::WHITE, door::COLOR::BLUE};
+  door::ANSIColor active_channel_color =
+      door::ANSIColor{door::COLOR::YELLOW, door::COLOR::BLUE, door::ATTR::BOLD};
+  door::ANSIColor text_color{door::COLOR::WHITE};
+
   std::string cmd = irc_msg[1];
 
   if (irc_msg[0] == "ERROR") {
@@ -37,7 +44,7 @@ void render(message_stamp &msg_stamp, door::Door &door, ircClient &irc) {
     if (tmp[0] == ':')
       tmp.erase(0, 1);
     stamp(msg_stamp.stamp, door);
-    door << "* ERROR: " << tmp << door::nl;
+    door << error << "* ERROR: " << tmp << door::reset << door::nl;
   }
 
   if (cmd == "332") {
@@ -47,7 +54,7 @@ void render(message_stamp &msg_stamp, door::Door &door, ircClient &irc) {
     std::string output =
         "Topic for " + channel_topic[0] + " is: " + channel_topic[1];
     stamp(msg_stamp.stamp, door);
-    door << output << door::nl;
+    door << info << output << door::reset << door::nl;
   }
 
   if (cmd == "366") {
@@ -56,12 +63,12 @@ void render(message_stamp &msg_stamp, door::Door &door, ircClient &irc) {
 
     irc.channels_lock.lock();
     stamp(msg_stamp.stamp, door);
-    door << "* users on " << channel << " : ";
+    door << info << "* users on " << channel << " : ";
     for (auto name : irc.channels[channel]) {
       door << name << " ";
     }
     irc.channels_lock.unlock();
-    door << door::nl;
+    door << door::reset << door::nl;
     // names.clear();
   }
 
@@ -70,7 +77,7 @@ void render(message_stamp &msg_stamp, door::Door &door, ircClient &irc) {
     std::string temp = irc_msg[3];
     temp.erase(0, 1);
     stamp(msg_stamp.stamp, door);
-    door << "* " << temp << door::nl;
+    door << info << "* " << temp << door::reset << door::nl;
   }
 
   // 400 and 500 are errors?  should show those.
@@ -79,24 +86,41 @@ void render(message_stamp &msg_stamp, door::Door &door, ircClient &irc) {
     if (tmp[0] == ':')
       tmp.erase(0, 1);
     stamp(msg_stamp.stamp, door);
-    door << "* " << tmp << door::nl;
+    door << error << "* " << tmp << door::reset << door::nl;
   }
 
   if (cmd == "NOTICE") {
     std::string tmp = irc_msg[3];
     tmp.erase(0, 1);
     stamp(msg_stamp.stamp, door);
-    door << parse_nick(irc_msg[0]) << " NOTICE " << tmp << door::nl;
+    door << nick_color << parse_nick(irc_msg[0]) << " NOTICE " << tmp
+         << door::reset << door::nl;
   }
 
   if (cmd == "ACTION") {
     if (irc_msg[2][0] == '#') {
       stamp(msg_stamp.stamp, door);
+      if (irc_msg[2] == irc.talkto())
+        door << active_channel_color;
+      else
+        door << channel_color;
+      door << irc_msg[2] << "/" << nick_color;
+      std::string nick = parse_nick(irc_msg[0]);
+      int len = irc.max_nick_length - nick.size();
+      if (len > 0)
+        door << std::string(len, ' ');
+      door << "* " << nick << " " << irc_msg[3] << door::reset << door::nl;
+      /*
       door << "* " << irc_msg[2] << "/" << parse_nick(irc_msg[0]) << " "
            << irc_msg[3] << door::nl;
+           */
     } else {
       stamp(msg_stamp.stamp, door);
-      door << "* " << parse_nick(irc_msg[0]) << " " << irc_msg[3] << door::nl;
+      door << nick_color << "* " << parse_nick(irc_msg[0]) << " " << irc_msg[3]
+           << door::reset << door::nl;
+
+      // door << "* " << parse_nick(irc_msg[0]) << " " << irc_msg[3] <<
+      // door::nl;
     }
   }
 
@@ -104,24 +128,33 @@ void render(message_stamp &msg_stamp, door::Door &door, ircClient &irc) {
     std::string tmp = irc_msg[3];
     tmp.erase(0, 1);
     stamp(msg_stamp.stamp, door);
-    door << parse_nick(irc_msg[0]) << " set topic of " << irc_msg[2] << " to "
-         << tmp << door::nl;
+    door << info << parse_nick(irc_msg[0]) << " set topic of " << irc_msg[2]
+         << " to " << tmp << door::reset << door::nl;
   }
 
   if (cmd == "PRIVMSG") {
-    door::ANSIColor nick_color{door::COLOR::WHITE, door::COLOR::BLUE};
 
     if (irc_msg[2][0] == '#') {
       std::string tmp = irc_msg[3];
       tmp.erase(0, 1);
-      door::ANSIColor channel_color{door::COLOR::WHITE, door::COLOR::BLUE};
-      if (irc_msg[2] == irc.talkto()) {
-        channel_color = door::ANSIColor{door::COLOR::YELLOW, door::COLOR::BLUE,
-                                        door::ATTR::BOLD};
-      }
+
       stamp(msg_stamp.stamp, door);
+      if (irc_msg[2] == irc.talkto())
+        door << active_channel_color;
+      else
+        door << channel_color;
+      door << irc_msg[2];
+      door << "/" << nick_color;
+
+      std::string nick = parse_nick(irc_msg[0]);
+      int len = irc.max_nick_length + 2 - nick.size();
+      if (len > 0)
+        door << std::string(len, ' ');
+      door << nick << " " << text_color << tmp << door::reset << door::nl;
+      /*
       door << channel_color << irc_msg[2] << "/" << nick_color
            << parse_nick(irc_msg[0]) << door::reset << " " << tmp << door::nl;
+      */
     } else {
       std::string tmp = irc_msg[3];
       tmp.erase(0, 1);
@@ -135,7 +168,7 @@ void render(message_stamp &msg_stamp, door::Door &door, ircClient &irc) {
     std::string tmp = irc_msg[2];
     tmp.erase(0, 1);
     stamp(msg_stamp.stamp, door);
-    door << "* " << parse_nick(irc_msg[0]) << " is now known as " << tmp
-         << door::nl;
+    door << info << "* " << parse_nick(irc_msg[0]) << " is now known as " << tmp
+         << door::reset << door::nl;
   }
 }