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

Removed cmd source generator. Commands are no longer partial methods. Compilations should be slightly faster now. Updated packages and adapted drawing code to the new apis. There may be some bugs.

Browse Source
This commit is contained in:
Kwoth
2022-07-18 04:33:50 +02:00
parent 3db194c186
commit 99c60459f8
98 changed files with 747 additions and 788 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/NadekoBot/Modules/Music/Music.cs
View File

@@ -155,7 +155,7 @@ public sealed partial class Music : NadekoModule<IMusicService>
// join vc
[Cmd]
[RequireContext(ContextType.Guild)]
public async partial Task Join()
public async Task Join()
{
var user = (IGuildUser)ctx.User;
@@ -173,7 +173,7 @@ public sealed partial class Music : NadekoModule<IMusicService>
// leave vc (destroy)
[Cmd]
[RequireContext(ContextType.Guild)]
public async partial Task Destroy()
public async Task Destroy()
{
var valid = await ValidateAsync();
if (!valid)
@@ -186,36 +186,36 @@ public sealed partial class Music : NadekoModule<IMusicService>
[Cmd]
[RequireContext(ContextType.Guild)]
[Priority(2)]
public partial Task Play()
public Task Play()
=> Next();
// play - index = skip to that index
[Cmd]
[RequireContext(ContextType.Guild)]
[Priority(1)]
public partial Task Play(int index)
public Task Play(int index)
=> MoveToIndex(index);
// play - query = q(query)
[Cmd]
[RequireContext(ContextType.Guild)]
[Priority(0)]
public partial Task Play([Leftover] string query)
public Task Play([Leftover] string query)
=> QueueByQuery(query);
[Cmd]
[RequireContext(ContextType.Guild)]
public partial Task Queue([Leftover] string query)
public Task Queue([Leftover] string query)
=> QueueByQuery(query);
[Cmd]
[RequireContext(ContextType.Guild)]
public partial Task QueueNext([Leftover] string query)
public Task QueueNext([Leftover] string query)
=> QueueByQuery(query, true);
[Cmd]
[RequireContext(ContextType.Guild)]
public async partial Task Volume(int vol)
public async Task Volume(int vol)
{
if (vol is < 0 or > 100)
{
@@ -233,7 +233,7 @@ public sealed partial class Music : NadekoModule<IMusicService>
[Cmd]
[RequireContext(ContextType.Guild)]
public async partial Task Next()
public async Task Next()
{
var valid = await ValidateAsync();
if (!valid)
@@ -247,7 +247,7 @@ public sealed partial class Music : NadekoModule<IMusicService>
// list queue, relevant page
[Cmd]
[RequireContext(ContextType.Guild)]
public async partial Task ListQueue()
public async Task ListQueue()
{
// show page with the current track
if (!_service.TryGetMusicPlayer(ctx.Guild.Id, out var mp))
@@ -262,7 +262,7 @@ public sealed partial class Music : NadekoModule<IMusicService>
// list queue, specify page
[Cmd]
[RequireContext(ContextType.Guild)]
public async partial Task ListQueue(int page)
public async Task ListQueue(int page)
{
if (--page < 0)
return;
@@ -332,7 +332,7 @@ public sealed partial class Music : NadekoModule<IMusicService>
// search
[Cmd]
[RequireContext(ContextType.Guild)]
public async partial Task QueueSearch([Leftover] string query)
public async Task QueueSearch([Leftover] string query)
{
_ = ctx.Channel.TriggerTypingAsync();
@@ -385,7 +385,7 @@ public sealed partial class Music : NadekoModule<IMusicService>
[Cmd]
[RequireContext(ContextType.Guild)]
[Priority(1)]
public async partial Task TrackRemove(int index)
public async Task TrackRemove(int index)
{
if (index < 1)
{
@@ -421,7 +421,7 @@ public sealed partial class Music : NadekoModule<IMusicService>
[Cmd]
[RequireContext(ContextType.Guild)]
[Priority(0)]
public async partial Task TrackRemove(All _ = All.All)
public async Task TrackRemove(All _ = All.All)
{
var valid = await ValidateAsync();
if (!valid)
@@ -439,7 +439,7 @@ public sealed partial class Music : NadekoModule<IMusicService>
[Cmd]
[RequireContext(ContextType.Guild)]
public async partial Task Stop()
public async Task Stop()
{
var valid = await ValidateAsync();
if (!valid)
@@ -465,7 +465,7 @@ public sealed partial class Music : NadekoModule<IMusicService>
[Cmd]
[RequireContext(ContextType.Guild)]
public async partial Task QueueRepeat(InputRepeatType type = InputRepeatType.Queue)
public async Task QueueRepeat(InputRepeatType type = InputRepeatType.Queue)
{
var valid = await ValidateAsync();
if (!valid)
@@ -483,7 +483,7 @@ public sealed partial class Music : NadekoModule<IMusicService>
[Cmd]
[RequireContext(ContextType.Guild)]
public async partial Task Pause()
public async Task Pause()
{
var valid = await ValidateAsync();
if (!valid)
@@ -500,19 +500,19 @@ public sealed partial class Music : NadekoModule<IMusicService>
[Cmd]
[RequireContext(ContextType.Guild)]
public partial Task Radio(string radioLink)
public Task Radio(string radioLink)
=> QueueByQuery(radioLink, false, MusicPlatform.Radio);
[Cmd]
[RequireContext(ContextType.Guild)]
[OwnerOnly]
public partial Task Local([Leftover] string path)
public Task Local([Leftover] string path)
=> QueueByQuery(path, false, MusicPlatform.Local);
[Cmd]
[RequireContext(ContextType.Guild)]
[OwnerOnly]
public async partial Task LocalPlaylist([Leftover] string dirPath)
public async Task LocalPlaylist([Leftover] string dirPath)
{
if (string.IsNullOrWhiteSpace(dirPath))
return;
@@ -551,7 +551,7 @@ public sealed partial class Music : NadekoModule<IMusicService>
[Cmd]
[RequireContext(ContextType.Guild)]
public async partial Task TrackMove(int from, int to)
public async Task TrackMove(int from, int to)
{
if (--from < 0 || --to < 0 || from == to)
{
@@ -592,12 +592,12 @@ public sealed partial class Music : NadekoModule<IMusicService>
[Cmd]
[RequireContext(ContextType.Guild)]
public partial Task SoundCloudQueue([Leftover] string query)
public Task SoundCloudQueue([Leftover] string query)
=> QueueByQuery(query, false, MusicPlatform.SoundCloud);
[Cmd]
[RequireContext(ContextType.Guild)]
public async partial Task SoundCloudPl([Leftover] string playlist)
public async Task SoundCloudPl([Leftover] string playlist)
{
if (string.IsNullOrWhiteSpace(playlist))
return;
@@ -622,7 +622,7 @@ public sealed partial class Music : NadekoModule<IMusicService>
[Cmd]
[RequireContext(ContextType.Guild)]
public async partial Task Playlist([Leftover] string playlistQuery)
public async Task Playlist([Leftover] string playlistQuery)
{
if (string.IsNullOrWhiteSpace(playlistQuery))
return;
@@ -653,7 +653,7 @@ public sealed partial class Music : NadekoModule<IMusicService>
[Cmd]
[RequireContext(ContextType.Guild)]
public async partial Task NowPlaying()
public async Task NowPlaying()
{
var mp = await _service.GetOrCreateMusicPlayerAsync((ITextChannel)ctx.Channel);
if (mp is null)
@@ -679,7 +679,7 @@ public sealed partial class Music : NadekoModule<IMusicService>
[Cmd]
[RequireContext(ContextType.Guild)]
public async partial Task PlaylistShuffle()
public async Task PlaylistShuffle()
{
var valid = await ValidateAsync();
if (!valid)
@@ -699,7 +699,7 @@ public sealed partial class Music : NadekoModule<IMusicService>
[Cmd]
[RequireContext(ContextType.Guild)]
[UserPerm(GuildPerm.ManageMessages)]
public async partial Task SetMusicChannel()
public async Task SetMusicChannel()
{
await _service.SetMusicChannelAsync(ctx.Guild.Id, ctx.Channel.Id);
@@ -709,7 +709,7 @@ public sealed partial class Music : NadekoModule<IMusicService>
[Cmd]
[RequireContext(ContextType.Guild)]
[UserPerm(GuildPerm.ManageMessages)]
public async partial Task UnsetMusicChannel()
public async Task UnsetMusicChannel()
{
await _service.SetMusicChannelAsync(ctx.Guild.Id, null);
@@ -718,7 +718,7 @@ public sealed partial class Music : NadekoModule<IMusicService>
[Cmd]
[RequireContext(ContextType.Guild)]
public async partial Task AutoDisconnect()
public async Task AutoDisconnect()
{
var newState = await _service.ToggleAutoDisconnectAsync(ctx.Guild.Id);
@@ -731,7 +731,7 @@ public sealed partial class Music : NadekoModule<IMusicService>
[Cmd]
[RequireContext(ContextType.Guild)]
[UserPerm(GuildPerm.Administrator)]
public async partial Task MusicQuality()
public async Task MusicQuality()
{
var quality = await _service.GetMusicQualityAsync(ctx.Guild.Id);
await ReplyConfirmLocalizedAsync(strs.current_music_quality(Format.Bold(quality.ToString())));
@@ -740,7 +740,7 @@ public sealed partial class Music : NadekoModule<IMusicService>
[Cmd]
[RequireContext(ContextType.Guild)]
[UserPerm(GuildPerm.Administrator)]
public async partial Task MusicQuality(QualityPreset preset)
public async Task MusicQuality(QualityPreset preset)
{
await _service.SetMusicQualityAsync(ctx.Guild.Id, preset);
await ReplyConfirmLocalizedAsync(strs.music_quality_set(Format.Bold(preset.ToString())));
@@ -748,7 +748,7 @@ public sealed partial class Music : NadekoModule<IMusicService>
[Cmd]
[RequireContext(ContextType.Guild)]
public async partial Task QueueAutoPlay()
public async Task QueueAutoPlay()
{
var newValue = await _service.ToggleQueueAutoPlayAsync(ctx.Guild.Id);
if (newValue)

10
src/NadekoBot/Modules/Music/PlaylistCommands.cs
View File

@@ -37,7 +37,7 @@ public sealed partial class Music
[Cmd]
[RequireContext(ContextType.Guild)]
public async partial Task Playlists([Leftover] int num = 1)
public async Task Playlists([Leftover] int num = 1)
{
if (num <= 0)
return;
@@ -60,7 +60,7 @@ public sealed partial class Music
[Cmd]
[RequireContext(ContextType.Guild)]
public async partial Task DeletePlaylist([Leftover] int id)
public async Task DeletePlaylist([Leftover] int id)
{
var success = false;
try
@@ -91,7 +91,7 @@ public sealed partial class Music
[Cmd]
[RequireContext(ContextType.Guild)]
public async partial Task PlaylistShow(int id, int page = 1)
public async Task PlaylistShow(int id, int page = 1)
{
if (page-- < 1)
return;
@@ -118,7 +118,7 @@ public sealed partial class Music
[Cmd]
[RequireContext(ContextType.Guild)]
public async partial Task Save([Leftover] string name)
public async Task Save([Leftover] string name)
{
if (!_service.TryGetMusicPlayer(ctx.Guild.Id, out var mp))
{
@@ -159,7 +159,7 @@ public sealed partial class Music
[Cmd]
[RequireContext(ContextType.Guild)]
public async partial Task Load([Leftover] int id)
public async Task Load([Leftover] int id)
{
// expensive action, 1 at a time
await _playlistLock.WaitAsync();