From f682ee31bed8baa5ad7ff152828933bd454a9401 Mon Sep 17 00:00:00 2001 From: miraai Date: Tue, 2 Aug 2016 01:45:55 +0200 Subject: [PATCH 01/14] Update SelfAssignedRolesCommand.cs --- .../Administration/Commands/SelfAssignedRolesCommand.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NadekoBot/Modules/Administration/Commands/SelfAssignedRolesCommand.cs b/NadekoBot/Modules/Administration/Commands/SelfAssignedRolesCommand.cs index 4386ab11..f88957bd 100644 --- a/NadekoBot/Modules/Administration/Commands/SelfAssignedRolesCommand.cs +++ b/NadekoBot/Modules/Administration/Commands/SelfAssignedRolesCommand.cs @@ -17,7 +17,7 @@ namespace NadekoBot.Modules.Administration.Commands { cgb.CreateCommand(Module.Prefix + "asar") .Description("Adds a role, or list of roles separated by whitespace" + - $"(use quotations for multiword roles) to the list of self-assignable roles. | {Prefix}asar Gamer") + $"(use quotations for multiword roles) to the list of self-assignable roles. | `{Prefix}asar Gamer`") .Parameter("roles", ParameterType.Multiple) .AddCheck(SimpleCheckers.CanManageRoles) .Do(async e => @@ -112,7 +112,7 @@ namespace NadekoBot.Modules.Administration.Commands cgb.CreateCommand(Module.Prefix + "iam") .Description("Adds a role to you that you choose. " + "Role must be on a list of self-assignable roles." + - $" | {Prefix}iam Gamer") + $" | `{Prefix}iam Gamer`") .Parameter("role", ParameterType.Unparsed) .Do(async e => { @@ -168,7 +168,7 @@ namespace NadekoBot.Modules.Administration.Commands .Alias(Module.Prefix + "iamn") .Description("Removes a role to you that you choose. " + "Role must be on a list of self-assignable roles." + - $" | {Prefix}iamn Gamer") + $" | `{Prefix}iamn Gamer`") .Parameter("role", ParameterType.Unparsed) .Do(async e => { From ecd8f82204d56ff67b513fcfcc5f2e100b50bee8 Mon Sep 17 00:00:00 2001 From: miraai Date: Tue, 2 Aug 2016 01:53:12 +0200 Subject: [PATCH 02/14] Update FilterInvitesCommand.cs --- .../Modules/Permissions/Commands/FilterInvitesCommand.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NadekoBot/Modules/Permissions/Commands/FilterInvitesCommand.cs b/NadekoBot/Modules/Permissions/Commands/FilterInvitesCommand.cs index d26a9aca..445558c3 100644 --- a/NadekoBot/Modules/Permissions/Commands/FilterInvitesCommand.cs +++ b/NadekoBot/Modules/Permissions/Commands/FilterInvitesCommand.cs @@ -55,7 +55,7 @@ namespace NadekoBot.Modules.Permissions.Commands .Alias(Module.Prefix + "cfi") .Description("Enables or disables automatic deleting of invites on the channel." + "If no channel supplied, it will default to current one. Use ALL to apply to all existing channels at once." + - $" | {Prefix}cfi enable #general-chat") + $" | `{Prefix}cfi enable #general-chat`") .Parameter("bool") .Parameter("channel", ParameterType.Optional) .Do(async e => @@ -95,7 +95,7 @@ namespace NadekoBot.Modules.Permissions.Commands cgb.CreateCommand(Module.Prefix + "srvrfilterinv") .Alias(Module.Prefix + "sfi") - .Description($"Enables or disables automatic deleting of invites on the server. | {Prefix}sfi disable") + .Description($"Enables or disables automatic deleting of invites on the server. | `{Prefix}sfi disable`") .Parameter("bool") .Do(async e => { From 778c06ec8d18fdee9859a6f679e8d1a92de7a4dc Mon Sep 17 00:00:00 2001 From: miraai Date: Tue, 2 Aug 2016 01:54:25 +0200 Subject: [PATCH 03/14] Update FilterWordsCommand.cs --- .../Modules/Permissions/Commands/FilterWordsCommand.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/NadekoBot/Modules/Permissions/Commands/FilterWordsCommand.cs b/NadekoBot/Modules/Permissions/Commands/FilterWordsCommand.cs index 33fd1ac4..b574ef23 100644 --- a/NadekoBot/Modules/Permissions/Commands/FilterWordsCommand.cs +++ b/NadekoBot/Modules/Permissions/Commands/FilterWordsCommand.cs @@ -53,7 +53,7 @@ namespace NadekoBot.Modules.Permissions.Commands .Alias(Module.Prefix + "cfw") .Description("Enables or disables automatic deleting of messages containing banned words on the channel." + "If no channel supplied, it will default to current one. Use ALL to apply to all existing channels at once." + - $" | {Prefix}cfw enable #general-chat") + $" | `{Prefix}cfw enable #general-chat`") .Parameter("bool") .Parameter("channel", ParameterType.Optional) .Do(async e => @@ -89,7 +89,7 @@ namespace NadekoBot.Modules.Permissions.Commands cgb.CreateCommand(Module.Prefix + "addfilterword") .Alias(Module.Prefix + "afw") .Description("Adds a new word to the list of filtered words" + - $" | {Prefix}afw poop") + $" | `{Prefix}afw poop`") .Parameter("word", ParameterType.Unparsed) .Do(async e => { @@ -111,7 +111,7 @@ namespace NadekoBot.Modules.Permissions.Commands cgb.CreateCommand(Module.Prefix + "rmvfilterword") .Alias(Module.Prefix + "rfw") .Description("Removes the word from the list of filtered words" + - $" | {Prefix}rw poop") + $" | `{Prefix}rw poop`") .Parameter("word", ParameterType.Unparsed) .Do(async e => { @@ -133,7 +133,7 @@ namespace NadekoBot.Modules.Permissions.Commands cgb.CreateCommand(Module.Prefix + "lstfilterwords") .Alias(Module.Prefix + "lfw") .Description("Shows a list of filtered words" + - $" | {Prefix}lfw") + $" | `{Prefix}lfw`") .Do(async e => { try @@ -152,7 +152,7 @@ namespace NadekoBot.Modules.Permissions.Commands cgb.CreateCommand(Module.Prefix + "srvrfilterwords") .Alias(Module.Prefix + "sfw") - .Description($"Enables or disables automatic deleting of messages containing forbidden words on the server. | {Prefix}sfw disable") + .Description($"Enables or disables automatic deleting of messages containing forbidden words on the server. | `{Prefix}sfw disable`") .Parameter("bool") .Do(async e => { From 138b8ae7e9a9b6ce2a8c0d7f28b124cbed4ea7ba Mon Sep 17 00:00:00 2001 From: miraai Date: Tue, 2 Aug 2016 01:56:32 +0200 Subject: [PATCH 04/14] Update PermissionsModule.cs --- NadekoBot/Modules/Permissions/PermissionsModule.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NadekoBot/Modules/Permissions/PermissionsModule.cs b/NadekoBot/Modules/Permissions/PermissionsModule.cs index a201f848..d2bc1840 100644 --- a/NadekoBot/Modules/Permissions/PermissionsModule.cs +++ b/NadekoBot/Modules/Permissions/PermissionsModule.cs @@ -813,7 +813,7 @@ namespace NadekoBot.Modules.Permissions cgb.CreateCommand(Prefix + "allcmdcooldowns") .Alias(Prefix + "acmdcds") - .Description("Shows a list of all commands and their respective cooldowns.") + .Description("Shows a list of all commands and their respective cooldowns. | `{Prefix}acmdcds`") .Do(async e => { ServerPermissions perms; From d5001f8d9022bc8ce3eac5af145a3af3f79b313d Mon Sep 17 00:00:00 2001 From: miraai Date: Tue, 2 Aug 2016 01:57:56 +0200 Subject: [PATCH 05/14] Update AdministrationModule.cs --- NadekoBot/Modules/Administration/AdministrationModule.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NadekoBot/Modules/Administration/AdministrationModule.cs b/NadekoBot/Modules/Administration/AdministrationModule.cs index 670d2513..2ea33354 100644 --- a/NadekoBot/Modules/Administration/AdministrationModule.cs +++ b/NadekoBot/Modules/Administration/AdministrationModule.cs @@ -815,7 +815,7 @@ namespace NadekoBot.Modules.Administration }); cgb.CreateCommand(Prefix + "donators") - .Description("List of lovely people who donated to keep this project alive.") + .Description("List of lovely people who donated to keep this project alive. | `{Prefix}donators`") .Do(async e => { await Task.Run(async () => From cf8d105c6fbd9cae347312cbf54f5abf88975852 Mon Sep 17 00:00:00 2001 From: miraai Date: Tue, 2 Aug 2016 01:59:43 +0200 Subject: [PATCH 06/14] Update RipCommand.cs --- NadekoBot/Modules/Conversations/Commands/RipCommand.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NadekoBot/Modules/Conversations/Commands/RipCommand.cs b/NadekoBot/Modules/Conversations/Commands/RipCommand.cs index f6960e5f..9c4842bf 100644 --- a/NadekoBot/Modules/Conversations/Commands/RipCommand.cs +++ b/NadekoBot/Modules/Conversations/Commands/RipCommand.cs @@ -23,7 +23,7 @@ namespace NadekoBot.Modules.Conversations.Commands internal override void Init(CommandGroupBuilder cgb) { cgb.CreateCommand("rip") - .Description("Shows a grave image of someone with a start year | @NadekoBot rip @Someone 2000") + .Description("Shows a grave image of someone with a start year | `@NadekoBot rip @Someone 2000`") .Parameter("user", ParameterType.Required) .Parameter("year", ParameterType.Optional) .Do(async e => From 8726a8ac79c8745f34fbdfda0de2200c6a124292 Mon Sep 17 00:00:00 2001 From: miraai Date: Tue, 2 Aug 2016 02:00:52 +0200 Subject: [PATCH 07/14] Update GamblingModule.cs --- NadekoBot/Modules/Gambling/GamblingModule.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NadekoBot/Modules/Gambling/GamblingModule.cs b/NadekoBot/Modules/Gambling/GamblingModule.cs index efa3a553..d7ced224 100644 --- a/NadekoBot/Modules/Gambling/GamblingModule.cs +++ b/NadekoBot/Modules/Gambling/GamblingModule.cs @@ -187,7 +187,7 @@ namespace NadekoBot.Modules.Gambling cgb.CreateCommand(Prefix + "leaderboard") .Alias(Prefix + "lb") - .Description($"Displays bot currency leaderboard | {Prefix}lb") + .Description($"Displays bot currency leaderboard | `{Prefix}lb`") .Do(async e => { var richestTemp = DbHandler.Instance.GetTopRichest(); From 55e9115bcb13d6ccb2dce9e0d0ddd604bec9c857 Mon Sep 17 00:00:00 2001 From: miraai Date: Tue, 2 Aug 2016 02:02:58 +0200 Subject: [PATCH 08/14] Update MusicModule.cs --- NadekoBot/Modules/Music/MusicModule.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NadekoBot/Modules/Music/MusicModule.cs b/NadekoBot/Modules/Music/MusicModule.cs index eaf290ba..e0045ab9 100644 --- a/NadekoBot/Modules/Music/MusicModule.cs +++ b/NadekoBot/Modules/Music/MusicModule.cs @@ -756,7 +756,7 @@ namespace NadekoBot.Modules.Music cgb.CreateCommand(Prefix + "getlink") .Alias(Prefix + "gl") - .Description("Shows a link to the song in the queue by index, or the currently playing song by default.") + .Description("Shows a link to the song in the queue by index, or the currently playing song by default. | `{Prefix}gl`") .Parameter("index", ParameterType.Optional) .Do(async e => { @@ -791,7 +791,7 @@ namespace NadekoBot.Modules.Music cgb.CreateCommand(Prefix + "autoplay") .Alias(Prefix + "ap") - .Description("Toggles autoplay - When the song is finished, automatically queue a related youtube song. (Works only for youtube songs and when queue is empty)") + .Description("Toggles autoplay - When the song is finished, automatically queue a related youtube song. (Works only for youtube songs and when queue is empty) | `{Prefix}ap`") .Do(async e => { From 29d0e66d108d5142c3b37b318572b3eb046eb3b3 Mon Sep 17 00:00:00 2001 From: miraai Date: Tue, 2 Aug 2016 02:06:07 +0200 Subject: [PATCH 09/14] Update SearchesModule.cs --- NadekoBot/Modules/Searches/SearchesModule.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NadekoBot/Modules/Searches/SearchesModule.cs b/NadekoBot/Modules/Searches/SearchesModule.cs index 84d0c0a1..c484fabf 100644 --- a/NadekoBot/Modules/Searches/SearchesModule.cs +++ b/NadekoBot/Modules/Searches/SearchesModule.cs @@ -149,7 +149,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】 cgb.CreateCommand(Prefix + "randomcat") .Alias(Prefix + "meow") - .Description("Shows a random cat image.") + .Description("Shows a random cat image. | `{Prefix}meow`") .Do(async e => { await e.Channel.SendMessage(JObject.Parse( @@ -159,7 +159,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】 cgb.CreateCommand(Prefix + "randomdog") .Alias(Prefix + "woof") - .Description("Shows a random dog image.") + .Description("Shows a random dog image. | `{Prefix}woof`") .Do(async e => { await e.Channel.SendMessage("http://random.dog/" + await SearchHelper.GetResponseStringAsync("http://random.dog/woof").ConfigureAwait(false)).ConfigureAwait(false); From ecacd4515deafc40af165b2017ce1b71f98eeef4 Mon Sep 17 00:00:00 2001 From: miraai Date: Tue, 2 Aug 2016 02:11:30 +0200 Subject: [PATCH 10/14] Update ClashOfClansModule.cs --- .../Modules/ClashOfClans/ClashOfClansModule.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/NadekoBot/Modules/ClashOfClans/ClashOfClansModule.cs b/NadekoBot/Modules/ClashOfClans/ClashOfClansModule.cs index 37443900..449c4da6 100644 --- a/NadekoBot/Modules/ClashOfClans/ClashOfClansModule.cs +++ b/NadekoBot/Modules/ClashOfClans/ClashOfClansModule.cs @@ -148,7 +148,7 @@ namespace NadekoBot.Modules.ClashOfClans cgb.CreateCommand(Prefix + "createwar") .Alias(Prefix + "cw") - .Description($"Creates a new war by specifying a size (>10 and multiple of 5) and enemy clan name. |{Prefix}cw 15 The Enemy Clan") + .Description($"Creates a new war by specifying a size (>10 and multiple of 5) and enemy clan name. | `{Prefix}cw 15 The Enemy Clan`") .Parameter("size") .Parameter("enemy_clan", ParameterType.Unparsed) .Do(async e => @@ -186,7 +186,7 @@ namespace NadekoBot.Modules.ClashOfClans cgb.CreateCommand(Prefix + "startwar") .Alias(Prefix + "sw") - .Description("Starts a war with a given number.") + .Description("Starts a war with a given number. | `{Prefix}sw 15`") .Parameter("number", ParameterType.Required) .Do(async e => { @@ -211,7 +211,7 @@ namespace NadekoBot.Modules.ClashOfClans cgb.CreateCommand(Prefix + "listwar") .Alias(Prefix + "lw") - .Description($"Shows the active war claims by a number. Shows all wars in a short way if no number is specified. | {Prefix}lw [war_number] or {Prefix}lw") + .Description($"Shows the active war claims by a number. Shows all wars in a short way if no number is specified. | `{Prefix}lw [war_number] or {Prefix}lw`") .Parameter("number", ParameterType.Optional) .Do(async e => { @@ -253,7 +253,7 @@ namespace NadekoBot.Modules.ClashOfClans cgb.CreateCommand(Prefix + "claim") .Alias(Prefix + "call") .Alias(Prefix + "c") - .Description($"Claims a certain base from a certain war. You can supply a name in the third optional argument to claim in someone else's place. | {Prefix}call [war_number] [base_number] [optional_other_name]") + .Description($"Claims a certain base from a certain war. You can supply a name in the third optional argument to claim in someone else's place. | `{Prefix}call [war_number] [base_number] [optional_other_name]`") .Parameter("number") .Parameter("baseNumber") .Parameter("other_name", ParameterType.Unparsed) @@ -292,21 +292,21 @@ namespace NadekoBot.Modules.ClashOfClans .Alias(Prefix + "cf") .Alias(Prefix + "cf3") .Alias(Prefix + "claimfinish3") - .Description($"Finish your claim with 3 stars if you destroyed a base. Optional second argument finishes for someone else. | {Prefix}cf [war_number] [optional_other_name]") + .Description($"Finish your claim with 3 stars if you destroyed a base. Optional second argument finishes for someone else. | `{Prefix}cf [war_number] [optional_other_name]`") .Parameter("number", ParameterType.Required) .Parameter("other_name", ParameterType.Unparsed) .Do(e => FinishClaim(e)); cgb.CreateCommand(Prefix + "claimfinish2") .Alias(Prefix + "cf2") - .Description($"Finish your claim with 2 stars if you destroyed a base. Optional second argument finishes for someone else. | {Prefix}cf [war_number] [optional_other_name]") + .Description($"Finish your claim with 2 stars if you destroyed a base. Optional second argument finishes for someone else. | `{Prefix}cf [war_number] [optional_other_name]`") .Parameter("number", ParameterType.Required) .Parameter("other_name", ParameterType.Unparsed) .Do(e => FinishClaim(e, 2)); cgb.CreateCommand(Prefix + "claimfinish1") .Alias(Prefix + "cf1") - .Description($"Finish your claim with 1 stars if you destroyed a base. Optional second argument finishes for someone else. | {Prefix}cf [war_number] [optional_other_name]") + .Description($"Finish your claim with 1 stars if you destroyed a base. Optional second argument finishes for someone else. | `{Prefix}cf [war_number] [optional_other_name]`") .Parameter("number", ParameterType.Required) .Parameter("other_name", ParameterType.Unparsed) .Do(e => FinishClaim(e, 1)); @@ -314,7 +314,7 @@ namespace NadekoBot.Modules.ClashOfClans cgb.CreateCommand(Prefix + "unclaim") .Alias(Prefix + "uncall") .Alias(Prefix + "uc") - .Description($"Removes your claim from a certain war. Optional second argument denotes a person in whose place to unclaim | {Prefix}uc [war_number] [optional_other_name]") + .Description($"Removes your claim from a certain war. Optional second argument denotes a person in whose place to unclaim | `{Prefix}uc [war_number] [optional_other_name]`") .Parameter("number", ParameterType.Required) .Parameter("other_name", ParameterType.Unparsed) .Do(async e => @@ -344,7 +344,7 @@ namespace NadekoBot.Modules.ClashOfClans cgb.CreateCommand(Prefix + "endwar") .Alias(Prefix + "ew") - .Description($"Ends the war with a given index. |{Prefix}ew [war_number]") + .Description($"Ends the war with a given index. | `{Prefix}ew [war_number]`") .Parameter("number") .Do(async e => { From 70de5aca59645fb2ff520fece5ef34ee9e2b5fec Mon Sep 17 00:00:00 2001 From: miraai Date: Tue, 2 Aug 2016 02:13:03 +0200 Subject: [PATCH 11/14] Update CustomReactions.cs --- NadekoBot/Modules/CustomReactions/CustomReactions.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NadekoBot/Modules/CustomReactions/CustomReactions.cs b/NadekoBot/Modules/CustomReactions/CustomReactions.cs index a613b6c5..b62b2dd7 100644 --- a/NadekoBot/Modules/CustomReactions/CustomReactions.cs +++ b/NadekoBot/Modules/CustomReactions/CustomReactions.cs @@ -50,7 +50,7 @@ namespace NadekoBot.Modules.CustomReactions var c = cgb.CreateCommand(commandName); if (commandName.Contains(NadekoBot.BotMention)) c.Alias(commandName.Replace("<@", "<@!")); - c.Description($"Custom reaction. |{command.Key}") + c.Description($"Custom reaction. | `{command.Key}`") .Parameter("args", ParameterType.Unparsed) .Do(async e => { @@ -64,4 +64,4 @@ namespace NadekoBot.Modules.CustomReactions }); } } -} \ No newline at end of file +} From e8e6f3286c8e5372ddffd6f21b79b37955425e30 Mon Sep 17 00:00:00 2001 From: miraai Date: Tue, 2 Aug 2016 02:15:29 +0200 Subject: [PATCH 12/14] Update TrelloModule.cs --- NadekoBot/Modules/Trello/TrelloModule.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NadekoBot/Modules/Trello/TrelloModule.cs b/NadekoBot/Modules/Trello/TrelloModule.cs index 14938aca..527a2ed5 100644 --- a/NadekoBot/Modules/Trello/TrelloModule.cs +++ b/NadekoBot/Modules/Trello/TrelloModule.cs @@ -106,7 +106,7 @@ namespace NadekoBot.Modules.Trello cgb.CreateCommand(Prefix + "lists") .Alias(Prefix + "list") - .Description($"Lists all lists yo ;) | {Prefix}list") + .Description($"Lists all lists, yo ;) | `{Prefix}list`") .Do(async e => { if (!NadekoBot.IsOwner(e.User.Id)) return; From 6ffbb406cdb146bcf2d4b0a6663cfde87734cd35 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 2 Aug 2016 03:03:06 +0200 Subject: [PATCH 13/14] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 4992761a..a6b58fb6 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ ![img](https://ci.appveyor.com/api/projects/status/gmu6b3ltc80hr3k9?svg=true) [![Discord](https://discordapp.com/api/servers/117523346618318850/widget.png)](https://discord.gg/0ehQwTK2RBjAxzEY) +[![Documentation Status](https://readthedocs.org/projects/nadekobot/badge/?version=latest)](http://nadekobot.readthedocs.io/en/latest/?badge=latest) # NadekoBot ## [Click here to invite nadeko to your discord server](https://discordapp.com/oauth2/authorize?client_id=170254782546575360&scope=bot&permissions=66186303) From 5c006555f17387efc63ca6ead1a7be68a649b7d6 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 2 Aug 2016 04:49:27 +0200 Subject: [PATCH 14/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a6b58fb6..7f57978b 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Documentation Status](https://readthedocs.org/projects/nadekobot/badge/?version=latest)](http://nadekobot.readthedocs.io/en/latest/?badge=latest) # NadekoBot -## [Click here to invite nadeko to your discord server](https://discordapp.com/oauth2/authorize?client_id=170254782546575360&scope=bot&permissions=66186303) +## [Click here to invite Nadeko to your Discord server](https://discordapp.com/oauth2/authorize?client_id=170254782546575360&scope=bot&permissions=66186303) ## [Click here for a list of commands](https://github.com/Kwoth/NadekoBot/blob/master/commandlist.md) ## INSTRUCTIONS, FAQ ---> [Wiki](https://github.com/Kwoth/NadekoBot/wiki)