diff --git a/constants/fokabotCommands.py b/constants/fokabotCommands.py index b82fc96..90256c7 100644 --- a/constants/fokabotCommands.py +++ b/constants/fokabotCommands.py @@ -6,15 +6,10 @@ from constants import exceptions from helpers import userHelper import time from helpers import systemHelper -import re import requests import json from constants import mods from helpers import generalFunctions -import sys -import traceback -from helpers import consoleHelper -from constants import bcolors """ Commands callbacks @@ -328,7 +323,7 @@ def getPPMessage(userID): return "Error in LETS API call ({}). Please tell this to a dev.".format(data["message"]) else: raise exceptions.apiException - + # Return response in chat # Song name and mods msg = "{song}{plus}{mods} ".format(song=data["song_name"], plus="+" if token.tillerino[1] > 0 else "", mods=generalFunctions.readableMods(token.tillerino[1])) @@ -370,8 +365,7 @@ def tillerinoNp(fro, chan, message): return False # Get beatmap id from URL - p = re.compile("^https?:\\/\\/osu\\.ppy\\.sh\\/b\\/(\\d*)") - beatmapID = p.search(beatmapURL).groups(0)[0] + beatmapID = fokabot.npRegex.search(beatmapURL).groups(0)[0] # Update latest tillerino song for current token token = glob.tokens.getTokenFromUsername(fro) diff --git a/objects/fokabot.py b/objects/fokabot.py index 7a25b20..27754f7 100644 --- a/objects/fokabot.py +++ b/objects/fokabot.py @@ -4,6 +4,10 @@ from objects import glob from constants import actions from constants import serverPackets from constants import fokabotCommands +import re + +# Tillerino np regex, compiled only once to increase performance +npRegex = re.compile("^https?:\\/\\/osu\\.ppy\\.sh\\/b\\/(\\d*)") def connect(): """Add FokaBot to connected users and send userpanel/stats packet to everyone"""