diff --git a/NadekoBot/Classes/Music/MusicControls.cs b/NadekoBot/Classes/Music/MusicControls.cs index 7c51c5c2..155da1fb 100644 --- a/NadekoBot/Classes/Music/MusicControls.cs +++ b/NadekoBot/Classes/Music/MusicControls.cs @@ -49,9 +49,10 @@ namespace NadekoBot.Classes.Music { lock (_voiceLock) { CurrentSong?.Stop(); CurrentSong = null; - if (SongQueue.Count == 0) return; - CurrentSong = SongQueue[0]; - SongQueue.RemoveAt(0); + if (SongQueue.Count != 0) { + CurrentSong = SongQueue[0]; + SongQueue.RemoveAt(0); + } else return; } try { @@ -69,9 +70,9 @@ namespace NadekoBot.Classes.Music { if(kvp != null) kvp.Cancel(); } - SongQueue.Clear(); + SongQueue?.Clear(); LoadNextSong(); - VoiceClient.Disconnect(); + VoiceClient?.Disconnect(); VoiceClient = null; } } diff --git a/NadekoBot/Classes/Music/StreamRequest.cs b/NadekoBot/Classes/Music/StreamRequest.cs index 35270c33..4facc250 100644 --- a/NadekoBot/Classes/Music/StreamRequest.cs +++ b/NadekoBot/Classes/Music/StreamRequest.cs @@ -168,7 +168,7 @@ namespace NadekoBot.Classes.Music { Task.Run(() => bufferCancelSource.Cancel()); } - await Task.Delay(50); + await Task.Delay(500); } if (State == StreamState.Completed) { diff --git a/NadekoBot/Commands/CopyCommand.cs b/NadekoBot/Commands/CopyCommand.cs index fa3ff706..bc95c5c3 100644 --- a/NadekoBot/Commands/CopyCommand.cs +++ b/NadekoBot/Commands/CopyCommand.cs @@ -20,7 +20,7 @@ namespace NadekoBot private async void Client_MessageReceived(object sender, Discord.MessageEventArgs e) { if (CopiedUsers.Contains(e.User.Id)) { - await e.Send( e.Message.Text); + await e.Send( e.Message.Text.Replace("@everyone","@everryone")); } } diff --git a/NadekoBot/Modules/Conversations.cs b/NadekoBot/Modules/Conversations.cs index cd8b1599..e7265a78 100644 --- a/NadekoBot/Modules/Conversations.cs +++ b/NadekoBot/Modules/Conversations.cs @@ -323,18 +323,18 @@ namespace NadekoBot.Modules Message msg; var msgs = e.Channel.Messages .Where(m => m.MentionedUsers.Contains(e.User)) - .OrderBy(m => m.Timestamp); + .OrderByDescending(m => m.Timestamp); if (msgs.Count() > 0) msg = msgs.FirstOrDefault(); else { var msgsarr = await e.Channel.DownloadMessages(10000); msg = msgsarr .Where(m => m.MentionedUsers.Contains(e.User)) - .OrderBy(m => m.Timestamp) + .OrderByDescending(m => m.Timestamp) .FirstOrDefault(); } if (msg != null) - await e.Send("Last message mentioning you was at " + msg.Timestamp + "\n**Message:** " + msg.RawText); + await e.Send("Last message mentioning you was at " + msg.Timestamp + "\n**Message:** " + msg.RawText.Replace("@everyone","@everryone")); else await e.Send("I can't find a message mentioning you."); }); diff --git a/NadekoBot/NadekoBot.cs b/NadekoBot/NadekoBot.cs index 54f7d0d2..8a986fa1 100644 --- a/NadekoBot/NadekoBot.cs +++ b/NadekoBot/NadekoBot.cs @@ -23,7 +23,7 @@ namespace NadekoBot { public static string password; public static string TrelloAppKey; public static bool ForwardMessages = false; - public static string BotVersion = "0.8-beta1"; + public static string BotVersion = "0.8-beta2"; public static int commandsRan = 0; static void Main() {