refactor: move major modules around
This commit is contained in:
parent
2f3cf9f81b
commit
4358e22f77
GPG Key ID:
2486BFB7B1E6A4A3
125
core.py
125
core.py
@ -1,7 +1,122 @@
|
||||
message_handlers = {}
|
||||
import contextlib
|
||||
import importlib
|
||||
import inspect
|
||||
import io
|
||||
import textwrap
|
||||
import traceback
|
||||
|
||||
import disnake_paginator
|
||||
|
||||
import commands
|
||||
import constants
|
||||
import utils
|
||||
|
||||
|
||||
async def trigger_message_handlers(event_type: str, *data):
|
||||
if event_type in message_handlers:
|
||||
for message_handler in message_handlers[event_type]:
|
||||
await message_handler(*data)
|
||||
async def on_message(message):
|
||||
tokens = commands.tokenize(message.content)
|
||||
if not tokens:
|
||||
return
|
||||
matched = commands.match_token(tokens[0])
|
||||
if not matched:
|
||||
return
|
||||
|
||||
if len(matched) > 1:
|
||||
await utils.reply(
|
||||
message,
|
||||
f"ambiguous command, could be {' or '.join([f'`{match.value}`' for match in matched])}",
|
||||
)
|
||||
return
|
||||
|
||||
C = commands.Command
|
||||
try:
|
||||
match matched[0]:
|
||||
case C.EXECUTE if message.author.id in constants.OWNERS:
|
||||
code = message.content[len(tokens[0]) + 1 :].strip().strip("`")
|
||||
for replacement in ["python", "py"]:
|
||||
if code.startswith(replacement):
|
||||
code = code[len(replacement) :]
|
||||
|
||||
stdout = io.StringIO()
|
||||
try:
|
||||
with contextlib.redirect_stdout(stdout):
|
||||
if "#globals" in code:
|
||||
exec(
|
||||
f"async def run_code():\n{textwrap.indent(code, ' ')}",
|
||||
globals(),
|
||||
)
|
||||
await globals()["run_code"]()
|
||||
else:
|
||||
dictionary = dict(locals(), **globals())
|
||||
exec(
|
||||
f"async def run_code():\n{textwrap.indent(code, ' ')}",
|
||||
dictionary,
|
||||
dictionary,
|
||||
)
|
||||
await dictionary["run_code"]()
|
||||
output = stdout.getvalue()
|
||||
except Exception as e:
|
||||
output = "`" + str(e) + "`"
|
||||
|
||||
output = utils.filter_secrets(output)
|
||||
|
||||
if len(output) > 2000:
|
||||
output = output.replace("`", "\\`")
|
||||
pager = disnake_paginator.ButtonPaginator(
|
||||
prefix=f"```\n",
|
||||
suffix="```",
|
||||
color=constants.EMBED_COLOR,
|
||||
segments=disnake_paginator.split(output),
|
||||
invalid_user_function=utils.invalid_user_handler,
|
||||
)
|
||||
await pager.start(
|
||||
disnake_paginator.wrappers.MessageInteractionWrapper(message)
|
||||
)
|
||||
elif len(output.strip()) == 0:
|
||||
await utils.add_check_reaction(message)
|
||||
else:
|
||||
await message.channel.send(output)
|
||||
case C.CLEAR | C.PURGE:
|
||||
await commands.tools.clear(message)
|
||||
case C.JOIN:
|
||||
await commands.voice.join(message)
|
||||
case C.LEAVE:
|
||||
await commands.voice.leave(message)
|
||||
case C.QUEUE | C.PLAY:
|
||||
await commands.voice.queue_or_play(message)
|
||||
case C.SKIP:
|
||||
await commands.voice.skip(message)
|
||||
case C.RESUME:
|
||||
await commands.voice.resume(message)
|
||||
case C.PAUSE:
|
||||
await commands.voice.pause(message)
|
||||
case C.VOLUME:
|
||||
await commands.voice.volume(message)
|
||||
case C.UPTIME:
|
||||
await commands.bot.uptime(message)
|
||||
except Exception as e:
|
||||
await utils.reply(
|
||||
message,
|
||||
f"exception occurred while processing command: ```\n{''.join(traceback.format_exception(e)).replace('`', '\\`')}```",
|
||||
)
|
||||
|
||||
|
||||
def rreload(reloaded_modules, module):
|
||||
reloaded_modules.add(module)
|
||||
importlib.reload(module)
|
||||
if "__reload_module__" in dir(module):
|
||||
module.__reload_module__()
|
||||
|
||||
with contextlib.suppress(AttributeError):
|
||||
for module in filter(
|
||||
lambda m: m.__spec__.origin != "frozen",
|
||||
filter(
|
||||
lambda v: inspect.ismodule(v)
|
||||
and (
|
||||
v.__name__.split(".")[-1]
|
||||
not in constants.RELOAD_BLACKLISTED_MODULES
|
||||
)
|
||||
and (v not in reloaded_modules),
|
||||
map(lambda attr: getattr(module, attr), dir(module)),
|
||||
),
|
||||
):
|
||||
rreload(reloaded_modules, module)
|
||||
|
||||
101
events.py
101
events.py
@ -1,98 +1,7 @@
|
||||
import contextlib
|
||||
import io
|
||||
import textwrap
|
||||
import traceback
|
||||
|
||||
import disnake_paginator
|
||||
|
||||
import commands
|
||||
import constants
|
||||
import utils
|
||||
dynamic_handlers = {}
|
||||
|
||||
|
||||
async def on_message(message):
|
||||
tokens = commands.tokenize(message.content)
|
||||
if not tokens:
|
||||
return
|
||||
matched = commands.match_token(tokens[0])
|
||||
if not matched:
|
||||
return
|
||||
|
||||
if len(matched) > 1:
|
||||
await utils.reply(
|
||||
message,
|
||||
f"ambiguous command, could be {' or '.join([f'`{match.value}`' for match in matched])}",
|
||||
)
|
||||
return
|
||||
|
||||
C = commands.Command
|
||||
try:
|
||||
match matched[0]:
|
||||
case C.EXECUTE if message.author.id in constants.OWNERS:
|
||||
code = message.content[len(tokens[0]) + 1 :].strip().strip("`")
|
||||
for replacement in ["python", "py"]:
|
||||
if code.startswith(replacement):
|
||||
code = code[len(replacement) :]
|
||||
|
||||
stdout = io.StringIO()
|
||||
try:
|
||||
with contextlib.redirect_stdout(stdout):
|
||||
if "#globals" in code:
|
||||
exec(
|
||||
f"async def run_code():\n{textwrap.indent(code, ' ')}",
|
||||
globals(),
|
||||
)
|
||||
await globals()["run_code"]()
|
||||
else:
|
||||
dictionary = dict(locals(), **globals())
|
||||
exec(
|
||||
f"async def run_code():\n{textwrap.indent(code, ' ')}",
|
||||
dictionary,
|
||||
dictionary,
|
||||
)
|
||||
await dictionary["run_code"]()
|
||||
output = stdout.getvalue()
|
||||
except Exception as e:
|
||||
output = "`" + str(e) + "`"
|
||||
|
||||
output = utils.filter_secrets(output)
|
||||
|
||||
if len(output) > 2000:
|
||||
output = output.replace("`", "\\`")
|
||||
pager = disnake_paginator.ButtonPaginator(
|
||||
prefix=f"```\n",
|
||||
suffix="```",
|
||||
color=constants.EMBED_COLOR,
|
||||
segments=disnake_paginator.split(output),
|
||||
invalid_user_function=utils.invalid_user_handler,
|
||||
)
|
||||
await pager.start(
|
||||
disnake_paginator.wrappers.MessageInteractionWrapper(message)
|
||||
)
|
||||
elif len(output.strip()) == 0:
|
||||
await utils.add_check_reaction(message)
|
||||
else:
|
||||
await message.channel.send(output)
|
||||
case C.CLEAR | C.PURGE:
|
||||
await commands.tools.clear(message)
|
||||
case C.JOIN:
|
||||
await commands.voice.join(message)
|
||||
case C.LEAVE:
|
||||
await commands.voice.leave(message)
|
||||
case C.QUEUE | C.PLAY:
|
||||
await commands.voice.queue_or_play(message)
|
||||
case C.SKIP:
|
||||
await commands.voice.skip(message)
|
||||
case C.RESUME:
|
||||
await commands.voice.resume(message)
|
||||
case C.PAUSE:
|
||||
await commands.voice.pause(message)
|
||||
case C.VOLUME:
|
||||
await commands.voice.volume(message)
|
||||
case C.UPTIME:
|
||||
await commands.bot.uptime(message)
|
||||
except Exception as e:
|
||||
await utils.reply(
|
||||
message,
|
||||
f"exception occurred while processing command: ```\n{''.join(traceback.format_exception(e)).replace('`', '\\`')}```",
|
||||
)
|
||||
async def trigger_dynamic_handlers(event_type: str, *data):
|
||||
if event_type in dynamic_handlers:
|
||||
for message_handler in dynamic_handlers[event_type]:
|
||||
await message_handler(*data)
|
||||
|
||||
32
main.py
32
main.py
@ -1,5 +1,3 @@
|
||||
import contextlib
|
||||
import importlib
|
||||
import inspect
|
||||
import time
|
||||
|
||||
@ -18,14 +16,14 @@ async def on_ready():
|
||||
|
||||
@client.event
|
||||
async def on_message_edit(before, after):
|
||||
await core.trigger_message_handlers("on_message_edit", before, after)
|
||||
await events.trigger_dynamic_handlers("on_message_edit", before, after)
|
||||
|
||||
await on_message(after)
|
||||
|
||||
|
||||
@client.event
|
||||
async def on_message(message):
|
||||
await core.trigger_message_handlers("on_message", message)
|
||||
await events.trigger_dynamic_handlers("on_message", message)
|
||||
|
||||
global reloaded_modules
|
||||
|
||||
@ -41,34 +39,12 @@ async def on_message(message):
|
||||
and v.__name__ not in constants.RELOAD_BLACKLISTED_MODULES,
|
||||
globals().values(),
|
||||
):
|
||||
rreload(reloaded_modules, module)
|
||||
core.rreload(reloaded_modules, module)
|
||||
|
||||
await utils.add_check_reaction(message)
|
||||
return
|
||||
|
||||
await events.on_message(message)
|
||||
|
||||
|
||||
def rreload(reloaded_modules, module):
|
||||
reloaded_modules.add(module)
|
||||
importlib.reload(module)
|
||||
if "__reload_module__" in dir(module):
|
||||
module.__reload_module__()
|
||||
|
||||
with contextlib.suppress(AttributeError):
|
||||
for module in filter(
|
||||
lambda m: m.__spec__.origin != "frozen",
|
||||
filter(
|
||||
lambda v: inspect.ismodule(v)
|
||||
and (
|
||||
v.__name__.split(".")[-1]
|
||||
not in constants.RELOAD_BLACKLISTED_MODULES
|
||||
)
|
||||
and (v not in reloaded_modules),
|
||||
map(lambda attr: getattr(module, attr), dir(module)),
|
||||
),
|
||||
):
|
||||
rreload(reloaded_modules, module)
|
||||
await core.on_message(message)
|
||||
|
||||
|
||||
client.run(constants.SECRETS["TOKEN"])
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user