such cleanup
This commit is contained in:
@ -10,6 +10,7 @@ import setproctitle
|
||||
import hypercorn
|
||||
import hypercorn.asyncio
|
||||
from dotenv import load_dotenv
|
||||
from asyncio import Task
|
||||
from discord.ext import bridge, commands
|
||||
from termcolor import colored
|
||||
from constants import OWNERS, BOT_CHANIDS
|
||||
@ -38,50 +39,56 @@ load_dotenv()
|
||||
|
||||
intents = discord.Intents.all()
|
||||
intents.message_content = True
|
||||
bot = bridge.Bot(command_prefix=".", intents=intents,
|
||||
owner_ids=OWNERS, activity=bot_activity,
|
||||
help_command=commands.MinimalHelpCommand())
|
||||
|
||||
@bot.event
|
||||
async def on_ready() -> None:
|
||||
"""Run on Bot Ready"""
|
||||
logging.info("%s online!", bot.user)
|
||||
class Havoc(bridge.Bot):
|
||||
def __init__(self) -> None:
|
||||
super().__init__(command_prefix=".", intents=intents,
|
||||
owner_ids=OWNERS, activity=bot_activity,
|
||||
help_command=commands.MinimalHelpCommand())
|
||||
self.BOT_CHANIDS = BOT_CHANIDS
|
||||
|
||||
def load_exts(self, initialRun: Optional[bool] = True) -> None:
|
||||
"""
|
||||
Load Cogs/Extensions
|
||||
Args:
|
||||
initialRun (Optional[bool]) default: True
|
||||
Returns:
|
||||
None"""
|
||||
load_method = self.load_extension if initialRun\
|
||||
else self.reload_extension
|
||||
|
||||
def load_exts(initialRun: Optional[bool] = True) -> None:
|
||||
"""
|
||||
Load Cogs/Extensions
|
||||
Args:
|
||||
initialRun (Optional[bool]) default: True
|
||||
Returns:
|
||||
None"""
|
||||
load_method = bot.load_extension if initialRun else bot.reload_extension
|
||||
for cog in cogs_list:
|
||||
logging.info("Loading: %s", cog)
|
||||
load_method(f'cogs.{cog}')
|
||||
|
||||
for cog in cogs_list:
|
||||
logging.info("Loading: %s", cog)
|
||||
load_method(f'cogs.{cog}')
|
||||
importlib.reload(api)
|
||||
from api import API # pylint: disable=unused-import
|
||||
api_config = hypercorn.config.Config()
|
||||
api_config.bind = ["10.10.10.100:5992"]
|
||||
api_instance = api.API(self)
|
||||
try:
|
||||
self.fapi_task.cancel()
|
||||
except Exception as e:
|
||||
logging.debug("Failed to cancel fapi_task: %s",
|
||||
str(e))
|
||||
|
||||
logging.info("Starting FAPI Task")
|
||||
|
||||
importlib.reload(api)
|
||||
from api import API # pylint: disable=unused-import
|
||||
api_config = hypercorn.config.Config()
|
||||
api_config.bind = "10.10.10.100:5992"
|
||||
api_instance = api.API(bot)
|
||||
try:
|
||||
bot.fapi_task.cancel()
|
||||
except Exception as e:
|
||||
logging.debug("Failed to cancel fapi_task: %s",
|
||||
str(e))
|
||||
|
||||
logging.info("Starting FAPI Task")
|
||||
|
||||
bot.fapi_task = bot.loop.create_task(hypercorn.asyncio.serve(api_instance.api_app,
|
||||
self.fapi_task: Task = self.loop.create_task(hypercorn.asyncio.serve(api_instance.api_app,
|
||||
api_config))
|
||||
|
||||
|
||||
@commands.Cog.listener()
|
||||
async def on_ready(self) -> None:
|
||||
"""Run on Bot Ready"""
|
||||
logging.info("%s online!", self.user)
|
||||
|
||||
|
||||
|
||||
def __init__() -> None:
|
||||
logging.info(colored(f"Log level: {logging.getLevelName(logging.root.level)}",
|
||||
"red", attrs=['reverse']))
|
||||
bot.BOT_CHANIDS = BOT_CHANIDS
|
||||
bot.load_exts = load_exts
|
||||
bot.load_exts()
|
||||
bot = Havoc()
|
||||
bot.run(os.getenv('TOKEN'))
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
Reference in New Issue
Block a user