diff --git a/cogs/leaderboards.py b/cogs/leaderboards.py index 9e4cf67..53b33b8 100644 --- a/cogs/leaderboards.py +++ b/cogs/leaderboards.py @@ -2,6 +2,7 @@ import discord from discord.ext import commands from data.DatabaseConnection import * from datetime import datetime, timedelta +from functions.emoji_check import * class Leaderboards(commands.Cog): def __init__(self, client): @@ -32,7 +33,7 @@ class Leaderboards(commands.Cog): quizplayersdb = QuizPlayersDB() for player in quizplayersdb.get_top_players(): discorduser = {} - discorduser["playerName"] = (await self.client.fetch_user(player["discordid"])).name + discorduser["playerName"] = deEmojify((await self.client.fetch_user(player["discordid"])).name).strip() discorduser["stat"] = player["stat"] top_players.append(discorduser) quizplayersdb.close() diff --git a/cogs/playerlink.py b/cogs/playerlink.py index 0a094d5..27e5e67 100755 --- a/cogs/playerlink.py +++ b/cogs/playerlink.py @@ -7,6 +7,7 @@ import asyncio import threading from functions.timer import Timer from data import constants +from functions.emoji_check import * import re from data.DatabaseConnection import * @@ -37,15 +38,6 @@ def get_player_uuid(minecraftname): raise PlayerError() return data_string -def deEmojify(text): - regrex_pattern = re.compile(pattern = "[" - u"\U0001F600-\U0001F64F" # emoticons - u"\U0001F300-\U0001F5FF" # symbols & pictographs - u"\U0001F680-\U0001F6FF" # transport & map symbols - u"\U0001F1E0-\U0001F1FF" # flags (iOS) - "]+", flags = re.UNICODE) - return regrex_pattern.sub(r'',text) - def send_chat(discordname, minecraftname, code): HOST = '192.168.1.214' # The server's hostname or IP address PORT = 25224 # The port used by the server diff --git a/data/DatabaseConnection.py b/data/DatabaseConnection.py index 7195ff5..1f9e20a 100755 --- a/data/DatabaseConnection.py +++ b/data/DatabaseConnection.py @@ -28,8 +28,9 @@ class DatabaseConnection: elif database == "s13_worldcraft": self.mydb = mysql.connector.connect( host="192.168.1.251", - user="u13_f2zpWZpIKY", - password="@fZQ6Uu3+U^WH1i2JNemgTC7", + user="worldcraft", + port="3308", + password="uJpa9VOW2P0bh0p1", database=database ) elif database == "s13_ecobridge": diff --git a/functions/emoji_check.py b/functions/emoji_check.py new file mode 100644 index 0000000..e3a30e2 --- /dev/null +++ b/functions/emoji_check.py @@ -0,0 +1,10 @@ +import re + +def deEmojify(text): + regrex_pattern = re.compile(pattern = "[" + u"\U0001F600-\U0001F64F" # emoticons + u"\U0001F300-\U0001F5FF" # symbols & pictographs + u"\U0001F680-\U0001F6FF" # transport & map symbols + u"\U0001F1E0-\U0001F1FF" # flags (iOS) + "]+", flags = re.UNICODE) + return regrex_pattern.sub(r'',text)