diff --git a/musicbot/cogs/music/__init__.py b/musicbot/cogs/music/__init__.py index b7f5239..c07cfb2 100644 --- a/musicbot/cogs/music/__init__.py +++ b/musicbot/cogs/music/__init__.py @@ -1,10 +1,13 @@ # Discord Packages import discord from discord.ext import commands, tasks +from lavalink.events import ( + NodeChangedEvent, NodeConnectedEvent, NodeDisconnectedEvent, PlayerUpdateEvent, QueueEndEvent, TrackEndEvent, + TrackStartEvent, TrackStuckEvent) import asyncio -import re import json +import re import urllib from bs4 import BeautifulSoup @@ -17,11 +20,6 @@ from ...utils.userinteraction.selector import Selector2, SelectorButton, Selecto from .decorators import BasicVoiceClient, require_playing, require_queue, require_voice_connection, voteable from .music_errors import WrongTextChannelError -from lavalink.events import TrackStartEvent, TrackEndEvent, TrackStuckEvent, QueueEndEvent, \ - NodeConnectedEvent, PlayerUpdateEvent, NodeChangedEvent, \ - NodeDisconnectedEvent - - time_rx = re.compile('[0-9]+') url_rx = re.compile('https?:\\/\\/(?:www\\.)?.+') diff --git a/musicbot/cogs/nodemanager.py b/musicbot/cogs/nodemanager.py index fd9bc39..5e4c501 100644 --- a/musicbot/cogs/nodemanager.py +++ b/musicbot/cogs/nodemanager.py @@ -1,7 +1,7 @@ # Discord Packages import discord from discord.ext import commands -from lavalink import Node, Client +from lavalink import Client, Node import codecs diff --git a/musicbot/utils/userinteraction/selector.py b/musicbot/utils/userinteraction/selector.py index 14e8d4c..b4944ae 100644 --- a/musicbot/utils/userinteraction/selector.py +++ b/musicbot/utils/userinteraction/selector.py @@ -2,9 +2,9 @@ from __future__ import annotations # Discord Packages import discord + import asyncio import inspect - from typing import Callable, Coroutine, List from .paginators import TextPaginator diff --git a/setup.cfg b/setup.cfg index 92598fc..a14c0aa 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,7 +8,7 @@ known_discord = discord,lavalink known_utils = cogs.utils,cogs.helpformatter import_heading_discord = Discord Packages import_heading_utils = Bot Utilities -sections = DISCORD,FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,UTILS,LOCALFOLDER +sections = FUTURE,DISCORD,STDLIB,THIRDPARTY,FIRSTPARTY,UTILS,LOCALFOLDER no_lines_before = LOCALFOLDER indent = " " line_length = 120