Merge branch 'dev' into player-control-ui

cogs/information.py

@@ -1,17 +1,18 @@
+import datetime
+import time
 from typing import Optional
 
 import discord
-from discord.ext import tasks, commands
-
-import time
-from discord.ext.commands import Context
 import humanize
-import datetime
 import lavalink
+from discord.ext import commands
+from discord.ext import tasks
+from discord.ext.commands import Context
+
 from bot import ChristmasBot
+from utils.database import AutoJoin
 from utils.EmbedGenerator import EmbedGenerator
 from utils.paginator import HelpPaginator
-from utils.database import AutoJoin
 
 
 class InformationCog(commands.Cog, name="Information"):

cogs/music.py

@@ -8,17 +8,19 @@ from discord.channel import TextChannel
 from discord.ext.commands.context import Context
 from discord.ext.commands.errors import CommandError
 import lavalink
+from discord import Embed
+from discord.channel import TextChannel
 from discord.ext import commands
-from lavalink.models import AudioTrack, DefaultPlayer
+from discord.ext.commands.context import Context
+from lavalink.models import AudioTrack
+from lavalink.models import DefaultPlayer
 
 from bot import ChristmasBot
-from utils.EmbedGenerator import EmbedGenerator
-from utils.database import AutoJoin
 from context import CustomContext
-from discord import Embed
-
+from utils.database import AutoJoin
 from utils.database import Playlist
 from utils.exceptions import EmbeddedCommandException
+from utils.EmbedGenerator import EmbedGenerator
 
 url_rx = re.compile(r"https?://(?:www\.)?.+")
 

cogs/owner.py

@@ -1,16 +1,15 @@
-import discord
-from discord.ext import commands
-
-import textwrap
-import io
-import traceback
 import asyncio
+import io
+import textwrap
 import time
+import traceback
 from asyncio.subprocess import PIPE
+from contextlib import redirect_stdout
 from io import BytesIO
 from platform import python_version
-from contextlib import redirect_stdout
 
+import discord
+from discord.ext import commands
 from discord.ext.commands.context import Context
 
 from bot import ChristmasBot

cogs/settings.py

@@ -1,10 +1,11 @@
-from context import CustomContext
 from discord.ext import commands
-from utils.EmbedGenerator import EmbedGenerator
-from utils.database import AutoJoin
-from bot import ChristmasBot
 from discord.ext.commands import Context
 
+from bot import ChristmasBot
+from context import CustomContext
+from utils.database import AutoJoin
+from utils.EmbedGenerator import EmbedGenerator
+
 
 class SettingsCog(commands.Cog, name="Settings"):
     def __init__(self, bot: ChristmasBot):