diff --git a/NadekoBot/Classes/Trivia/TriviaGame.cs b/NadekoBot/Classes/Trivia/TriviaGame.cs index bf7fbfca..9f5ad478 100644 --- a/NadekoBot/Classes/Trivia/TriviaGame.cs +++ b/NadekoBot/Classes/Trivia/TriviaGame.cs @@ -76,7 +76,7 @@ namespace NadekoBot.Classes.Trivia { // load next question if game is still running await Task.Delay(2000); } - End().Wait(); + await End(); } private async Task End() { diff --git a/NadekoBot/Commands/TriviaCommand.cs b/NadekoBot/Commands/TriviaCommand.cs index 42234145..5137097c 100644 --- a/NadekoBot/Commands/TriviaCommand.cs +++ b/NadekoBot/Commands/TriviaCommand.cs @@ -41,7 +41,7 @@ namespace NadekoBot.Commands { .Alias("-tq") .Do(async e=> { if (runningTrivias.ContainsKey(e.Server)) { - runningTrivias[e.Server].StopGame(); + await runningTrivias[e.Server].StopGame(); } else await e.Channel.SendMessage("No trivia is running on this server."); }); diff --git a/NadekoBot/Modules/Administration.cs b/NadekoBot/Modules/Administration.cs index dc66f57b..e07f0723 100644 --- a/NadekoBot/Modules/Administration.cs +++ b/NadekoBot/Modules/Administration.cs @@ -417,7 +417,7 @@ namespace NadekoBot.Modules { .Parameter("user",ParameterType.Unparsed) .Do(async e => { var usrId = NadekoBot.client.CurrentUser.Id; - if (!string.IsNullOrWhiteSpace(e.GetArg("user"))) { + if (!string.IsNullOrWhiteSpace(e.GetArg("user")) && e.User.ServerPermissions.ManageMessages) { var usr = e.Server.FindUsers(e.GetArg("user")).FirstOrDefault(); if (usr != null) usrId = usr.Id; diff --git a/NadekoBot/Modules/Gambling.cs b/NadekoBot/Modules/Gambling.cs index 62bb458f..85412923 100644 --- a/NadekoBot/Modules/Gambling.cs +++ b/NadekoBot/Modules/Gambling.cs @@ -33,7 +33,11 @@ namespace NadekoBot.Modules return; } var members = role.Members.Where(u => u.Status == Discord.UserStatus.Online); // only online - await e.Channel.SendMessage($"**Raffled user:** {members.ToArray()[new System.Random().Next(0, members.Count())].Name}"); + try { + var usr = members.ToArray()[new System.Random().Next(0, members.Count())]; + await e.Channel.SendMessage($"**Raffled user:** {usr.Name} (id: {usr.Id})"); + } + catch { } }); /* cgb.CreateCommand("$$") diff --git a/NadekoBot/NadekoBot.cs b/NadekoBot/NadekoBot.cs index 8a12aa7b..a04dedcf 100644 --- a/NadekoBot/NadekoBot.cs +++ b/NadekoBot/NadekoBot.cs @@ -144,11 +144,12 @@ namespace NadekoBot { try { var request = e.Request as Discord.API.Client.Rest.SendMessageRequest; if (request != null) { + request.Content = request.Content?.Replace("@everyone", "@everyοne"); if (string.IsNullOrWhiteSpace(request.Content)) e.Cancel = true; else Console.WriteLine("Sending request."); - request.Content = request.Content.Replace("@everyone", "@everyοne"); + var content = request.Content; } } catch {