fsylvain/Risitas_BOT
1
0
Fork 0
mirror of https://github.com/Floriansylvain/Risitas_BOT.git synced 2026-08-19 11:43:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

🎨 - Massive code cleaning

Browse Source
This commit is contained in:
Florian Sylvain
2021-04-01 23:15:43 +02:00
parent 37115cb362
commit 53ccad4f1e
9 changed files with 102 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ext/cmd_lol.py
+29 -30
View File
@@ -1,11 +1,10 @@
import discord
import asyncio
from discord.ext import commands
from discord.ext.commands.cooldowns import BucketType
from api_riot import rank_track, what_player, last_match
CD_LOLRANK = 0
class LolCmds(commands.Cog, name='League of Legend commands'):
def __init__(self, bot):
self.bot = bot
@@ -17,58 +16,58 @@ class LolCmds(commands.Cog, name='League of Legend commands'):
if player != 0:
ranks = rank_track(player)
embed = discord.Embed(title=invocator_name, url='https://bit.ly/3biTekM')
embed.set_thumbnail(url='http://ddragon.leagueoflegends.com/cdn/11.2.1/img/profileicon/' + str(
player['profileIconId']) + '.png')
embed.set_thumbnail(url='http://ddragon.leagueoflegends.com/cdn/11.2.1/img/profileicon/' +
str(player['profileIconId']) + '.png')
embed.set_author(name='League Of Legend - Rank', url='https://euw.leagueoflegends.com/en-gb/',
icon_url='https://static.wikia.nocookie.net/leagueoflegends/images/0/07/' +
'League_of_Legends_icon.png/revision/latest?cb=20191018194326')
icon_url='https://static.wikia.nocookie.net/leagueoflegends/images/0/07/' +
'League_of_Legends_icon.png/revision/latest?cb=20191018194326')
if isinstance(ranks, list):
for rank_s in ranks:
embed.add_field(name=rank_s[0], value=str(rank_s[1]) + ' ' + str(rank_s[2]) + ' ' + str(
rank_s[3]) + ' LP' + '\n' + str(rank_s[4]) + 'W/' + str(rank_s[5]) + 'L', inline=False)
embed.add_field(name=rank_s[0], value=str(rank_s[1]) + ' ' +
str(rank_s[2]) + ' ' + str(rank_s[3]) + ' LP\n' +
str(rank_s[4]) + 'W/' + str(rank_s[5]) +
'L', inline=False)
else:
embed.description = ranks
await ctx.send(embed=embed)
else:
await ctx.send('The username you entered is unknown.')
@commands.command(ignore_extra=False)
@commands.cooldown(1, 2, commands.BucketType.user)
async def lol_lastgame(self, ctx, invocator_name):
player = what_player(invocator_name)
if player != 0:
lst = last_match(player)
lst_p = lst[0]
maximum = lst_p[0][1]
for stat in lst_p:
maximum = lst[0][0][1]
for stat in lst[0]:
if stat[1] > maximum:
maximum = stat[1]
tab, players, kda = [], [], []
for stat in lst_p:
for stat in lst[0]:
pourcent = round(100*stat[1]/maximum)
equals = int(round(float(pourcent)/3.3))
hyphen = 30 - equals
tab.append('[' + '='*equals + ' '*hyphen +']\n')
tab.append('[' + '=' * equals + ' ' * (30 - equals) + ']\n')
players.append(stat[0][:15] + '\n')
kda.append(str(stat[2]) + '/' + str(stat[3]) + '/' + str(stat[4]) + '\n')
embed = discord.Embed(title=invocator_name, url='https://bit.ly/3biTekM',
description='Date: ' + lst[2] + '\nLength: ' + lst[3])
embed = discord.Embed(title=invocator_name, url='https://bit.ly/3biTekM',
description='Date: ' + lst[2] + '\nLength: ' + lst[3])
embed.set_author(name='League Of Legend - Last Game', url='https://euw.leagueoflegends.com/en-gb/',
icon_url='https://static.wikia.nocookie.net/leagueoflegends/images/0/07/' +
'League_of_Legends_icon.png/revision/latest?cb=20191018194326')
icon_url='https://static.wikia.nocookie.net/leagueoflegends/images/0/07/' +
'League_of_Legends_icon.png/revision/latest?cb=20191018194326')
await ctx.send(embed=embed)
for i in range(0, -2, -1):
embed = discord.Embed(title='Team 1' if not i else 'Team 2', colour=
discord.Colour.green() if lst[1][0][i] == 'Win' else discord.Colour.red(), description=
(':drop_of_blood: First blood\n' if len(lst[1][1]) != 0 and lst[1][1][i] else '') +
(':tokyo_tower: First tower\n' if len(lst[1][2]) != 0 and lst[1][2][i] else '') +
(':dragon_face: First dragon\n' if len(lst[1][3]) != 0 and lst[1][3][i] else ''))
embed.add_field(name='Players',
value='```\n' + ''.join(players[:5] if not i else players[5:]) + '```')
embed.add_field(name='Total damage dealt to champions',
value='```\n' + ''.join(tab[:5] if not i else tab[5:]) + '```')
embed.add_field(name='K / D / A',
value='```\n' + ''.join(kda[:5] if not i else kda[5:]) + '```')
embed = discord.Embed(title='Team 1' if not i else 'Team 2',
colour=discord.Colour.green() if lst[1][0][i] == 'Win' else discord.Colour.red(),
description=(':drop_of_blood: First blood\n' if len(lst[1][1]) != 0 and lst[1][1][i] else '') +
(':tokyo_tower: First tower\n' if len(lst[1][2]) != 0 and lst[1][2][i] else '') +
(':dragon_face: First dragon\n' if len(lst[1][3]) != 0 and lst[1][3][i] else ''))
embed.add_field(name='Players',
value='```\n' + ''.join(players[:5] if not i else players[5:]) + '```')
embed.add_field(name='Total damage dealt to champions',
value='```\n' + ''.join(tab[:5] if not i else tab[5:]) + '```')
embed.add_field(name='K / D / A',
value='```\n' + ''.join(kda[:5] if not i else kda[5:]) + '```')
await ctx.send(embed=embed)
else:
await ctx.send('The username you entered is unknown.')
python/ext/cmd_osu.py
+20 -17
View File
@@ -1,7 +1,8 @@
import discord
import asyncio
from discord.ext import commands
from api_osu import *
from api_osu import (ask_osu_profile,
ask_osu_last_game,
ask_osu_acc)
class OsuCmds(commands.Cog, name='Osu! commands'):
@@ -16,35 +17,36 @@ class OsuCmds(commands.Cog, name='Osu! commands'):
else:
embed = discord.Embed(title=username, url='https://osu.ppy.sh/users/' + str(lst[0]))
embed.set_author(name='Osu! - Profile', url='https://osu.ppy.sh/home',
icon_url=r'https://upload.wikimedia.org/wikipedia/commons/4/44/Osu%21Logo_%282019%29.png')
icon_url=r'https://upload.wikimedia.org/wikipedia/commons/4/44/Osu%21Logo_%282019%29.png')
embed.set_thumbnail(url='https://a.ppy.sh/' + str(lst[0]))
embed.add_field(name='Global Ranking', value='#'+str('{:,}'.format(lst[8])))
embed.add_field(name='Total Play Time', value=
str("%.0f" % ((lst[6] % (86400 * 30)) / 86400))+'d '+
str("%.0f" % ((lst[6] % 86400) / 3600))+'h '+
str("%.0f" % ((lst[6] % 3600) / 60))+'m ')
embed.add_field(name='Total Play Time',
value=str("%.0f" % ((lst[6] % (86400 * 30)) / 86400)) + 'd ' +
str("%.0f" % ((lst[6] % 86400) / 3600)) + 'h ' +
str("%.0f" % ((lst[6] % 3600) / 60)) + 'm ')
embed.add_field(name='|', value='|')
embed.add_field(name='Level', value=str("%.0f" % lst[7]))
embed.add_field(name='Ranked Score', value=str('{:,}'.format(lst[1])))
embed.add_field(name='Hit Accuracy', value=str("%.2f" % lst[2])+'%')
embed.add_field(name='Hit Accuracy', value=str("%.2f" % lst[2]) + '%')
embed.add_field(name='Play Count', value=str('{:,}'.format(lst[3])))
embed.add_field(name='Total Score', value=str('{:,}'.format(lst[4])))
embed.add_field(name='Total Hits', value=str('{:,}'.format(lst[5])))
await ctx.send(embed=embed)
@commands.command(ignore_extra=False)
async def osu_lastgame(self, ctx, username):
lst = await ask_osu_last_game(username)
if lst == 1:
await ctx.send('The player you entered is unknown or didn\'t played any game recently.')
else:
embed = discord.Embed(title=str(lst[1]) + ' by ' + str(lst[2]), url='https://osu.ppy.sh/beatmapsets/' + str(lst[0]),
description='BPM: ' + str("%.0f" % lst[3]) + ' ; Stars: ' + str("%.1f" % lst[4]) +
' ; CS: ' + str(lst[5]) + ' ; AR: ' + str(lst[7]) +
' ; OD: ' + str(lst[6]) + ' ; HP: ' + str(lst[8]))
embed = discord.Embed(title=str(lst[1]) + ' by ' + str(lst[2]),
url='https://osu.ppy.sh/beatmapsets/' + str(lst[0]),
description='BPM: ' + str("%.0f" % lst[3]) +
' ; Stars: ' + str("%.1f" % lst[4]) +
' ; CS: ' + str(lst[5]) + ' ; AR: ' + str(lst[7]) +
' ; OD: ' + str(lst[6]) + ' ; HP: ' + str(lst[8]))
embed.set_author(name='Osu! - Last game', url='https://osu.ppy.sh/home',
icon_url=r'https://upload.wikimedia.org/wikipedia/commons/4/44/Osu%21Logo_%282019%29.png')
icon_url=r'https://upload.wikimedia.org/wikipedia/commons/4/44/Osu%21Logo_%282019%29.png')
embed.set_thumbnail(url='https://b.ppy.sh/thumb/' + str(lst[0]) + 'l.jpg')
embed.add_field(name='Rank', value=str(lst[11]))
embed.add_field(name='Score', value=str('{:,}'.format(lst[9])))
@@ -52,7 +54,8 @@ class OsuCmds(commands.Cog, name='Osu! commands'):
embed.add_field(name='300', value=str(lst[12]))
embed.add_field(name='Geki', value=str(lst[17]))
embed.add_field(name='Accuracy',
value=str("%.2f" % (((lst[12]*300)+(lst[13]*100)+(lst[14]*50))/(sum(lst[12:16])*300)*100) + '%'))
value=str("%.2f" % (((lst[12]*300) + (lst[13]*100) + (lst[14]*50)) /
(sum(lst[12:16]) * 300) * 100) + '%'))
embed.add_field(name='100', value=str(lst[13]))
embed.add_field(name='Katu', value=str(lst[16]))
embed.add_field(name='Player :', value=str(username))
@@ -61,13 +64,13 @@ class OsuCmds(commands.Cog, name='Osu! commands'):
embed.add_field(name='|', value='|')
await ctx.send(embed=embed)
@commands.command(ignore_extra=False)
async def osu_acc(self, ctx, username):
test_acc = await ask_osu_acc(username)
if test_acc:
embed = discord.Embed()
embed.set_author(name='Osu! - Accuracy', icon_url=r'https://upload.wikimedia.org/wikipedia/commons/4/44/Osu%21Logo_%282019%29.png')
embed.set_author(name='Osu! - Accuracy',
icon_url=r'https://upload.wikimedia.org/wikipedia/commons/4/44/Osu%21Logo_%282019%29.png')
embed.set_image(url="attachment://acc.jpeg")
await ctx.send(embed=embed, file=discord.File('acc.jpeg'))
else:
python/ext/cmd_other.py
+2 -3
View File
@@ -1,7 +1,6 @@
import discord
import asyncio
import discord
from discord.ext import commands
from discord.ext.commands.cooldowns import BucketType
class OtherCmds(commands.Cog, name='Other commands'):
@@ -10,7 +9,7 @@ class OtherCmds(commands.Cog, name='Other commands'):
@commands.command(ignore_extra=False)
@commands.cooldown(1, 2, commands.BucketType.guild)
async def issou(self, ctx, username: discord.User = None):
async def issou(self, ctx, username: discord.User=None):
if username is not None:
user = username
else:
python/ext/cmd_owner.py
+6 -9
View File
@@ -1,9 +1,8 @@
from discord.ext import commands
from datetime import datetime
from __main__ import startup_date
import os, sys
import os
import sys
import discord
import asyncio
from discord.ext import commands
from __main__ import startup_date
class OwnerCmds(commands.Cog, name='Owner commands'):
@@ -16,7 +15,6 @@ class OwnerCmds(commands.Cog, name='Owner commands'):
self.bot.load_extension('ext.' + extension)
await ctx.send("Extension loaded.")
@commands.command(hidden=True, ignore_extra=False)
@commands.is_owner()
async def unloadext(self, ctx, extension):
@@ -29,14 +27,13 @@ class OwnerCmds(commands.Cog, name='Owner commands'):
result = str(os.popen('git pull').read())
await ctx.send('``' + result + '``')
if 'Already up to date' not in result:
os.execl(sys.executable, os.path.abspath(__file__), *sys.argv)
os.execl(sys.executable, os.path.abspath(__file__), *sys.argv)
@commands.command(hidden=True)
@commands.is_owner()
async def getlogs(self, ctx):
await ctx.send('Logs since ' + startup_date.strftime("``[%d-%m-%y | %H:%M:%S]``"),
file=discord.File('logs.txt'))
file=discord.File('logs.txt'))
def setup(bot):
python/ext/cmd_twitch.py
+2 -3
View File
@@ -1,16 +1,16 @@
import discord
import asyncio
import socket
import re
import discord
from private import ID_TWITCH, TOKEN_TWITCH, SERVER, PORT, NICKNAME
from discord.ext import tasks, commands
from discord.ext.commands.cooldowns import BucketType
from emoji import demojize
from twitch import TwitchClient
twitch_client = TwitchClient(client_id=ID_TWITCH, oauth_token=TOKEN_TWITCH)
chats = dict()
def check_user(name):
user = twitch_client.users.translate_usernames_to_ids([name])
if not user:
@@ -94,7 +94,6 @@ class TwitchCmds(commands.Cog, name='Twitch commands'):
else:
await ctx.send('```This twitch channel doesn\'t seems to exist.```')
@commands.command()
async def chat_stop(self, ctx):
try: