diff --git a/common b/common index e30a9a5..ab26c07 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit e30a9a5ddd07ca7fd2e4d92d695f2b1a5374d069 +Subproject commit ab26c073a72cf73330a145a76e4df7b2fc22ee04 diff --git a/constants/serverPackets.py b/constants/serverPackets.py index 07d27e9..69e000c 100644 --- a/constants/serverPackets.py +++ b/constants/serverPackets.py @@ -140,7 +140,7 @@ def userStats(userID, force = False): [userToken.playcount, dataTypes.UINT32], [userToken.totalScore, dataTypes.UINT64], [userToken.gameRank, dataTypes.UINT32], - [userToken.pp if userToken.pp <= 65535 and userToken.pp > 0 else 0, dataTypes.UINT16] + [userToken.pp if 65535 >= userToken.pp > 0 else 0, dataTypes.UINT16] ]) diff --git a/helpers/discordBotHelper.py b/helpers/discordBotHelper.py deleted file mode 100644 index fa3ca0f..0000000 --- a/helpers/discordBotHelper.py +++ /dev/null @@ -1,62 +0,0 @@ -import requests -from objects import glob -from urllib.parse import urlencode - -def sendDiscordMessage(channel, message, alertDev = False, prefix = "**pep.py**"): - """ - Send a message to a discord server. - This is used with ripple's schiavobot. - - channel -- bunk, staff or general - message -- message to send - alertDev -- if True, hl developers group - prefix -- string to prepend to message - """ - if glob.discord: - for _ in range(0,20): - try: - finalMsg = "{prefix} {message}".format(prefix=prefix, message=message) if alertDev == False else "{prefix} {hl} - {message}".format(prefix=prefix, hl=glob.conf.config["discord"]["devgroup"], message=message) - requests.get("{}/{}?{}".format(glob.conf.config["discord"]["boturl"], channel, urlencode({ "message": finalMsg }))) - break - except: - continue - -def sendConfidential(message, alertDev = False): - """ - Send a message to #bunker - - message -- message to send - """ - sendDiscordMessage("bunk", message, alertDev) - -def sendStaff(message): - """ - Send a message to #staff - - message -- message to send - """ - sendDiscordMessage("staff", message) - -def sendGeneral(message): - """ - Send a message to #general - - message -- message to send - """ - sendDiscordMessage("general", message) - -def sendChatlog(message): - """ - Send a message to #chatlog - - message -- message to send - """ - sendDiscordMessage("chatlog", message, prefix="") - -def sendCM(message): - """ - Send a message to #communitymanagers - - message -- message to send - """ - sendDiscordMessage("cm", message) diff --git a/irc/ircserver.py b/irc/ircserver.py index ada0f3d..6d7b565 100644 --- a/irc/ircserver.py +++ b/irc/ircserver.py @@ -146,7 +146,7 @@ class Client: quitmsg = "EOT" except socket.error as x: # Error while reading data, this client will be disconnected - data = "" + data = bytes() quitmsg = x if data: @@ -204,7 +204,7 @@ class Client: log.debug("[IRC] [{}:{}] <- {}".format(self.ip, self.port, self.__writebuffer[:sent])) self.__writebuffer = self.__writebuffer[sent:] except socket.error as x: - self.disconnect(x) + self.disconnect(str(x)) def checkAlive(self): diff --git a/objects/glob.py b/objects/glob.py index 4ae1e10..6788feb 100644 --- a/objects/glob.py +++ b/objects/glob.py @@ -36,6 +36,7 @@ cloudflare = False chatFilters = None userIDCache = {} pool = None +ircServer = None busyThreads = 0 debug = False diff --git a/objects/stream.py b/objects/stream.py index d1145c5..4fca536 100644 --- a/objects/stream.py +++ b/objects/stream.py @@ -1,4 +1,4 @@ -class stream(): +class stream: def __init__(self, name): """ Initialize a stream object diff --git a/objects/streamList.py b/objects/streamList.py index 3cf5ab7..85e1258 100644 --- a/objects/streamList.py +++ b/objects/streamList.py @@ -1,6 +1,6 @@ from objects import stream -class streamList(): +class streamList: def __init__(self): self.streams = {}