Add /quit to hotkeys. Fix part/channels.

irc.cpp

@@ -307,7 +307,7 @@ void ircClient::receive(std::string &text) {
         std::string output =
             "You have joined " + msg_to + " [talkto = " + msg_to + "]";
         message(output);
-        talkto = msg_to;
+        talkto(msg_to);
         // insert empty set here.
         std::set<std::string> empty;
         channels[msg_to] = empty;
@@ -321,18 +321,46 @@ void ircClient::receive(std::string &text) {
     }
 
     if (cmd == "PART") {
-      msg_to.erase(0, 1); // channel
-
       channels_lock.lock();
       if (nick == source) {
         std::string output = "You left " + msg_to;
 
-        channels.erase(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;
+          }
+        }
+
         if (!channels.empty()) {
-          talkto = channels.begin()->first;
-          output += " [talkto = " + talkto + "]";
+          talkto(channels.begin()->first);
+          output += " [talkto = " + talkto() + "]";
         } else {
-          talkto = "";
+          talkto("");
         }
         message(output);
 
@@ -356,10 +384,10 @@ void ircClient::receive(std::string &text) {
       if (wholeft == nick) {
         channels.erase(msg_to);
         if (!channels.empty()) {
-          talkto = channels.begin()->first;
-          output += " [talkto = " + talkto + "]";
+          talkto(channels.begin()->first);
+          output += " [talkto = " + talkto() + "]";
         } else {
-          talkto = "";
+          talkto("");
         }
       } else {
         channels[msg_to].erase(wholeft);

irc.h

@@ -48,7 +48,22 @@ public:
   std::string debug_output;
   std::ofstream debug_file;
 
-  std::string talkto;
+protected:
+  boost::signals2::mutex talkto_lock;
+  std::string _talkto;
+
+public:
+  std::string talkto(void) {
+    talkto_lock.lock();
+    std::string ret{_talkto};
+    talkto_lock.unlock();
+    return ret;
+  };
+  void talkto(std::string talkvalue) {
+    talkto_lock.lock();
+    _talkto = talkvalue;
+    talkto_lock.unlock();
+  };
 
   // channels / users
   boost::signals2::mutex channels_lock;

main.cpp

@@ -71,7 +71,7 @@ bool check_for_input(door::Door &d, ircClient &irc) {
     // ok, nothing has been displayed at this time.
     if (d.haskey()) {
       // something to do.
-      prompt = "[" + irc.talkto + "]";
+      prompt = "[" + irc.talkto() + "]";
       d << prompt_color << prompt << input_color << " ";
       c = d.sleep_key(1);
       if (c < 0) {
@@ -131,6 +131,11 @@ bool check_for_input(door::Door &d, ircClient &irc) {
               input = "/help";
               d << input;
               break;
+            case 'q':
+            case 'Q':
+              erase(d, input.size());
+              input = "/quit";
+              d << input;
             }
           }
         }
@@ -139,7 +144,7 @@ bool check_for_input(door::Door &d, ircClient &irc) {
         // hot-keys
         if (input[0] == '/') {
           if ((input == "/help") or (input == "/talkto ") or
-              (input == "/join ") or (input == "/part")) {
+              (input == "/join ") or (input == "/part") or (input == "/quit")) {
             erase(d, input.size());
             erase(d, prompt.size());
             input.clear();
@@ -161,6 +166,7 @@ bool check_for_input(door::Door &d, ircClient &irc) {
         }
       }
       if (c == 0x0d) {
+        clear_input(d);
         prompt.clear();
         return true;
       }
@@ -242,19 +248,76 @@ int main(int argc, char *argv[]) {
       // yes, we have something
       if (input[0] == '/') {
         // command given
+        std::vector<std::string> cmd = split_limit(input, 3);
+
+        if (cmd[0] == "/quit") {
+          irc.write("QUIT");
+        }
+        if (cmd[0] == "/talkto") {
+          irc.talkto(cmd[1]);
+          door << "[talkto = " << cmd[1] << "]" << door::nl;
+        }
+
+        if (cmd[0] == "/join") {
+          std::string tmp = "JOIN " + cmd[1];
+          irc.write(tmp);
+        }
+
+        if (cmd[0] == "/part") {
+          std::string tmp = "PART " + cmd[1];
+          irc.write(tmp);
+        }
+
+        if (cmd[0] == "/me") {
+          cmd = split_limit(input, 2);
+          std::string tmp = "PRIVMSG " + irc.talkto() + " :\x01" + "ACTION " +
+                            cmd[1] + "\x01";
+          irc.write(tmp);
+          door << "* " << irc.nick << " " << cmd[1] << door::nl;
+        }
+
+        if (cmd[0] == "/info") {
+          irc.channels_lock.lock();
+          for (auto c : irc.channels) {
+            door << "CH " << c.first << " ";
+            for (auto s : c.second) {
+              door << s << " ";
+            }
+            door << door::nl;
+          }
+          irc.channels_lock.unlock();
+        }
+        /*
         if (std::toupper(input[1]) == 'Q') {
           irc.write("QUIT");
         } else {
           // for now, just output whatever they gave us.
-          input.erase(0,1);
+          input.erase(0, 1);
           irc.write(input);
         }
+        */
       } else {
-        std::string output = "PRIVMSG " + irc.talkto + " :" + input;
+        std::string target = irc.talkto();
+        std::string output = "PRIVMSG " + target + " :" + input;
+        // I need to display something here to show we've said something (and
+        // where we've said it)
+        door::ANSIColor nick_color{door::COLOR::WHITE, door::COLOR::BLUE};
+
+        if (target[0] == '#') {
+          door::ANSIColor channel_color = door::ANSIColor{
+              door::COLOR::YELLOW, door::COLOR::BLUE, door::ATTR::BOLD};
+
+          door << nick_color << irc.nick << door::ANSIColor(door::COLOR::CYAN)
+               << "/" << channel_color << target << door::reset << " " << input
+               << door::nl;
+
+        } else {
+          door << nick_color << irc.nick << "/" << target << door::reset << " "
+               << input << door::nl;
+        }
         irc.write(output);
       };
       input.clear();
-      door << door::nl;
     }
 
     /*
@@ -324,8 +387,8 @@ int main(int argc, char *argv[]) {
         if (cmd == "372") {
           // MOTD
           std::string temp = m[3];
-          temp.erase(0,1);
-          door << "* " <<  temp << door::nl;
+          temp.erase(0, 1);
+          door << "* " << temp << door::nl;
         }
 
         // 400 and 500 are errors?  should show those.
@@ -368,7 +431,7 @@ int main(int argc, char *argv[]) {
             tmp.erase(0, 1);
             door::ANSIColor channel_color{door::COLOR::WHITE,
                                           door::COLOR::BLUE};
-            if (m[2] == irc.talkto) {
+            if (m[2] == irc.talkto()) {
               channel_color = door::ANSIColor{
                   door::COLOR::YELLOW, door::COLOR::BLUE, door::ATTR::BOLD};
             }