tueem/TomatenMusic-V2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
EkiciLP
2022-03-24 08:58:55 +01:00
parent 482a64ac54 8720bf9f88
commit b532f19080
9 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TomatenMusicCore/Music/Entitites/LavalinkPlaylist.cs → TomatenMusicCore/Music/Entitites/ILavalinkPlaylist.cs
View File

@@ -8,7 +8,7 @@ using Lavalink4NET.Player;
namespace TomatenMusic.Music.Entitites
{
public interface LavalinkPlaylist
public interface ILavalinkPlaylist
{
public string Name { get; }
public IEnumerable<LavalinkTrack> Tracks { get; }

2
TomatenMusicCore/Music/Entitites/SpotifyPlaylist.cs
View File

@@ -5,7 +5,7 @@ using System.Text;
namespace TomatenMusic.Music.Entitites
{
public class SpotifyPlaylist : LavalinkPlaylist
public class SpotifyPlaylist : ILavalinkPlaylist
{
public string Name { get; }
public IEnumerable<LavalinkTrack> Tracks { get; }

2
TomatenMusicCore/Music/Entitites/YoutubePlaylist.cs
View File

@@ -9,7 +9,7 @@ using TomatenMusic.Services;
namespace TomatenMusic.Music.Entitites
{
public class YoutubePlaylist : LavalinkPlaylist
public class YoutubePlaylist : ILavalinkPlaylist
{
public string Name { get; }

4
TomatenMusicCore/Music/GuildPlayer.cs
View File

@@ -111,7 +111,7 @@ namespace TomatenMusic.Music
QueuePrompt.UpdateFor(GuildId);
}
public async Task PlayPlaylistAsync(LavalinkPlaylist playlist)
public async Task PlayPlaylistAsync(ILavalinkPlaylist playlist)
{
EnsureNotDestroyed();
EnsureConnected();
@@ -129,7 +129,7 @@ namespace TomatenMusic.Music
QueuePrompt.UpdateFor(GuildId);
}
public async Task PlayPlaylistNowAsync(LavalinkPlaylist playlist)
public async Task PlayPlaylistNowAsync(ILavalinkPlaylist playlist)
{
EnsureConnected();
EnsureNotDestroyed();

4
TomatenMusicCore/Music/MusicActionResponse.cs
View File

@@ -8,11 +8,11 @@ namespace TomatenMusic.Music
{
public class MusicActionResponse
{
public LavalinkPlaylist Playlist { get; }
public ILavalinkPlaylist Playlist { get; }
public LavalinkTrack Track { get; }
public IEnumerable<LavalinkTrack> Tracks { get; }
public bool isPlaylist { get; }
public MusicActionResponse(LavalinkTrack track = null, LavalinkPlaylist playlist = null, IEnumerable<LavalinkTrack> tracks = null)
public MusicActionResponse(LavalinkTrack track = null, ILavalinkPlaylist playlist = null, IEnumerable<LavalinkTrack> tracks = null)
{
Playlist = playlist;
Track = track;

4
TomatenMusicCore/Music/PlayerQueue.cs
View File

@@ -18,7 +18,7 @@ namespace TomatenMusic.Music
public Queue<LavalinkTrack> Queue { get; set; } = new Queue<LavalinkTrack>();
public Queue<LavalinkTrack> PlayedTracks { get; set; } = new Queue<LavalinkTrack>();
public ILogger<PlayerQueue> _logger { get; set; } = TomatenMusicBot.ServiceProvider.GetRequiredService<ILogger<PlayerQueue>>();
public LavalinkPlaylist CurrentPlaylist { get; set; }
public ILavalinkPlaylist CurrentPlaylist { get; set; }
public LoopType LoopType { get; private set; } = LoopType.NONE;
@@ -36,7 +36,7 @@ namespace TomatenMusic.Music
QueueLoopList.Add(track);
}
public Task QueuePlaylistAsync(LavalinkPlaylist playlist)
public Task QueuePlaylistAsync(ILavalinkPlaylist playlist)
{
return Task.Run(() =>
{