CodeMirror/Bonfire
1
0
Fork 0
mirror of synced 2024-05-20 20:42:27 +12:00
Code Issues Releases Wiki Activity

Update for rewrite: Batch 4

Browse source
This commit is contained in:
phxntxm 2017-03-07 17:47:00 -06:00
parent 2852576250
commit d82127fa38
4 changed files with 48 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cogs/events.py
View file

@ -20,11 +20,7 @@ class StatsUpdate:
self.bot.loop.create_task(self.session.close())
async def update(self):
server_count = 0
data = await config.get_content('bot_data')
for entry in data:
server_count += entry.get('server_count')
server_count = len(self.bot.servers)
carbon_payload = {
'key': config.carbon_key,

12
cogs/raffle.py
View file

@ -173,9 +173,9 @@ class Raffle:
"Ready to start a new raffle! Please respond with the title you would like to use for this raffle!")
check = lambda m: m.author == author and m.channel == channel
msg = await self.bot.wait_for('message', check=check, timeout=120)
if msg is None:
try:
msg = await self.bot.wait_for('message', check=check, timeout=120)
except asyncio.TimeoutError:
await ctx.send("You took too long! >:c")
return
@ -192,9 +192,9 @@ class Raffle:
return re.search("\d+ (minutes?|hours?|days?|weeks?|months?)", m.content.lower()) is not None
else:
return False
msg = await self.bot.wait_for('message', timeout=120, check=check)
if msg is None:
try:
msg = await self.bot.wait_for('message', timeout=120, check=check)
except asyncio.TimeoutError:
await ctx.send("You took too long! >:c")
return

54
cogs/roles.py
View file

