mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

.whoplays command added

Browse Source
This commit is contained in:
Master Kwoth 2016-05-14 20:20:49 +02:00
parent c51d41d40f
commit b7c8bf504c
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
NadekoBot/Modules/Administration/AdministrationModule.cs
View File

@ -946,6 +946,25 @@ namespace NadekoBot.Modules.Administration
await e.Channel.SendMessage(":ok:"); await e.Channel.SendMessage(":ok:");
}); });
cgb.CreateCommand(Prefix + "whoplays")
.Description("Shows a list of users who are playing the specified game")
.Parameter("game")
.Do(async e =>
{
var game = e.GetArg("game").Trim().ToUpperInvariant();
var en = e.Server.Users
.Where(u => u.CurrentGame?.ToUpperInvariant() == game)
.Select(u => $"{u.Name}");
var arr = en as string[] ?? en.ToArray();
if (arr.Length == 0)
await e.Channel.SendMessage("Nobody. (not 100% sure)");
else
await e.Channel.SendMessage("• " + string.Join("\n• ", arr));
});
}); });
} }

10
NadekoBot/Modules/Music/Classes/MusicControls.cs
View File

@ -95,10 +95,12 @@ namespace NadekoBot.Modules.Music.Classes
Console.WriteLine($"Exception in PlaySong: {ex}"); Console.WriteLine($"Exception in PlaySong: {ex}");
} }
OnCompleted(this, curSong); OnCompleted(this, curSong);
if (RepeatSong) curSong = CurrentSong; //to check if its null now
playlist.Insert(0, curSong); if (curSong != null)
else if (RepeatPlaylist) if (RepeatSong)
playlist.Insert(playlist.Count, curSong); playlist.Insert(0, curSong);
else if (RepeatPlaylist)
playlist.Insert(playlist.Count, curSong);
SongCancelSource = new CancellationTokenSource(); SongCancelSource = new CancellationTokenSource();
cancelToken = SongCancelSource.Token; cancelToken = SongCancelSource.Token;
} }