diff --git a/pomice/__init__.py b/pomice/__init__.py index e4d5456..32b2a97 100644 --- a/pomice/__init__.py +++ b/pomice/__init__.py @@ -7,7 +7,6 @@ Copyright (c) 2023, cloudwithax Licensed under GPL-3.0 """ - import discord if not discord.version_info.major >= 2: diff --git a/pomice/models/events.py b/pomice/models/events.py index 625e2d0..b206fb5 100644 --- a/pomice/models/events.py +++ b/pomice/models/events.py @@ -3,14 +3,16 @@ from __future__ import annotations import abc from enum import Enum from enum import unique -from typing import TYPE_CHECKING from typing import Literal +from typing import TYPE_CHECKING + from discord import Guild from pydantic import computed_field from pydantic import Field + from pomice.models import BaseModel -from pomice.player import Player from pomice.objects import Track +from pomice.player import Player from pomice.pool import NodePool if TYPE_CHECKING: @@ -41,7 +43,8 @@ class PomiceEvent(BaseModel, abc.ABC): name: str @abc.abstractmethod - def dispatch(self, bot: Client) -> None: ... + def dispatch(self, bot: Client) -> None: + ... class TrackStartEvent(PomiceEvent): diff --git a/pomice/player.py b/pomice/player.py index 8ce87af..29fc531 100644 --- a/pomice/player.py +++ b/pomice/player.py @@ -16,9 +16,6 @@ from discord.ext import commands from . import events from .enums import SearchType -from pomice.models.events import PomiceEvent -from pomice.models.events import TrackEndEvent -from pomice.models.events import TrackStartEvent from .exceptions import FilterInvalidArgument from .exceptions import FilterTagAlreadyInUse from .exceptions import FilterTagInvalid @@ -30,6 +27,9 @@ from .objects import Playlist from .objects import Track from .pool import Node from .pool import NodePool +from pomice.models.events import PomiceEvent +from pomice.models.events import TrackEndEvent +from pomice.models.events import TrackStartEvent from pomice.models.version import LavalinkVersion if TYPE_CHECKING: