diff --git a/NadekoBot/Classes/SpeedTyping.cs b/NadekoBot/Classes/SpeedTyping.cs index 02244928..7a0ae87d 100644 --- a/NadekoBot/Classes/SpeedTyping.cs +++ b/NadekoBot/Classes/SpeedTyping.cs @@ -9,6 +9,10 @@ using NadekoBot.Extensions; namespace NadekoBot.Classes { + public static class SentencesProvider { + + } + public class TypingGame { private Channel channel; @@ -23,7 +27,6 @@ namespace NadekoBot.Classes { } internal void Start() { - throw new NotImplementedException(); } } @@ -60,13 +63,15 @@ namespace NadekoBot.Classes { }; public override void Init(CommandGroupBuilder cgb) { - cgb.CreateCommand("typing contest") + /* + cgb.CreateCommand("typing start") .Description("Starts a typing contest.") .Do(DoFunc()); cgb.CreateCommand("typing stop") .Description("Stops a typing contest on the current channel.") .Do(QuitFunc()); + */ } } } diff --git a/NadekoBot/Commands/HelpCommand.cs b/NadekoBot/Commands/HelpCommand.cs index 744ae36e..65836170 100644 --- a/NadekoBot/Commands/HelpCommand.cs +++ b/NadekoBot/Commands/HelpCommand.cs @@ -10,7 +10,7 @@ namespace NadekoBot { public override Func DoFunc() => async e => { - string helpstr = "Official repo: **github.com/Kwoth/NadekoBot/**\nBot Creator's server: https://discord.gg/0ehQwTK2RBhxEi0X"; + string helpstr = "Official repo: **github.com/Kwoth/NadekoBot/**"; string lastCategory = ""; foreach (var com in client.Commands().AllCommands) @@ -22,6 +22,7 @@ namespace NadekoBot } helpstr += PrintCommandHelp(com); } + helpstr += "\nBot Creator's server: https://discord.gg/0ehQwTK2RBhxEi0X"; helpstr = helpstr.Replace(NadekoBot.botMention, "@BotName"); while (helpstr.Length > 2000) { diff --git a/NadekoBot/Modules/Games.cs b/NadekoBot/Modules/Games.cs index 7c949bd1..c8c9984c 100644 --- a/NadekoBot/Modules/Games.cs +++ b/NadekoBot/Modules/Games.cs @@ -12,7 +12,7 @@ namespace NadekoBot.Modules { public Games() : base() { commands.Add(new Trivia()); - commands.Add(new SpeedTyping()); + //commands.Add(new SpeedTyping()); } public override void Install(ModuleManager manager) diff --git a/NadekoBot/NadekoBot.cs b/NadekoBot/NadekoBot.cs index afdbcf31..bb4894c1 100644 --- a/NadekoBot/NadekoBot.cs +++ b/NadekoBot/NadekoBot.cs @@ -24,7 +24,7 @@ namespace NadekoBot public static string password; public static string TrelloAppKey; public static bool ForwardMessages = false; - public static string BotVersion = "0.7-beta1"; + public static string BotVersion = "0.7-beta2"; static void Main() { @@ -146,12 +146,19 @@ namespace NadekoBot private static async void Client_MessageReceived(object sender, MessageEventArgs e) { if (e.Server != null || e.User.Id == client.CurrentUser.Id) return; try { - (await client.GetInvite(e.Message.Text))?.Accept(); - } catch (Exception) { } + await (await client.GetInvite(e.Message.Text)).Accept(); + await e.Send("I got in!"); + return; + } catch (Exception) { + if (e.User.Id == 109338686889476096) { //carbonitex invite + await e.Send("Failed to join the server."); + return; + } + } if (ForwardMessages && OwnerUser != null) await OwnerUser.SendMessage(e.User +": ```\n"+e.Message.Text+"\n```"); - + if (repliedRecently = !repliedRecently) { await e.Send("You can type `-h` or `-help` or `@MyName help` in any of the channels I am in and I will send you a message with my commands.\n Or you can find out what i do here: https://github.com/Kwoth/NadekoBot\nYou can also just send me an invite link to a server and I will join it.\nIf you don't want me on your server, you can simply ban me ;(\nBot Creator's server: https://discord.gg/0ehQwTK2RBhxEi0X"); Timer t = new Timer(); diff --git a/NadekoBot/NadekoBot.csproj b/NadekoBot/NadekoBot.csproj index f2e7b558..9636447d 100644 --- a/NadekoBot/NadekoBot.csproj +++ b/NadekoBot/NadekoBot.csproj @@ -141,6 +141,7 @@ +