diff --git a/bert.py b/bert.py index 4d61c18..b04d748 100755 --- a/bert.py +++ b/bert.py @@ -72,10 +72,7 @@ def safeexit(): def connect(host, port): print("Connecting to "+host+":"+str(port)) - try: - irc.connect((host, port)) - except Exception as err: - print("Connection failed! "+str(err)) + irc.connect((host, port)) def sendRaw(data): @@ -84,26 +81,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 +104,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): @@ -254,22 +239,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(): @@ -509,7 +491,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()