WhatTheMike/Fox-V3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Continuing

Browse Source
This commit is contained in:
bobloy 2017-11-08 12:09:56 -05:00
parent 11ff602e28
commit 9a208f2d34
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
fight/fight.py
View File

@ -194,28 +194,28 @@ class Fight:
"""Admin command for starting or managing tournaments""" """Admin command for starting or managing tournaments"""
# guild = ctx.message.guild # guild = ctx.message.guild
if guild.id not in self.the_data: # if guild.id not in self.the_data:
self.the_data[guild.id] = { # self.the_data[guild.id] = {
"CURRENT": None, # "CURRENT": None,
"TOURNEYS": {}, # "TOURNEYS": {},
"SETTINGS": { # "SETTINGS": {
"SELFREPORT": True, # "SELFREPORT": True,
"REPORTCHNNL": None, # "REPORTCHNNL": None,
"ANNOUNCECHNNL": None, # "ANNOUNCECHNNL": None,
"ADMIN": None # "ADMIN": None
}, # },
"SRTRACKER": { # "SRTRACKER": {
"ROUND": None, # "ROUND": None,
"CHNNLS": None, # "CHNNLS": None,
}, # },
"EMOJI": { # "EMOJI": {
"NUMS": [], # "NUMS": [],
"UNDO": None, # "UNDO": None,
"APPR": None # "APPR": None
} # }
} # }
self.save_data() # self.save_data()
if ctx.invoked_subcommand is None: if ctx.invoked_subcommand is None:
await self.bot.send_cmd_help(ctx) await self.bot.send_cmd_help(ctx)
@ -491,13 +491,15 @@ class Fight:
await ctx.send("Tournament Admin role is now set to: " + role.mention) await ctx.send("Tournament Admin role is now set to: " + role.mention)
# **********************Private command group start********************* # **********************Private command group start*********************
def _guildsettings(self, guildID): async def _guildsettings(self, ctx: commands.Context):
"""Returns the dictionary of guild settings""" """Returns the dictionary of guild settings"""
return self.the_data[guildID]["SETTINGS"] # return self.the_data[guildID]["SETTINGS"]
return await self.config.guild(ctx.guild).settings
def _messagetracker(self, guildID): await def _messagetracker(self, ctx: commands.Context):
"""Returns the dictionary of message tracking""" """Returns the dictionary of message tracking"""
return self.the_data[guildID]["SRTRACKER"] # return self.the_data[guildID]["SRTRACKER"]
return self.config.guild(ctx.guild).srtracker
def _activefight(self, guildID): def _activefight(self, guildID):
"""Returns id for active fight, or None if no active fight""" """Returns id for active fight, or None if no active fight"""