fix giving rep to yourself via different nick with same account

thanks to findus for discovering this :D

bert.py

@@ -38,10 +38,8 @@ y = "\x038"
 r = "\x034"
 g = "\x033"
 
-context = ssl.create_default_context()
-with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as sock:
-    irc = context.wrap_socket(sock, server_hostname=host)
-
+# global variable for the socket, see connect()
+irc = None
 
 # Currency API
 def get_exchange():
@@ -71,11 +69,11 @@ def safeexit():
 
 
 def connect(host, port):
+   global irc
    print("Connecting to "+host+":"+str(port))
-   try:
-      irc.connect((host, port))
-   except Exception as err:
-      print("Connection failed! "+str(err))
+   context = ssl.create_default_context()
+   with socket.create_connection((host, port), timeout=180) as sock:
+       irc = context.wrap_socket(sock, server_hostname=host)
 
 
 def sendRaw(data):
@@ -84,26 +82,17 @@ def sendRaw(data):
 
 def register(nick, host):
    print("Registering User...")
-   try:
-      sendRaw("USER "+nick+" "+host+" "+nick+" "+nick+"\n")
-   except Exception as err:
-      print("Failed! "+str(err))
+   sendRaw("USER "+nick+" "+host+" "+nick+" "+nick+"\n")
 
 
 def name(nick):
    print("Setting Nickname to "+nick)
-   try:
-      sendRaw("NICK "+nick+"\n")
-   except Exception as err:
-      print("Failed! "+str(err))
+   sendRaw("NICK "+nick+"\n")
 
 
 def auth(nick, password):
    print("Authenticating...")
-   try:
-      sendRaw("PRIVMSG NickServ :IDENTIFY "+nick+" "+password+"\n")
-   except Exception as err:
-      print(err)
+   sendRaw("PRIVMSG NickServ :IDENTIFY "+nick+" "+password+"\n")
 
 
 def join(chan):
@@ -116,10 +105,7 @@ def join(chan):
 
 def mode(nick):
    print("Setting modes +B-x")
-   try:
-      sendRaw("MODE "+nick+" +B-x\n")
-   except Exception as err:
-      print("Failed! "+str(err))
+   sendRaw("MODE "+nick+" +B-x\n")
 
 
 def part(chan):
@@ -154,7 +140,14 @@ def me(chan, msg):
 
 
 def getData():
-   raw = irc.recv(4096)
+   try:
+      raw = irc.recv(4096)
+   except TimeoutError:
+      print("Connection timed out!")
+      sys.exit(0)
+   if not raw:
+      print("Connection lost!")
+      sys.exit(0)
    try:
       data = raw.decode("UTF-8")
    except:
@@ -187,7 +180,7 @@ def is_registered(username):
    try:
       sendRaw("WHOIS "+str(username)+"\n")
       user_info = getMessage()
-      regex = r"330 "+str(re.escape(nick))+" "+str(re.escape(username))+" \S+ :is logged in as"
+      regex = rf"330 {str(re.escape(nick))} {str(re.escape(username))} \S+ :is logged in as"
       matches = re.finditer(regex, user_info, re.MULTILINE)
       for match in matches:
          acc_name = match.group(0).split()[3]
@@ -254,22 +247,19 @@ def ping(msg):
 
 
 def start(host, port, nick, password, chans):
-   try:
-      connect(host, port)
-      sleep(2)
-      register(nick, host)
-      sleep(2)
-      name(nick)
-      sleep(6)
-      auth(nick, password)
-      sleep(2)
-      mode(nick)
-      sleep(2)
-      for chan in chans:
-         join(chan)
-      sleep(2)
-   except Exception as err:
-      print("FAIL: "+str(err))
+   connect(host, port)
+   sleep(2)
+   register(nick, host)
+   sleep(2)
+   name(nick)
+   sleep(6)
+   auth(nick, password)
+   sleep(2)
+   mode(nick)
+   sleep(2)
+   for chan in chans:
+      join(chan)
+   sleep(2)
 
 
 def command_loop():
@@ -375,14 +365,14 @@ def command_loop():
                   except:
                      reason = "None"
                      print("with no reason")
-                  if user == ircnick:
-                     say(channel, "You can't give rep to yourself. Selfish little prick!")
-                     continue
                   try:
                      acc_name = is_registered(user)
                      give_acc = is_registered(ircnick)
                      print("found account name for "+str(user)+": "+str(acc_name))
                      if acc_name != None and give_acc != None:
+                        if acc_name == give_acc:
+                           say(channel, "You can't give rep to yourself. Selfish little prick!")
+                           continue
                         give_rep(acc_name, user, give_acc, reason, channel)
                      elif give_acc == None:
                         say(channel, "You are not registered!")
@@ -509,7 +499,11 @@ class fefe_thread(threading.Thread):
       fefe_check()
 
 def main():
-   start(host, port, nick, password, set(join_chans + fefe_chans))
+   try:
+      start(host, port, nick, password, set(join_chans + fefe_chans))
+   except Exception as err:
+      print("FAIL: "+str(err))
+      sys.exit(1)
    thread_command = command_thread(1)
    #thread_fefe = fefe_thread(2)
    thread_command.start()