fix track objs in track events to be optional

This commit is contained in:
cloudwithax 2023-03-13 18:53:01 -04:00
parent dde6e3711c
commit 45d3e611a5
3 changed files with 6 additions and 8 deletions

1
.gitignore vendored
View File

@ -11,3 +11,4 @@ Pipfile.lock
.mypy_cache/ .mypy_cache/
.vscode/ .vscode/
.venv/ .venv/
*.code-workspace

View File

@ -20,7 +20,7 @@ if not discord.version_info.major >= 2:
"using 'pip install discord.py'", "using 'pip install discord.py'",
) )
__version__ = "2.3" __version__ = "2.3.1a"
__title__ = "pomice" __title__ = "pomice"
__author__ = "cloudwithax" __author__ = "cloudwithax"
__license__ = "GPL-3.0" __license__ = "GPL-3.0"

View File

@ -59,8 +59,7 @@ class TrackStartEvent(PomiceEvent):
def __init__(self, data: dict, player: Player): def __init__(self, data: dict, player: Player):
self.player: Player = player self.player: Player = player
assert self.player._current is not None self.track: Optional[Track] = self.player._current
self.track: Track = self.player._current
# on_pomice_track_start(player, track) # on_pomice_track_start(player, track)
self.handler_args = self.player, self.track self.handler_args = self.player, self.track
@ -80,8 +79,7 @@ class TrackEndEvent(PomiceEvent):
def __init__(self, data: dict, player: Player): def __init__(self, data: dict, player: Player):
self.player: Player = player self.player: Player = player
assert self.player._ending_track is not None self.track: Optional[Track] = self.player._ending_track
self.track: Track = self.player._ending_track
self.reason: str = data["reason"] self.reason: str = data["reason"]
# on_pomice_track_end(player, track, reason) # on_pomice_track_end(player, track, reason)
@ -106,8 +104,7 @@ class TrackStuckEvent(PomiceEvent):
def __init__(self, data: dict, player: Player): def __init__(self, data: dict, player: Player):
self.player: Player = player self.player: Player = player
assert self.player._ending_track is not None self.track: Optional[Track] = self.player._ending_track
self.track: Track = self.player._ending_track
self.threshold: float = data["thresholdMs"] self.threshold: float = data["thresholdMs"]
# on_pomice_track_stuck(player, track, threshold) # on_pomice_track_stuck(player, track, threshold)
@ -132,7 +129,7 @@ class TrackExceptionEvent(PomiceEvent):
def __init__(self, data: dict, player: Player): def __init__(self, data: dict, player: Player):
self.player: Player = player self.player: Player = player
assert self.player._ending_track is not None assert self.player._ending_track is not None
self.track: Track = self.player._ending_track self.track: Optional[Track] = self.player._ending_track
# Error is for Lavalink <= 3.3 # Error is for Lavalink <= 3.3
self.exception: str = data.get( self.exception: str = data.get(
"error", "error",