From 83611d9f1a05c0c47a005df5024d55eeb1132971 Mon Sep 17 00:00:00 2001
From: Roxedus <me@roxedus.dev>
Date: Sun, 14 Jun 2020 15:41:07 +0200
Subject: [PATCH] Update requirements, adapt changes

---
 cogs/music.py           | 3 +++
 cogs/utils/checks.py    | 2 +-
 cogs/utils/mixplayer.py | 9 +++++----
 requirements.txt        | 6 +++---
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/cogs/music.py b/cogs/music.py
index 22e8ea7..f64d053 100644
--- a/cogs/music.py
+++ b/cogs/music.py
@@ -81,11 +81,13 @@ class Music(commands.Cog):
                 numtracks = 0
                 for track in tracks:
                     if track['info']['length'] <= maxlength:
+                        track = lavalink.models.AudioTrack(track, ctx.author.id)
                         player.add(requester=ctx.author.id, track=track)
                         numtracks += 1
             else:
                 numtracks = len(tracks)
                 for track in tracks:
+                    track = lavalink.models.AudioTrack(track, ctx.author.id)
                     player.add(requester=ctx.author.id, track=track)
 
             embed.title = '{playlist_enqued}'
@@ -94,6 +96,7 @@ class Music(commands.Cog):
             await ctx.send(embed=embed)
         else:
             track = results['tracks'][0]
+            track = lavalink.models.AudioTrack(track, ctx.author.id)
             await self.enqueue(ctx, track, embed)
             embed = ctx.localizer.format_embed(embed)
             await ctx.send(embed=embed)
diff --git a/cogs/utils/checks.py b/cogs/utils/checks.py
index 3798eac..75e22db 100644
--- a/cogs/utils/checks.py
+++ b/cogs/utils/checks.py
@@ -61,7 +61,7 @@ def is_dj(ctx):
 def dj_or(alone: bool = False, track_requester: bool = False):
     async def predicate(ctx):
         try:
-            player = ctx.bot.lavalink.players.get(ctx.guild.id)
+            player = ctx.bot.lavalink.player_manager.get(ctx.guild.id)
             is_alone = (ctx.author in player.listeners and len(player.listeners) == 1) and alone
             requester = (player.current.requester == ctx.author.id) and track_requester
 
diff --git a/cogs/utils/mixplayer.py b/cogs/utils/mixplayer.py
index f6cf2fa..116f0cd 100644
--- a/cogs/utils/mixplayer.py
+++ b/cogs/utils/mixplayer.py
@@ -3,6 +3,7 @@ import lavalink
 from lavalink import AudioTrack, DefaultPlayer, Node
 from lavalink.events import QueueEndEvent, TrackEndEvent, TrackExceptionEvent, TrackStartEvent, TrackStuckEvent
 
+import typing
 from collections import OrderedDict, deque
 from itertools import chain, cycle, islice
 from random import shuffle
@@ -18,13 +19,13 @@ class MixPlayer(DefaultPlayer):
         self.skip_voters = set()
         self.boosted = False
 
-    def add(self, requester: int, track: dict, pos: int = None):
+    def add(self, requester: int, track: typing.Union[dict, AudioTrack], pos: int = None):
         """ Adds a track to the queue. """
-        return self.queue.add_track(requester, AudioTrack(track, requester), pos)
+        return self.queue.add_track(requester, track, pos)
 
-    def add_next(self, requester: int, track: dict):
+    def add_next(self, requester: int, track: typing.Union[dict, AudioTrack], pos: int = None):
         """ Adds a track to beginning of the queue """
-        self.queue.add_next_track(AudioTrack(track, requester))
+        self.queue.add_next_track(track)
 
     def move_user_track(self, requester: int, initial: int, final: int):
         """ Moves a track in a users queue"""
diff --git a/requirements.txt b/requirements.txt
index 58c9768..d65fede 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
-discord.py >= 1.3
-git+https://github.com/Devoxin/Lavalink.py@b614a5389e3cf5ea7c444041428a05b084ca15ec
+discord.py >= 1.3.3
+git+https://github.com/Devoxin/Lavalink.py@7a93b5b50d324f9dfd073bd8a3c835261a98a50b
 asyncio
 pyyaml
 BeautifulSoup4
-aiohttp<3.5.0,>=3.3.0
\ No newline at end of file
+aiohttp>=3.6.0,<3.7.0
\ No newline at end of file