aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnInternetTroll <lucafulger@gmail.com>2020-06-27 16:01:33 +0000
committerAnInternetTroll <lucafulger@gmail.com>2020-06-27 16:01:33 +0000
commitd2c48f914a57fc0eb3c55ffc877d4dae73273270 (patch)
tree9581adf9ec284607d01cfc62705187ff21767231
parent6c6daffcffaa7289deff2a97b49c894486d8127c (diff)
parent4e3700629dc878ca7f895ee2badd686e3862121f (diff)
downloadsteve-bot-d2c48f914a57fc0eb3c55ffc877d4dae73273270.tar
steve-bot-d2c48f914a57fc0eb3c55ffc877d4dae73273270.tar.gz
steve-bot-d2c48f914a57fc0eb3c55ffc877d4dae73273270.tar.bz2
steve-bot-d2c48f914a57fc0eb3c55ffc877d4dae73273270.tar.lz
steve-bot-d2c48f914a57fc0eb3c55ffc877d4dae73273270.tar.xz
steve-bot-d2c48f914a57fc0eb3c55ffc877d4dae73273270.tar.zst
steve-bot-d2c48f914a57fc0eb3c55ffc877d4dae73273270.zip
Merge branch 'master' of https://github.com/AnInternetTroll/mcbeDiscordBot
-rw-r--r--cogs/admin.py2
-rwxr-xr-xcogs/src.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/cogs/admin.py b/cogs/admin.py
index 1fd8c5e..c00097b 100644
--- a/cogs/admin.py
+++ b/cogs/admin.py
@@ -19,7 +19,7 @@ class Admin(commands.Cog):
@commands.command(aliases=['deleteEverything'], hidden=True)
@commands.check(is_botmaster)
async def purge(self, ctx):
- await ctx.message.channel.purge()
+ await ctx.message.channel.purge(limit=500)
@commands.command(aliases=['quit'], hidden=True)
@commands.check(is_botmaster)
diff --git a/cogs/src.py b/cogs/src.py
index df40678..bf776e7 100755
--- a/cogs/src.py
+++ b/cogs/src.py
@@ -119,11 +119,11 @@ async def pendingRuns(self, ctx):
mcbece_runs += 1
embed = discord.Embed(
title=leaderboard, url=link, description=f"{categoryName} in `{str(rta).replace('000','')}` by **{player}**", color=16711680+i*60, timestamp=timestamp)
- await self.bot.get_channel(self.bot.config[str(ctx.message.guild.id)]["pending_channel"]).send(embed=embed)
+ await self.bot.get_channel(int(self.bot.config[str(ctx.message.guild.id)]["pending_channel"])).send(embed=embed)
runs = runs2
gameID = gameID2
embed_stats = discord.Embed(title='Pending Run Stats', description=f"Full Game Runs: {mcbe_runs}\nIndividual Level Runs: {mcbeil_runs}\nCategory Extension Runs: {mcbece_runs}", color=16711680 + i * 60)
- await self.bot.get_channel(self.bot.config[str(ctx.message.guild.id)]["pending_channel"]).send(embed=embed_stats)
+ await self.bot.get_channel(int(self.bot.config[str(ctx.message.guild.id)]["pending_channel"])).send(embed=embed_stats)
async def verifyNew(self, apiKey=None, userID=None):
@@ -203,7 +203,7 @@ class Src(commands.Cog):
@commands.guild_only()
async def pending(self, ctx):
async with ctx.typing():
- await self.bot.get_channel(self.bot.config[str(ctx.message.guild.id)]["pending_channel"]).purge(limit=500)
+ await self.bot.get_channel(int(self.bot.config[str(ctx.message.guild.id)]["pending_channel"])).purge(limit=500)
await pendingRuns(self, ctx)
@commands.command(description="Reject runs quickly")