Included automatic disconnects as an InternalConnectionChangeEvent (#…

…78)

lyra/src/lib/consts.py

@@ -14,7 +14,7 @@
 """How many seconds to wait before checking the next time whether the track is confirmed to be stopped"""
 ADD_TRACKS_WRAP_LIM: t.Final = 3
 """How many tracks to be displayed in `/play`'s output before the text got summarized to "Added <i> tracks...\""""
-INACTIVITY_TIMEOUT: t.Final = 600
+INACTIVITY_TIMEOUT: t.Final = 10
 """Timeout duration for the automatic inactivity disconnection in seconds"""
 INACTIVITY_REFRESH: t.Final = 10
 """Amount of timeout refreshes to periodically check whether the inactivity condition is still met"""

lyra/src/lib/lava/__init__.py

@@ -16,5 +16,10 @@
     set_data,
     access_data,
 )
-from .events import ConnectionCommandsInvokedEvent, TrackStoppedEvent
+from .events import (
+    InternalConnectionChangeEvent,
+    ConnectionCommandsInvokedEvent,
+    AutomaticConnectionChangeEvent,
+    TrackStoppedEvent,
+)
 from .impl import EventHandler

lyra/src/lib/lava/events.py

@@ -12,7 +12,17 @@ class BaseLyraEvent(hk.Event, abc.ABC):
 
 
 @a.frozen
-class ConnectionCommandsInvokedEvent(BaseLyraEvent):
+class InternalConnectionChangeEvent(BaseLyraEvent):
+    pass
+
+
+@a.frozen
+class ConnectionCommandsInvokedEvent(InternalConnectionChangeEvent):
+    pass
+
+
+@a.frozen
+class AutomaticConnectionChangeEvent(InternalConnectionChangeEvent):
     pass
 
 

lyra/src/modules/connections.py

@@ -16,7 +16,12 @@
     NotConnectedError,
 )
 from ..lib.cmd import CommandIdentifier as C, with_identifier
-from ..lib.lava import ConnectionCommandsInvokedEvent, NodeDataRef, get_data
+from ..lib.lava import (
+    InternalConnectionChangeEvent,
+    AutomaticConnectionChangeEvent,
+    NodeDataRef,
+    get_data,
+)
 from ..lib.music import __init_component__
 from ..lib.connections import logger, cleanup, join_impl_precaught, leave
 
@@ -82,13 +87,13 @@ async def get_members_in_vc() -> frozenset[hk.VoiceState]:
     assert out_ch
 
     try:
-        conn_cmd_invoked = await bot.wait_for(
-            ConnectionCommandsInvokedEvent, timeout=0.5
+        internal_conn_change = await bot.wait_for(
+            InternalConnectionChangeEvent, timeout=0.5
         )
     except asyncio.TimeoutError:
-        conn_cmd_invoked = None
+        internal_conn_change = None
 
-    if not conn_cmd_invoked and old and old.user_id == bot_u.id:
+    if not internal_conn_change and old and old.user_id == bot_u.id:
         if not new.channel_id:
             await cleanup(event.guild_id, ndt, lvc, bot=bot, also_disconn=False)
             await bot.rest.create_message(
@@ -132,6 +137,7 @@ async def on_everyone_leaves_vc():
         assert __conn
 
         await cleanup(event.guild_id, ndt, lvc, bot=bot, also_del_np_msg=False)
+        bot.dispatch(AutomaticConnectionChangeEvent(bot))
 
         _vc: int = __conn['channel_id']
         logger.info(