ToneAPI/Sonar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13 from ToneAPI/Development

Browse Source 
Hotfix stats + async api gets + Seperator needed in form of comma ,
This commit is contained in:
iiLarsH
2023-05-11 22:42:10 +02:00
committed by GitHub
parent d43a3017a1 28256b1884
commit e079e11eb1
1 changed files with 52 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cogs/stats.py
+52 -46
View File
@@ -1,4 +1,5 @@
from urllib import request from urllib import request
import aiohttp
import discord import discord
from discord.ext import commands from discord.ext import commands
import requests import requests
@@ -19,34 +20,31 @@ class Stats(commands.Cog):
server = "" server = ""
weaponid= "" weaponid= ""
weaponname= "" weaponname= ""
if(message == ()): if(message == ()):
await ctx.send("```No player given```") await ctx.send("```No player given```")
error = True error = True
for i in message: message = " ".join(message)
item = i.replace(",", "") message = message.split(",")
function_dict = self.message_handler(item)
if(function_dict['player'] != None):
players[item] = self.getplayerid(item)
if(function_dict['weapon'] != None):
weaponname = function_dict["weapon"][1]
weaponid= function_dict['weapon'][0]
if(function_dict['server'] != None):
servers.append(function_dict['server'])
servers.append(self.getserver("", " ".join(message))) for item in message:
item = item.strip()
if(item != ""):
function_dict = await self.message_handler(item)
if(len(servers) != 0 and len(message) != 1): if(function_dict['player'] != None):
if(len(message) == 2 and weaponid != ""): players[item] = function_dict['player']
server = ""
elif(len(servers) > 1): if(function_dict['weapon'] != None and weaponid == "" and weaponname == ""):
for i in servers: weaponname = function_dict["weapon"][1]
if(i.lower() in " ".join(message).lower()): weaponid= function_dict['weapon'][0]
server = i
break if(function_dict['server'] != None and item not in players.keys()):
else: servers.append(function_dict['server'])
server = servers[0]
if(len(servers) >= 1):
server = servers[0]
if(len(players) == 0 and error == False): if(len(players) == 0 and error == False):
error = True error = True
@@ -54,8 +52,7 @@ class Stats(commands.Cog):
list_of_stats = [] list_of_stats = []
for i in players.keys(): for i in players.keys():
if(i.lower() not in server.lower()): stats = await self.getstats(playerid=players[i],weaponid=weaponid, weaponname=weaponname, server=server)
stats = self.getstats(playerid=players[i],weaponid=weaponid, weaponname=weaponname, server=server)
list_of_stats.append(stats) list_of_stats.append(stats)
if ("".join(list_of_stats) != ""): if ("".join(list_of_stats) != ""):
@@ -68,13 +65,13 @@ class Stats(commands.Cog):
await ctx.send(f'```{botmessage}```') await ctx.send(f'```{botmessage}```')
def message_handler(self, message): async def message_handler(self, message):
player = False player = False
weapon = False weapon = False
server = False server = False
return_message = {"player": None, "weapon": None, "server": None} return_message = {"player": None, "weapon": None, "server": None}
playerid = self.getplayerid(message) playerid = await self.getplayerid(message)
if(playerid != ""): if(playerid != ""):
player = True player = True
@@ -82,7 +79,7 @@ class Stats(commands.Cog):
if(weaponid != ""): if(weaponid != ""):
weapon = True weapon = True
servername = self.getserver(message) servername = await self.getserver(message)
if(servername != ""): if(servername != ""):
server = True server = True
@@ -95,13 +92,15 @@ class Stats(commands.Cog):
return return_message return return_message
def getplayerid(self, playername): async def getplayerid(self, playername):
playerid = "" playerid = ""
payload = str("username=") + playername payload = str(f"?username={playername}")
response = requests.get('https://northstar.tf/accounts/lookup_uid', params=payload).json() async with aiohttp.ClientSession() as session:
if (response['matches'] != None): async with session.get(f'https://northstar.tf/accounts/lookup_uid{payload}') as r:
playerid = response['matches'][0] response = await r.json()
return str(playerid) if (response['matches'] != None and response['matches'] != []):
playerid = response['matches'][0]
return str(playerid)
def getweaponid(self, weaponname): def getweaponid(self, weaponname):
weapons ={ weapons ={
@@ -161,28 +160,34 @@ class Stats(commands.Cog):
return weaponid, weaponname return weaponid, weaponname
def getserver(self, snippet, fullmessage = ""): async def getserver(self, snippet):
server = "" server = ""
response = requests.get('https://tone.sleepycat.date/v2/client/servers').json() async with aiohttp.ClientSession() as session:
servers = response.keys() async with session.get('https://tone.sleepycat.date/v2/client/servers') as r:
response = await r.json()
servers = response.keys()
for i in servers: for i in servers:
if(snippet.lower() in i.lower()): if(snippet.lower() == i.lower()):
server = i
if(i.lower() in fullmessage.lower()):
server = i server = i
break break
elif(snippet.lower() in i.lower()):
server = i
return server return server
def getstats(self, playerid, weaponid = "", weaponname = "", server = ""): async def getstats(self, playerid, weaponid = "", weaponname = "", server = ""):
payload = {'player': playerid, 'weapon': weaponid, 'server': server} payload = {'player': playerid, 'weapon': weaponid, 'server': server}
response = requests.get('https://tone.sleepycat.date/v2/client/players', params=payload).json() async with aiohttp.ClientSession() as session:
if(response == {}): async with session.get('https://tone.sleepycat.date/v2/client/players', params=payload) as r:
errorresponse = requests.get("https://northstar.tf/accounts/get_username", params={"uid": playerid}).json() response = await r.json()
if(errorresponse['matches'] != None): if(response == {}):
playername = errorresponse['matches'][0] async with aiohttp.ClientSession() as errorsession:
return str("No stats found for player: " + playername) async with errorsession.get("https://northstar.tf/accounts/get_username", params={"uid": playerid}) as Er:
errorresponse = await Er.json()
if(errorresponse['matches'] != None):
playername = errorresponse['matches'][0]
return str("No stats found for player: " + playername)
killstats = response[str(playerid)] killstats = response[str(playerid)]
@@ -202,6 +207,7 @@ class Stats(commands.Cog):
return botmessage return botmessage
async def setup(client): async def setup(client):
await client.add_cog(Stats(client)) await client.add_cog(Stats(client))