Detect nick changes, render. Show topic.

irc.cpp

@@ -134,12 +134,22 @@ void ircClient::write(std::string output) {
   }
 }
 
+/**
+ * @brief thread safe messages.push_back
+ *
+ * @param msg
+ */
 void ircClient::message_append(message_stamp &msg) {
   lock.lock();
   messages.push_back(msg);
   lock.unlock();
 }
 
+/**
+ * @brief thread safe message_stamp pop
+ *
+ * @return boost::optional<message_stamp>
+ */
 boost::optional<message_stamp> ircClient::message_pop(void) {
   lock.lock();
   message_stamp msg;
@@ -153,41 +163,6 @@ boost::optional<message_stamp> ircClient::message_pop(void) {
   return msg;
 }
 
-/*
-void ircClient::buffer_append(std::vector<std::string> &data) {
-  lock.lock();
-  buffer.push_back(data);
-  lock.unlock();
-}
-
-int ircClient::buffer_size(void) {
-  lock.lock();
-  int size = buffer.size();
-  lock.unlock();
-  return size;
-}
-
-std::vector<std::string> ircClient::buffer_pop(void) {
-  lock.lock();
-  std::vector<std::string> ret = buffer.front();
-  buffer.erase(buffer.begin());
-  lock.unlock();
-  return ret;
-}
-
-boost::optional<std::vector<std::string>> ircClient::buffer_maybe_pop(void) {
-  lock.lock();
-  if (buffer.empty()) {
-    lock.unlock();
-    return boost::optional<std::vector<std::string>>{};
-  }
-  std::vector<std::string> ret = buffer.front();
-  buffer.erase(buffer.begin());
-  lock.unlock();
-  return ret;
-}
-*/
-
 void ircClient::on_resolve(
     error_code error, boost::asio::ip::tcp::resolver::results_type results) {
   if (logging) {
@@ -195,6 +170,7 @@ void ircClient::on_resolve(
   }
   if (error) {
     std::string output = "Unable to resolve (DNS Issue?): " + error.message();
+    errors.push_back(output);
     message(output);
     socket.async_shutdown(std::bind(&ircClient::on_shutdown, this, _1));
   }
@@ -211,6 +187,7 @@ void ircClient::on_connect(error_code error,
   if (error) {
     std::string output = "Unable to connect: " + error.message();
     message(output);
+    errors.push_back(output);
     socket.async_shutdown(std::bind(&ircClient::on_shutdown, this, _1));
   }
 
@@ -223,8 +200,9 @@ void ircClient::on_handshake(error_code error) {
     log() << "Handshake: " << error.message() << std::endl;
   }
   if (error) {
-    std::string output = "Handshake: " + error.message();
+    std::string output = "Handshake Failure: " + error.message();
     message(output);
+    errors.push_back(output);
     socket.async_shutdown(std::bind(&ircClient::on_shutdown, this, _1));
   }
 
@@ -279,6 +257,11 @@ void ircClient::read_until(error_code error, std::size_t bytes) {
       socket, response, '\n', std::bind(&ircClient::read_until, this, _1, _2));
 }
 
+/**
+ * @brief Append a system message to the messages.
+ *
+ * @param msg
+ */
 void ircClient::message(std::string msg) {
   message_stamp ms;
   ms.buffer.push_back(msg);
@@ -348,36 +331,9 @@ void ircClient::receive(std::string &text) {
       if (nick == source) {
         std::string output = "You left " + msg_to;
 
-        if (logging) {
-          for (auto c : channels) {
-            log() << c.first << " ";
-            for (auto s : c.second) {
-              log() << s << " ";
-            }
-            log() << std::endl;
-          }
-        }
-
-        {
-          auto ch = channels.find(msg_to);
-          if (ch != channels.end()) {
-            channels.erase(ch);
-            log() << "erase ! " << msg_to << std::endl;
-
-          } else {
-            log() << "failed to find " << msg_to << std::endl;
-          }
-        }
-
-        if (logging) {
-          for (auto c : channels) {
-            log() << c.first << " ";
-            for (auto s : c.second) {
-              log() << s << " ";
-            }
-            log() << std::endl;
-          }
-        }
+        auto ch = channels.find(msg_to);
+        if (ch != channels.end())
+          channels.erase(ch);
 
         if (!channels.empty()) {
           talkto(channels.begin()->first);
@@ -428,9 +384,10 @@ void ircClient::receive(std::string &text) {
         // We've quit?
         channels.erase(channels.begin(), channels.end());
       } else {
-        for (auto c : channels) {
+        for (auto &c : channels) {
           c.second.erase(source);
           // would it be possible that channel is empty now?
+          // no, because we're still in it.
         }
       }
       channels_lock.unlock();
@@ -460,6 +417,19 @@ void ircClient::receive(std::string &text) {
       channels_lock.unlock();
     }
 
+    if (cmd == "NICK") {
+      msg_to.erase(0, 1);
+
+      channels_lock.lock();
+      for (auto &ch : channels) {
+        if (ch.second.erase(source) == 1) {
+          ch.second.insert(msg_to);
+        }
+      }
+
+      channels_lock.unlock();
+    }
+
     if (cmd == "PRIVMSG") {
       // Possibly a CTCP request.  Let's see
       std::string message = msg;

irc.h

@@ -78,19 +78,6 @@ public:
   boost::signals2::mutex channels_lock;
   std::map<std::string, std::set<std::string>> channels;
 
-  /*
-    std::set<std::string> channels;
-    std::set<std::string> users;
-      std::vector<std::string> motd;
-  */
-
-  // thread-safe buffer access
-  /*
-  void buffer_append(std::vector<std::string> &data);
-  int buffer_size(void);
-  std::vector<std::string> buffer_pop(void);
-  boost::optional<std::vector<std::string>> buffer_maybe_pop(void);
-  */
   void message(std::string msg);
   std::atomic<bool> shutdown;
 
@@ -98,9 +85,10 @@ public:
   void message_append(message_stamp &msg);
   boost::optional<message_stamp> message_pop(void);
 
+  std::vector<std::string> errors;
+
 private:
   boost::signals2::mutex lock;
-  // std::vector<std::vector<std::string>> buffer;
   std::vector<message_stamp> messages;
 
   bool registered;

main.cpp

@@ -98,21 +98,15 @@ int main(int argc, char *argv[]) {
 
   door << "Welcome to the IRC chat door." << door::nl;
 
-  // main "loop" -- not the proper way to do it.
   bool in_door = true;
 
   while (in_door) {
     // the main loop
     // custom input routine goes here
 
-    if (check_for_input(door, irc)) {
-    }
+    check_for_input(door, irc);
 
     boost::optional<message_stamp> msg;
-
-    // hold list of users -- until end names received.
-    // std::vector<std::string> names;
-
     bool input_cleared = false;
 
     do {
@@ -131,18 +125,25 @@ int main(int argc, char *argv[]) {
     if (input_cleared)
       restore_input(door);
 
+    // sleep is done in the check_for_input
     // std::this_thread::sleep_for(200ms);
     if (irc.shutdown)
       in_door = false;
   }
 
-  // We miss the ERROR / connection closed message
+  // Store error messages into door log!
+  while (!irc.errors.empty()) {
+    door.log() << "ERROR: " << irc.errors.front() << std::endl;
+    irc.errors.erase(irc.errors.begin());
+  }
 
   io_context.stop();
   Thread.join();
 
+  // disable the global logging std::function
+  get_logger = nullptr;
+
   door << "Returning to the BBS..." << door::nl;
 
-  // std::this_thread::sleep_for(2s);
   return 0;
 }

render.cpp

@@ -27,6 +27,16 @@ void render(message_stamp &msg_stamp, door::Door &door, ircClient &irc) {
     door << "* ERROR: " << tmp << door::nl;
   }
 
+  if (cmd == "332") {
+    // joined channel with topic
+    std::vector<std::string> channel_topic = split_limit(irc_msg[3], 2);
+    channel_topic[1].erase(0, 1);
+    std::string output =
+        "Topic for " + channel_topic[0] + " is: " + channel_topic[1];
+    stamp(msg_stamp, door);
+    door << output << door::nl;
+  }
+
   if (cmd == "366") {
     // end of names, output and clear
     std::string channel = split_limit(irc_msg[3], 2)[0];
@@ -107,4 +117,11 @@ void render(message_stamp &msg_stamp, door::Door &door, ircClient &irc) {
            << door::nl;
     }
   }
+
+  if (cmd == "NICK") {
+    std::string tmp = irc_msg[2];
+    tmp.erase(0, 1);
+    door << "* " << parse_nick(irc_msg[0]) << " is now known as " << tmp
+         << door::nl;
+  }
 }