Add isupport checking to check_networks.py, fix irccloud teams check

Author: DanielOaks

_data/checknetworks.py

@@ -41,8 +41,9 @@
 
 class IRCv3Connection:
     """Connects to an IRC server at the given address."""
-    def __init__(self, hostname, nick, username, realname, ipv6=False, debug=False):
+    def __init__(self, hostname, nick, username, realname, ipv6=False, debug=False, exit_early=False):
         self.debug = debug
+        self.exit_early = exit_early
         self._data = b''
 
         if ipv6:
@@ -61,6 +62,8 @@ def __init__(self, hostname, nick, username, realname, ipv6=False, debug=False):
         self.send('CAP LS 302')
         self.send('NICK {}'.format(nick))
         self.send('USER {} 0 * :{}'.format(username, realname))
+        if exit_early:
+            self.send('QUIT')
         self.send('CAP END')
 
         # events setup
@@ -74,7 +77,7 @@ def __init__(self, hostname, nick, username, realname, ipv6=False, debug=False):
         # basic data
         self.caps = {}
         self.isupport = {}
-    
+
     def loop(self):
         """Start connection loop."""
         try:
@@ -142,38 +145,60 @@ def on_connected(self, msg):
 def check_net(versions, info):
     print("Connecting to:", info['name'])
     hostname = info['net-address']['display']
+    exit_early = info['net-address'].get('exit-early', False)
 
     supported = {}
 
-    irc = IRCv3Connection(hostname, nick, username, realname, debug=False)
+    irc = IRCv3Connection(hostname, nick, username, realname, debug=False, exit_early=exit_early)
     irc.loop()
 
-    supported['features'] = irc.isupport.keys()
+    supported['isupport'] = irc.isupport.keys()
     supported['caps'] = irc.caps.keys()
 
-    # generate cap lists
+    # generate cap and isupport lists
     all_caps = []
+    all_isupport = []
     for ver in versions:
         for spec in versions[ver]['specs']:
             all_caps.extend(versions[ver]['specs'][spec].get('caps', []))
-
-    claimed_supported = []
-    for ver in info['support']:
-        for spec in info['support'][ver]:
-            claimed_supported.extend(versions[ver]['specs'][spec].get('caps', []))
-
-    claimed_unsupported = []
+            all_isupport.extend(versions[ver]['specs'][spec].get('isupport', []))
+
+    claimed_supported_caps = []
+    claimed_supported_isupport = []
+    for suptype in ['support', 'partial']:
+        if suptype not in info:
+            continue
+        for ver in info[suptype]:
+            for spec in info[suptype][ver]:
+                claimed_supported_caps.extend(versions[ver]['specs'][spec].get('caps', []))
+                claimed_supported_isupport.extend(versions[ver]['specs'][spec].get('isupport', []))
+
+    claimed_unsupported_caps = []
+    claimed_unsupported_isupport = []
     for cap in all_caps:
-        if cap not in claimed_supported:
-            claimed_unsupported.append(cap)
+        if cap not in claimed_supported_caps:
+            claimed_unsupported_caps.append(cap)
+    for key in all_isupport:
+        if key not in claimed_supported_isupport:
+            claimed_unsupported_isupport.append(key)
 
     # and check them
-    for cap in claimed_supported:
+    for cap in claimed_supported_caps:
         if cap not in supported['caps']:
-            print(' *!* - ', info['name'], 'claims to support', cap, 'but does not')
-    for cap in claimed_unsupported:
+            print(' *!* - ', info['name'], 'claims to advertise cap', cap, 'but does not')
+    for cap in claimed_unsupported_caps:
         if cap in supported['caps']:
-            print(' *!* + ', info['name'], 'now also supports', cap)
+            print(' *!* + ', info['name'], 'now also sadvertise cap', cap)
+    if exit_early:
+        # we didn't get to see isupport tokens, skip checking those
+        return
+
+    for token in claimed_supported_isupport:
+        if token not in supported['isupport']:
+            print(' *!* - ', info['name'], 'claims to advertise isupport token', token, 'but does not')
+    for token in claimed_unsupported_isupport:
+        if token in supported['isupport']:
+            print(' *!* + ', info['name'], 'now also sadvertise isupport token', token)
 
 if __name__ == '__main__':
     arguments = docopt(__doc__, version='0.0.1')

_data/irc_versions.yml

@@ -59,6 +59,8 @@ stable:
       hide-if-no-support: true
       tags:
         - draft/bot
+      isupport:
+        - BOT
     chghost:
       name: chghost
       description: chghost Extension
@@ -106,6 +108,8 @@ stable:
       name: Monitor
       description: Monitor
       link: /specs/extensions/monitor.html
+      isupport:
+        - MONITOR
     msgid:
       name: msgid
       description: Message IDs
@@ -167,6 +171,8 @@ stable:
       link: /specs/extensions/utf8-only.html
       hide-if-no-support: true
       hide-on-servers: true
+      isupport:
+        - UTF8ONLY
     webirc:
       name: WebIRC
       description: WebIRC Extension

_data/su_networks.yml

@@ -39,6 +39,7 @@
       net-address:
         link:  ircs://team-irc.irccloud.com:6697/
         display: team-irc.irccloud.com
+        exit-early: true
       link: https://blog.irccloud.com/private-teams-servers/
       note: >
         Invite required. PM jwheare for access.

_data/validation/support_list.types.yaml

@@ -40,6 +40,6 @@ support:
         tags:
           type: listofstrings
           required: false
-        features:
+        isupport:
           type: listofstrings
           required: false

_data/validation/sw_list.types.yaml

@@ -30,6 +30,9 @@ software:
               type: string
             display:
               type: string
+            exit-early:
+              type: boolean
+              required: false
         os:
           type: listofstrings
           required: false