@ -44,9 +44,9 @@ class Roles:
# If no users are mentioned, ask the author for a list of the members they want to remove the role from
if len(members) == 0:
await ctx.send("Please provide the list of members you want to remove a role from")
msg = await self.bot.wait_for('message', check=check, timeout=60)
if msg is None:
try:
msg = await self.bot.wait_for('message', check=check, timeout=60)
except asyncio.TimeoutError:
await ctx.send("You took too long. I'm impatient, don't make me wait")
return
if len(msg.mentions) == 0:
@ -60,8 +60,9 @@ class Roles:
"Make sure the roles, if more than one is provided, are separate by commas. "
"Here is a list of this server's roles:"
"```\n{}```".format("\n".join([r.name for r in server_roles])))
msg = await self.bot.wait_for('message', check=check, timeout=60)
if msg is None:
try:
msg = await self.bot.wait_for('message', check=check, timeout=60)
except asyncio.TimeoutError:
await ctx.send("You took too long. I'm impatient, don't make me wait")
return
@ -105,8 +106,9 @@ class Roles:
members = ctx.message.mentions
if len(members) == 0:
await ctx.send("Please provide the list of members you want to add a role to")
msg = await self.bot.wait_for('message', check=check, timeout=60)
if msg is None:
try:
msg = await self.bot.wait_for('message', check=check, timeout=60)
except asyncio.TimeoutError:
await ctx.send("You took too long. I'm impatient, don't make me wait")
return
if len(msg.mentions) == 0:
@ -118,9 +120,9 @@ class Roles:
"Make sure the roles, if more than one is provided, are separate by commas. "
"Here is a list of this server's roles:"
"```\n{}```".format("\n".join([r.name for r in server_roles])))
msg = await self.bot.wait_for('message', check=check, timeout=60)
if msg is None:
try:
msg = await self.bot.wait_for('message', check=check, timeout=60)
except asyncio.TimeoutError:
await ctx.send("You took too long. I'm impatient, don't make me wait")
return
role_names = re.split(', ?', msg.content)
@ -168,8 +170,9 @@ class Roles:
else:
return False
msg = await self.bot.wait_for('message', timeout=60, check=check)
if msg is None:
try:
msg = await self.bot.wait_for('message', timeout=60, check=check)
except asyncio.TimeoutError:
await ctx.send("You took too long. I'm impatient, don't make me wait")
return
# If we have gotten here, based on our previous check, we know that the content provided is a valid role.
@ -222,8 +225,9 @@ class Roles:
# Start the checks for the role, get the name of the role first
await ctx.send(
"Alright! I'm ready to create a new role, please respond with the name of the role you want to create")
msg = await self.bot.wait_for('message', timeout=60.0, check=author_check)
if msg is None:
try:
msg = await self.bot.wait_for('message', timeout=60.0, check=author_check)
except asyncio.TimeoutError:
await ctx.send("You took too long. I'm impatient, don't make me wait")
return
name = msg.content
@ -236,8 +240,9 @@ class Roles:
"```\n{}```".format(fmt))
# For this we're going to give a couple extra minutes before we timeout
# as it might take a bit to figure out which permissions they want
msg = await self.bot.wait_for('message', timeout=180.0, check=num_seperated_check)
if msg is None:
try:
msg = await self.bot.wait_for('message', timeout=180.0, check=num_seperated_check)
except asyncio.TimeoutError:
await ctx.send("You took too long. I'm impatient, don't make me wait")
return
@ -246,16 +251,18 @@ class Roles:
# Check if this role should be in a separate section on the sidebard, i.e. hoisted
await ctx.send("Do you want this role to be in a separate section on the sidebar? (yes or no)")
msg = await self.bot.wait_for('message', timeout=60.0, check=yes_no_check)
if msg is None:
try:
msg = await self.bot.wait_for('message', timeout=60.0, check=yes_no_check)
except asyncio.TimeoutError:
await ctx.send("You took too long. I'm impatient, don't make me wait")
return
hoist = True if msg.content.lower() == "yes" else False
# Check if this role should be able to be mentioned
await ctx.send("Do you want this role to be mentionable? (yes or no)")
msg = await self.bot.wait_for('message', timeout=60.0, check=yes_no_check)
if msg is None:
try:
msg = await self.bot.wait_for('message', timeout=60.0, check=yes_no_check)
except asyncio.TimeoutError:
await ctx.send("You took too long. I'm impatient, don't make me wait")
return
mentionable = True if msg.content.lower() == "yes" else False
@ -277,9 +284,10 @@ class Roles:
await asyncio.sleep(1)
await ctx.send("We did it! You just created the new role {}\nIf you want to add this role"
" to some people, mention them now".format(role.name))
msg = await self.bot.wait_for('message', timeout=60.0, check=members_check)
# There's no need to mention the users, so don't send a failure message if they didn't, just return
if msg is None:
try:
msg = await self.bot.wait_for('message', timeout=60.0, check=members_check)
except asyncio.TimeoutError:
# There's no need to mention the users, so don't send a failure message if they didn't, just return
return
# Otherwise members were mentioned, add the new role to them now

12
cogs/utils/paginator.py
View file

@ -120,12 +120,17 @@ class Pages:
"""lets you type a page number to go to"""
to_delete = []
to_delete.append(await self.message.channel.send('What page do you want to go to?'))
def check(m):
if m.author == self.author and m.channel == self.message.channel:
return m.content.isdigit()
else:
return False
msg = await self.bot.wait_for('message', check=check, timeout=30.0)
try:
msg = await self.bot.wait_for('message', check=check, timeout=30.0)
except asyncio.TimeoutError:
msg = None
if msg is not None:
page = int(msg.content)
to_delete.append(msg)
@ -185,7 +190,10 @@ class Pages:
await self.show_page(start_page, first=True)
while self.paginating:
react = await self.bot.wait_for('reaction_add', check=self.react_check, timeout=120.0)
try:
react = await self.bot.wait_for('reaction_add', check=self.react_check, timeout=120.0)
except asyncio.TimeoutError:
react = None
if react is None:
self.paginating = False
try: