minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-11 09:48:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

More cleanup

Browse Source 
- Moved all bot files to src/NadekoBot
- Fixed tests path in ci
- Fixed some warnings in MusicService
- Cleaned up csproj slightly
This commit is contained in:
Kwoth
2021-06-18 04:00:05 +02:00
parent 6b92cb3c89
commit 38c7f32a76
14 changed files with 41 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/NadekoBot/Modules/Music/Services/IMusicService.cs
View File

@@ -1,5 +1,6 @@
#nullable enable
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Threading.Tasks;
using Discord;
using NadekoBot.Core.Common;
@@ -24,7 +25,7 @@ namespace NadekoBot.Modules.Music.Services
public Task JoinVoiceChannelAsync(ulong guildId, ulong voiceChannelId);
Task<IMusicPlayer?> GetOrCreateMusicPlayerAsync(ITextChannel contextChannel);
bool TryGetMusicPlayer(ulong guildId, out IMusicPlayer musicPlayer);
bool TryGetMusicPlayer(ulong guildId, [MaybeNullWhen(false)] out IMusicPlayer musicPlayer);
Task<int> EnqueueYoutubePlaylistAsync(IMusicPlayer mp, string playlistId, string queuer);
Task EnqueueDirectoryAsync(IMusicPlayer mp, string dirPath, string queuer);
Task<int> EnqueueSoundcloudPlaylistAsync(IMusicPlayer mp, string playlist, string queuer);

3
src/NadekoBot/Modules/Music/Services/MusicService.cs
View File

@@ -2,6 +2,7 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Threading.Tasks;
using Discord;
@@ -93,7 +94,7 @@ namespace NadekoBot.Modules.Music.Services
return _players.GetOrAdd(contextChannel.GuildId, newPLayer);
}
public bool TryGetMusicPlayer(ulong guildId, out IMusicPlayer musicPlayer)
public bool TryGetMusicPlayer(ulong guildId, [MaybeNullWhen(false)] out IMusicPlayer musicPlayer)
=> _players.TryGetValue(guildId, out musicPlayer);
public async Task<int> EnqueueYoutubePlaylistAsync(IMusicPlayer mp, string query, string queuer)