fix(irc): also remove _ from username for puppets (#196)

Author: TrueBrain

dibridge/irc.py

@@ -129,12 +129,12 @@ async def _pinger(self):
 
     async def _connect(self):
         while True:
-            try:
-                username = self._nickname
-                # An additional constraints usernames have over nicknames, that they are
-                # also not allowed to start with an underscore.
-                username = re.sub(r"^_+", "", username)
+            username = self._nickname
+            # An additional constraints usernames have over nicknames, that they are
+            # also not allowed to start with an underscore.
+            username = re.sub(r"^_+", "", username)
 
+            try:
                 await self.connection.connect(
                     self._host,
                     self._port,

dibridge/irc_puppet.py

@@ -1,6 +1,7 @@
 import asyncio
 import irc.client_aio
 import logging
+import re
 import socket
 
 
@@ -139,11 +140,17 @@ async def connect(self):
         local_addr = (str(self._ipv6_address), 0)
 
         while self._reconnect:
+            username = self._nickname
+            # An additional constraints usernames have over nicknames, that they are
+            # also not allowed to start with an underscore.
+            username = re.sub(r"^_+", "", username)
+
             try:
                 await self.connection.connect(
                     self._irc_host,
                     self._irc_port,
                     self._nickname,
+                    username=username,
                     # We force an IPv6 connection, as we need that for the puppet source address.
                     connect_factory=irc.connection.AioFactory(
                         family=socket.AF_INET6, local_addr=local_addr, ssl=self._irc_port == 6697