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

Music **should** be perfectly stable! .uid improved

Browse Source
This commit is contained in:
Master Kwoth
2016-01-28 04:38:26 +01:00
parent db73723f67
commit 073d67c1ed
5 changed files with 116 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
NadekoBot/Modules/Administration.cs
View File

@ -256,15 +256,11 @@ namespace NadekoBot.Modules
cgb.CreateCommand(".uid").Alias(".userid")
.Description("Shows user id")
.Parameter("user", ParameterType.Required)
.Parameter("user", ParameterType.Optional)
.Do(async e => {
var usr = e.Channel.FindUsers(e.GetArg("user")).FirstOrDefault();
if (usr == null) {
await e.Send("You must mention a user.");
return;
}
await e.Send("Id of the user " + usr.Name + " is " + usr.Id);
var usr = e.User;
if(e.GetArg("user") != null) e.Channel.FindUsers(e.GetArg("user")).FirstOrDefault();
await e.Send($"Id of the user { usr.Name } is { usr.Id }");
});
cgb.CreateCommand(".cid").Alias(".channelid")

14
NadekoBot/Modules/Music.cs
View File

@ -15,6 +15,7 @@ using System.Net;
using System.Globalization;
using System.Collections.Concurrent;
using NadekoBot.Classes.Music;
using Timer = System.Timers.Timer;
namespace NadekoBot.Modules {
class Music : DiscordModule {
@ -44,10 +45,18 @@ namespace NadekoBot.Modules {
}
public Music() : base() {
System.Timers.Timer cleaner = new System.Timers.Timer();
Timer cleaner = new Timer();
cleaner.Elapsed += (s, e) => CleanMusicPlayers();
cleaner.Interval = 10000;
cleaner.Start();
Timer statPrinter = new Timer();
NadekoBot.client.Connected += (s, e) => {
if (statPrinter.Enabled) return;
statPrinter.Elapsed += (se, ev) => { Console.WriteLine($"<<--Music-->> {musicPlayers.Count} songs playing."); musicPlayers.ForEach(kvp => Console.WriteLine(kvp.Value?.CurrentSong?.PrintStats())); Console.WriteLine("<<--Music END-->>"); };
statPrinter.Interval = 5000;
statPrinter.Start();
};
}
public override void Install(ModuleManager manager) {
@ -74,7 +83,6 @@ namespace NadekoBot.Modules {
player.RemoveAllSongs();
if (player.CurrentSong != null) {
player.CurrentSong.Cancel();
player.CurrentSong = null;
}
});
@ -129,7 +137,7 @@ namespace NadekoBot.Modules {
player.SongQueue.Add(sr);
} catch (Exception ex) {
Console.WriteLine();
await e.Send("Error. :anger:");
await e.Send($"Error. :anger:\n{ex.Message}");
return;
}
});