Merge branch 'dev' into player-control-ui

This commit is contained in:
2021-11-06 12:19:52 +01:00
committed by GitHub
12 changed files with 252 additions and 44 deletions
+7 -5
View File
@@ -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\.)?.+")