.BANCHO. Add IRC support, internal changes

events/logoutEvent.py

@@ -4,8 +4,9 @@ from constants import bcolors
 from constants import serverPackets
 import time
 from helpers import logHelper as log
+from helpers import chatHelper as chat
 
-def handle(userToken, _):
+def handle(userToken, _=None):
 	# get usertoken data
 	userID = userToken.userID
 	username = userToken.username
@@ -15,8 +16,9 @@ def handle(userToken, _):
 	# the old logout packet will still be in the queue and will be sent to
 	# the server, so we accept logout packets sent at least 5 seconds after login
 	# if the user logs out before 5 seconds, he will be disconnected later with timeout check
-	if int(time.time()-userToken.loginTime) >= 5:
+	if int(time.time()-userToken.loginTime) >= 5 or userToken.irc == True:
 		# Stop spectating if needed
+		# TODO: Call stopSpectatingEvent!!!!!!!!!
 		if userToken.spectating != 0:
 			# The user was spectating someone
 			spectatorHostToken = glob.tokens.getTokenFromUserID(userToken.spectating)
@@ -26,13 +28,17 @@ def handle(userToken, _):
 
 		# Part all joined channels
 		for i in userToken.joinedChannels:
-			glob.channels.channels[i].userPart(userID)
+			chat.partChannel(token=userToken, channel=i)
 
 		# TODO: Lobby left if joined
 
 		# Enqueue our disconnection to everyone else
 		glob.tokens.enqueueAll(serverPackets.userLogout(userID))
 
+		# Disconnect from IRC if needed
+		if userToken.irc == True and glob.irc == True:
+			glob.ircServer.forceDisconnection(userToken.username)
+
 		# Delete token
 		glob.tokens.deleteToken(requestToken)