Merge pull request #13 from Kwoth/dev

dev upd

DockerGuide.md

@@ -43,6 +43,7 @@ Open putty and type ip adress **you got in your email** with port 22
 - Type `nano /nadeko/credentials.json` and type in your `credentials`  
 - CTRL+X then CTRL+Y to save  
 - Type `docker start nadeko`  
+- Type `docker logs -f nadeko` to see the console output
 
 **Your bot is running, enjoy! o/**
 

LinuxSetup.md

@@ -153,7 +153,7 @@ TMUX
 `certmgr -ssl https://discordapp.com`
 
 **14)**
-`certmgr --ssl https://gateway.discord.gg`
+`certmgr -ssl https://gateway.discord.gg`
 
 Type `yes` and hit Enter **(three times - as it will ask for three times)**
 

NadekoBot/Modules/Administration/AdministrationModule.cs

@@ -64,7 +64,7 @@ namespace NadekoBot.Modules.Administration
                 commands.ForEach(cmd => cmd.Init(cgb));
 
                 cgb.CreateCommand(Prefix + "delmsgoncmd")
-                    .Description($"Toggles the automatic deletion of user's successful command message to prevent chat flood. Server Manager Only. | `{Prefix}delmsgoncmd`")
+                    .Description($"Toggles the automatic deletion of user's successful command message to prevent chat flood. **Server Manager Only.** | `{Prefix}delmsgoncmd`")
                     .AddCheck(SimpleCheckers.ManageServer())
                     .Do(async e =>
                     {
@@ -90,7 +90,7 @@ namespace NadekoBot.Modules.Administration
                     });
 
                 cgb.CreateCommand(Prefix + "setrole").Alias(Prefix + "sr")
-                    .Description($"Sets a role for a given user. | `{Prefix}sr @User Guest`")
+                    .Description($"Sets a role for a given user. **Needs Manage Roles Permissions.**| `{Prefix}sr @User Guest`")
                     .Parameter("user_name", ParameterType.Required)
                     .Parameter("role_name", ParameterType.Unparsed)
                     .AddCheck(SimpleCheckers.CanManageRoles)
@@ -133,7 +133,7 @@ namespace NadekoBot.Modules.Administration
                     });
 
                 cgb.CreateCommand(Prefix + "removerole").Alias(Prefix + "rr")
-                    .Description($"Removes a role from a given user. | `{Prefix}rr @User Admin`")
+                    .Description($"Removes a role from a given user. **Needs Manage Roles Permissions.**| `{Prefix}rr @User Admin`")
                     .Parameter("user_name", ParameterType.Required)
                     .Parameter("role_name", ParameterType.Unparsed)
                     .AddCheck(SimpleCheckers.CanManageRoles)
@@ -171,7 +171,7 @@ namespace NadekoBot.Modules.Administration
 
                 cgb.CreateCommand(Prefix + "renamerole")
                     .Alias(Prefix + "renr")
-                    .Description($"Renames a role. Role you are renaming must be lower than bot's highest role. | `{Prefix}renr \"First role\" SecondRole`")
+                    .Description($"Renames a role. Roles you are renaming must be lower than bot's highest role. **Manage Roles Permissions.** | `{Prefix}renr \"First role\" SecondRole`")
                     .Parameter("r1", ParameterType.Required)
                     .Parameter("r2", ParameterType.Required)
                     .AddCheck(new SimpleCheckers.ManageRoles())
@@ -204,7 +204,7 @@ namespace NadekoBot.Modules.Administration
                     });
 
                 cgb.CreateCommand(Prefix + "removeallroles").Alias(Prefix + "rar")
-                    .Description($"Removes all roles from a mentioned user. | `{Prefix}rar @User`")
+                    .Description($"Removes all roles from a mentioned user. **Needs Manage Roles Permissions.**| `{Prefix}rar @User`")
                     .Parameter("user_name", ParameterType.Unparsed)
                     .AddCheck(SimpleCheckers.CanManageRoles)
                     .Do(async e =>
@@ -230,7 +230,7 @@ namespace NadekoBot.Modules.Administration
                     });
 
                 cgb.CreateCommand(Prefix + "createrole").Alias(Prefix + "cr")
-                    .Description($"Creates a role with a given name. | `{Prefix}cr Awesome Role`")
+                    .Description($"Creates a role with a given name. **Needs Manage Roles Permissions.**| `{Prefix}cr Awesome Role`")
                     .Parameter("role_name", ParameterType.Unparsed)
                     .AddCheck(SimpleCheckers.CanManageRoles)
                     .Do(async e =>
@@ -253,7 +253,7 @@ namespace NadekoBot.Modules.Administration
                     .Parameter("r", ParameterType.Optional)
                     .Parameter("g", ParameterType.Optional)
                     .Parameter("b", ParameterType.Optional)
-                    .Description($"Set a role's color to the hex or 0-255 rgb color value provided. | `{Prefix}rc Admin 255 200 100` or `{Prefix}rc Admin ffba55`")
+                    .Description($"Set a role's color to the hex or 0-255 rgb color value provided. **Needs Manage Roles Permissions.** | `{Prefix}rc Admin 255 200 100` or `{Prefix}rc Admin ffba55`")
                     .Do(async e =>
                     {
                         if (!e.User.ServerPermissions.ManageRoles)
@@ -298,7 +298,7 @@ namespace NadekoBot.Modules.Administration
                 cgb.CreateCommand(Prefix + "ban").Alias(Prefix + "b")
                     .Parameter("user", ParameterType.Required)
                     .Parameter("msg", ParameterType.Unparsed)
-                    .Description($"Bans a user by id or name with an optional message. | `{Prefix}b \"@some Guy\" Your behaviour is toxic.`")
+                    .Description($"Bans a user by id or name with an optional message. **Needs Ban Permissions.**| `{Prefix}b \"@some Guy\" Your behaviour is toxic.`")
                         .Do(async e =>
                         {
                             var msg = e.GetArg("msg");
@@ -333,7 +333,7 @@ namespace NadekoBot.Modules.Administration
                 cgb.CreateCommand(Prefix + "softban").Alias(Prefix + "sb")
                     .Parameter("user", ParameterType.Required)
                     .Parameter("msg", ParameterType.Unparsed)
-                    .Description($"Bans and then unbans a user by id or name with an optional message. | `{Prefix}sb \"@some Guy\" Your behaviour is toxic.`")
+                    .Description($"Bans and then unbans a user by id or name with an optional message. **Needs Ban Permissions.**| `{Prefix}sb \"@some Guy\" Your behaviour is toxic.`")
                         .Do(async e =>
                         {
                             var msg = e.GetArg("msg");
@@ -369,7 +369,7 @@ namespace NadekoBot.Modules.Administration
                 cgb.CreateCommand(Prefix + "kick").Alias(Prefix + "k")
                     .Parameter("user")
                     .Parameter("msg", ParameterType.Unparsed)
-                    .Description($"Kicks a mentioned user. | `{Prefix}k \"@some Guy\" Your behaviour is toxic.`")
+                    .Description($"Kicks a mentioned user. **Needs Kick Permissions.**| `{Prefix}k \"@some Guy\" Your behaviour is toxic.`")
                     .Do(async e =>
                     {
                         var msg = e.GetArg("msg");
@@ -400,7 +400,7 @@ namespace NadekoBot.Modules.Administration
                         }
                     });
                 cgb.CreateCommand(Prefix + "mute")
-                    .Description($"Mutes mentioned user or users. | `{Prefix}mute \"@Someguy\"` or `{Prefix}mute \"@Someguy\" \"@Someguy\"`")
+                    .Description($"Mutes mentioned user or users. **Needs Mute Permissions.**| `{Prefix}mute \"@Someguy\"` or `{Prefix}mute \"@Someguy\" \"@Someguy\"`")
                     .Parameter("throwaway", ParameterType.Unparsed)
                     .Do(async e =>
                     {
@@ -426,7 +426,7 @@ namespace NadekoBot.Modules.Administration
                     });
 
                 cgb.CreateCommand(Prefix + "unmute")
-                    .Description($"Unmutes mentioned user or users. | `{Prefix}unmute \"@Someguy\"` or `{Prefix}unmute \"@Someguy\" \"@Someguy\"`")
+                    .Description($"Unmutes mentioned user or users. **Needs Mute Permissions.**| `{Prefix}unmute \"@Someguy\"` or `{Prefix}unmute \"@Someguy\" \"@Someguy\"`")
                     .Parameter("throwaway", ParameterType.Unparsed)
                     .Do(async e =>
                     {
@@ -453,7 +453,7 @@ namespace NadekoBot.Modules.Administration
 
                 cgb.CreateCommand(Prefix + "deafen")
                     .Alias(Prefix + "deaf")
-                    .Description($"Deafens mentioned user or users | `{Prefix}deaf \"@Someguy\"` or `{Prefix}deaf \"@Someguy\" \"@Someguy\"`")
+                    .Description($"Deafens mentioned user or users. **Needs Deafen Permissions.**| `{Prefix}deaf \"@Someguy\"` or `{Prefix}deaf \"@Someguy\" \"@Someguy\"`")
                     .Parameter("throwaway", ParameterType.Unparsed)
                     .Do(async e =>
                     {
@@ -480,7 +480,7 @@ namespace NadekoBot.Modules.Administration
 
                 cgb.CreateCommand(Prefix + "undeafen")
                     .Alias(Prefix + "undef")
-                    .Description($"Undeafens mentioned user or users | `{Prefix}undef \"@Someguy\"` or `{Prefix}undef \"@Someguy\" \"@Someguy\"`")
+                    .Description($"Undeafens mentioned user or users. **Needs Deafen Permissions.** | `{Prefix}undef \"@Someguy\"` or `{Prefix}undef \"@Someguy\" \"@Someguy\"`")
                     .Parameter("throwaway", ParameterType.Unparsed)
                     .Do(async e =>
                     {
@@ -507,7 +507,7 @@ namespace NadekoBot.Modules.Administration
 
                 cgb.CreateCommand(Prefix + "delvoichanl")
                     .Alias(Prefix + "dvch")
-                    .Description($"Deletes a voice channel with a given name. | `{Prefix}dvch VoiceChannelName`")
+                    .Description($"Deletes a voice channel with a given name. **Needs Manage Channel Permissions.**| `{Prefix}dvch VoiceChannelName`")
                     .Parameter("channel_name", ParameterType.Required)
                     .Do(async e =>
                     {
@@ -530,7 +530,7 @@ namespace NadekoBot.Modules.Administration
 
                 cgb.CreateCommand(Prefix + "creatvoichanl")
                     .Alias(Prefix + "cvch")
-                    .Description($"Creates a new voice channel with a given name. | `{Prefix}cvch VoiceChannelName`")
+                    .Description($"Creates a new voice channel with a given name. **Needs Manage Channel Permissions.** | `{Prefix}cvch VoiceChannelName`")
                     .Parameter("channel_name", ParameterType.Required)
                     .Do(async e =>
                     {
@@ -550,7 +550,7 @@ namespace NadekoBot.Modules.Administration
 
                 cgb.CreateCommand(Prefix + "deltxtchanl")
                     .Alias(Prefix + "dtch")
-                    .Description($"Deletes a text channel with a given name. | `{Prefix}dtch TextChannelName`")
+                    .Description($"Deletes a text channel with a given name. **Needs Manage Channel Permissions.** | `{Prefix}dtch TextChannelName`")
                     .Parameter("channel_name", ParameterType.Required)
                     .Do(async e =>
                     {
@@ -572,7 +572,7 @@ namespace NadekoBot.Modules.Administration
 
                 cgb.CreateCommand(Prefix + "creatxtchanl")
                     .Alias(Prefix + "ctch")
-                    .Description($"Creates a new text channel with a given name. | `{Prefix}ctch TextChannelName`")
+                    .Description($"Creates a new text channel with a given name. **Needs Manage Channel Permissions.** | `{Prefix}ctch TextChannelName`")
                     .Parameter("channel_name", ParameterType.Required)
                     .Do(async e =>
                     {
@@ -592,7 +592,7 @@ namespace NadekoBot.Modules.Administration
 
                 cgb.CreateCommand(Prefix + "settopic")
                     .Alias(Prefix + "st")
-                    .Description($"Sets a topic on the current channel. | `{Prefix}st My new topic`")
+                    .Description($"Sets a topic on the current channel. **Needs Manage Channel Permissions.** | `{Prefix}st My new topic`")
                     .AddCheck(SimpleCheckers.ManageChannels())
                     .Parameter("topic", ParameterType.Unparsed)
                     .Do(async e =>
@@ -604,7 +604,7 @@ namespace NadekoBot.Modules.Administration
 
                 cgb.CreateCommand(Prefix + "setchanlname")
                     .Alias(Prefix + "schn")
-                    .Description($"Changed the name of the current channel.| `{Prefix}schn NewName`")
+                    .Description($"Changed the name of the current channel. **Needs Manage Channel Permissions.**| `{Prefix}schn NewName`")
                     .AddCheck(SimpleCheckers.ManageChannels())
                     .Parameter("name", ParameterType.Unparsed)
                     .Do(async e =>
@@ -815,7 +815,7 @@ namespace NadekoBot.Modules.Administration
                   });
 
                 cgb.CreateCommand(Prefix + "donators")
-                    .Description("List of lovely people who donated to keep this project alive. | `{Prefix}donators`")
+                    .Description($"List of lovely people who donated to keep this project alive. | `{Prefix}donators`")
                     .Do(async e =>
                     {
                         await Task.Run(async () =>
@@ -829,7 +829,7 @@ namespace NadekoBot.Modules.Administration
                     });
 
                 cgb.CreateCommand(Prefix + "donadd")
-                    .Description($"Add a donator to the database. | `{Prefix}donadd Donate Amount`")
+                    .Description($"Add a donator to the database. **Kwoth Only** | `{Prefix}donadd Donate Amount`")
                     .Parameter("donator")
                     .Parameter("amount")
                     .AddCheck(SimpleCheckers.OwnerOnly())

NadekoBot/Modules/Administration/Commands/AutoAssignRole.cs

@@ -34,7 +34,7 @@ namespace NadekoBot.Modules.Administration.Commands
         {
             cgb.CreateCommand(Module.Prefix + "autoassignrole")
                 .Alias(Module.Prefix + "aar")
-                .Description($"Automaticaly assigns a specified role to every user who joins the server. |`{Prefix}aar` to disable, `{Prefix}aar Role Name` to enable")
+                .Description($"Automaticaly assigns a specified role to every user who joins the server. **Needs Manage Roles Permissions.** |`{Prefix}aar` to disable, `{Prefix}aar Role Name` to enable")
                 .Parameter("role", ParameterType.Unparsed)
                 .AddCheck(new SimpleCheckers.ManageRoles())
                 .Do(async e =>

NadekoBot/Modules/Administration/Commands/CrossServerTextChannel.cs

@@ -65,7 +65,7 @@ namespace NadekoBot.Modules.Administration.Commands
         {
             cgb.CreateCommand(Module.Prefix + "scsc")
                 .Description("Starts an instance of cross server channel. You will get a token as a DM " +
-                             $"that other people will use to tune in to the same instance. | `{Prefix}scsc`")
+                             $"that other people will use to tune in to the same instance. **Bot Owner Only.** | `{Prefix}scsc`")
                 .AddCheck(SimpleCheckers.OwnerOnly())
                 .Do(async e =>
                 {
@@ -79,7 +79,7 @@ namespace NadekoBot.Modules.Administration.Commands
                 });
 
             cgb.CreateCommand(Module.Prefix + "jcsc")
-                .Description($"Joins current channel to an instance of cross server channel using the token. | `{Prefix}jcsc`")
+                .Description($"Joins current channel to an instance of cross server channel using the token. **Needs Manage Server Permissions.**| `{Prefix}jcsc`")
                 .Parameter("token")
                 .AddCheck(SimpleCheckers.ManageServer())
                 .Do(async e =>
@@ -95,7 +95,7 @@ namespace NadekoBot.Modules.Administration.Commands
                 });
 
             cgb.CreateCommand(Module.Prefix + "lcsc")
-                .Description($"Leaves Cross server channel instance from this channel. | `{Prefix}lcsc`")
+                .Description($"Leaves Cross server channel instance from this channel. **Needs Manage Server Permissions.**| `{Prefix}lcsc`")
                 .AddCheck(SimpleCheckers.ManageServer())
                 .Do(async e =>
                 {

NadekoBot/Modules/Administration/Commands/CustomReactionsCommands.cs

@@ -146,7 +146,7 @@ namespace NadekoBot.Modules.Administration.Commands
 
             cgb.CreateCommand(Prefix + "delcustreact")
                 .Alias(Prefix + "dcr")
-                .Description($"Deletes a custom reaction with given name (and index). | `{Prefix}dcr index`")
+                .Description($"Deletes a custom reaction with given name (and index). **Bot Owner Only.**| `{Prefix}dcr index`")
                 .Parameter("name", ParameterType.Required)
                 .Parameter("index", ParameterType.Optional)
                 .AddCheck(SimpleCheckers.OwnerOnly())

NadekoBot/Modules/Administration/Commands/IncidentsCommands.cs

@@ -14,7 +14,7 @@ namespace NadekoBot.Modules.Administration.Commands
         {
             cgb.CreateCommand(Module.Prefix + "listincidents")
                 .Alias(Prefix + "lin")
-                .Description($"List all UNREAD incidents and flags them as read. | `{Prefix}lin`")
+                .Description($"List all UNREAD incidents and flags them as read. **Needs Manage Server Permissions.**| `{Prefix}lin`")
                 .AddCheck(SimpleCheckers.ManageServer())
                 .Do(async e =>
                 {
@@ -27,7 +27,7 @@ namespace NadekoBot.Modules.Administration.Commands
 
             cgb.CreateCommand(Module.Prefix + "listallincidents")
                 .Alias(Prefix + "lain")
-                .Description($"Sends you a file containing all incidents and flags them as read. | `{Prefix}lain`")
+                .Description($"Sends you a file containing all incidents and flags them as read. **Needs Manage Server Permissions.**| `{Prefix}lain`")
                 .AddCheck(SimpleCheckers.ManageServer())
                 .Do(async e =>
                 {

NadekoBot/Modules/Administration/Commands/LogCommand.cs

@@ -375,7 +375,7 @@ namespace NadekoBot.Modules.Administration.Commands
         {
 
             cgb.CreateCommand(Module.Prefix + "spmom")
-                .Description($"Toggles whether mentions of other offline users on your server will send a pm to them. | `{Prefix}spmom`")
+                .Description($"Toggles whether mentions of other offline users on your server will send a pm to them. **Needs Manage Server Permissions.**| `{Prefix}spmom`")
                 .AddCheck(SimpleCheckers.ManageServer())
                 .Do(async e =>
                 {
@@ -413,7 +413,7 @@ namespace NadekoBot.Modules.Administration.Commands
 
 
             cgb.CreateCommand(Prefix + "logignore")
-                .Description($"Toggles whether the {Prefix}logserver command ignores this channel. Useful if you have hidden admin channel and public log channel. | `{Prefix}logignore`")
+                .Description($"Toggles whether the {Prefix}logserver command ignores this channel. Useful if you have hidden admin channel and public log channel. **Bot Owner Only!**| `{Prefix}logignore`")
                 .AddCheck(SimpleCheckers.OwnerOnly())
                 .AddCheck(SimpleCheckers.ManageServer())
                 .Do(async e =>
@@ -431,7 +431,7 @@ namespace NadekoBot.Modules.Administration.Commands
                 });
 
             cgb.CreateCommand(Module.Prefix + "userpresence")
-                  .Description($"Starts logging to this channel when someone from the server goes online/offline/idle. | `{Prefix}userpresence`")
+                  .Description($"Starts logging to this channel when someone from the server goes online/offline/idle. **Needs Manage Server Permissions.**| `{Prefix}userpresence`")
                   .AddCheck(SimpleCheckers.ManageServer())
                   .Do(async e =>
                   {
@@ -447,7 +447,7 @@ namespace NadekoBot.Modules.Administration.Commands
                   });
 
             cgb.CreateCommand(Module.Prefix + "voicepresence")
-                  .Description("Toggles logging to this channel whenever someone joins or leaves a voice channel you are in right now. | `{Prefix}voicerpresence`")
+                  .Description($"Toggles logging to this channel whenever someone joins or leaves a voice channel you are in right now. **Needs Manage Server Permissions.**| `{Prefix}voicerpresence`")
                   .Parameter("all", ParameterType.Optional)
                   .AddCheck(SimpleCheckers.ManageServer())
                   .Do(async e =>

NadekoBot/Modules/Administration/Commands/MessageRepeater.cs

@@ -57,7 +57,7 @@ namespace NadekoBot.Modules.Administration.Commands
 
             cgb.CreateCommand(Module.Prefix + "repeatinvoke")
                 .Alias(Module.Prefix + "repinv")
-                .Description($"Immediately shows the repeat message and restarts the timer. | `{Prefix}repinv`")
+                .Description($"Immediately shows the repeat message and restarts the timer. **Needs Manage Messages Permissions.**| `{Prefix}repinv`")
                 .AddCheck(SimpleCheckers.ManageMessages())
                 .Do(async e =>
                 {
@@ -73,7 +73,7 @@ namespace NadekoBot.Modules.Administration.Commands
 
             cgb.CreateCommand(Module.Prefix + "repeat")
                 .Description("Repeat a message every X minutes. If no parameters are specified, " +
-                             $"repeat is disabled. Requires manage messages. |`{Prefix}repeat 5 Hello there`")
+                             $"repeat is disabled. **Needs Manage Messages Permissions.** |`{Prefix}repeat 5 Hello there`")
                 .Parameter("minutes", ParameterType.Optional)
                 .Parameter("msg", ParameterType.Unparsed)
                 .AddCheck(SimpleCheckers.ManageMessages())

NadekoBot/Modules/Administration/Commands/PlayingRotate.cs

@@ -96,14 +96,14 @@ namespace NadekoBot.Modules.Administration.Commands
         {
             cgb.CreateCommand(Module.Prefix + "rotateplaying")
                 .Alias(Module.Prefix + "ropl")
-                .Description($"Toggles rotation of playing status of the dynamic strings you specified earlier. | `{Prefix}ropl`")
+                .Description($"Toggles rotation of playing status of the dynamic strings you specified earlier. **Bot Owner Only!** | `{Prefix}ropl`")
                 .AddCheck(SimpleCheckers.OwnerOnly())
                 .Do(DoFunc());
 
             cgb.CreateCommand(Module.Prefix + "addplaying")
                 .Alias(Module.Prefix + "adpl")
                 .Description("Adds a specified string to the list of playing strings to rotate. " +
-                             "Supported placeholders: " + string.Join(", ", PlayingPlaceholders.Keys)+ $" | `{Prefix}adpl`")
+                             "Supported placeholders: " + string.Join(", ", PlayingPlaceholders.Keys)+ $" **Bot Owner Only!**| `{Prefix}adpl`")
                 .Parameter("text", ParameterType.Unparsed)
                 .AddCheck(SimpleCheckers.OwnerOnly())
                 .Do(async e =>
@@ -126,7 +126,7 @@ namespace NadekoBot.Modules.Administration.Commands
 
             cgb.CreateCommand(Module.Prefix + "listplaying")
                 .Alias(Module.Prefix + "lipl")
-                .Description($"Lists all playing statuses with their corresponding number. | `{Prefix}lipl`")
+                .Description($"Lists all playing statuses with their corresponding number. **Bot Owner Only!**| `{Prefix}lipl`")
                 .AddCheck(SimpleCheckers.OwnerOnly())
                 .Do(async e =>
                 {
@@ -143,7 +143,7 @@ namespace NadekoBot.Modules.Administration.Commands
 
             cgb.CreateCommand(Module.Prefix + "removeplaying")
                 .Alias(Module.Prefix + "repl", Module.Prefix + "rmpl")
-                .Description($"Removes a playing string on a given number. | `{Prefix}rmpl`")
+                .Description($"Removes a playing string on a given number. **Bot Owner Only!**| `{Prefix}rmpl`")
                 .Parameter("number", ParameterType.Required)
                 .AddCheck(SimpleCheckers.OwnerOnly())
                 .Do(async e =>

NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs

@@ -41,7 +41,7 @@ namespace NadekoBot.Modules.Administration.Commands
         internal override void Init(CommandGroupBuilder cgb)
         {
             cgb.CreateCommand(Module.Prefix + "slowmode")
-                .Description($"Toggles slow mode. When ON, users will be able to send only 1 message every 5 seconds. | `{Prefix}slowmode`")
+                .Description($"Toggles slow mode. When ON, users will be able to send only 1 message every 5 seconds. **Needs Manage Messages Permissions.**| `{Prefix}slowmode`")
                 .AddCheck(SimpleCheckers.ManageMessages())
                 .Do(async e =>
                 {

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. **Needs Manage Roles Permissions.**| `{Prefix}asar Gamer`")
                 .Parameter("roles", ParameterType.Multiple)
                 .AddCheck(SimpleCheckers.CanManageRoles)
                 .Do(async e =>

NadekoBot/Modules/Administration/Commands/SelfCommands.cs

@@ -14,7 +14,7 @@ namespace NadekoBot.Modules.Administration.Commands
         internal override void Init(CommandGroupBuilder cgb)
         {
             cgb.CreateCommand(Module.Prefix + "leave")
-                .Description($"Makes Nadeko leave the server. Either name or id required. | `{Prefix}leave 123123123331`")
+                .Description($"Makes Nadeko leave the server. Either name or id required. **Bot Owner Only!**| `{Prefix}leave 123123123331`")
                 .Parameter("arg", ParameterType.Required)
                 .AddCheck(SimpleCheckers.OwnerOnly())
                 .Do(async e =>

NadekoBot/Modules/Administration/Commands/ServerGreetCommand.cs

@@ -219,7 +219,7 @@ namespace NadekoBot.Modules.Administration.Commands
         internal override void Init(CommandGroupBuilder cgb)
         {
             cgb.CreateCommand(Module.Prefix + "grdel")
-                .Description($"Toggles automatic deletion of greet and bye messages. | `{Prefix}grdel`")
+                .Description($"Toggles automatic deletion of greet and bye messages. **Needs Manage Server Permissions.**| `{Prefix}grdel`")
                 .Do(async e =>
                 {
                     if (!e.User.ServerPermissions.ManageServer) return;
@@ -232,7 +232,7 @@ namespace NadekoBot.Modules.Administration.Commands
                 });
 
             cgb.CreateCommand(Module.Prefix + "greet")
-                .Description($"Toggles anouncements on the current channel when someone joins the server. | `{Prefix}greet`")
+                .Description($"Toggles anouncements on the current channel when someone joins the server. **Needs Manage Server Permissions.**| `{Prefix}greet`")
                 .Do(async e =>
                 {
                     if (!e.User.ServerPermissions.ManageServer) return;
@@ -245,7 +245,7 @@ namespace NadekoBot.Modules.Administration.Commands
                 });
 
             cgb.CreateCommand(Module.Prefix + "greetmsg")
-                .Description($"Sets a new join announcement message. Type %user% if you want to mention the new member. Using it with no message will show the current greet message. | `{Prefix}greetmsg Welcome to the server, %user%.`")
+                .Description($"Sets a new join announcement message. Type %user% if you want to mention the new member. Using it with no message will show the current greet message. **Needs Manage Server Permissions.**| `{Prefix}greetmsg Welcome to the server, %user%.`")
                 .Parameter("msg", ParameterType.Unparsed)
                 .Do(async e =>
                 {
@@ -278,7 +278,7 @@ namespace NadekoBot.Modules.Administration.Commands
                 });
 
             cgb.CreateCommand(Module.Prefix + "byemsg")
-                .Description($"Sets a new leave announcement message. Type %user% if you want to mention the new member. Using it with no message will show the current bye message. | `{Prefix}byemsg %user% has left the server.`")
+                .Description($"Sets a new leave announcement message. Type %user% if you want to mention the new member. Using it with no message will show the current bye message. **Needs Manage Server Permissions.**| `{Prefix}byemsg %user% has left the server.`")
                 .Parameter("msg", ParameterType.Unparsed)
                 .Do(async e =>
                 {
@@ -297,7 +297,7 @@ namespace NadekoBot.Modules.Administration.Commands
                 });
 
             cgb.CreateCommand(Module.Prefix + "byepm")
-                .Description($"Toggles whether the good bye messages will be sent in a PM or in the text channel. | `{Prefix}byepm`")
+                .Description($"Toggles whether the good bye messages will be sent in a PM or in the text channel. **Needs Manage Server Permissions.**| `{Prefix}byepm`")
                 .Do(async e =>
                 {
                     if (!e.User.ServerPermissions.ManageServer) return;
@@ -313,7 +313,7 @@ namespace NadekoBot.Modules.Administration.Commands
                 });
 
             cgb.CreateCommand(Module.Prefix + "greetpm")
-                .Description($"Toggles whether the greet messages will be sent in a PM or in the text channel. | `{Prefix}greetpm`")
+                .Description($"Toggles whether the greet messages will be sent in a PM or in the text channel. **Needs Manage Server Permissions.**| `{Prefix}greetpm`")
                 .Do(async e =>
                 {
                     if (!e.User.ServerPermissions.ManageServer) return;

NadekoBot/Modules/Administration/Commands/VoicePlusTextCommand.cs

@@ -88,7 +88,7 @@ namespace NadekoBot.Modules.Administration.Commands
         {
             cgb.CreateCommand(Module.Prefix + "cleanv+t")
                 .Alias(Module.Prefix + "cv+t")
-                .Description($"Deletes all text channels ending in `-voice` for which voicechannels are not found. **Use at your own risk.** | `{Prefix}cleanv+t`")
+                .Description($"Deletes all text channels ending in `-voice` for which voicechannels are not found. **Use at your own risk.\nNeeds Manage Roles and Manage Channels Permissions.** | `{Prefix}cleanv+t`")
                 .AddCheck(SimpleCheckers.CanManageRoles)
                 .AddCheck(SimpleCheckers.ManageChannels())
                 .Do(async e =>
@@ -120,7 +120,7 @@ namespace NadekoBot.Modules.Administration.Commands
             cgb.CreateCommand(Module.Prefix + "voice+text")
                 .Alias(Module.Prefix + "v+t")
                 .Description("Creates a text channel for each voice channel only users in that voice channel can see." +
-                             $"If you are server owner, keep in mind you will see them all the time regardless. | `{Prefix}voice+text`")
+                             $"If you are server owner, keep in mind you will see them all the time regardless. **Needs Manage Roles and Manage Channels Permissions.**| `{Prefix}voice+text`")
                 .AddCheck(SimpleCheckers.ManageChannels())
                 .AddCheck(SimpleCheckers.CanManageRoles)
                 .Do(async e =>

NadekoBot/Modules/ClashOfClans/ClashOfClansModule.cs

@@ -186,7 +186,7 @@ namespace NadekoBot.Modules.ClashOfClans
 
                 cgb.CreateCommand(Prefix + "startwar")
                     .Alias(Prefix + "sw")
-                    .Description("Starts a war with a given number. | `{Prefix}sw 15`")
+                    .Description($"Starts a war with a given number. | `{Prefix}sw 15`")
                     .Parameter("number", ParameterType.Required)
                     .Do(async e =>
                     {

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. | `{Prefix}gl`")
+                    .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) | `{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) | `{Prefix}ap`")
                     .Do(async e =>
                     {
 

NadekoBot/Modules/Permissions/Classes/PermissionChecker.cs

@@ -49,7 +49,6 @@ namespace NadekoBot.Modules.Permissions.Classes
             {
                 return false;
             }
-
             if (timeBlackList.Contains(user.Id))
                 return false;
 
@@ -64,9 +63,9 @@ namespace NadekoBot.Modules.Permissions.Classes
             PermissionsHandler.PermissionsDict.TryGetValue(user.Server.Id, out perms);
 
             AddUserCooldown(user.Server.Id, user.Id, command.Text.ToLower());
-            if (commandCooldowns.Keys.Contains(user.Server.Id+":"+command.Text.ToLower()))
+            if (commandCooldowns.Keys.Contains(user.Server.Id + ":" + command.Text.ToLower()))
             {
-                if(perms?.Verbose == true)
+                if (perms?.Verbose == true)
                     error = $"{user.Mention} You have a cooldown on that command.";
                 return false;
             }
@@ -150,7 +149,8 @@ namespace NadekoBot.Modules.Permissions.Classes
             }
         }
 
-        public void AddUserCooldown(ulong serverId, ulong userId, string commandName) {
+        public void AddUserCooldown(ulong serverId, ulong userId, string commandName)
+        {
             commandCooldowns.TryAdd(commandName, userId);
             var tosave = serverId + ":" + commandName;
             Task.Run(async () =>
@@ -158,7 +158,8 @@ namespace NadekoBot.Modules.Permissions.Classes
                 ServerPermissions perms;
                 PermissionsHandler.PermissionsDict.TryGetValue(serverId, out perms);
                 int cd;
-                if (!perms.CommandCooldowns.TryGetValue(commandName,out cd)) {
+                if (!perms.CommandCooldowns.TryGetValue(commandName, out cd))
+                {
                     return;
                 }
                 if (commandCooldowns.TryAdd(tosave, userId))

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. | `{Prefix}acmdcds`")
+                    .Description($"Shows a list of all commands and their respective cooldowns. | `{Prefix}acmdcds`")
                     .Do(async e =>
                     {
                         ServerPermissions perms;

NadekoBot/Modules/Searches/Commands/EvalCommand.cs

@@ -17,7 +17,7 @@ namespace NadekoBot.Modules.Searches.Commands
         {
             cgb.CreateCommand(Module.Prefix + "calculate")
                 .Alias(Module.Prefix + "calc")
-                .Description($"Evaluate a mathematical expression. | {Prefix}calc 1+1")
+                .Description($"Evaluate a mathematical expression. | `{Prefix}calc 1+1`")
                 .Parameter("expression", ParameterType.Unparsed)
                 .Do(EvalFunc());
         }

NadekoBot/Modules/Searches/Commands/OsuCommands.cs

@@ -56,7 +56,7 @@ namespace NadekoBot.Modules.Searches.Commands
                   });
 
             cgb.CreateCommand(Module.Prefix + "osu b")
-                .Description($"Shows information about an osu beatmap. |`{Prefix}osu b` https://osu.ppy.sh/s/127712`")
+                .Description($"Shows information about an osu beatmap. |`{Prefix}osu b` https://osu.ppy.sh/s/127712")
                 .Parameter("map", ParameterType.Unparsed)
                 .Do(async e =>
                 {
@@ -88,7 +88,7 @@ namespace NadekoBot.Modules.Searches.Commands
                 });
 
             cgb.CreateCommand(Module.Prefix + "osu top5")
-                .Description($"Displays a user's top 5 plays.  |{Prefix}osu top5 Name")
+                .Description($"Displays a user's top 5 plays.  |`{Prefix}osu top5 Name`")
                 .Parameter("usr", ParameterType.Required)
                 .Parameter("mode", ParameterType.Unparsed)
                 .Do(async e =>

NadekoBot/Modules/Searches/SearchesModule.cs

@@ -86,7 +86,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
                 cgb.CreateCommand(Prefix + "ani")
                     .Alias(Prefix + "anime", Prefix + "aq")
                     .Parameter("query", ParameterType.Unparsed)
-                    .Description($"Queries anilist for an anime and shows the first result. | `{Prefix}aq aquerion evol`")
+                    .Description($"Queries anilist for an anime and shows the first result. | `{Prefix}aq aquarion evol`")
                     .Do(async e =>
                     {
                         if (!(await SearchHelper.ValidateQuery(e.Channel, e.GetArg("query")).ConfigureAwait(false))) return;
@@ -106,7 +106,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
 
                 cgb.CreateCommand(Prefix + "imdb")
                     .Parameter("query", ParameterType.Unparsed)
-                    .Description($"Queries imdb for movies or series, show first result. | `{Prefix}imdb query`")
+                    .Description($"Queries imdb for movies or series, show first result. | `{Prefix}imdb Batman vs Superman`")
                     .Do(async e =>
                     {
                         if (!(await SearchHelper.ValidateQuery(e.Channel, e.GetArg("query")).ConfigureAwait(false))) return;
@@ -130,7 +130,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
                 cgb.CreateCommand(Prefix + "mang")
                     .Alias(Prefix + "manga").Alias(Prefix + "mq")
                     .Parameter("query", ParameterType.Unparsed)
-                    .Description($"Queries anilist for a manga and shows the first result. | `{Prefix}mq query`")
+                    .Description($"Queries anilist for a manga and shows the first result. | `{Prefix}mq Shingeki no kyojin`")
                     .Do(async e =>
                     {
                         if (!(await SearchHelper.ValidateQuery(e.Channel, e.GetArg("query")).ConfigureAwait(false))) return;
@@ -149,7 +149,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
 
                 cgb.CreateCommand(Prefix + "randomcat")
                     .Alias(Prefix + "meow")
-                    .Description("Shows a random cat image. | `{Prefix}meow`")
+                    .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. | `{Prefix}woof`")
+                    .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);
@@ -502,7 +502,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
                 cgb.CreateCommand(Prefix + "av")
                     .Alias(Prefix + "avatar")
                     .Parameter("mention", ParameterType.Required)
-                    .Description($"Shows a mentioned person's avatar. | `{Prefix}av @X`")
+                    .Description($"Shows a mentioned person's avatar. | `{Prefix}av \"@SomeGuy\"`")
                     .Do(async e =>
                     {
                         var usr = e.Channel.FindUsers(e.GetArg("mention")).FirstOrDefault();

NadekoBot/Modules/Trello/TrelloModule.cs

@@ -71,7 +71,7 @@ namespace NadekoBot.Modules.Trello
                 cgb.CreateCommand(Prefix + "bind")
                     .Description("Bind a trello bot to a single channel. " +
                                  "You will receive notifications from your board when something is added or edited." +
-                                 $" | `{Prefix}bind [board_id]`")
+                                 $" **Bot Owner Only!**| `{Prefix}bind [board_id]`")
                     .Parameter("board_id", Discord.Commands.ParameterType.Required)
                     .Do(async e =>
                     {
@@ -92,7 +92,7 @@ namespace NadekoBot.Modules.Trello
                     });
 
                 cgb.CreateCommand(Prefix + "unbind")
-                    .Description($"Unbinds a bot from the channel and board. | `{Prefix}unbind`")
+                    .Description($"Unbinds a bot from the channel and board. **Bot Owner Only!**| `{Prefix}unbind`")
                     .Do(async e =>
                     {
                         if (!NadekoBot.IsOwner(e.User.Id)) return;
@@ -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 ;) **Bot Owner Only!**| `{Prefix}list`")
                     .Do(async e =>
                     {
                         if (!NadekoBot.IsOwner(e.User.Id)) return;
@@ -116,7 +116,7 @@ namespace NadekoBot.Modules.Trello
                     });
 
                 cgb.CreateCommand(Prefix + "cards")
-                    .Description($"Lists all cards from the supplied list. You can supply either a name or an index. | `{Prefix}cards index`")
+                    .Description($"Lists all cards from the supplied list. You can supply either a name or an index. **Bot Owner Only!**| `{Prefix}cards index`")
                     .Parameter("list_name", Discord.Commands.ParameterType.Unparsed)
                     .Do(async e =>
                     {

NadekoBot/Modules/Utility/UtilityModule.cs

@@ -48,7 +48,7 @@ namespace NadekoBot.Modules.Utility
                         if (arr.Length == 0)
                             await e.Channel.SendMessage("Nobody. (not 100% sure)").ConfigureAwait(false);
                         else
-                            await e.Channel.SendMessage("```xl\n" + string.Join("\n", arr.GroupBy(item => (i++) / 3).Select(ig => string.Concat(ig.Select(el => $"• {el,-35}")))) + "\n```").ConfigureAwait(false);
+                            await e.Channel.SendMessage("```xl\n" + string.Join("\n", arr.GroupBy(item => (i++) / 3).Select(ig => string.Concat(ig.Select(el => $"• {el,-35}")))) + "\n```").ConfigureAwait(false);
                     });
 
                 cgb.CreateCommand(Prefix + "inrole")
@@ -134,7 +134,7 @@ namespace NadekoBot.Modules.Utility
                     .Do(async e => await e.Channel.SendMessage("This server's ID is " + e.Server.Id).ConfigureAwait(false));
 
                 cgb.CreateCommand(Prefix + "roles")
-                    .Description("List all roles on this server or a single user if specified.")
+                    .Description($"List all roles on this server or a single user if specified. | `{Prefix}roles`")
                     .Parameter("user", ParameterType.Unparsed)
                     .Do(async e =>
                     {
@@ -143,10 +143,10 @@ namespace NadekoBot.Modules.Utility
                             var usr = e.Server.FindUsers(e.GetArg("user")).FirstOrDefault();
                             if (usr == null) return;
 
-                            await e.Channel.SendMessage($"`List of roles for **{usr.Name}**:` \n• " + string.Join("\n• ", usr.Roles)).ConfigureAwait(false);
+                            await e.Channel.SendMessage($"`List of roles for **{usr.Name}**:` \n• " + string.Join("\n• ", usr.Roles)).ConfigureAwait(false);
                             return;
                         }
-                        await e.Channel.SendMessage("`List of roles:` \n• " + string.Join("\n• ", e.Server.Roles)).ConfigureAwait(false);
+                        await e.Channel.SendMessage("`List of roles:` \n• " + string.Join("\n• ", e.Server.Roles)).ConfigureAwait(false);
                     });
 
 

NadekoBot/NadekoBot.cs

@@ -121,8 +121,8 @@ namespace NadekoBot
                 LogLevel = LogSeverity.Warning,
                 LogHandler = (s, e) =>
                     Console.WriteLine($"Severity: {e.Severity}" +
-                                      $"Message: {e.Message}" +
+                                      $"ExceptionMessage: {e.Exception?.Message ?? "-"}" +
-                                      $"ExceptionMessage: {e.Exception?.Message ?? "-"}"),
+                                      $"Message: {e.Message}"),
             });
 
             //create a command service
@@ -197,7 +197,7 @@ namespace NadekoBot
                     return;
                 }
 #if NADEKO_RELEASE
-                await Task.Delay(120000).ConfigureAwait(false);
+                await Task.Delay(150000).ConfigureAwait(false);
 #else
                 await Task.Delay(1000).ConfigureAwait(false);
 #endif

NadekoBot/NadekoBot.csproj

@@ -161,22 +161,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>lib\ScaredFingers.UnitsConversion.dll</HintPath>
     </Reference>
-    <Reference Include="SQLite-net, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\sqlite-net-pcl.1.1.2\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLite-net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="SQLitePCL.batteries, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SQLitePCL.bundle_green.0.9.2\lib\net45\SQLitePCL.batteries.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="SQLitePCL.raw, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SQLitePCL.raw.0.9.2\lib\net45\SQLitePCL.raw.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="SQLitePCLPlugin_esqlite3, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SQLitePCL.plugin.sqlite3.net45.0.9.2\lib\net45\SQLitePCLPlugin_esqlite3.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Net" />
@@ -217,6 +201,7 @@
     <Compile Include="Modules\Searches\Commands\OsuCommands.cs" />
     <Compile Include="Modules\Searches\Commands\PokemonSearchCommands.cs" />
     <Compile Include="Modules\Utility\UtilityModule.cs" />
+    <Compile Include="SQLite.cs" />
     <Compile Include="_Models\DataModels\TestDataModel.cs" />
     <Compile Include="_Models\DataModels\Incident.cs" />
     <Compile Include="_Models\JSONModels\AnimeResult.cs" />
@@ -231,7 +216,7 @@
     <Compile Include="Modules\Music\Classes\MusicControls.cs" />
     <Compile Include="Modules\Music\Classes\PoopyBuffer.cs" />
     <Compile Include="Modules\Music\Classes\Song.cs" />
-	<Compile Include="Modules\Music\Classes\SongBuffer.cs" />
+    <Compile Include="Modules\Music\Classes\SongBuffer.cs" />
     <Compile Include="Modules\Music\Classes\SoundCloud.cs" />
     <Compile Include="Modules\Permissions\Classes\PermissionChecker.cs" />
     <Compile Include="Modules\Permissions\Classes\PermissionHelper.cs" />

NadekoBot/_Models/JSONModels/Configuration.cs

@@ -81,6 +81,15 @@ namespace NadekoBot.Classes.JSONModels
                 "https://cdn.discordapp.com/attachments/140007341880901632/156721724430352385/okawari_01_haruka_weird_mask.jpg",
                 "https://cdn.discordapp.com/attachments/140007341880901632/156721728763068417/mustache-best-girl.png"
 
+            } },
+            {"%mention% inv", new List<string>() {
+                "To invite your bot, click on this link -> <https://discordapp.com/oauth2/authorize?client_id=%target%&scope=bot&permissions=66186303>"
+            } },
+            { "%mention% threaten", new List<string>() {
+                "You wanna die, %target%?"
+            } },
+            { "%mention% archer", new List<string>() {
+                "http://i.imgur.com/Bha9NhL.jpg"
             } }
         };
 
@@ -208,7 +217,8 @@ Nadeko Support Server: <https://discord.gg/0ehQwTK2RBjAxzEY>";
             {
                 File.WriteAllText("data/config.json", JsonConvert.SerializeObject(NadekoBot.Config, Formatting.Indented));
             }
-            finally {
+            finally
+            {
                 configLock.Release();
             }
         }

NadekoBot/bin/Debug/data/config_example.json

@@ -82,6 +82,15 @@
       "https://cdn.discordapp.com/attachments/140007341880901632/156721715831898113/hqdefault.jpg",
       "https://cdn.discordapp.com/attachments/140007341880901632/156721724430352385/okawari_01_haruka_weird_mask.jpg",
       "https://cdn.discordapp.com/attachments/140007341880901632/156721728763068417/mustache-best-girl.png"
+    ],
+    "%mention% inv": [
+      "To invite your bot, click on this link -> <https://discordapp.com/oauth2/authorize?client_id=%target%&scope=bot&permissions=66186303>"
+    ],
+    "%mention% threaten": [
+      "You wanna die, %target%?"
+    ],
+    "%mention% archer": [
+      "http://i.imgur.com/Bha9NhL.jpg"
     ]
   },
   "RotatingStatuses": [],

NadekoBot/packages.config

@@ -10,7 +10,7 @@
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net46" />
   <package id="RestSharp" version="105.2.3" targetFramework="net452" />
-  <package id="sqlite-net-pcl" version="1.1.2" targetFramework="net452" />
+  <package id="sqlite-net" version="1.0.8" targetFramework="net452" />
   <package id="SQLitePCL.bundle_green" version="0.9.2" targetFramework="net452" />
   <package id="SQLitePCL.native.sqlite3.v110_xp" version="0.9.2" targetFramework="net452" />
   <package id="SQLitePCL.plugin.sqlite3.net45" version="0.9.2" targetFramework="net452" />

README.md

@@ -1,8 +1,9 @@
 ![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)
+## [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)
 

commandlist.md

@@ -1,82 +1,82 @@
-######For more information and how to setup your own NadekoBot, go to: **http://github.com/Kwoth/NadekoBot/**
+######For more information and how to setup your own NadekoBot, go to: <http://github.com/Kwoth/NadekoBot/wiki>
-######You can donate on patreon: `https://patreon.com/nadekobot`
+######You can donate on patreon: <https://patreon.com/nadekobot>
 ######or paypal: `nadekodiscordbot@gmail.com`
 
-#NadekoBot List Of Commands  
+#NadekoBot List Of Commands  
-Version: `NadekoBot v0.9.6054.4837`
 ### Help  
 Command and aliases |  Description |  Usage
 ----------------|--------------|-------
 `-h`, `-help`, `@BotName help`, `@BotName h`, `~h`  |  Either shows a help for a single command, or PMs you help link if no arguments are specified. |  `-h !m q` or just `-h` 
 `-hgit`  |  Generates the commandlist.md file. **Bot Owner Only!** |  `-hgit`
 `-readme`, `-guide`  |  Sends a readme and a guide links to the channel. |  `-readme` or `-guide`
-`-donate`, `~donate`  |  Instructions for helping the project! |  `{Prefix}donate` or `~donate`
+`-donate`, `~donate`  |  Instructions for helping the project! |  `-donate` or `~donate`
-`-modules`, `.modules`  |  List all bot modules. |  `{Prefix}modules` or `.modules`
+`-modules`, `.modules`  |  List all bot modules. |  `-modules` or `.modules`
-`-commands`, `.commands`  |  List all of the bot's commands from a certain module. |  `{Prefix}commands` or `.commands`
+`-commands`, `.commands`  |  List all of the bot's commands from a certain module. |  `-commands` or `.commands`
 
 ### Administration  
 Command and aliases |  Description |  Usage
 ----------------|--------------|-------
-`.grdel`  |  Toggles automatic deletion of greet and bye messages. |  `.grdel`
+`.grdel`  |  Toggles automatic deletion of greet and bye messages. **Needs Manage Server Permissions.**| `.grdel`
-`.greet`  |  Toggles anouncements on the current channel when someone joins the server. |  `.greet`
+`.greet`  |  Toggles anouncements on the current channel when someone joins the server. **Needs Manage Server Permissions.**| `.greet`
-`.greetmsg`  |  Sets a new join announcement message. Type %user% if you want to mention the new member. Using it with no message will show the current greet message. |  `.greetmsg Welcome to the server, %user%.`
+`.greetmsg`  |  Sets a new join announcement message. Type %user% if you want to mention the new member. Using it with no message will show the current greet message. **Needs Manage Server Permissions.**| `.greetmsg Welcome to the server, %user%.`
 `.bye`  |  Toggles anouncements on the current channel when someone leaves the server. |  `.bye`
-`.byemsg`  |  Sets a new leave announcement message. Type %user% if you want to mention the new member. Using it with no message will show the current bye message. |  `.byemsg %user% has left the server.`
+`.byemsg`  |  Sets a new leave announcement message. Type %user% if you want to mention the new member. Using it with no message will show the current bye message. **Needs Manage Server Permissions.**| `.byemsg %user% has left the server.`
-`.byepm`  |  Toggles whether the good bye messages will be sent in a PM or in the text channel. |  `.byepm`
+`.byepm`  |  Toggles whether the good bye messages will be sent in a PM or in the text channel. **Needs Manage Server Permissions.**| `.byepm`
-`.greetpm`  |  Toggles whether the greet messages will be sent in a PM or in the text channel. |  `.greetpm`
+`.greetpm`  |  Toggles whether the greet messages will be sent in a PM or in the text channel. **Needs Manage Server Permissions.**| `.greetpm`
-`.spmom`  |  Toggles whether mentions of other offline users on your server will send a pm to them. |  `.spmom`
+`.spmom`  |  Toggles whether mentions of other offline users on your server will send a pm to them. **Needs Manage Server Permissions.**| `.spmom`
 `.logserver`  |  Toggles logging in this channel. Logs every message sent/deleted/edited on the server. **Bot Owner Only!** |  `.logserver`
-`.logignore`  |  Toggles whether the .logserver command ignores this channel. Useful if you have hidden admin channel and public log channel. |  `.logignore`
+`.logignore`  |  Toggles whether the .logserver command ignores this channel. Useful if you have hidden admin channel and public log channel. **Bot Owner Only!**| `.logignore`
-`.userpresence`  |  Starts logging to this channel when someone from the server goes online/offline/idle. |  `.userpresence`
+`.userpresence`  |  Starts logging to this channel when someone from the server goes online/offline/idle. **Needs Manage Server Permissions.**| `.userpresence`
-`.voicepresence`  |  Toggles logging to this channel whenever someone joins or leaves a voice channel you are in right now. |  `{Prefix}voicerpresence`
+`.voicepresence`  |  Toggles logging to this channel whenever someone joins or leaves a voice channel you are in right now. **Needs Manage Server Permissions.**| `.voicerpresence`
-`.repeatinvoke`, `.repinv`  |  Immediately shows the repeat message and restarts the timer. |  `{Prefix}repinv`
+`.repeatinvoke`, `.repinv`  |  Immediately shows the repeat message and restarts the timer. **Needs Manage Messages Permissions.**| `.repinv`
-`.repeat`  |  Repeat a message every X minutes. If no parameters are specified, repeat is disabled. Requires manage messages. | `.repeat 5 Hello there`
+`.repeat`  |  Repeat a message every X minutes. If no parameters are specified, repeat is disabled. **Needs Manage Messages Permissions.** | `.repeat 5 Hello there`
-`.rotateplaying`, `.ropl`  |  Toggles rotation of playing status of the dynamic strings you specified earlier. |  `.ropl`
+`.rotateplaying`, `.ropl`  |  Toggles rotation of playing status of the dynamic strings you specified earlier. **Bot Owner Only!** |  `.ropl`
-`.addplaying`, `.adpl`  |  Adds a specified string to the list of playing strings to rotate. Supported placeholders: %servers%, %users%, %playing%, %queued%, %trivia% |  `.adpl`
+`.addplaying`, `.adpl`  |  Adds a specified string to the list of playing strings to rotate. Supported placeholders: %servers%, %users%, %playing%, %queued%, %trivia% **Bot Owner Only!**| `.adpl`
-`.listplaying`, `.lipl`  |  Lists all playing statuses with their corresponding number. |  `.lipl`
+`.listplaying`, `.lipl`  |  Lists all playing statuses with their corresponding number. **Bot Owner Only!**| `.lipl`
-`.removeplaying`, `.repl`, `.rmpl`  |  Removes a playing string on a given number. |  `.rmpl`
+`.removeplaying`, `.repl`, `.rmpl`  |  Removes a playing string on a given number. **Bot Owner Only!**| `.rmpl`
-`.slowmode`  |  Toggles slow mode. When ON, users will be able to send only 1 message every 5 seconds. |  `.slowmode`
+`.slowmode`  |  Toggles slow mode. When ON, users will be able to send only 1 message every 5 seconds. **Needs Manage Messages Permissions.**| `.slowmode`
-`.cleanv+t`, `.cv+t`  |  Deletes all text channels ending in `-voice` for which voicechannels are not found. **Use at your own risk.** |  `.cleanv+t`
+`.cleanv+t`, `.cv+t`  |  Deletes all text channels ending in `-voice` for which voicechannels are not found. **Use at your own risk.
-`.voice+text`, `.v+t`  |  Creates a text channel for each voice channel only users in that voice channel can see.If you are server owner, keep in mind you will see them all the time regardless. |  `.voice+text`
+Needs Manage Roles and Manage Channels Permissions.** |  `.cleanv+t`
-`.scsc`  |  Starts an instance of cross server channel. You will get a token as a DM that other people will use to tune in to the same instance. |  `.scsc`
+`.voice+text`, `.v+t`  |  Creates a text channel for each voice channel only users in that voice channel can see.If you are server owner, keep in mind you will see them all the time regardless. **Needs Manage Roles and Manage Channels Permissions.**| `.voice+text`
-`.jcsc`  |  Joins current channel to an instance of cross server channel using the token. |  `.jcsc`
+`.scsc`  |  Starts an instance of cross server channel. You will get a token as a DM that other people will use to tune in to the same instance. **Bot Owner Only.** |  `.scsc`
-`.lcsc`  |  Leaves Cross server channel instance from this channel. |  `.lcsc`
+`.jcsc`  |  Joins current channel to an instance of cross server channel using the token. **Needs Manage Server Permissions.**| `.jcsc`
-`.asar`  |  Adds a role, or list of roles separated by whitespace(use quotations for multiword roles) to the list of self-assignable roles. |  .asar Gamer
+`.lcsc`  |  Leaves Cross server channel instance from this channel. **Needs Manage Server Permissions.**| `.lcsc`
+`.asar`  |  Adds a role, or list of roles separated by whitespace(use quotations for multiword roles) to the list of self-assignable roles. **Needs Manage Roles Permissions.**| `.asar Gamer`
 `.rsar`  |  Removes a specified role from the list of self-assignable roles. |  `.rsar`
 `.lsar`  |  Lists all self-assignable roles. |  `.lsar`
 `.togglexclsar`, `.tesar`  |  toggle whether the self-assigned roles should be exclusive |  `.tesar`
-`.iam`  |  Adds a role to you that you choose. Role must be on a list of self-assignable roles. |  .iam Gamer
+`.iam`  |  Adds a role to you that you choose. Role must be on a list of self-assignable roles. |  `.iam Gamer`
-`.iamnot`, `.iamn`  |  Removes a role to you that you choose. Role must be on a list of self-assignable roles. |  .iamn Gamer
+`.iamnot`, `.iamn`  |  Removes a role to you that you choose. Role must be on a list of self-assignable roles. |  `.iamn Gamer`
 `.addcustreact`, `.acr`  |  Add a custom reaction. Guide here: <https://github.com/Kwoth/NadekoBot/wiki/Custom-Reactions> **Bot Owner Only!**   |  `.acr "hello" I love saying hello to %user%`
 `.listcustreact`, `.lcr`  |  Lists custom reactions (paginated with 30 commands per page). Use 'all' instead of page number to get all custom reactions DM-ed to you.  | `.lcr 1`
 `.showcustreact`, `.scr`  |  Shows all possible responses from a single custom reaction. | `.scr %mention% bb`
 `.editcustreact`, `.ecr`  |  Edits a custom reaction, arguments are custom reactions name, index to change, and a (multiword) message **Bot Owner Only** |  `.ecr "%mention% disguise" 2 Test 123`
-`.delcustreact`, `.dcr`  |  Deletes a custom reaction with given name (and index). |  `.dcr index`
+`.delcustreact`, `.dcr`  |  Deletes a custom reaction with given name (and index). **Bot Owner Only.**| `.dcr index`
-`.autoassignrole`, `.aar`  |  Automaticaly assigns a specified role to every user who joins the server. Type `.aar` to disable, `.aar Role Name` to enable
+`.autoassignrole`, `.aar`  |  Automaticaly assigns a specified role to every user who joins the server. **Needs Manage Roles Permissions.** | `.aar` to disable, `.aar Role Name` to enable
-`.leave`  |  Makes Nadeko leave the server. Either name or id required. |  `.leave 123123123331`
+`.leave`  |  Makes Nadeko leave the server. Either name or id required. **Bot Owner Only!**| `.leave 123123123331`
-`.listincidents`, `.lin`  |  List all UNREAD incidents and flags them as read. |  `.lin`
+`.listincidents`, `.lin`  |  List all UNREAD incidents and flags them as read. **Needs Manage Server Permissions.**| `.lin`
-`.listallincidents`, `.lain`  |  Sends you a file containing all incidents and flags them as read. |  `.lain`
+`.listallincidents`, `.lain`  |  Sends you a file containing all incidents and flags them as read. **Needs Manage Server Permissions.**| `.lain`
-`.delmsgoncmd`  |  Toggles the automatic deletion of user's successful command message to prevent chat flood. Server Manager Only. |  `.delmsgoncmd`
+`.delmsgoncmd`  |  Toggles the automatic deletion of user's successful command message to prevent chat flood. **Server Manager Only.** |  `.delmsgoncmd`
 `.restart`  |  Restarts the bot. Might not work. **Bot Owner Only** |  `.restart`
-`.setrole`, `.sr`  |  Sets a role for a given user. |  `.sr @User Guest`
+`.setrole`, `.sr`  |  Sets a role for a given user. **Needs Manage Roles Permissions.**| `.sr @User Guest`
-`.removerole`, `.rr`  |  Removes a role from a given user. |  `.rr @User Admin`
+`.removerole`, `.rr`  |  Removes a role from a given user. **Needs Manage Roles Permissions.**| `.rr @User Admin`
-`.renamerole`, `.renr`  |  Renames a role. Role you are renaming must be lower than bot's highest role. |  `.renr "First role" SecondRole`
+`.renamerole`, `.renr`  |  Renames a role. Roles you are renaming must be lower than bot's highest role. **Manage Roles Permissions.** |  `.renr "First role" SecondRole`
-`.removeallroles`, `.rar`  |  Removes all roles from a mentioned user. |  `.rar @User`
+`.removeallroles`, `.rar`  |  Removes all roles from a mentioned user. **Needs Manage Roles Permissions.**| `.rar @User`
-`.createrole`, `.cr`  |  Creates a role with a given name. |  `.cr Awesome Role`
+`.createrole`, `.cr`  |  Creates a role with a given name. **Needs Manage Roles Permissions.**| `.cr Awesome Role`
-`.rolecolor`, `.rc`  |  Set a role's color to the hex or 0-255 rgb color value provided. |  `.rc Admin 255 200 100` or `.rc Admin ffba55`
+`.rolecolor`, `.rc`  |  Set a role's color to the hex or 0-255 rgb color value provided. **Needs Manage Roles Permissions.** |  `.rc Admin 255 200 100` or `.rc Admin ffba55`
-`.ban`, `.b`  |  Bans a user by id or name with an optional message. |  `.b "@some Guy" Your behaviour is toxic.`
+`.ban`, `.b`  |  Bans a user by id or name with an optional message. **Needs Ban Permissions.**| `.b "@some Guy" Your behaviour is toxic.`
-`.softban`, `.sb`  |  Bans and then unbans a user by id or name with an optional message. |  `.sb "@some Guy" Your behaviour is toxic.`
+`.softban`, `.sb`  |  Bans and then unbans a user by id or name with an optional message. **Needs Ban Permissions.**| `.sb "@some Guy" Your behaviour is toxic.`
-`.kick`, `.k`  |  Kicks a mentioned user. |  `.k "@some Guy" Your behaviour is toxic.`
+`.kick`, `.k`  |  Kicks a mentioned user. **Needs Kick Permissions.**| `.k "@some Guy" Your behaviour is toxic.`
-`.mute`  |  Mutes mentioned user or users. |  `.mute "@Someguy"` or `.mute "@Someguy" "@Someguy"`
+`.mute`  |  Mutes mentioned user or users. **Needs Mute Permissions.**| `.mute "@Someguy"` or `.mute "@Someguy" "@Someguy"`
-`.unmute`  |  Unmutes mentioned user or users. |  `.unmute "@Someguy"` or `.unmute "@Someguy" "@Someguy"`
+`.unmute`  |  Unmutes mentioned user or users. **Needs Mute Permissions.**| `.unmute "@Someguy"` or `.unmute "@Someguy" "@Someguy"`
-`.deafen`, `.deaf`  |  Deafens mentioned user or users |  `.deaf "@Someguy"` or `.deaf "@Someguy" "@Someguy"`
+`.deafen`, `.deaf`  |  Deafens mentioned user or users. **Needs Deafen Permissions.**| `.deaf "@Someguy"` or `.deaf "@Someguy" "@Someguy"`
-`.undeafen`, `.undef`  |  Undeafens mentioned user or users |  `.undef "@Someguy"` or `.undef "@Someguy" "@Someguy"`
+`.undeafen`, `.undef`  |  Undeafens mentioned user or users. **Needs Deafen Permissions.** |  `.undef "@Someguy"` or `.undef "@Someguy" "@Someguy"`
-`.delvoichanl`, `.dvch`  |  Deletes a voice channel with a given name. |  `.dvch VoiceChannelName`
+`.delvoichanl`, `.dvch`  |  Deletes a voice channel with a given name. **Needs Manage Channel Permissions.**| `.dvch VoiceChannelName`
-`.creatvoichanl`, `.cvch`  |  Creates a new voice channel with a given name. |  `.cvch VoiceChannelName`
+`.creatvoichanl`, `.cvch`  |  Creates a new voice channel with a given name. **Needs Manage Channel Permissions.** |  `.cvch VoiceChannelName`
-`.deltxtchanl`, `.dtch`  |  Deletes a text channel with a given name. |  `.dtch TextChannelName`
+`.deltxtchanl`, `.dtch`  |  Deletes a text channel with a given name. **Needs Manage Channel Permissions.** |  `.dtch TextChannelName`
-`.creatxtchanl`, `.ctch`  |  Creates a new text channel with a given name. |  `.ctch TextChannelName`
+`.creatxtchanl`, `.ctch`  |  Creates a new text channel with a given name. **Needs Manage Channel Permissions.** |  `.ctch TextChannelName`
-`.settopic`, `.st`  |  Sets a topic on the current channel. |  `.st My new topic`
+`.settopic`, `.st`  |  Sets a topic on the current channel. **Needs Manage Channel Permissions.** |  `.st My new topic`
-`.setchanlname`, `.schn`  |  Changed the name of the current channel.| `.schn NewName`
+`.setchanlname`, `.schn`  |  Changed the name of the current channel. **Needs Manage Channel Permissions.**| `.schn NewName`
 `.heap`  |  Shows allocated memory - **Bot Owner Only!** |  `.heap`
 `.prune`, `.clr`  |  `.prune` removes all nadeko's messages in the last 100 messages.`.prune X` removes last X messages from the channel (up to 100)`.prune @Someone` removes all Someone's messages in the last 100 messages.`.prune @Someone X` removes last X 'Someone's' messages in the channel. |  `.prune` or `.prune 5` or `.prune @Someone` or `.prune @Someone X`
 `.die`  |  Shuts the bot down and notifies users about the restart. **Bot Owner Only!** |  `.die`
@@ -86,8 +86,8 @@ Command and aliases |  Description |  Usage
 `.send`  |  Send a message to someone on a different server through the bot. **Bot Owner Only!** |  `.send serverid|u:user_id Send this to a user!` or `.send serverid|c:channel_id Send this to a channel!`
 `.mentionrole`, `.menro`  |  Mentions every person from the provided role or roles (separated by a ',') on this server. Requires you to have mention everyone permission. |  `.menro RoleName`
 `.unstuck`  |  Clears the message queue. **Bot Owner Only!** |  `.unstuck`
-`.donators`  |  List of lovely people who donated to keep this project alive.
+`.donators`  |  List of lovely people who donated to keep this project alive. |  `.donators`
-`.donadd`  |  Add a donator to the database. |  `.donadd Donate Amount`
+`.donadd`  |  Add a donator to the database. **Kwoth Only** |  `.donadd Donate Amount`
 `.announce`  |  Sends a message to all servers' general channel bot is connected to.**Bot Owner Only!** |  `.announce Useless spam`
 `.savechat`  |  Saves a number of messages to a text file and sends it to you. **Bot Owner Only** |  `.savechat 150`
 
@@ -107,19 +107,19 @@ Command and aliases |  Description |  Usage
 `.userid`, `.uid`  |  Shows user ID. |  `.uid` or `.uid "@SomeGuy"`
 `.channelid`, `.cid`  |  Shows current channel ID. |  `.cid`
 `.serverid`, `.sid`  |  Shows current server ID. |  `.sid`
-`.roles`  |  List all roles on this server or a single user if specified.
+`.roles`  |  List all roles on this server or a single user if specified. |  `.roles`
 `.channeltopic`, `.ct`  |  Sends current channel's topic as a message. |  `.ct`
 
 ### Permissions  
 Command and aliases |  Description |  Usage
 ----------------|--------------|-------
-`;chnlfilterinv`, `;cfi`  |  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. |  ;cfi enable #general-chat
+`;chnlfilterinv`, `;cfi`  |  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. |  `;cfi enable #general-chat`
-`;srvrfilterinv`, `;sfi`  |  Enables or disables automatic deleting of invites on the server. |  ;sfi disable
+`;srvrfilterinv`, `;sfi`  |  Enables or disables automatic deleting of invites on the server. |  `;sfi disable`
-`;chnlfilterwords`, `;cfw`  |  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. |  ;cfw enable #general-chat
+`;chnlfilterwords`, `;cfw`  |  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. |  `;cfw enable #general-chat`
-`;addfilterword`, `;afw`  |  Adds a new word to the list of filtered words |  ;afw poop
+`;addfilterword`, `;afw`  |  Adds a new word to the list of filtered words |  `;afw poop`
-`;rmvfilterword`, `;rfw`  |  Removes the word from the list of filtered words |  ;rw poop
+`;rmvfilterword`, `;rfw`  |  Removes the word from the list of filtered words |  `;rw poop`
-`;lstfilterwords`, `;lfw`  |  Shows a list of filtered words |  ;lfw
+`;lstfilterwords`, `;lfw`  |  Shows a list of filtered words |  `;lfw`
-`;srvrfilterwords`, `;sfw`  |  Enables or disables automatic deleting of messages containing forbidden words on the server. |  ;sfw disable
+`;srvrfilterwords`, `;sfw`  |  Enables or disables automatic deleting of messages containing forbidden words on the server. |  `;sfw disable`
 `;permrole`, `;pr`  |  Sets a role which can change permissions. Or supply no parameters to find out the current one. Default one is 'Nadeko'. |  `;pr role`
 `;rolepermscopy`, `;rpc`  |  Copies BOT PERMISSIONS (not discord permissions) from one role to another. | `;rpc Some Role ~ Some other role`
 `;chnlpermscopy`, `;cpc`  |  Copies BOT PERMISSIONS (not discord permissions) from one channel to another. | `;cpc Some Channel ~ Some other channel`
@@ -149,7 +149,7 @@ Command and aliases |  Description |  Usage
 `;cubl`  |  Unblacklists a mentioned channel (#general for example). |  `;cubl #some_channel`
 `;sbl`  |  Blacklists a server by a name or id (#general for example). **BOT OWNER ONLY** |  `;sbl [servername/serverid]`
 `;cmdcooldown`, `;cmdcd`  |  Sets a cooldown per user for a command. Set 0 to clear. |  `;cmdcd "some cmd" 5`
-`;allcmdcooldowns`, `;acmdcds`  |  Shows a list of all commands and their respective cooldowns.
+`;allcmdcooldowns`, `;acmdcds`  |  Shows a list of all commands and their respective cooldowns. |  `;acmdcds`
 
 ### Conversations  
 Command and aliases |  Description |  Usage
@@ -157,7 +157,7 @@ Command and aliases |  Description |  Usage
 `..`  |  Adds a new quote with the specified name (single word) and message (no limit). |  `.. abc My message`
 `...`  |  Shows a random quote with a specified name. |  `... abc`
 `..qdel`, `..quotedelete`  |  Deletes all quotes with the specified keyword. You have to either be bot owner or the creator of the quote to delete it. |  `..qdel abc`
-`@BotName rip`  |  Shows a grave image of someone with a start year |  @NadekoBot rip @Someone 2000
+`@BotName rip`  |  Shows a grave image of someone with a start year |  `@NadekoBot rip @Someone 2000`
 `@BotName die`  |  Works only for the owner. Shuts the bot down. |  `@NadekoBot die`
 `@BotName do you love me`  |  Replies with positive answer only to the bot owner. |  `@NadekoBot do you love me`
 `@BotName how are you`, `@BotName how are you?`  |  Replies positive only if bot owner is online. |  `@NadekoBot how are you`
@@ -183,7 +183,7 @@ Command and aliases |  Description |  Usage
 `$award`  |  Gives someone a certain amount of flowers. **Bot Owner Only!** |  `$award 100 @person`
 `$take`  |  Takes a certain amount of flowers from someone. **Bot Owner Only!** |  `$take 1 "@someguy"`
 `$betroll`, `$br`  |  Bets a certain amount of NadekoFlowers and rolls a dice. Rolling over 66 yields x2 flowers, over 90 - x3 and 100 x10. |  `$br 5`
-`$leaderboard`, `$lb`  |  Displays bot currency leaderboard |  $lb
+`$leaderboard`, `$lb`  |  Displays bot currency leaderboard |  `$lb`
 
 ### Games  
 Command and aliases |  Description |  Usage
@@ -239,8 +239,8 @@ Command and aliases |  Description |  Usage
 `!!playlists`, `!!pls`  |  Lists all playlists. Paginated. 20 per page. Default page is 0. | `!!pls 1`
 `!!deleteplaylist`, `!!delpls`  |  Deletes a saved playlist. Only if you made it or if you are the bot owner. |  `!!delpls animu-5`
 `!!goto`  |  Goes to a specific time in seconds in a song. |  `!!goto 30`
-`!!getlink`, `!!gl`  |  Shows a link to the currently playing song.
+`!!getlink`, `!!gl`  |  Shows a link to the song in the queue by index, or the currently playing song by default. |  `!!gl`
-`!!autoplay`, `!!ap`  |  Toggles autoplay - When the song is finished, automatically queue a related youtube song. (Works only for youtube songs and when queue is empty)
+`!!autoplay`, `!!ap`  |  Toggles autoplay - When the song is finished, automatically queue a related youtube song. (Works only for youtube songs and when queue is empty) |  `!!ap`
 
 ### Searches  
 Command and aliases |  Description |  Usage
@@ -258,21 +258,21 @@ Command and aliases |  Description |  Usage
 `~convert`  |  Convert quantities from>to. |  `~convert m>km 1000`
 `~convertlist`  |  List of the convertable dimensions and currencies.
 `~wowjoke`  |  Get one of Kwoth's penultimate WoW jokes. |  `~wowjoke`
-`~calculate`, `~calc`  |  Evaluate a mathematical expression. |  ~calc 1+1
+`~calculate`, `~calc`  |  Evaluate a mathematical expression. |  `~calc 1+1`
 `~osu`  |  Shows osu stats for a player. |  `~osu Name` or `~osu Name taiko`
-`~osu b`  |  Shows information about an osu beatmap. | `~osu b` https://osu.ppy.sh/s/127712`
+`~osu b`  |  Shows information about an osu beatmap. | `~osu b` https://osu.ppy.sh/s/127712
-`~osu top5`  |  Displays a user's top 5 plays.  | ~osu top5 Name
+`~osu top5`  |  Displays a user's top 5 plays.  | `~osu top5 Name`
 `~pokemon`, `~poke`  |  Searches for a pokemon. |  `~poke Sylveon`
 `~pokemonability`, `~pokeab`  |  Searches for a pokemon ability. |  `~pokeab "water gun"`
 `~memelist`  |  Pulls a list of memes you can use with `~memegen` from http://memegen.link/templates/ |  `~memelist`
 `~memegen`  |  Generates a meme from memelist with top and bottom text. |  `~memegen biw "gets iced coffee" "in the winter"`
 `~we`  |  Shows weather data for a specified city and a country. BOTH ARE REQUIRED. Use country abbrevations. |  `~we Moscow RF`
 `~yt`  |  Searches youtubes and shows the first result |  `~yt query`
-`~ani`, `~anime`, `~aq`  |  Queries anilist for an anime and shows the first result. |  `~aq aquerion evol`
+`~ani`, `~anime`, `~aq`  |  Queries anilist for an anime and shows the first result. |  `~aq aquarion evol`
-`~imdb`  |  Queries imdb for movies or series, show first result. |  `~imdb query`
+`~imdb`  |  Queries imdb for movies or series, show first result. |  `~imdb Batman vs Superman`
-`~mang`, `~manga`, `~mq`  |  Queries anilist for a manga and shows the first result. |  `~mq query`
+`~mang`, `~manga`, `~mq`  |  Queries anilist for a manga and shows the first result. |  `~mq Shingeki no kyojin`
-`~randomcat`, `~meow`  |  Shows a random cat image.
+`~randomcat`, `~meow`  |  Shows a random cat image. |  `~meow`
-`~randomdog`, `~woof`  |  Shows a random dog image.
+`~randomdog`, `~woof`  |  Shows a random dog image. |  `~woof`
 `~i`  |  Pulls the first image found using a search parameter. Use ~ir for different results. |  `~i cute kitten`
 `~ir`  |  Pulls a random image using a search parameter. |  `~ir cute kitten`
 `~lmgtfy`  |  Google something for an idiot. |  `~lmgtfy query`
@@ -292,7 +292,7 @@ Command and aliases |  Description |  Usage
 `~wiki`  |  Gives you back a wikipedia link |  `~wiki query`
 `~clr`  |  Shows you what color corresponds to that hex. |  `~clr 00ff00`
 `~videocall`  |  Creates a private <http://www.appear.in> video call link for you and other mentioned people. The link is sent to mentioned people via a private message. |  `~videocall "@SomeGuy"`
-`~av`, `~avatar`  |  Shows a mentioned person's avatar. |  `~av @X`
+`~av`, `~avatar`  |  Shows a mentioned person's avatar. |  `~av "@SomeGuy"`
 
 ### NSFW  
 Command and aliases |  Description |  Usage
@@ -309,15 +309,15 @@ Command and aliases |  Description |  Usage
 ### ClashOfClans  
 Command and aliases |  Description |  Usage
 ----------------|--------------|-------
-`,createwar`, `,cw`  |  Creates a new war by specifying a size (>10 and multiple of 5) and enemy clan name. | ,cw 15 The Enemy Clan
+`,createwar`, `,cw`  |  Creates a new war by specifying a size (>10 and multiple of 5) and enemy clan name. |  `,cw 15 The Enemy Clan`
-`,startwar`, `,sw`  |  Starts a war with a given number.
+`,startwar`, `,sw`  |  Starts a war with a given number. |  `,sw 15`
-`,listwar`, `,lw`  |  Shows the active war claims by a number. Shows all wars in a short way if no number is specified. |  ,lw [war_number] or ,lw
+`,listwar`, `,lw`  |  Shows the active war claims by a number. Shows all wars in a short way if no number is specified. |  `,lw [war_number] or ,lw`
-`,claim`, `,call`, `,c`  |  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.  |  ,call [war_number] [base_number] [optional_other_name]
+`,claim`, `,call`, `,c`  |  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.  |  `,call [war_number] [base_number] [optional_other_name]`
-`,claimfinish`, `,cf`, `,cf3`, `,claimfinish3`  |  Finish your claim with 3 stars if you destroyed a base. Optional second argument finishes for someone else. |  ,cf [war_number] [optional_other_name]
+`,claimfinish`, `,cf`, `,cf3`, `,claimfinish3`  |  Finish your claim with 3 stars if you destroyed a base. Optional second argument finishes for someone else. |  `,cf [war_number] [optional_other_name]`
-`,claimfinish2`, `,cf2`  |  Finish your claim with 2 stars if you destroyed a base. Optional second argument finishes for someone else. |  ,cf [war_number] [optional_other_name]
+`,claimfinish2`, `,cf2`  |  Finish your claim with 2 stars if you destroyed a base. Optional second argument finishes for someone else. |  `,cf [war_number] [optional_other_name]`
-`,claimfinish1`, `,cf1`  |  Finish your claim with 1 stars if you destroyed a base. Optional second argument finishes for someone else. |  ,cf [war_number] [optional_other_name]
+`,claimfinish1`, `,cf1`  |  Finish your claim with 1 stars if you destroyed a base. Optional second argument finishes for someone else. |  `,cf [war_number] [optional_other_name]`
-`,unclaim`, `,uncall`, `,uc`  |  Removes your claim from a certain war. Optional second argument denotes a person in whose place to unclaim |  ,uc [war_number] [optional_other_name]
+`,unclaim`, `,uncall`, `,uc`  |  Removes your claim from a certain war. Optional second argument denotes a person in whose place to unclaim |  `,uc [war_number] [optional_other_name]`
-`,endwar`, `,ew`  |  Ends the war with a given index. | ,ew [war_number]
+`,endwar`, `,ew`  |  Ends the war with a given index. |  `,ew [war_number]`
 
 ### Pokegame  
 Command and aliases |  Description |  Usage
@@ -332,32 +332,34 @@ Command and aliases |  Description |  Usage
 Command and aliases |  Description |  Usage
 ----------------|--------------|-------
 `~translate`, `~trans`  |  Translates from>to text. From the given language to the destiation language. |  `~trans en>fr Hello`
-`~translangs`  |  List the valid languages for translation. |  `{Prefix}translangs` or `{Prefix}translangs language`
+`~translangs`  |  List the valid languages for translation. |  `~translangs` or `~translangs language`
 
 ### Customreactions  
 Command and aliases |  Description |  Usage
 ----------------|--------------|-------
-`\o\`  |  Custom reaction. | \o\
+`\o\`  |  Custom reaction. |  `\o\`
-`/o/`  |  Custom reaction. | /o/
+`/o/`  |  Custom reaction. |  `/o/`
-`moveto`  |  Custom reaction. | moveto
+`moveto`  |  Custom reaction. |  `moveto`
-`comeatmebro`  |  Custom reaction. | comeatmebro
+`comeatmebro`  |  Custom reaction. |  `comeatmebro`
-`e`  |  Custom reaction. | e
+`e`  |  Custom reaction. |  `e`
-`@BotName insult`, `<@!116275390695079945> insult`  |  Custom reaction. | %mention% insult
+`@BotName insult`, `<@!116275390695079945> insult`  |  Custom reaction. |  `%mention% insult`
-`@BotName praise`, `<@!116275390695079945> praise`  |  Custom reaction. | %mention% praise
+`@BotName praise`, `<@!116275390695079945> praise`  |  Custom reaction. |  `%mention% praise`
-`@BotName pat`, `<@!116275390695079945> pat`  |  Custom reaction. | %mention% pat
+`@BotName pat`, `<@!116275390695079945> pat`  |  Custom reaction. |  `%mention% pat`
-`@BotName cry`, `<@!116275390695079945> cry`  |  Custom reaction. | %mention% cry
+`@BotName cry`, `<@!116275390695079945> cry`  |  Custom reaction. |  `%mention% cry`
-`@BotName are you real?`, `<@!116275390695079945> are you real?`  |  Custom reaction. | %mention% are you real?
+`@BotName are you real?`, `<@!116275390695079945> are you real?`  |  Custom reaction. |  `%mention% are you real?`
-`@BotName are you there?`, `<@!116275390695079945> are you there?`  |  Custom reaction. | %mention% are you there?
+`@BotName are you there?`, `<@!116275390695079945> are you there?`  |  Custom reaction. |  `%mention% are you there?`
-`@BotName draw`, `<@!116275390695079945> draw`  |  Custom reaction. | %mention% draw
+`@BotName draw`, `<@!116275390695079945> draw`  |  Custom reaction. |  `%mention% draw`
-`@BotName bb`, `<@!116275390695079945> bb`  |  Custom reaction. | %mention% bb
+`@BotName bb`, `<@!116275390695079945> bb`  |  Custom reaction. |  `%mention% bb`
-`@BotName call`, `<@!116275390695079945> call`  |  Custom reaction. | %mention% call
+`@BotName call`, `<@!116275390695079945> call`  |  Custom reaction. |  `%mention% call`
-`@BotName disguise`, `<@!116275390695079945> disguise`  |  Custom reaction. | %mention% disguise
+`@BotName disguise`, `<@!116275390695079945> disguise`  |  Custom reaction. |  `%mention% disguise`
-`~hentai`  |  Custom reaction. | ~hentai
+`@BotName inv`, `<@!116275390695079945> inv`  |  Custom reaction. |  `%mention% inv`
+`@BotName threaten`, `<@!116275390695079945> threaten`  |  Custom reaction. |  `%mention% threaten`
+`@BotName archer`, `<@!116275390695079945> archer`  |  Custom reaction. |  `%mention% archer`
 
 ### Trello  
 Command and aliases |  Description |  Usage
 ----------------|--------------|-------
-`trello bind`  |  Bind a trello bot to a single channel. You will receive notifications from your board when something is added or edited. |  `trello bind [board_id]`
+`trello bind`  |  Bind a trello bot to a single channel. You will receive notifications from your board when something is added or edited. **Bot Owner Only!**| `trello bind [board_id]`
-`trello unbind`  |  Unbinds a bot from the channel and board.
+`trello unbind`  |  Unbinds a bot from the channel and board. **Bot Owner Only!**| `trello unbind`
-`trello lists`, `trello list`  |  Lists all lists yo ;)
+`trello lists`, `trello list`  |  Lists all lists, yo ;) **Bot Owner Only!**| `trello list`
-`trello cards`  |  Lists all cards from the supplied list. You can supply either a name or an index. |  `trello cards index`
+`trello cards`  |  Lists all cards from the supplied list. You can supply either a name or an index. **Bot Owner Only!**| `trello cards index`

docs/index.rst

@@ -0,0 +1 @@
+Hai, this will be docs of nakeda