.BANCHO. .FIX. Fix mod rank login error, add exception output at login, add some modules

cantSpectateEvent.py

@@ -1,7 +1,7 @@
 import glob
 import serverPackets
-import consoleHelper
-import bcolors
+from helpers import consoleHelper
+from constants import bcolors
 import exceptions
 
 def handle(userToken, packetData):

changeActionEvent.py

@@ -1,7 +1,7 @@
 import glob
 import clientPackets
 import serverPackets
-import actions
+from constants import actions
 import userHelper
 
 def handle(userToken, packetData):

changeMatchModsEvent.py

@@ -1,7 +1,7 @@
 import glob
 import clientPackets
 import matchModModes
-import mods
+from constants import mods
 
 def handle(userToken, packetData):
 	# Get token data

changeMatchSettingsEvent.py

@@ -1,8 +1,8 @@
 import glob
 import clientPackets
 import matchModModes
-import consoleHelper
-import bcolors
+from helpers import consoleHelper
+from constants import bcolors
 import random
 import matchTeamTypes
 import matchTeams

changeSlotEvent.py

@@ -1,7 +1,7 @@
 import clientPackets
 import glob
-import consoleHelper
-import bcolors
+from helpers import consoleHelper
+from constants import bcolors
 
 def handle(userToken, packetData):
 	# Get usertoken data

channelJoinEvent.py

@@ -3,8 +3,8 @@ Event called when someone joins a channel
 """
 
 import clientPackets
-import consoleHelper
-import bcolors
+from helpers import consoleHelper
+from constants import bcolors
 import serverPackets
 import glob
 import exceptions

channelPartEvent.py

@@ -2,8 +2,8 @@
 Event called when someone parts a channel
 """
 
-import consoleHelper
-import bcolors
+from helpers import consoleHelper
+from constants import bcolors
 import glob
 import clientPackets
 import serverPackets

createMatchEvent.py

@@ -1,8 +1,8 @@
 import serverPackets
 import clientPackets
 import glob
-import consoleHelper
-import bcolors
+from helpers import consoleHelper
+from constants import bcolors
 import joinMatchEvent
 import exceptions
 

databaseHelper.py

@@ -1,6 +1,6 @@
 import pymysql
-import bcolors
-import consoleHelper
+from constants import bcolors
+from helpers import consoleHelper
 import threading
 import glob
 

fokabot.py

@@ -1,7 +1,7 @@
 """FokaBot related functions"""
 import userHelper
 import glob
-import actions
+from constants import actions
 import serverPackets
 import fokabotCommands
 

helpers/consoleHelper.py

@@ -1,6 +1,6 @@
 """Some console related functions"""
 
-import bcolors
+from constants import bcolors
 import glob
 
 def printServerStartHeader(asciiArt):

joinLobbyEvent.py

@@ -1,7 +1,7 @@
 import serverPackets
 import glob
-import consoleHelper
-import bcolors
+from helpers import consoleHelper
+from constants import bcolors
 
 def handle(userToken, _):
 	# Get userToken data

joinMatchEvent.py

@@ -1,8 +1,8 @@
 import clientPackets
 import serverPackets
 import glob
-import consoleHelper
-import bcolors
+from helpers import consoleHelper
+from constants import bcolors
 import exceptions
 
 def handle(userToken, packetData):

locationHelper.py

@@ -1,8 +1,8 @@
 import urllib.request
 import json
 
-import consoleHelper
-import bcolors
+from helpers import consoleHelper
+from constants import bcolors
 
 # API URL
 URL = "http://ip.zxq.co/"

loginEvent.py

@@ -2,13 +2,15 @@ import userHelper
 import serverPackets
 import exceptions
 import glob
-import consoleHelper
-import bcolors
+from helpers import consoleHelper
+from constants import bcolors
 import locationHelper
 import countryHelper
 import time
 import generalFunctions
 import channelJoinEvent
+import sys
+import traceback
 
 def handle(flaskRequest):
 	# Data to return
@@ -123,7 +125,7 @@ def handle(flaskRequest):
 		responseToken.enqueue(serverPackets.onlineUsers())
 
 		# Get location and country from ip.zxq.co or database
