Update init

This commit is contained in:
Zeva Rose 2022-02-04 09:55:05 -07:00
parent 6fad4f3787
commit 5629dd534f

View file

@ -1,13 +1,13 @@
"""Main J.A.R.V.I.S. package.""" """Main J.A.R.V.I.S. package."""
import logging import logging
from dis_snek import Intents, Snake from dis_snek import Intents, Snake, listen
from mongoengine import connect from mongoengine import connect
# from jarvis import logo # noqa: F401 # from jarvis import logo # noqa: F401
from jarvis import tasks, utils from jarvis import tasks, utils
from jarvis.config import get_config from jarvis.config import get_config
from jarvis.events import guild, member, message from jarvis.events import member, message
jconfig = get_config() jconfig = get_config()
@ -17,17 +17,17 @@ file_handler = logging.FileHandler(filename="jarvis.log", encoding="UTF-8", mode
file_handler.setFormatter(logging.Formatter("[%(asctime)s][%(levelname)s][%(name)s] %(message)s")) file_handler.setFormatter(logging.Formatter("[%(asctime)s][%(levelname)s][%(name)s] %(message)s"))
logger.addHandler(file_handler) logger.addHandler(file_handler)
intents = Intents.default() intents = Intents.DEFAULT
intents.members = True intents.members = True
restart_ctx = None restart_ctx = None
jarvis = Snake(intents=intents, default_prefix=utils.get_prefix, sync_interactions=jconfig.sync) jarvis = Snake(intents=intents, default_prefix="!", sync_interactions=jconfig.sync)
__version__ = "2.0.0a0" __version__ = "2.0.0a0"
@jarvis.add_listener @listen()
async def on_ready() -> None: async def on_ready() -> None:
"""Lepton on_ready override.""" """Lepton on_ready override."""
global restart_ctx global restart_ctx
@ -35,6 +35,12 @@ async def on_ready() -> None:
print(" Connected to {} guild(s)".format(len(jarvis.guilds))) print(" Connected to {} guild(s)".format(len(jarvis.guilds)))
@listen()
async def on_startup() -> None:
"""Lepton on_startup override."""
tasks.init()
def run() -> None: def run() -> None:
"""Run J.A.R.V.I.S.""" """Run J.A.R.V.I.S."""
connect( connect(
@ -60,19 +66,11 @@ def run() -> None:
) )
jarvis.max_messages = jconfig.max_messages jarvis.max_messages = jconfig.max_messages
tasks.init()
# Add event listeners # Add event listeners
if jconfig.events: if jconfig.events:
_ = [ _ = [
guild.GuildEventHandler(jarvis),
member.MemberEventHandler(jarvis), member.MemberEventHandler(jarvis),
message.MessageEventHandler(jarvis), message.MessageEventHandler(jarvis),
] ]
jarvis.run(jconfig.token, bot=True, reconnect=True) jarvis.start(jconfig.token)
for cog in jarvis.cogs:
session = getattr(cog, "_session", None)
if session:
session.close()
if restart_ctx:
return restart_ctx