From 66f53bba0f7f2fc86925f596faf8b1de36c38e58 Mon Sep 17 00:00:00 2001 From: CramMK Date: Thu, 7 May 2020 10:49:25 +0200 Subject: [PATCH] Fix .aquabot command --- aquabot.py | 5 +---- cogs/general.py | 17 ----------------- cogs/help.py | 20 +++++++++++++++----- 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/aquabot.py b/aquabot.py index e08e340..3e0b9e3 100644 --- a/aquabot.py +++ b/aquabot.py @@ -45,7 +45,7 @@ for cog in loadconfig.__cogs__: # ACTIVITY async def activity(): - while True: # Infinite Loop + while True: new_activity = random.choice(loadconfig.__activity__) status = f"{new_activity[1]} | {loadconfig.__prefix__}aquabot" activity = discord.Activity(name=status, type=new_activity[0]) @@ -57,9 +57,6 @@ async def activity(): async def on_ready(): """ This prints some information about the bot, while starting up - - Inspired by: - https://gist.github.com/EvieePy/d78c061a4798ae81be9825468fe146be """ bot.AppInfo = await bot.application_info() diff --git a/cogs/general.py b/cogs/general.py index 13d8764..bb729af 100644 --- a/cogs/general.py +++ b/cogs/general.py @@ -19,23 +19,6 @@ class General(commands.Cog): self.bot = bot # COG BODY - @commands.command(name="about") - async def about(self, ctx): - """ - Prints some information about myself - """ - embed = discord.Embed(colour=discord.Colour.blue()) - embed.set_thumbnail(url=ctx.me.avatar_url) - - embed.add_field(name="Owner", value=self.bot.AppInfo.owner, inline=True) - embed.add_field(name="Command Prefix", value=loadconfig.__prefix__, inline=True) - - footer_text = ( - "This Bot is a project by MarcMK and can be found " - "on github.com/CramMK/aquabot") - embed.set_footer(text=footer_text, icon_url=loadconfig.__avatar__) - - await ctx.send(embed=embed) # COG ENDING diff --git a/cogs/help.py b/cogs/help.py index 668f466..05a3bc1 100644 --- a/cogs/help.py +++ b/cogs/help.py @@ -5,10 +5,13 @@ Some help for the users: https://discordpy.readthedocs.io/en/latest/ext/commands/cogs.html """ -# IMPORTS - exter +# IMPORTS - external import discord from discord.ext import commands +# IMPORTS - internal +import loadconfig + # COG INIT class Help(commands.Cog): def __init__(self, bot): @@ -20,10 +23,17 @@ class Help(commands.Cog): """ Sends a short help for new users """ - response = ( - "I'm the usele... divine AquaBot!\n" - "If you need help. try using the `help` command!") - await ctx.send(response) + embed = discord.Embed(colour=discord.Colour.blue()) + embed.set_thumbnail(url=ctx.me.avatar_url) + + embed.add_field(name="Owner", value=self.bot.AppInfo.owner, inline=True) + embed.add_field(name="Command Prefix", value=loadconfig.__prefix__, inline=True) + embed.add_field(name="Source Code", value="[GitHub](https://github.com/crammk/aquabot)", inline=True) + + footer_text = "This Bot is a project by MarcMK." + embed.set_footer(text=footer_text) + + await ctx.send(embed=embed) # COG ENDING