2 files changed, 18 insertions(+), 3 deletions(-)

M src/irc/irc_client.cpp
M src/irc/irc_client.hpp

@@ 20,7 20,8 @@ IrcClient::IrcClient(std::shared_ptr<Poller> poller, const std::string& hostname
   current_nick(username),
   bridge(bridge),
   welcomed(false),
-  chanmodes({"", "", "", ""})
+  chanmodes({"", "", "", ""}),
+  chantypes({'#', '&'})
 {
   this->dummy_channel.topic = "This is a virtual channel provided for "
                               "convenience by biboumi, it is not connected "


@@ 279,6 280,15 @@ void IrcClient::on_isupport_message(const IrcMessage& message)
             this->prefix_to_mode[token[j++]] = token[i++];
           }
       }
+    else if (token.substr(0, 10) == "CHANTYPES=")
+      {
+        // Remove the default types, they apply only if no other value is
+        // specified.
+        this->chantypes.clear();
+        size_t i = 11;
+        while (i < token.size())
+          this->chantypes.insert(token[i++]);
+      }
   }
 }
 


@@ 564,8 574,7 @@ void IrcClient::on_kick(const IrcMessage& message)
 void IrcClient::on_mode(const IrcMessage& message)
 {
   const std::string target = message.arguments[0];
-  if (target[0] == '&' || target[0] == '#' ||
-      target[0] == '!' || target[0] == '+')
+  if (this->chantypes.find(target[0]) != this->chantypes.end())
     this->on_channel_mode(message);
   else
     this->on_user_mode(message);

@@ 12,6 12,7 @@
 #include <vector>
 #include <string>
 #include <map>
+#include <set>
 
 class Bridge;
 


@@ 258,6 259,11 @@ private:
    */
   std::vector<std::string> chanmodes;
   /**
+   * See http://www.irc.org/tech_docs/draft-brocklesby-irc-isupport-03.txt
+   * section 3.5
+   */
+  std::set<char> chantypes;
+  /**
    * Each motd line received is appended to this string, which we send when
    * the motd is completely received
    */