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

Clash of clans organizer. M3u support fix. Better strings on a few places.

Browse Source
This commit is contained in:
Master Kwoth
2016-02-16 21:11:27 +01:00
parent 643f8590a7
commit 5fa81c1810
6 changed files with 346 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NadekoBot/Modules/Administration.cs
View File

@ -600,9 +600,9 @@ namespace NadekoBot.Modules {
await Task.Run(async () => {
var rows = Classes.DBHandler.Instance.GetAllRows<Donator>();
var donatorsOrdered = rows.OrderByDescending(d => d.Amount);
string str = $"`Total number of people who donated is {donatorsOrdered.Count()}`\n";
string str = $"**Thanks to the people listed below for making this project happen!**\n";
await e.Channel.SendMessage(str + string.Join(", ", donatorsOrdered.Select(d => d.UserName)));
await e.Channel.SendMessage(str + string.Join("⭐", donatorsOrdered.Select(d => d.UserName)));
});
});

1
NadekoBot/Modules/Games.cs
View File

@ -18,6 +18,7 @@ namespace NadekoBot.Modules
commands.Add(new Trivia());
commands.Add(new SpeedTyping());
commands.Add(new PollCommand());
commands.Add(new ClashOfClans());
_8BallAnswers = JArray.Parse(File.ReadAllText("data/8ball.json")).Select(t => t.ToString()).ToArray();
}

6
NadekoBot/Modules/Music.cs
View File

@ -195,7 +195,7 @@ namespace NadekoBot.Modules {
}
var ids = await SearchHelper.GetVideoIDs(await SearchHelper.GetPlaylistIdByKeyword(e.GetArg("playlist")));
//todo TEMPORARY SOLUTION, USE RESOLVE QUEUE IN THE FUTURE
var msg = await e.Send($"🎵 Attempting to queue **{ids.Count}** songs".SnPl(ids.Count));
var msg = await e.Send($"🎵 `Attempting to queue **{ids.Count}** songs".SnPl(ids.Count)+"...`");
foreach (var id in ids) {
Task.Run(async () => await QueueSong(e, id, true)).ConfigureAwait(false);
await Task.Delay(150);
@ -321,7 +321,7 @@ namespace NadekoBot.Modules {
sr.OnBuffering += async () => {
msg = await e.Send($"🎵`Buffering...`{sr.FullPrettyName}");
};
sr.Resolve();
await sr.Resolve();
} catch (Exception ex) {
Console.WriteLine();
await e.Send($"💢 {ex.Message}");
@ -365,7 +365,7 @@ namespace NadekoBot.Modules {
C:\xxx5xx\x6xxxxxx\x7xxxxx\xx.mp3
*/
try {
var m = Regex.Match(file, "(?<url>^[^#].*)");
var m = Regex.Match(file, "(?<url>^[^#].*)", RegexOptions.Multiline);
var res = m.Groups["url"]?.ToString();
return res?.Trim();
}