CodeMirror/Bonfire
1
0
Fork 0
mirror of synced 2024-05-23 22:09:38 +12:00
Code Issues Releases Wiki Activity

Merge branch 'rewrite' of https://github.com/Phxntxm/Bonfire into rewrite

Browse source
This commit is contained in:
Phxntxm 2017-08-10 16:55:06 -05:00
parent af9eeabe5e da67359bb3
commit 9b4fe182e0
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cogs/interaction.py
View file

@ -175,10 +175,11 @@ class Interaction:
settings = self.bot.db.load('server_settings', key=ctx.message.guild.id) or {}
# Get the custom messages we can use
custom_msgs = settings.get('hugs')
default_on = settings.get('default_hugs')
# if they exist, then we want to see if we want to use default as well
if custom_msgs:
if settings.get('default_hugs'):
msgs = custom_msgs + hugs
if default_on or default_on is None:
msgs = hugs + custom_msgs
else:
msgs = custom_msgs
# Otherwise we simply just want to use the default, no matter what the default setting is
@ -271,12 +272,13 @@ class Interaction:
settings = self.bot.db.load('server_settings', key=ctx.message.guild.id) or {}
# Get the custom messages we can use
custom_msgs = settings.get('battles')
default_on = settings.get('default_battles')
# if they exist, then we want to see if we want to use default as well
if custom_msgs:
if settings.get('default_battles'):
msgs = custom_msgs + battle_outcomes
if default_on or default_on is None:
msgs = battle_outcomes + custom_msgs
else:
msgs = battle_outcomes
msgs = custom_msgs
# Otherwise we simply just want to use the default, no matter what the default setting is
else:
msgs = battle_outcomes