From 951784718b6f2732786291320a362a169b3e9015 Mon Sep 17 00:00:00 2001 From: Romain Date: Mon, 24 Aug 2020 21:08:55 +0200 Subject: [PATCH] update (cogs.basics>ping): optimisation Remove unused parts --- cogs/basics.py | 139 ++++++++++++++++++++++++------------------------- 1 file changed, 68 insertions(+), 71 deletions(-) diff --git a/cogs/basics.py b/cogs/basics.py index 2534219..08465e9 100755 --- a/cogs/basics.py +++ b/cogs/basics.py @@ -1,71 +1,68 @@ -import platform -import socket -import subprocess - -import discord -from discord.ext import commands -from discord.http import Route - - -class Basics(commands.Cog): - """Commandes générales.""" - - def __init__(self, bot): - self.bot = bot - - @commands.command() - async def ping(self, ctx): - ping_res = str(subprocess.Popen(["/bin/ping", "-c1", "discord.com"], - stdout=subprocess.PIPE).stdout.read()) - formated_res = [item for item in ping_res.split() if 'time=' in item] - result = self.bot.latency * 1000 # str(formated_res[0])[5:] - - if float(result) >= 200: - em = discord.Embed(title="Ping : " + str(result) + "ms", - description="... c'est quoi ce ping !", - colour=0xFF1111) - await ctx.send(embed=em) - elif float(result) > 100 < 200: - em = discord.Embed(title="Ping : " + str(result) + "ms", - description="Ca va, ça peut aller, mais j'ai " - "l'impression d'avoir 40 ans !", - colour=0xFFA500) - await ctx.send(embed=em) - else: - em = discord.Embed(title="Ping : " + str(result) + "ms", - description="Wow c'te vitesse de réaction, " - "je m'épate moi-même !", - colour=0x11FF11) - await ctx.send(embed=em) - - """---------------------------------------------------------------------""" - - @commands.command() - async def info(self, ctx): - """Affiches des informations sur le bot""" - text = open('texts/info.md').read() - os_info = str(platform.system()) + " / " + str(platform.release()) - em = discord.Embed(title='Informations sur TuxBot', - description=text.format(os_info, - platform.python_version(), - socket.gethostname(), - discord.__version__, - Route.BASE), - colour=0x89C4F9) - em.set_footer(text="/home/****/bot.py") - await ctx.send(embed=em) - - """---------------------------------------------------------------------""" - - @commands.command() - async def help(self, ctx, page: int = 1): - """Affiches l'aide du bot""" - page = int(page) if 0 < int(page) < 5 else 1 - text = open('texts/help.md').read().split("[split]") - em = discord.Embed(title='Commandes de TuxBot', description=text[page - 1], - colour=0x89C4F9) - await ctx.send(content=f"page {page}/{len(text)}", embed=em) - - -def setup(bot): - bot.add_cog(Basics(bot)) +import platform +import socket +import subprocess + +import discord +from discord.ext import commands +from discord.http import Route + + +class Basics(commands.Cog): + """Commandes générales.""" + + def __init__(self, bot): + self.bot = bot + + @commands.command() + async def ping(self, ctx): + result = self.bot.latency * 1000 + + if float(result) >= 300: + em = discord.Embed(title="Ping : " + str(result) + "ms", + description="... c'est quoi ce ping !", + colour=0xFF1111) + await ctx.send(embed=em) + elif float(result) > 200: + em = discord.Embed(title="Ping : " + str(result) + "ms", + description="Ca va, ça peut aller, mais j'ai " + "l'impression d'avoir 40 ans !", + colour=0xFFA500) + await ctx.send(embed=em) + else: + em = discord.Embed(title="Ping : " + str(result) + "ms", + description="Wow c'te vitesse de réaction, " + "je m'épate moi-même !", + colour=0x11FF11) + await ctx.send(embed=em) + + """---------------------------------------------------------------------""" + + @commands.command() + async def info(self, ctx): + """Affiches des informations sur le bot""" + text = open('texts/info.md').read() + os_info = str(platform.system()) + " / " + str(platform.release()) + em = discord.Embed(title='Informations sur TuxBot', + description=text.format(os_info, + platform.python_version(), + socket.gethostname(), + discord.__version__, + Route.BASE), + colour=0x89C4F9) + em.set_footer(text="/home/****/bot.py") + await ctx.send(embed=em) + + """---------------------------------------------------------------------""" + + @commands.command() + async def help(self, ctx, page: int = 1): + """Affiches l'aide du bot""" + page = int(page) if 0 < int(page) < 5 else 1 + text = open('texts/help.md').read().split("[split]") + em = discord.Embed(title='Commandes de TuxBot', description=text[page - 1], + colour=0x89C4F9) + await ctx.send(content=f"page {page}/{len(text)}", embed=em) + + +def setup(bot): + bot.add_cog(Basics(bot))