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

Added universal exception handling, removed most exception handling from the commands themselves

Browse source
This commit is contained in:
Phxntxm 2016-07-09 07:57:25 -05:00
parent 15bfd2775d
commit c00b7d446d
7 changed files with 153 additions and 210 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bot.py
View file

@ -44,6 +44,9 @@ async def on_member_remove(member):
@bot.event @bot.event
async def on_command_error(error, ctx): async def on_command_error(error, ctx):
if isinstance(error,pymysql.OperationalError):
config.resetConnection()
await bot.say("The connection to the MySQL server was lost! Please try your command one more time {}".format(ctx.message.author.mention)
fmt = 'An error occurred while processing this request: ```py\n{}: {}\n```' fmt = 'An error occurred while processing this request: ```py\n{}: {}\n```'
await bot.say(fmt.format(type(e).__name__, e)) await bot.say(fmt.format(type(e).__name__, e))

77
cogs/core.py
View file

@ -16,13 +16,9 @@ class Core:
@commands.command() @commands.command()
async def joke(self): async def joke(self):
"""Prints a random riddle""" """Prints a random riddle"""
try: fortuneCommand = "/usr/bin/fortune riddles"
fortuneCommand = "/usr/bin/fortune riddles" fortune = subprocess.check_output(fortuneCommand.split()).decode("utf-8")
fortune = subprocess.check_output(fortuneCommand.split()).decode("utf-8") await self.bot.say(fortune)
await self.bot.say(fortune)
except Exception as e:
fmt = 'An error occurred while processing this request: ```py\n{}: {}\n```'
await self.bot.say(fmt.format(type(e).__name__, e))
@commands.command() @commands.command()
async def urban(self, *msg: str): async def urban(self, *msg: str):
@ -38,55 +34,44 @@ class Core:
await self.bot.say(data['list'][0]['definition']) await self.bot.say(data['list'][0]['definition'])
except discord.HTTPException: except discord.HTTPException:
await self.bot.say('```Error: Definition is too long for me to send```') await self.bot.say('```Error: Definition is too long for me to send```')
except Exception as e:
fmt = 'An error occurred while processing this request: ```py\n{}: {}\n```'
await self.bot.say(fmt.format(type(e).__name__, e))
@commands.command(pass_context=True) @commands.command(pass_context=True)
async def derpi(self, ctx, *search: str): async def derpi(self, ctx, *search: str):
"""Provides a random image from the first page of derpibooru.org for the following term""" """Provides a random image from the first page of derpibooru.org for the following term"""
try: if len(search) > 0:
if len(search) > 0: url = 'https://derpibooru.org/search.json?q='
url = 'https://derpibooru.org/search.json?q=' query = '+'.join(search)
query = '+'.join(search) url += query
url += query if ctx.message.channel.id in config.nsfwChannels:
if ctx.message.channel.id in config.nsfwChannels: url += ",+explicit&filter_id=95938"
url += ",+explicit&filter_id=95938" # url should now be in the form of url?q=search+terms
# url should now be in the form of url?q=search+terms # Next part processes the json format, and saves the data in useful lists/dictionaries
# Next part processes the json format, and saves the data in useful lists/dictionaries response = urllib.request.urlopen(url)
response = urllib.request.urlopen(url) data = json.loads(response.read().decode('utf-8'))
data = json.loads(response.read().decode('utf-8')) results = data['search']
results = data['search']
if len(results) > 0: if len(results) > 0:
index = random.randint(0, len(results) - 1) index = random.randint(0, len(results) - 1)
randImageUrl = results[index].get('representations').get('full')[2:] randImageUrl = results[index].get('representations').get('full')[2:]
randImageUrl = 'http://' + randImageUrl randImageUrl = 'http://' + randImageUrl
imageLink = randImageUrl.strip() imageLink = randImageUrl.strip()
else:
await self.bot.say("No results with that search term, {0}!".format(ctx.message.author.mention))
return
else: else:
with urllib.request.urlopen('https://derpibooru.org/images/random') as response: await self.bot.say("No results with that search term, {0}!".format(ctx.message.author.mention))
imageLink = response.geturl() return
url = 'https://shpro.link/redirect.php/' else:
data = urllib.parse.urlencode({'link': imageLink}).encode('ascii') with urllib.request.urlopen('https://derpibooru.org/images/random') as response:
response = urllib.request.urlopen(url, data).read().decode('utf-8') imageLink = response.geturl()
await self.bot.say(response) url = 'https://shpro.link/redirect.php/'
except Exception as e: data = urllib.parse.urlencode({'link': imageLink}).encode('ascii')
fmt = 'An error occurred while processing this request: ```py\n{}: {}\n```' response = urllib.request.urlopen(url, data).read().decode('utf-8')
await self.bot.say(fmt.format(type(e).__name__, e)) await self.bot.say(response)
@commands.command(pass_context=True) @commands.command(pass_context=True)
async def roll(self, ctx): async def roll(self, ctx):
"""Rolls a six sided die""" """Rolls a six sided die"""
try: num = random.randint(1, 6)
num = random.randint(1, 6) fmt = '{0.message.author.name} has rolled a die and got the number {1}!'
fmt = '{0.message.author.name} has rolled a die and got the number {1}!' await self.bot.say(fmt.format(ctx, num))
await self.bot.say(fmt.format(ctx, num))
except Exception as e:
fmt = 'An error occurred while processing this request: ```py\n{}: {}\n```'
await self.bot.say(fmt.format(type(e).__name__, e))
def setup(bot): def setup(bot):

174
cogs/interaction.py
View file

@ -62,122 +62,106 @@ class Interaction:
@commands.command(pass_context=True, no_pm=True) @commands.command(pass_context=True, no_pm=True)
async def battle(self, ctx, player2: discord.Member): async def battle(self, ctx, player2: discord.Member):
"""Challenges the mentioned user to a battle""" """Challenges the mentioned user to a battle"""
try: global battleP1
global battleP1 global battleP2
global battleP2 global battling
global battling if battling:
if battling: return
return if len(ctx.message.mentions) == 0:
if len(ctx.message.mentions) == 0: await self.bot.say("You must mention someone in the room " + ctx.message.author.mention + "!")
await self.bot.say("You must mention someone in the room " + ctx.message.author.mention + "!") return
return if len(ctx.message.mentions) > 1:
if len(ctx.message.mentions) > 1: await self.bot.say("You cannot battle more than one person at once!")
await self.bot.say("You cannot battle more than one person at once!") return
return if ctx.message.author.id == player2.id:
if ctx.message.author.id == player2.id: await self.bot.say("Why would you want to battle yourself? Suicide is not the answer")
await self.bot.say("Why would you want to battle yourself? Suicide is not the answer") return
return if self.bot.user.id == player2.id:
if self.bot.user.id == player2.id: await self.bot.say("I always win, don't even try it.")
await self.bot.say("I always win, don't even try it.") return
return fmt = "{0.mention} has challenged you to a battle {1.mention}\n!accept or !decline"
fmt = "{0.mention} has challenged you to a battle {1.mention}\n!accept or !decline" battleP1 = ctx.message.author
battleP1 = ctx.message.author battleP2 = player2
battleP2 = player2 await self.bot.say(fmt.format(ctx.message.author, player2))
await self.bot.say(fmt.format(ctx.message.author, player2)) t = Timer(180, battlingOff)
t = Timer(180, battlingOff) t.start()
t.start() battling = True
battling = True
except Exception as e:
fmt = 'An error occurred while processing this request: ```py\n{}: {}\n```'
await self.bot.say(fmt.format(type(e).__name__, e))
@commands.command(no_pm=True) @commands.command(no_pm=True)
@checks.battled(battleP2) @checks.battled(battleP2)
async def accept(self): async def accept(self):
"""Accepts the battle challenge""" """Accepts the battle challenge"""
try: if not battling:
if not battling: return
return num = random.randint(1, 100)
num = random.randint(1, 100) fmt = config.battleWins[random.randint(0, len(config.battleWins) - 1)]
fmt = config.battleWins[random.randint(0, len(config.battleWins) - 1)] if num <= 50:
if num <= 50: await self.bot.say(fmt.format(battleP1.mention, battleP2.mention))
await self.bot.say(fmt.format(battleP1.mention, battleP2.mention)) updateBattleRecords(battleP1, battleP2)
updateBattleRecords(battleP1, battleP2) elif num > 50:
elif num > 50: await self.bot.say(fmt.format(battleP2.mention, battleP1.mention))
await self.bot.say(fmt.format(battleP2.mention, battleP1.mention)) updateBattleRecords(battleP2, battleP1)
updateBattleRecords(battleP2, battleP1) battlingOff()
battlingOff()
except Exception as e:
fmt = 'An error occurred while processing this request: ```py\n{}: {}\n```'
await self.bot.say(fmt.format(type(e).__name__, e))
@commands.command(no_pm=True) @commands.command(no_pm=True)
@checks.battled(battleP2) @checks.battled(battleP2)
async def decline(self): async def decline(self):
"""Declines the battle challenge""" """Declines the battle challenge"""
try: if not battling:
if not battling: return
return await self.bot.say("{0} has chickened out! {1} wins by default!".format(battleP2.mention, battleP1.mention))
await self.bot.say("{0} has chickened out! {1} wins by default!".format(battleP2.mention, battleP1.mention)) updateBattleRecords(battleP1, battleP2)
updateBattleRecords(battleP1, battleP2) battlingOff()
battlingOff()
except Exception as e:
fmt = 'An error occurred while processing this request: ```py\n{}: {}\n```'
await self.bot.say(fmt.format(type(e).__name__, e))
@commands.command(pass_context=True, no_pm=True) @commands.command(pass_context=True, no_pm=True)
async def boop(self, ctx, boopee: discord.Member): async def boop(self, ctx, boopee: discord.Member):
"""Boops the mentioned person""" """Boops the mentioned person"""
try: booper = ctx.message.author
booper = ctx.message.author if len(ctx.message.mentions) == 0:
if len(ctx.message.mentions) == 0: await self.bot.say("You must mention someone in the room " + ctx.message.author.mention + "!")
await self.bot.say("You must mention someone in the room " + ctx.message.author.mention + "!") return
return if len(ctx.message.mentions) > 1:
if len(ctx.message.mentions) > 1: await self.bot.say("You cannot boop more than one person at once!")
await self.bot.say("You cannot boop more than one person at once!") return
return if boopee.id == booper.id:
if boopee.id == booper.id: await self.bot.say("You can't boop yourself! Silly...")
await self.bot.say("You can't boop yourself! Silly...") return
return if boopee.id == self.bot.user.id:
if boopee.id == self.bot.user.id: await self.bot.say("Why the heck are you booping me? Get away from me >:c")
await self.bot.say("Why the heck are you booping me? Get away from me >:c") return
return
cursor = config.connection.cursor() cursor = config.connection.cursor()
cursor.execute('use {0}'.format(config.db_boops)) cursor.execute('use {0}'.format(config.db_boops))
sql = "show tables like '" + str(booper.id) + "'" sql = "show tables like '" + str(booper.id) + "'"
cursor.execute(sql)
result = cursor.fetchone()
amount = 1
# Booper's table exists, continue
if result is not None:
sql = "select `amount` from `" + booper.id + "` where id='" + str(boopee.id) + "'"
cursor.execute(sql) cursor.execute(sql)
result = cursor.fetchone() result = cursor.fetchone()
amount = 1 # Boopee's entry exists, continue
# Booper's table exists, continue
if result is not None: if result is not None:
sql = "select `amount` from `" + booper.id + "` where id='" + str(boopee.id) + "'" amount = result.get('amount') + 1
sql = "update `" + str(booper.id) + "` set amount = " + str(amount) + " where id=" + str(
boopee.id)
cursor.execute(sql) cursor.execute(sql)
result = cursor.fetchone() # Boopee does not exist, need to create the field for it
# Boopee's entry exists, continue
if result is not None:
amount = result.get('amount') + 1
sql = "update `" + str(booper.id) + "` set amount = " + str(amount) + " where id=" + str(
boopee.id)
cursor.execute(sql)
# Boopee does not exist, need to create the field for it
else:
sql = "insert into `" + str(booper.id) + "` (id,amount) values ('" + str(boopee.id) + "',1)"
cursor.execute(sql)
# Booper's table does not exist, need to create the table
else: else:
sql = "create table `" + str(booper.id) + \
"` (`id` varchar(255) not null,`amount` int(11) not null" + \
",primary key (`id`)) engine=InnoDB default charset=utf8 collate=utf8_bin"
cursor.execute(sql)
sql = "insert into `" + str(booper.id) + "` (id,amount) values ('" + str(boopee.id) + "',1)" sql = "insert into `" + str(booper.id) + "` (id,amount) values ('" + str(boopee.id) + "',1)"
cursor.execute(sql) cursor.execute(sql)
fmt = "{0.mention} has just booped you {1.mention}! That's {2} times now!" # Booper's table does not exist, need to create the table
await self.bot.say(fmt.format(booper, boopee, amount)) else:
config.connection.commit() sql = "create table `" + str(booper.id) + \
except Exception as e: "` (`id` varchar(255) not null,`amount` int(11) not null" + \
fmt = 'An error occurred while processing this request: ```py\n{}: {}\n```' ",primary key (`id`)) engine=InnoDB default charset=utf8 collate=utf8_bin"
await self.bot.say(fmt.format(type(e).__name__, e)) cursor.execute(sql)
sql = "insert into `" + str(booper.id) + "` (id,amount) values ('" + str(boopee.id) + "',1)"
cursor.execute(sql)
fmt = "{0.mention} has just booped you {1.mention}! That's {2} times now!"
await self.bot.say(fmt.format(booper, boopee, amount))
config.connection.commit()
def setup(bot): def setup(bot):

18
cogs/mod.py
View file

@ -11,24 +11,16 @@ class Mod:
@checks.isAdmin() @checks.isAdmin()
async def leave(self, ctx): async def leave(self, ctx):
"""Forces the bot to leave the server""" """Forces the bot to leave the server"""
try: await self.bot.say('Why must I leave? Hopefully I can come back :c')
await self.bot.say('Why must I leave? Hopefully I can come back :c') await self.bot.leave_server(ctx.message.server)
await self.bot.leave_server(ctx.message.server)
except Exception as e:
fmt = 'An error occurred while processing this request: ```py\n{}: {}\n```'
await self.bot.say(fmt.format(type(e).__name__, e))
@commands.command(pass_context=True) @commands.command(pass_context=True)
@checks.isMod() @checks.isMod()
async def say(self, ctx, *msg: str): async def say(self, ctx, *msg: str):
"""Tells the bot to repeat what you say""" """Tells the bot to repeat what you say"""
try: msg = ' '.join(msg)
msg = ' '.join(msg) await self.bot.say(msg)
await self.bot.say(msg) await self.bot.delete_message(ctx.message)
await self.bot.delete_message(ctx.message)
except Exception as e:
fmt = 'An error occurred while processing this request: ```py\n{}: {}\n```'
await self.bot.say(fmt.format(type(e).__name__, e))
def setup(bot): def setup(bot):

78
cogs/owner.py
View file

@ -19,7 +19,6 @@ class Owner:
@checks.isOwner() @checks.isOwner()
async def restart(self, ctx): async def restart(self, ctx):
"""Forces the bot to restart""" """Forces the bot to restart"""
try:
cursor = config.connection.cursor() cursor = config.connection.cursor()
cursor.execute('use {0}'.format(config.db_default)) cursor.execute('use {0}'.format(config.db_default))
sql = "update restart_server set channel_id={0} where id=1".format(ctx.message.channel.id) sql = "update restart_server set channel_id={0} where id=1".format(ctx.message.channel.id)
@ -28,83 +27,60 @@ class Owner:
await self.bot.say("Restarting; see you in the next life {0}!".format(ctx.message.author.mention)) await self.bot.say("Restarting; see you in the next life {0}!".format(ctx.message.author.mention))
python = sys.executable python = sys.executable
os.execl(python, python, *sys.argv) os.execl(python, python, *sys.argv)
except Exception as e:
fmt = 'An error occurred while processing this request: ```py\n{}: {}\n```'
await self.bot.say(fmt.format(type(e).__name__, e))
@commands.command(pass_context=True) @commands.command(pass_context=True)
@checks.isOwner() @checks.isOwner()
async def py(self, ctx): async def py(self, ctx):
"""Executes code""" """Executes code"""
try: match_single = getter.findall(ctx.message.content)
match_single = getter.findall(ctx.message.content) match_multi = multi.findall(ctx.message.content)
match_multi = multi.findall(ctx.message.content) if not match_single and not match_multi:
if not match_single and not match_multi: return
return else:
if not match_multi:
result = eval(match_single[0])
await self.bot.say("```{0}```".format(result))
else: else:
if not match_multi: def r(v):
result = eval(match_single[0]) config.loop.create_task(self.bot.say("```{0}```".format(v)))
await self.bot.say("```{0}```".format(result))
else:
def r(v):
config.loop.create_task(self.bot.say("```{0}```".format(v)))
exec(match_multi[0]) exec(match_multi[0])
except Exception as e:
fmt = 'An error occurred while processing this request: ```py\n{}: {}\n```'
await self.bot.say(fmt.format(type(e).__name__, e))
@commands.command(pass_context=True) @commands.command(pass_context=True)
@checks.isOwner() @checks.isOwner()
async def shutdown(self, ctx): async def shutdown(self, ctx):
"""Shuts the bot down""" """Shuts the bot down"""
try: fmt = 'Shutting down, I will miss you {0.author.name}'
fmt = 'Shutting down, I will miss you {0.author.name}' await self.bot.say(fmt.format(ctx.message))
await self.bot.say(fmt.format(ctx.message)) await self.bot.logout()
await self.bot.logout() await self.bot.close()
await self.bot.close()
except Exception as e:
fmt = 'An error occurred while processing this request: ```py\n{}: {}\n```'
await self.bot.say(fmt.format(type(e).__name__, e))
@commands.command() @commands.command()
@checks.isOwner() @checks.isOwner()
async def avatar(self, content: str): async def avatar(self, content: str):
"""Changes the avatar for the bot to the filename following the command""" """Changes the avatar for the bot to the filename following the command"""
try: file = '/home/phxntx5/public_html/bot/images/' + content
file = '/home/phxntx5/public_html/bot/images/' + content with open(file, 'rb') as fp:
with open(file, 'rb') as fp: await self.bot.edit_profile(avatar=fp.read())
await self.bot.edit_profile(avatar=fp.read())
except Exception as e:
fmt = 'An error occurred while processing this request: ```py\n{}: {}\n```'
await self.bot.say(fmt.format(type(e).__name__, e))
@commands.command() @commands.command()
@checks.isOwner() @checks.isOwner()
async def name(self, newNick: str): async def name(self, newNick: str):
"""Changes the bot's name""" """Changes the bot's name"""
try: await self.bot.edit_profile(username=newNick)
await self.bot.edit_profile(username=newNick) await self.bot.say('Changed username to ' + newNick)
await self.bot.say('Changed username to ' + newNick) # Restart the bot after this, as profile changes are not immediate
# Restart the bot after this, as profile changes are not immediate python = sys.executable
python = sys.executable os.execl(python, python, *sys.argv)
os.execl(python, python, *sys.argv)
except Exception as e:
fmt = 'An error occurred while processing this request: ```py\n{}: {}\n```'
await self.bot.say(fmt.format(type(e).__name__, e))
@commands.command() @commands.command()
@checks.isOwner() @checks.isOwner()
async def status(self, *stat: str): async def status(self, *stat: str):
"""Changes the bot's 'playing' status""" """Changes the bot's 'playing' status"""
try: newStatus = ' '.join(stat)
newStatus = ' '.join(stat) game = discord.Game(name=newStatus, type=0)
game = discord.Game(name=newStatus, type=0) await self.bot.change_status(game)
await self.bot.change_status(game) await self.bot.say("Just changed my status to '{0}'!".format(newStatus))
await self.bot.say("Just changed my status to '{0}'!".format(newStatus))
except Exception as e:
fmt = 'An error occurred while processing this request: ```py\n{}: {}\n```'
await self.bot.say(fmt.format(type(e).__name__, e))
def setup(bot): def setup(bot):

7
cogs/playlist.py
View file

@ -198,11 +198,8 @@ class Music:
@commands.command(pass_context=True, no_pm=True) @commands.command(pass_context=True, no_pm=True)
async def queuelength(self, ctx): async def queuelength(self, ctx):
"""Prints the length of the queue""" """Prints the length of the queue"""
try: await self.bot.say("There are a total of {} songs in the queue"
await self.bot.say("There are a total of {} songs in the queue" .format(str(self.get_voice_state(ctx.message.server).songs.qsize())))
.format(str(self.get_voice_state(ctx.message.server).songs.qsize())))
except:
await self.bot.say(traceback.format_exc())
@commands.command(pass_context=True, no_pm=True) @commands.command(pass_context=True, no_pm=True)
async def skip(self, ctx): async def skip(self, ctx):

6
cogs/utils/config.py
View file

@ -27,3 +27,9 @@ adminCommands = global_config.get("adminCommands", {})
openCommands = global_config.get("openCommands", {}) openCommands = global_config.get("openCommands", {})
ownerCommands = global_config.get("ownerCommands", {}) ownerCommands = global_config.get("ownerCommands", {})
voiceCommands = global_config.get("voiceCommands", {}) voiceCommands = global_config.get("voiceCommands", {})
def resetConnection()
global connection
connection = pymysql.connect(host=global_config.get("db_host"), user=global_config.get("db_user"),
password=global_config.get("db_user_pass"), charset='utf8mb4',
cursorclass=pymysql.cursors.DictCursor)