fix(core): properly use on_voice_state_update

This is called for different members updating their own individual voice
states, not just the bot itself. If someone leaves the channel, we get
their view of their voice state.

.envrc

@@ -0,0 +1,6 @@
+dotenv
+
+export VIRTUAL_ENV=."venv"
+layout python
+
+use flake

.gitignore

@@ -1,3 +1,4 @@
+.direnv
 .env
 .venv
 __pycache__

errornocord/constants.py

@@ -31,34 +31,34 @@ REACTIONS = {
     "pizza": ["🍕"],
 }
 RELOADABLE_MODULES = [
-    "arguments",
+    "errornocord.arguments",
-    "audio",
+    "errornocord.audio",
-    "audio.discord",
+    "errornocord.audio.discord",
-    "audio.queue",
+    "errornocord.audio.queue",
-    "audio.utils",
+    "errornocord.audio.utils",
-    "audio.youtubedl",
+    "errornocord.audio.youtubedl",
-    "commands",
+    "errornocord.commands",
-    "commands.bot",
+    "errornocord.commands.bot",
-    "commands.tools",
+    "errornocord.commands.tools",
-    "commands.utils",
+    "errornocord.commands.utils",
-    "commands.voice",
+    "errornocord.commands.voice",
-    "commands.voice.channel",
+    "errornocord.commands.voice.channel",
-    "commands.voice.playback",
+    "errornocord.commands.voice.playback",
-    "commands.voice.playing",
+    "errornocord.commands.voice.playing",
-    "commands.voice.queue",
+    "errornocord.commands.voice.queue",
-    "commands.voice.sponsorblock",
+    "errornocord.commands.voice.sponsorblock",
-    "commands.voice.utils",
+    "errornocord.commands.voice.utils",
-    "constants",
+    "errornocord.constants",
-    "core",
+    "errornocord.core",
-    "events",
+    "errornocord.events",
-    "extra",
+    "errornocord.extra",
-    "fun",
+    "errornocord.fun",
-    "sponsorblock",
+    "errornocord.sponsorblock",
-    "tasks",
+    "errornocord.tasks",
-    "utils",
+    "errornocord.utils",
-    "utils.common",
+    "errornocord.utils.common",
-    "utils.discord",
+    "errornocord.utils.discord",
-    "voice",
+    "errornocord.voice",
     "yt_dlp",
     "yt_dlp.version",
 ]

errornocord/core.py

@@ -148,22 +148,20 @@ async def on_message(message, edited=False):
         command_locks[(message.guild.id, message.author.id)].release()
 
 
-async def on_voice_state_update(_, before, after):
+async def on_voice_state_update(member, before, after):
-    if not before.channel and after.channel:
+    def is_alone(channel):
-        return
-
-    if before.channel and not after.channel:
-        if before.channel.guild.id in players:
-            del players[before.channel.guild.id]
-        return
-
-    def is_empty(channel):
         return [m.id for m in (channel.members if channel else [])] == [client.user.id]
 
-    if is_empty(after.channel):
+    if member.id == client.user.id and is_alone(after.channel):
-        if after.channel.guild.id in players:
+        if before.channel.guild.id in players:
-            del players[after.channel.guild.id]
+            del players[before.channel.guild.id]
         await after.channel.guild.voice_client.disconnect()
+        return
+
+    if is_alone(before.channel):
+        if before.channel.guild.id in players:
+            del players[before.channel.guild.id]
+        await before.channel.guild.voice_client.disconnect()
 
 
 def rreload(reloaded_modules, module):
@@ -187,8 +185,8 @@ def rreload(reloaded_modules, module):
 
 def reload(*_):
     reloaded_modules = set()
-    rreload(reloaded_modules, __import__("core"))
+    rreload(reloaded_modules, __import__("errornocord.core"))
-    rreload(reloaded_modules, __import__("extra"))
+    rreload(reloaded_modules, __import__("errornocord.extra"))
     for module in filter(
         lambda v: inspect.ismodule(v) and v.__name__ in RELOADABLE_MODULES,
         globals().values(),

errornocord/extra.py

@@ -4,7 +4,7 @@ import string
 import disnake
 from youtube_transcript_api._api import YouTubeTranscriptApi
 
-from state import client, kill, players
+from .state import client, kill, players
 
 
 async def transcript(

pyproject.toml

@@ -8,3 +8,6 @@ errornocord = "errornocord.main:main"
 [tool.setuptools.packages.find]
 where = ["."]
 include = ["errornocord*"]
+
+[tool.basedpyright]
+typeCheckingMode = "basic"