From 45d3e611a5ae5cee988f1825cecdc021d858191c Mon Sep 17 00:00:00 2001 From: cloudwithax Date: Mon, 13 Mar 2023 18:53:01 -0400 Subject: [PATCH] fix track objs in track events to be optional --- .gitignore | 1 + pomice/__init__.py | 2 +- pomice/events.py | 11 ++++------- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index c2e7f47..ccae5fc 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ Pipfile.lock .mypy_cache/ .vscode/ .venv/ +*.code-workspace diff --git a/pomice/__init__.py b/pomice/__init__.py index ab9eb8b..0f2f4f3 100644 --- a/pomice/__init__.py +++ b/pomice/__init__.py @@ -20,7 +20,7 @@ if not discord.version_info.major >= 2: "using 'pip install discord.py'", ) -__version__ = "2.3" +__version__ = "2.3.1a" __title__ = "pomice" __author__ = "cloudwithax" __license__ = "GPL-3.0" diff --git a/pomice/events.py b/pomice/events.py index e920bb7..0d51afc 100644 --- a/pomice/events.py +++ b/pomice/events.py @@ -59,8 +59,7 @@ class TrackStartEvent(PomiceEvent): def __init__(self, data: dict, player: Player): self.player: Player = player - assert self.player._current is not None - self.track: Track = self.player._current + self.track: Optional[Track] = self.player._current # on_pomice_track_start(player, track) self.handler_args = self.player, self.track @@ -80,8 +79,7 @@ class TrackEndEvent(PomiceEvent): def __init__(self, data: dict, player: Player): self.player: Player = player - assert self.player._ending_track is not None - self.track: Track = self.player._ending_track + self.track: Optional[Track] = self.player._ending_track self.reason: str = data["reason"] # on_pomice_track_end(player, track, reason) @@ -106,8 +104,7 @@ class TrackStuckEvent(PomiceEvent): def __init__(self, data: dict, player: Player): self.player: Player = player - assert self.player._ending_track is not None - self.track: Track = self.player._ending_track + self.track: Optional[Track] = self.player._ending_track self.threshold: float = data["thresholdMs"] # on_pomice_track_stuck(player, track, threshold) @@ -132,7 +129,7 @@ class TrackExceptionEvent(PomiceEvent): def __init__(self, data: dict, player: Player): self.player: Player = player 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 self.exception: str = data.get( "error",