diff --git a/NadekoBot/Commands/SpeedTyping.cs b/NadekoBot/Commands/SpeedTyping.cs index 6d786967..e8c35539 100644 --- a/NadekoBot/Commands/SpeedTyping.cs +++ b/NadekoBot/Commands/SpeedTyping.cs @@ -63,6 +63,7 @@ namespace NadekoBot { } await Stop(); + await Start(); } private void HandleAnswers() { diff --git a/NadekoBot/Modules/Conversations.cs b/NadekoBot/Modules/Conversations.cs index e8f5aaa2..bb46b805 100644 --- a/NadekoBot/Modules/Conversations.cs +++ b/NadekoBot/Modules/Conversations.cs @@ -164,24 +164,16 @@ namespace NadekoBot.Modules List insults = new List { " you are a poop.", " you jerk.", " i will eat you when i get my powers back." }; Random r = new Random(); var u = e.Channel.FindUsers(e.GetArg("mention")).FirstOrDefault(); - if (u == null) { await e.Send("Invalid user specified."); return; } - if (u.Id == NadekoBot.OwnerID) - { + if (u.Id == NadekoBot.OwnerID) { await e.Send("I would never insult my master <3"); + return; } - else if (e.User.Id == NadekoBot.OwnerID) - { - await e.Send(u.Mention + insults[r.Next(0, insults.Count)]); - } - else - { - await e.Send(e.User.Mention + " Eww, why would i do that for you ?!"); - } + await e.Send(u.Mention + insults[r.Next(0, insults.Count)]); }); cgb.CreateCommand("praise") @@ -189,7 +181,7 @@ namespace NadekoBot.Modules .Parameter("mention", ParameterType.Required) .Do(async e => { - List praises = new List { " You are cool.", " You are nice... But don't get any wrong ideas.", " You did a good job." }; + List praises = new List { " You are cool.", " You are nice!", " You did a good job.", " You did something nice.", " is awesome!" }; Random r = new Random(); var u = e.Channel.FindUsers(e.GetArg("mention")).FirstOrDefault(); @@ -199,26 +191,11 @@ namespace NadekoBot.Modules return; } - if (e.User.Id == NadekoBot.OwnerID) - { - if (u.Id != NadekoBot.OwnerID) - await e.Send(u.Mention + praises[r.Next(0, praises.Count)]); - else - { - await e.Send(u.Mention + " No need, you know I love you <3"); - } - } - else - { - if (u.Id == NadekoBot.OwnerID) - { - await e.Send(e.User.Mention + " I don't need your permission to praise my beloved Master <3"); - } - else - { - await e.Send(e.User.Mention + " Yeah... No."); - } + if (u.Id == NadekoBot.OwnerID) { + await e.Send(e.User.Mention + " I don't need your permission to praise my beloved Master <3"); + return; } + await e.Send(u.Mention + praises[r.Next(0, praises.Count)]); }); cgb.CreateCommand("are you real")