ErrorNoInternet/ErrorNoCord
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: clean up initialization code

Browse Source
This commit is contained in:
Ryan 2025-01-06 00:48:00 -05:00
parent 84768653a9
commit 63a2db8278
Signed by: ErrorNoInternet
GPG Key ID: 2486BFB7B1E6A4A3
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
events.py
View File

@ -1,13 +1,14 @@
import asyncio import asyncio
import threading import threading
import time
import commands import commands
import core import core
import tasks import tasks
from state import client from state import client, start_time
async def on_ready(): def prepare():
threading.Thread( threading.Thread(
name="cleanup", name="cleanup",
target=asyncio.run_coroutine_threadsafe, target=asyncio.run_coroutine_threadsafe,
@ -18,10 +19,18 @@ async def on_ready():
).start() ).start()
async def on_bulk_message_delete(messages):
commands.voice.delete_queued(messages)
async def on_message(message): async def on_message(message):
await core.on_message(message) await core.on_message(message)
async def on_message_delete(message):
commands.voice.delete_queued([message])
async def on_message_edit(before, after): async def on_message_edit(before, after):
if before.content == after.content: if before.content == after.content:
return return
@ -29,24 +38,21 @@ async def on_message_edit(before, after):
await core.on_message(after, edited=True) await core.on_message(after, edited=True)
async def on_message_delete(message): async def on_ready():
commands.voice.delete_queued([message]) print(f"logged in as {client.user} in {round(time.time() - start_time, 1)}s")
async def on_bulk_message_delete(messages):
commands.voice.delete_queued(messages)
async def on_voice_state_update(member, before, after): async def on_voice_state_update(member, before, after):
await core.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 event_type, handlers in client.get_listeners().items():
for f in v: for handler in handlers:
client.remove_listener(f, k) client.remove_listener(handler, event_type)
client.add_listener(on_bulk_message_delete, "on_bulk_message_delete") client.add_listener(on_bulk_message_delete, "on_bulk_message_delete")
client.add_listener(on_message, "on_message") client.add_listener(on_message, "on_message")
client.add_listener(on_message_delete, "on_message_delete") client.add_listener(on_message_delete, "on_message_delete")
client.add_listener(on_message_edit, "on_message_edit") client.add_listener(on_message_edit, "on_message_edit")
client.add_listener(on_ready, "on_ready")
client.add_listener(on_voice_state_update, "on_voice_state_update") client.add_listener(on_voice_state_update, "on_voice_state_update")

13
main.py
View File

@ -1,16 +1,7 @@
import time
import constants import constants
import events import events
from state import client, start_time from state import client
@client.event
async def on_ready():
print(f"logged in as {client.user} in {round(time.time() - start_time, 1)}s")
await events.on_ready()
if __name__ == "__main__": if __name__ == "__main__":
events.prepare()
client.run(constants.SECRETS["TOKEN"]) client.run(constants.SECRETS["TOKEN"])