diff --git a/events.py b/events.py index 572e7d5..5d416f6 100644 --- a/events.py +++ b/events.py @@ -1,31 +1,13 @@ import commands import core -import events from state import client -dynamic_handlers = {} - - -async def trigger_dynamic_handlers(event_type: str, *data): - if event_type in dynamic_handlers: - for dynamic_handler in dynamic_handlers[event_type]: - try: - await dynamic_handler(*data) - except Exception as e: - print( - f"error in dynamic event handler {dynamic_handler} for {event_type}: {e}" - ) - async def on_message(message): - await events.trigger_dynamic_handlers("on_message", message) - await core.on_message(message) async def on_message_edit(before, after): - await events.trigger_dynamic_handlers("on_message_edit", before, after) - if before.content == after.content: return @@ -33,28 +15,21 @@ async def on_message_edit(before, after): async def on_message_delete(message): - await events.trigger_dynamic_handlers("on_bulk_delete", message) - commands.voice.delete_queued([message]) async def on_bulk_message_delete(messages): - await events.trigger_dynamic_handlers("on_bulk_message_delete", messages) - commands.voice.delete_queued(messages) async def on_voice_state_update(member, before, after): - await events.trigger_dynamic_handlers( - "on_voice_state_update", member, before, after - ) - await core.on_voice_state_update(member, before, after) for k, v in client.get_listeners().items(): for f in v: client.remove_listener(f, k) + client.add_listener(on_bulk_message_delete, "on_bulk_message_delete") client.add_listener(on_message, "on_message") client.add_listener(on_message_delete, "on_message_delete") diff --git a/main.py b/main.py index b1b9126..ac19e1d 100644 --- a/main.py +++ b/main.py @@ -7,7 +7,6 @@ from state import client, start_time @client.event async def on_ready(): - await events.trigger_dynamic_handlers("on_ready") print(f"logged in as {client.user} in {round(time.time() - start_time, 1)}s")