-		if generalFunctions.stringToBool(glob.conf.config["server"]["localizeusers"]):			
+		if generalFunctions.stringToBool(glob.conf.config["server"]["localizeusers"]):
 			# Get location and country from IP
 			location = locationHelper.getLocation(requestIP)
 			countryLetters = locationHelper.getCountry(requestIP)
@@ -170,6 +172,10 @@ def handle(flaskRequest):
 		# Bancho is restarting
 		responseData += serverPackets.notification("Bancho is restarting. Try again in a few minutes.")
 		responseData += serverPackets.loginError()
+	except:
+		# Unknown exception
+		msg = "UNKNOWN ERROR IN LOGIN!!!\n{}\n{}".format(sys.exc_info(), traceback.format_exc())
+		consoleHelper.printColored("[!] {}".format(msg), bcolors.RED)
 	finally:
 		# Print login failed message to console if needed
 		if err == True:

logoutEvent.py

@@ -1,6 +1,6 @@
 import glob
-import consoleHelper
-import bcolors
+from helpers import consoleHelper
+from constants import bcolors
 import serverPackets
 import time
 

match.py

@@ -5,8 +5,8 @@ import matchTeamTypes
 import matchModModes
 import slotStatuses
 import glob
-import consoleHelper
-import bcolors
+from helpers import consoleHelper
+from constants import bcolors
 import serverPackets
 import dataTypes
 import matchTeams

osuToken.py

@@ -1,10 +1,10 @@
 import uuid
-import actions
+from constants import actions
 import gameModes
 import userHelper
 import time
-import consoleHelper
-import bcolors
+from helpers import consoleHelper
+from constants import bcolors
 import serverPackets
 import logoutEvent
 

partLobbyEvent.py

@@ -1,7 +1,7 @@
 import glob
 import channelPartEvent
-import consoleHelper
-import bcolors
+from helpers import consoleHelper
+from constants import bcolors
 
 def handle(userToken, _):
 	# Get usertoken data

pep.py

@@ -10,7 +10,7 @@ from tornado.httpserver import HTTPServer
 from tornado.ioloop import IOLoop
 
 # pep.py files
-import bcolors
+from constants import bcolors
 import packetIDs
 import serverPackets
 import config
@@ -58,7 +58,7 @@ import matchChangeTeamEvent
 
 # pep.py helpers
 import packetHelper
-import consoleHelper
+from helpers import consoleHelper
 import databaseHelper
 import responseHelper
 import generalFunctions

sendPrivateMessageEvent.py

@@ -1,5 +1,5 @@
-import consoleHelper
-import bcolors
+from helpers import consoleHelper
+from constants import bcolors
 import clientPackets
 import serverPackets
 import glob

sendPublicMessageEvent.py

@@ -2,8 +2,8 @@ import exceptions
 import clientPackets
 import glob
 import fokabot
-import consoleHelper
-import bcolors
+from helpers import consoleHelper
+from constants import bcolors
 import serverPackets
 
 def handle(userToken, packetData):

serverPackets.py

@@ -103,7 +103,7 @@ def userPanel(userID):
 	elif rank == 4:
 		userRank = userRanks.ADMIN
 	elif rank == 3:
-		userRank = userRank.MOD
+		userRank = userRanks.MOD
 	elif rank == 2:
 		userRank = userRanks.SUPPORTER
 	else:

spectateFramesEvent.py

@@ -1,6 +1,6 @@
 import glob
-import consoleHelper
-import bcolors
+from helpers import consoleHelper
+from constants import bcolors
 import serverPackets
 import exceptions
 

startSpectatingEvent.py

@@ -1,5 +1,5 @@
-import consoleHelper
-import bcolors
+from helpers import consoleHelper
+from constants import bcolors
 import clientPackets
 import serverPackets
 import exceptions

stopSpectatingEvent.py

@@ -1,5 +1,5 @@
-import consoleHelper
-import bcolors
+from helpers import consoleHelper
+from constants import bcolors
 import glob
 import serverPackets
 import exceptions

systemHelper.py

@@ -4,8 +4,8 @@ import psutil
 import os
 import sys
 
-import consoleHelper
-import bcolors
+from helpers import consoleHelper
+from constants import bcolors
 import threading
 import signal