aboutsummaryrefslogtreecommitdiff
path: root/cogs/utils.py
diff options
context:
space:
mode:
authorAnInternetTroll <lucafulger@gmail.com>2020-08-05 16:46:05 +0000
committerAnInternetTroll <lucafulger@gmail.com>2020-08-05 16:46:05 +0000
commitd3d6b323bf84b35bd6d2eaa735eb335c84227f54 (patch)
tree61df64c1ad908116f500689e24c6a8585d840d87 /cogs/utils.py
parentb386a17a8b792863082d4e99cf86eb4461cf2b1e (diff)
downloadsteve-bot-d3d6b323bf84b35bd6d2eaa735eb335c84227f54.tar
steve-bot-d3d6b323bf84b35bd6d2eaa735eb335c84227f54.tar.gz
steve-bot-d3d6b323bf84b35bd6d2eaa735eb335c84227f54.tar.bz2
steve-bot-d3d6b323bf84b35bd6d2eaa735eb335c84227f54.tar.lz
steve-bot-d3d6b323bf84b35bd6d2eaa735eb335c84227f54.tar.xz
steve-bot-d3d6b323bf84b35bd6d2eaa735eb335c84227f54.tar.zst
steve-bot-d3d6b323bf84b35bd6d2eaa735eb335c84227f54.zip
General bug fixes and improvements
Diffstat (limited to 'cogs/utils.py')
-rwxr-xr-xcogs/utils.py17
1 files changed, 10 insertions, 7 deletions
diff --git a/cogs/utils.py b/cogs/utils.py
index 20fd4a8..4ebb465 100755
--- a/cogs/utils.py
+++ b/cogs/utils.py
@@ -86,7 +86,7 @@ class Utils(commands.Cog):
@commands.cooldown(1, 25, commands.BucketType.guild)
@commands.command()
async def findseed(self, ctx):
- """Test yout luck"""
+ """Test your luck"""
if ctx.message.channel.id != int(self.bot.config[str(ctx.message.guild.id)]["bot_channel"]):
await ctx.message.delete()
ctx.command.reset_cooldown(ctx)
@@ -163,8 +163,11 @@ class Utils(commands.Cog):
await member.edit(nick="JoetheSheepFucker")
def check(msg):
return msg.author == member and msg.type != discord.MessageType.new_member
- msg = await self.bot.wait_for("message", check=check, timeout=300)
- await msg.channel.send("<:PeepoPog:732172337956257872>")
+ try:
+ msg = await self.bot.wait_for("message", check=check, timeout=300)
+ await msg.channel.send("<:PeepoPog:732172337956257872>")
+ except asyncio.TimeoutError:
+ await msg.channel.send("<:pepesadcrash:739927552260440185>")
@commands.Cog.listener()
async def on_member_update(self, before, after):
@@ -179,7 +182,7 @@ class Utils(commands.Cog):
return
if message.author.bot:
return
- badWords = ["fair", "f a i r", "ⓕⓐⓘⓡ", "ⓕ ⓐ ⓘ ⓡ"]
+ badWords = ["fair", "ⓕⓐⓘⓡ"]
count = 0
coolKids = [
@@ -212,7 +215,7 @@ class Utils(commands.Cog):
self.tries +=1
for word in badWords:
- if word in message.content.lower():
+ if word in message.content.lower().replace(" ", ""):
count += 1;
fair = 'Fair '*count
await message.channel.send(fair)
@@ -228,7 +231,7 @@ class Utils(commands.Cog):
else:
await reportStuff(self, ctx, message)
- @commands.cooldown(1, 20, commands.BucketType.member)
+ @commands.cooldown(1, 20, commands.BucketType.guild)
@commands.command()
async def leaderboard(self, ctx):
"""Leaderboard of the people that matter"""
@@ -255,7 +258,7 @@ class Utils(commands.Cog):
@commands.command()
async def roll(self, ctx, pool):
- """Toll the dice"""
+ """Roll the dice"""
await ctx.send(f"You rolled a {randint(0, int(pool))}")
@commands.command(aliases=['commands', 'allcommands'])