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

fixed permissions, depercated !M setgame, debugging stuff

Browse Source
This commit is contained in:
Master Kwoth 2016-03-07 09:17:15 +01:00
parent 86a140f8bb
commit 638ddbd3b1
4 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
NadekoBot/Classes/Music/Song.cs
View File

@ -4,6 +4,7 @@ using System;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.CompilerServices;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -180,7 +181,16 @@ namespace NadekoBot.Classes.Music {
}); });
internal async Task Play(IAudioClient voiceClient, CancellationToken cancelToken) { internal async Task Play(IAudioClient voiceClient, CancellationToken cancelToken) {
var bufferTask = BufferSong(cancelToken).ConfigureAwait(false); var bufferTask = new ConfiguredTaskAwaitable();
try {
bufferTask = BufferSong(cancelToken).ConfigureAwait(false);
}
catch (Exception ex) {
var clr = Console.ForegroundColor;
Console.ForegroundColor = ConsoleColor.Red;
Console.WriteLine($"ERR BUFFER START : {ex.Message}\n{ex}");
Console.ForegroundColor = clr;
}
var bufferAttempts = 0; var bufferAttempts = 0;
const int waitPerAttempt = 500; const int waitPerAttempt = 500;
var toAttemptTimes = SongInfo.ProviderType != MusicType.Normal ? 5 : 9; var toAttemptTimes = SongInfo.ProviderType != MusicType.Normal ? 5 : 9;
@ -197,8 +207,10 @@ namespace NadekoBot.Classes.Music {
var read = songBuffer.Read(buffer, blockSize); var read = songBuffer.Read(buffer, blockSize);
if (read == 0) if (read == 0)
if (attempt++ == 20) { if (attempt++ == 20) {
Console.WriteLine("Waiting to empty out buffer.");
voiceClient.Wait(); voiceClient.Wait();
await bufferTask; await bufferTask;
Console.WriteLine("Song finished.");
return; return;
} }
else else

2
NadekoBot/Classes/Permissions/PermissionsHandler.cs
View File

@ -140,7 +140,7 @@ namespace NadekoBot.Classes.Permissions {
} }
private static void WriteServerToJson(ServerPermissions serverPerms) { private static void WriteServerToJson(ServerPermissions serverPerms) {
string pathToFile = $"data/permissions/{serverPerms}.json"; string pathToFile = $"data/permissions/{serverPerms.Id}.json";
File.WriteAllText(pathToFile, File.WriteAllText(pathToFile,
Newtonsoft.Json.JsonConvert.SerializeObject(serverPerms, Newtonsoft.Json.Formatting.Indented)); Newtonsoft.Json.JsonConvert.SerializeObject(serverPerms, Newtonsoft.Json.Formatting.Indented));
} }

4
NadekoBot/Commands/LoLCommands.cs
View File

@ -253,7 +253,9 @@ Assists: {general["assists"]} Ban: {general["banRate"]}%
var data = JObject.Parse( var data = JObject.Parse(
await Classes await Classes
.SearchHelper .SearchHelper
.GetResponseStringAsync($"http://api.champion.gg/stats/champs/mostBanned?api_key={NadekoBot.Creds.LOLAPIKey}&page=1&limit={showCount}"))["data"] as JArray; .GetResponseStringAsync($"http://api.champion.gg/stats/champs/mostBanned?" +
$"api_key={NadekoBot.Creds.LOLAPIKey}&page=1&" +
$"limit={showCount}"))["data"] as JArray;
var sb = new StringBuilder(); var sb = new StringBuilder();
sb.AppendLine($"**Showing {showCount} top banned champions.**"); sb.AppendLine($"**Showing {showCount} top banned champions.**");

12
NadekoBot/Modules/Music.cs
View File

@ -200,15 +200,11 @@ namespace NadekoBot.Modules {
cgb.CreateCommand("setgame") cgb.CreateCommand("setgame")
.Description("Sets the game of the bot to the number of songs playing.**Owner only**") .Description("Sets the game of the bot to the number of songs playing.**Owner only**")
.AddCheck(Classes.Permissions.SimpleCheckers.OwnerOnly()) .AddCheck(SimpleCheckers.OwnerOnly())
.Do(async e => { .Do(async e => {
setgameEnabled = !setgameEnabled; await e.Channel.SendMessage("❗This command is deprecated. " +
if (setgameEnabled) "Use:\n `.ropl`\n `.adpl %playing% songs, %queued% queued.` instead.\n " +
setgameTimer.Start(); "It even persists through restarts.");
else
setgameTimer.Stop();
await e.Channel.SendMessage("`Music status " + (setgameEnabled ? "enabled`" : "disabled`"));
}); });
cgb.CreateCommand("pl") cgb.CreateCommand("pl")