Merge pull request #617 from Kwoth/dev

0.99.9y

LinuxSetup.md

@@ -48,7 +48,7 @@ Note if the command is not being initiated, hit **Enter**
 **2.6)**
 *ONLY CentOS 7, Fedora 19 (and later)*
 
-`yum install yum-util`
+`yum install yum-utils`
 
 `rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"`
 

NadekoBot.sln

@@ -49,68 +49,68 @@ Global
 		{27A886F5-CDDA-4F4A-81EE-6DAFCCE9DE46}.Release|x64.Build.0 = Release|x64
 		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.Debug|x64.ActiveCfg = Debug|x64
+		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.Debug|x64.Build.0 = Debug|x64
+		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.Debug|x64.Build.0 = Debug|Any CPU
 		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.FullDebug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.FullDebug|Any CPU.Build.0 = Debug|Any CPU
-		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.FullDebug|x64.ActiveCfg = Debug|x64
+		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.FullDebug|x64.ActiveCfg = Debug|Any CPU
-		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.FullDebug|x64.Build.0 = Debug|x64
+		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.FullDebug|x64.Build.0 = Debug|Any CPU
 		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.NadekoRelease|Any CPU.ActiveCfg = Release|Any CPU
 		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.NadekoRelease|Any CPU.Build.0 = Release|Any CPU
-		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.NadekoRelease|x64.ActiveCfg = Release|x64
+		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.NadekoRelease|x64.ActiveCfg = Release|Any CPU
-		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.NadekoRelease|x64.Build.0 = Release|x64
+		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.NadekoRelease|x64.Build.0 = Release|Any CPU
 		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.Release|x64.ActiveCfg = Release|x64
+		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.Release|x64.ActiveCfg = Release|Any CPU
-		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.Release|x64.Build.0 = Release|x64
+		{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.Release|x64.Build.0 = Release|Any CPU
 		{8D71A857-879A-4A10-859E-5FF824ED6688}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8D71A857-879A-4A10-859E-5FF824ED6688}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D71A857-879A-4A10-859E-5FF824ED6688}.Debug|x64.ActiveCfg = Debug|x64
+		{8D71A857-879A-4A10-859E-5FF824ED6688}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8D71A857-879A-4A10-859E-5FF824ED6688}.Debug|x64.Build.0 = Debug|x64
+		{8D71A857-879A-4A10-859E-5FF824ED6688}.Debug|x64.Build.0 = Debug|Any CPU
 		{8D71A857-879A-4A10-859E-5FF824ED6688}.FullDebug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8D71A857-879A-4A10-859E-5FF824ED6688}.FullDebug|Any CPU.Build.0 = Debug|Any CPU
-		{8D71A857-879A-4A10-859E-5FF824ED6688}.FullDebug|x64.ActiveCfg = Debug|x64
+		{8D71A857-879A-4A10-859E-5FF824ED6688}.FullDebug|x64.ActiveCfg = Debug|Any CPU
-		{8D71A857-879A-4A10-859E-5FF824ED6688}.FullDebug|x64.Build.0 = Debug|x64
+		{8D71A857-879A-4A10-859E-5FF824ED6688}.FullDebug|x64.Build.0 = Debug|Any CPU
 		{8D71A857-879A-4A10-859E-5FF824ED6688}.NadekoRelease|Any CPU.ActiveCfg = Release|Any CPU
 		{8D71A857-879A-4A10-859E-5FF824ED6688}.NadekoRelease|Any CPU.Build.0 = Release|Any CPU
-		{8D71A857-879A-4A10-859E-5FF824ED6688}.NadekoRelease|x64.ActiveCfg = Release|x64
+		{8D71A857-879A-4A10-859E-5FF824ED6688}.NadekoRelease|x64.ActiveCfg = Release|Any CPU
-		{8D71A857-879A-4A10-859E-5FF824ED6688}.NadekoRelease|x64.Build.0 = Release|x64
+		{8D71A857-879A-4A10-859E-5FF824ED6688}.NadekoRelease|x64.Build.0 = Release|Any CPU
 		{8D71A857-879A-4A10-859E-5FF824ED6688}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8D71A857-879A-4A10-859E-5FF824ED6688}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8D71A857-879A-4A10-859E-5FF824ED6688}.Release|x64.ActiveCfg = Release|x64
+		{8D71A857-879A-4A10-859E-5FF824ED6688}.Release|x64.ActiveCfg = Release|Any CPU
-		{8D71A857-879A-4A10-859E-5FF824ED6688}.Release|x64.Build.0 = Release|x64
+		{8D71A857-879A-4A10-859E-5FF824ED6688}.Release|x64.Build.0 = Release|Any CPU
 		{3091164F-66AE-4543-A63D-167C1116241D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3091164F-66AE-4543-A63D-167C1116241D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3091164F-66AE-4543-A63D-167C1116241D}.Debug|x64.ActiveCfg = Debug|x64
+		{3091164F-66AE-4543-A63D-167C1116241D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3091164F-66AE-4543-A63D-167C1116241D}.Debug|x64.Build.0 = Debug|x64
+		{3091164F-66AE-4543-A63D-167C1116241D}.Debug|x64.Build.0 = Debug|Any CPU
 		{3091164F-66AE-4543-A63D-167C1116241D}.FullDebug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3091164F-66AE-4543-A63D-167C1116241D}.FullDebug|Any CPU.Build.0 = Debug|Any CPU
-		{3091164F-66AE-4543-A63D-167C1116241D}.FullDebug|x64.ActiveCfg = Debug|x64
+		{3091164F-66AE-4543-A63D-167C1116241D}.FullDebug|x64.ActiveCfg = Debug|Any CPU
-		{3091164F-66AE-4543-A63D-167C1116241D}.FullDebug|x64.Build.0 = Debug|x64
+		{3091164F-66AE-4543-A63D-167C1116241D}.FullDebug|x64.Build.0 = Debug|Any CPU
 		{3091164F-66AE-4543-A63D-167C1116241D}.NadekoRelease|Any CPU.ActiveCfg = Release|Any CPU
 		{3091164F-66AE-4543-A63D-167C1116241D}.NadekoRelease|Any CPU.Build.0 = Release|Any CPU
-		{3091164F-66AE-4543-A63D-167C1116241D}.NadekoRelease|x64.ActiveCfg = Release|x64
+		{3091164F-66AE-4543-A63D-167C1116241D}.NadekoRelease|x64.ActiveCfg = Release|Any CPU
-		{3091164F-66AE-4543-A63D-167C1116241D}.NadekoRelease|x64.Build.0 = Release|x64
+		{3091164F-66AE-4543-A63D-167C1116241D}.NadekoRelease|x64.Build.0 = Release|Any CPU
 		{3091164F-66AE-4543-A63D-167C1116241D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3091164F-66AE-4543-A63D-167C1116241D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3091164F-66AE-4543-A63D-167C1116241D}.Release|x64.ActiveCfg = Release|x64
+		{3091164F-66AE-4543-A63D-167C1116241D}.Release|x64.ActiveCfg = Release|Any CPU
-		{3091164F-66AE-4543-A63D-167C1116241D}.Release|x64.Build.0 = Release|x64
+		{3091164F-66AE-4543-A63D-167C1116241D}.Release|x64.Build.0 = Release|Any CPU
 		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.Debug|x64.ActiveCfg = Debug|x64
+		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.Debug|x64.Build.0 = Debug|x64
+		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.Debug|x64.Build.0 = Debug|Any CPU
 		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.FullDebug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.FullDebug|Any CPU.Build.0 = Debug|Any CPU
-		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.FullDebug|x64.ActiveCfg = Debug|x64
+		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.FullDebug|x64.ActiveCfg = Debug|Any CPU
-		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.FullDebug|x64.Build.0 = Debug|x64
+		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.FullDebug|x64.Build.0 = Debug|Any CPU
 		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.NadekoRelease|Any CPU.ActiveCfg = Release|Any CPU
 		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.NadekoRelease|Any CPU.Build.0 = Release|Any CPU
-		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.NadekoRelease|x64.ActiveCfg = Release|x64
+		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.NadekoRelease|x64.ActiveCfg = Release|Any CPU
-		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.NadekoRelease|x64.Build.0 = Release|x64
+		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.NadekoRelease|x64.Build.0 = Release|Any CPU
 		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.Release|x64.ActiveCfg = Release|x64
+		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.Release|x64.ActiveCfg = Release|Any CPU
-		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.Release|x64.Build.0 = Release|x64
+		{1B5603B4-6F8F-4289-B945-7BAAE523D740}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

NadekoBot/Classes/NadekoStats.cs

@@ -7,7 +7,9 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
+#if NADEKO_RELEASE
 using System.IO;
+#endif
 using System.Linq;
 using System.Net.Http;
 using System.Reflection;
@@ -227,6 +229,7 @@ namespace NadekoBot
             DateTime dt;
             if (!commandTracker.TryGetValue(e.Message.Id, out dt))
                 return;
+#if NADEKO_RELEASE
             try
             {
                 if (e is CommandErrorEventArgs)
@@ -248,18 +251,19 @@ namespace NadekoBot
                 }
             }
             catch { }
+#endif
         }
 
         private async void StatsCollector_RanCommand(object sender, CommandEventArgs e)
         {
             commandTracker.TryAdd(e.Message.Id, DateTime.UtcNow);
             Console.WriteLine($">>COMMAND STARTED\nCmd: {e.Command.Text}\nMsg: {e.Message.Text}\nUsr: {e.User.Name} [{e.User.Id}]\nSrvr: {e.Server?.Name ?? "PRIVATE"} [{e.Server?.Id}]\n-----");
+            commandsRan++;
 #if !NADEKO_RELEASE
             await Task.Run(() =>
             {
                 try
                 {
-                    commandsRan++;
                     Classes.DbHandler.Instance.Connection.Insert(new DataModels.Command
                     {
                         ServerId = (long)(e.Server?.Id ?? 0),

NadekoBot/Classes/SearchHelper.cs

@@ -61,10 +61,31 @@ namespace NadekoBot.Classes
             IEnumerable<KeyValuePair<string, string>> headers = null,
             RequestHttpMethod method = RequestHttpMethod.Get)
         {
-
+            if (string.IsNullOrWhiteSpace(url))
-            using (var streamReader = new StreamReader(await GetResponseStreamAsync(url, headers, method).ConfigureAwait(false)))
+                throw new ArgumentNullException(nameof(url));
+            var cl = new HttpClient();
+            cl.DefaultRequestHeaders.Clear();
+            switch (method)
             {
-                return await streamReader.ReadToEndAsync().ConfigureAwait(false);
+                case RequestHttpMethod.Get:
+                    if (headers != null)
+                    {
+                        foreach (var header in headers)
+                        {
+                            cl.DefaultRequestHeaders.TryAddWithoutValidation(header.Key, header.Value);
+                        }
+                    }
+                    return await cl.GetStringAsync(url).ConfigureAwait(false);
+                case RequestHttpMethod.Post:
+                    FormUrlEncodedContent formContent = null;
+                    if (headers != null)
+                    {
+                        formContent = new FormUrlEncodedContent(headers);
+                    }
+                    var message = await cl.PostAsync(url, formContent).ConfigureAwait(false);
+                    return await message.Content.ReadAsStringAsync().ConfigureAwait(false);
+                default:
+                    throw new NotImplementedException("That type of request is unsupported.");
             }
         }
 

NadekoBot/Classes/ServerSpecificConfig.cs

@@ -64,7 +64,7 @@ namespace NadekoBot.Classes
             await saveLock.WaitAsync();
             try
             {
-                File.WriteAllText(filePath, JsonConvert.SerializeObject(configs, Formatting.Indented));
+                await Task.Run(() => File.WriteAllText(filePath, JsonConvert.SerializeObject(configs, Formatting.Indented)));
             }
             finally
             {
@@ -208,11 +208,9 @@ namespace NadekoBot.Classes
 
         [JsonIgnore]
         private bool exclusiveSelfAssignedRoles = false;
-        public bool ExclusiveSelfAssignedRoles
+        public bool ExclusiveSelfAssignedRoles {
-        {
             get { return exclusiveSelfAssignedRoles; }
-            set
+            set {
-            {
                 exclusiveSelfAssignedRoles = value;
                 if (!SpecificConfigurations.Instantiated) return;
                 OnPropertyChanged();
@@ -280,7 +278,7 @@ namespace NadekoBot.Classes
         }
 
         public bool Equals(StreamNotificationConfig other) =>
-            this.Username.ToLower().Trim() == other.Username.ToLower().Trim() &&
+            this.Username.ToUpperInvariant().Trim() == other.Username.ToUpperInvariant().Trim() &&
             this.Type == other.Type &&
             this.ServerId == other.ServerId;
 

NadekoBot/Modules/Administration/AdministrationModule.cs

@@ -72,9 +72,9 @@ namespace NadekoBot.Modules.Administration
                         conf.AutoDeleteMessagesOnCommand = !conf.AutoDeleteMessagesOnCommand;
                         await Classes.JSONModels.ConfigHandler.SaveConfig().ConfigureAwait(false);
                         if (conf.AutoDeleteMessagesOnCommand)
-                            await e.Channel.SendMessage("❗`Now automatically deleting successfull command invokations.`");
+                            await e.Channel.SendMessage("❗`Now automatically deleting successful command invokations.`");
                         else
-                            await e.Channel.SendMessage("❗`Stopped automatic deletion of successfull command invokations.`");
+                            await e.Channel.SendMessage("❗`Stopped automatic deletion of successful command invokations.`");
 
                     });
 
@@ -628,7 +628,7 @@ namespace NadekoBot.Modules.Administration
                 cgb.CreateCommand(Prefix + "prune")
                     .Alias(Prefix + "clr")
                     .Description(
-                    "`.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` 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. **Needs Manage Messages Permissions**" +
                     $"| `{Prefix}prune` or `{Prefix}prune 5` or `{Prefix}prune @Someone` or `{Prefix}prune @Someone X`")
                     .Parameter("user_or_num", ParameterType.Optional)
                     .Parameter("num", ParameterType.Optional)
@@ -685,7 +685,7 @@ namespace NadekoBot.Modules.Administration
 
                 cgb.CreateCommand(Prefix + "setname")
                     .Alias(Prefix + "newnm")
-                    .Description($"Give the bot a new name. **Bot Owner Only!** | {Prefix}newnm BotName")
+                    .Description($"Give the bot a new name. **Bot Owner Only!** | `{Prefix}newnm BotName`")
                     .Parameter("new_name", ParameterType.Unparsed)
                     .AddCheck(SimpleCheckers.OwnerOnly())
                     .Do(async e =>
@@ -697,7 +697,7 @@ namespace NadekoBot.Modules.Administration
 
                 cgb.CreateCommand(Prefix + "newavatar")
                     .Alias(Prefix + "setavatar")
-                    .Description($"Sets a new avatar image for the NadekoBot. Argument is a direct link to an image. **Bot Owner Only!** | `{Prefix}setavatar https://i.ytimg.com/vi/WDudkR1eTMM/maxresdefault.jpg`")
+                    .Description($"Sets a new avatar image for the NadekoBot. Argument is a direct link to an image. **Bot Owner Only!** | `{Prefix}setavatar http://i.imgur.com/xTG3a1I.jpg`")
                     .Parameter("img", ParameterType.Unparsed)
                     .AddCheck(SimpleCheckers.OwnerOnly())
                     .Do(async e =>
@@ -728,7 +728,7 @@ namespace NadekoBot.Modules.Administration
                   });
 
                 cgb.CreateCommand(Prefix + "send")
-                    .Description($"Send a message to someone on a different server through the bot. **Bot Owner Only!** | `{Prefix}send serverid|u:user_id Send this to a user!` or `{Prefix}send serverid|c:channel_id Send this to a channel!`")
+                    .Description($"Send a message to someone on a different server through the bot. **Bot Owner Only!** | `{Prefix}send sid|u:uid Hello user!` or `{Prefix}send sid|c:cid Message to channel!` (cid = channel id, sid = server id)")
                     .Parameter("ids", ParameterType.Required)
                     .Parameter("msg", ParameterType.Unparsed)
                     .AddCheck(SimpleCheckers.OwnerOnly())

NadekoBot/Modules/Administration/Commands/AutoAssignRole.cs

@@ -10,7 +10,7 @@ namespace NadekoBot.Modules.Administration.Commands
     {
         public AutoAssignRole(DiscordModule module) : base(module)
         {
-            NadekoBot.Client.UserJoined += (s, e) =>
+            NadekoBot.OnReady += () => NadekoBot.Client.UserJoined += (s, e) =>
             {
                 try
                 {

NadekoBot/Modules/Administration/Commands/CrossServerTextChannel.cs

@@ -12,6 +12,8 @@ namespace NadekoBot.Modules.Administration.Commands
     class CrossServerTextChannel : DiscordCommand
     {
         public CrossServerTextChannel(DiscordModule module) : base(module)
+        {
+            NadekoBot.OnReady += () =>
             {
                 NadekoBot.Client.MessageReceived += async (s, e) =>
                 {
@@ -54,6 +56,7 @@ namespace NadekoBot.Modules.Administration.Commands
                     }
                     catch { }
                 };
+            };
         }
 
         private string GetText(Server server, Channel channel, User user, Message message) =>

NadekoBot/Modules/Administration/Commands/CustomReactionsCommands.cs

@@ -6,7 +6,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace NadekoBot.Modules.Administration.Commands
 {
@@ -23,7 +22,7 @@ namespace NadekoBot.Modules.Administration.Commands
 
             cgb.CreateCommand(Prefix + "addcustreact")
                 .Alias(Prefix + "acr")
-                .Description($"Add a custom reaction. Guide here: <https://github.com/Kwoth/NadekoBot/wiki/Custom-Reactions> **Bot Owner Only!**   | `{Prefix}acr \"hello\" I love saying hello to %user%`")
+                .Description($"Add a custom reaction. Guide here: <https://github.com/Kwoth/NadekoBot/wiki/Custom-Reactions> **Bot Owner Only!**   | `{Prefix}acr \"hello\" Hi there %user%`")
                 .AddCheck(SimpleCheckers.OwnerOnly())
                 .Parameter("name", ParameterType.Required)
                 .Parameter("message", ParameterType.Unparsed)

NadekoBot/Modules/Administration/Commands/LogCommand.cs

@@ -18,6 +18,8 @@ namespace NadekoBot.Modules.Administration.Commands
         private ConcurrentBag<KeyValuePair<Channel, string>> voicePresenceUpdates = new ConcurrentBag<KeyValuePair<Channel, string>>();
 
         public LogCommand(DiscordModule module) : base(module)
+        {
+            NadekoBot.OnReady += () =>
             {
                 NadekoBot.Client.MessageReceived += MsgRecivd;
                 NadekoBot.Client.MessageDeleted += MsgDltd;
@@ -50,10 +52,13 @@ namespace NadekoBot.Modules.Administration.Commands
                     }
                     catch { }
                 };
+            };
 
             // start the userpresence queue
 
-            NadekoBot.OnReady += () => Task.Run(async () =>
+            NadekoBot.OnReady += () =>
+            {
+                Task.Run(async () =>
                {
                    while (true)
                    {
@@ -80,6 +85,7 @@ namespace NadekoBot.Modules.Administration.Commands
                        await Task.Delay(5000);
                    }
                });
+            };
         }
 
         private async void ChannelUpdated(object sender, ChannelUpdatedEventArgs e)

NadekoBot/Modules/Administration/Commands/PlayingRotate.cs

@@ -9,7 +9,6 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Timers;
 using Timer = System.Timers.Timer;
 
 namespace NadekoBot.Modules.Administration.Commands
@@ -38,7 +37,7 @@ namespace NadekoBot.Modules.Administration.Commands
                 {"%trivia%", () => Games.Commands.TriviaCommands.RunningTrivias.Count.ToString()}
             };
 
-        private readonly SemaphoreSlim playingPlaceholderLock = new SemaphoreSlim(1,1);
+        private readonly SemaphoreSlim playingPlaceholderLock = new SemaphoreSlim(1, 1);
 
         public PlayingRotate(DiscordModule module) : base(module)
         {
@@ -70,8 +69,7 @@ namespace NadekoBot.Modules.Administration.Commands
                 }
                 catch { }
             };
-
+            NadekoBot.OnReady += () => timer.Enabled = NadekoBot.Config.IsRotatingStatus;
-            timer.Enabled = NadekoBot.Config.IsRotatingStatus;
         }
 
         public Func<CommandEventArgs, Task> DoFunc() => async e =>
@@ -86,7 +84,8 @@ namespace NadekoBot.Modules.Administration.Commands
                 NadekoBot.Config.IsRotatingStatus = timer.Enabled;
                 await ConfigHandler.SaveConfig().ConfigureAwait(false);
             }
-            finally {
+            finally
+            {
                 playingPlaceholderLock.Release();
             }
             await e.Channel.SendMessage($"❗`Rotating playing status has been {(timer.Enabled ? "enabled" : "disabled")}.`").ConfigureAwait(false);
@@ -103,7 +102,7 @@ namespace NadekoBot.Modules.Administration.Commands
             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)+ $" **Bot Owner Only!**| `{Prefix}adpl`")
+                             "Supported placeholders: " + string.Join(", ", PlayingPlaceholders.Keys) + $" **Bot Owner Only!**| `{Prefix}adpl`")
                 .Parameter("text", ParameterType.Unparsed)
                 .AddCheck(SimpleCheckers.OwnerOnly())
                 .Do(async e =>
@@ -152,7 +151,8 @@ namespace NadekoBot.Modules.Administration.Commands
                     int num;
                     string str;
                     await playingPlaceholderLock.WaitAsync().ConfigureAwait(false);
-                    try {
+                    try
+                    {
                         if (!int.TryParse(arg.Trim(), out num) || num <= 0 || num > NadekoBot.Config.RotatingStatuses.Count)
                             return;
                         str = NadekoBot.Config.RotatingStatuses[num - 1];

NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs

@@ -15,7 +15,7 @@ namespace NadekoBot.Modules.Administration.Commands
 
         public RatelimitCommand(DiscordModule module) : base(module)
         {
-            NadekoBot.Client.MessageReceived += async (s, e) =>
+            NadekoBot.OnReady += () => NadekoBot.Client.MessageReceived += async (s, e) =>
             {
                 if (e.Channel.IsPrivate || e.User.Id == NadekoBot.Client.CurrentUser.Id)
                     return;

NadekoBot/Modules/Administration/Commands/ServerGreetCommand.cs

@@ -31,8 +31,12 @@ namespace NadekoBot.Modules.Administration.Commands
         {
             AnnouncementsDictionary = new ConcurrentDictionary<ulong, AnnounceControls>();
 
+            //gotta subscribe after ready, to prevent trying to send these before all guilds are initialized
+            NadekoBot.OnReady += () =>
+            {
                 NadekoBot.Client.UserJoined += UserJoined;
                 NadekoBot.Client.UserLeft += UserLeft;
+            };
 
             var data = Classes.DbHandler.Instance.GetAllRows<DataModels.Announcement>();
 
@@ -245,7 +249,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. **Needs Manage Server Permissions.**| `{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, %user%.`")
                 .Parameter("msg", ParameterType.Unparsed)
                 .Do(async e =>
                 {
@@ -278,7 +282,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. **Needs Manage Server Permissions.**| `{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.`")
                 .Parameter("msg", ParameterType.Unparsed)
                 .Do(async e =>
                 {

NadekoBot/Modules/Administration/Commands/VoicePlusTextCommand.cs

@@ -17,7 +17,7 @@ namespace NadekoBot.Modules.Administration.Commands
         public VoicePlusTextCommand(DiscordModule module) : base(module)
         {
             // changing servers may cause bugs
-            NadekoBot.Client.UserUpdated += async (sender, e) =>
+            NadekoBot.OnReady += () => NadekoBot.Client.UserUpdated += async (sender, e) =>
             {
                 try
                 {
@@ -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.\nNeeds Manage Roles and Manage Channels Permissions.** | `{Prefix}cleanv+t`")
+                .Description($"Deletes all text channels ending in `-voice` for which voicechannels are not found. **Use at your own risk. Needs Manage Roles and Manage Channels Permissions.** | `{Prefix}cleanv+t`")
                 .AddCheck(SimpleCheckers.CanManageRoles)
                 .AddCheck(SimpleCheckers.ManageChannels())
                 .Do(async e =>

NadekoBot/Modules/ClashOfClans/ClashOfClansModule.cs

@@ -23,7 +23,9 @@ namespace NadekoBot.Modules.ClashOfClans
 
         public ClashOfClansModule()
         {
-            NadekoBot.OnReady += () => Task.Run(async () =>
+            NadekoBot.OnReady += () =>
+            {
+                Task.Run(async () =>
             {
                 if (File.Exists("data/clashofclans/wars.json"))
                 {
@@ -109,6 +111,7 @@ namespace NadekoBot.Modules.ClashOfClans
                     await Task.Delay(5000);
                 }
             });
+            };
         }
 
         private static void Save()

NadekoBot/Modules/Gambling/DiceRollCommand.cs

@@ -27,7 +27,7 @@ namespace NadekoBot.Modules.Gambling
 
             cgb.CreateCommand(Module.Prefix + "rolluo")
                 .Description("Rolls 0-100. If you supply a number [x] it rolls up to 30 normal dice (unordered)." +
-                             $" If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. | `{Prefix}roll` or `{Prefix}roll` 7 or `{Prefix}roll 3d5`")
+                             $" If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. | `{Prefix}rolluo` or `{Prefix}rolluo 7` or `{Prefix}rolluo 3d5`")
                 .Parameter("num", ParameterType.Optional)
                 .Do(RollFunc(false));
 

NadekoBot/Modules/Games/Commands/PollCommand.cs

@@ -18,7 +18,7 @@ namespace NadekoBot.Modules.Games.Commands
         internal override void Init(CommandGroupBuilder cgb)
         {
             cgb.CreateCommand(Module.Prefix + "poll")
-                  .Description($"Creates a poll, only person who has manage server permission can do it. | `{Prefix}poll Question?;Answer1;Answ 2;A_3`")
+                  .Description($"Creates a poll, only person who has manage server permission can do it. **Needs Manage Server Permissions**| `{Prefix}poll Question?;Answer1;Answ 2;A_3`")
                   .Parameter("allargs", ParameterType.Unparsed)
                   .Do(async e =>
                   {

NadekoBot/Modules/Help/Commands/HelpCommand.cs

@@ -1,10 +1,37 @@
-using Discord.Commands;
+//
+//                       _oo0oo_
+//                      o8888888o
+//                      88" . "88
+//                      (| -_- |)
+//                      0\  =  /0
+//                    ___/`---'\___
+//                  .' \\|     |// '.
+//                 / \\|||  :  |||// \
+//                / _||||| -:- |||||- \
+//               |   | \\\  -  /// |   |
+//               | \_|  ''\---/''  |_/ |
+//               \  .-\__  '-'  ___/-. /
+//             ___'. .'  /--.--\  `. .'___
+//          ."" '<  `.___\_<|>_/___.' >' "".
+//         | | :  `- \`.;`\ _ /`;.`/ - ` : | |
+//         \  \ `_.   \_ __\ /__ _/   .-` /  /
+//     =====`-.____`.___ \_____/___.-`___.-'=====
+//                       `=---='
+//
+//
+//     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//
+//               佛祖保佑         永无BUG
+//
+//
+using Discord.Commands;
 using NadekoBot.Extensions;
 using NadekoBot.Modules;
 using NadekoBot.Modules.Permissions.Classes;
 using System;
 using System.IO;
 using System.Linq;
+using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
@@ -47,32 +74,25 @@ namespace NadekoBot.Classes.Help.Commands
 
         public Action<CommandEventArgs> DoGitFunc() => e =>
         {
-            string helpstr =
+            var helpstr = new StringBuilder();
-$@"######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>
-######or paypal: `nadekodiscordbot@gmail.com`
 
-#NadekoBot List Of Commands  ";
+            var lastCategory = "";
-
-
-            string lastCategory = "";
             foreach (var com in NadekoBot.Client.GetService<CommandService>().AllCommands)
             {
                 if (com.Category != lastCategory)
                 {
-                    helpstr += "\n### " + com.Category + "  \n";
+                    helpstr.AppendLine("\n### " + com.Category + "  ");
-                    helpstr += "Command and aliases | Description | Usage\n";
+                    helpstr.AppendLine("Command and aliases | Description | Usage");
-                    helpstr += "----------------|--------------|-------\n";
+                    helpstr.AppendLine("----------------|--------------|-------");
                     lastCategory = com.Category;
                 }
-                helpstr += PrintCommandHelp(com);
+                helpstr.AppendLine($"`{com.Text}`{string.Concat(com.Aliases.Select(a => $", `{a}`"))} | {com.Description}");
             }
             helpstr = helpstr.Replace(NadekoBot.BotMention, "@BotName");
-            helpstr = helpstr.Replace(" |", " | ").Replace("**Usage**:", " | ").Replace("**Description:**", " | ").Replace("\n|", " |  \n");
 #if DEBUG
-            File.WriteAllText("../../../commandlist.md", helpstr);
+            File.WriteAllText("../../../docs/Commands List.md", helpstr.ToString());
 #else
-            File.WriteAllText("commandlist.md", helpstr);
+            File.WriteAllText("commandlist.md", helpstr.ToString());
 #endif
         };
 
@@ -92,13 +112,8 @@ $@"######For more information and how to setup your own NadekoBot, go to: <http:
                 .Description($"Sends a readme and a guide links to the channel. | `{Prefix}readme` or `{Prefix}guide`")
                 .Do(async e =>
                     await e.Channel.SendMessage(
-@"**Wiki with all info**: <https://github.com/Kwoth/NadekoBot/wiki>
+@"**LIST OF COMMANDS**: <http://nadekobot.readthedocs.io/en/latest/Commands%20List/>
-
+**Hosting Guides and docs can be found here**: <http://nadekobot.rtfd.io>").ConfigureAwait(false));
-**WINDOWS SETUP GUIDE**: <https://github.com/Kwoth/NadekoBot/blob/master/ComprehensiveGuide.md>
-
-**LINUX SETUP GUIDE**: <https://github.com/Kwoth/NadekoBot/blob/master/LinuxSetup.md>
-
-**LIST OF COMMANDS**: <https://github.com/Kwoth/NadekoBot/blob/master/commandlist.md>").ConfigureAwait(false));
 
             cgb.CreateCommand(Module.Prefix + "donate")
                 .Alias("~donate")

NadekoBot/Modules/Music/Classes/Song.cs

@@ -297,10 +297,22 @@ namespace NadekoBot.Modules.Music.Classes
 
                 if (video == null) // do something with this error
                     throw new Exception("Could not load any video elements based on the query.");
-                var m = Regex.Match(query, @"\?t=(?<t>\d*)");
+
+                var m = Regex.Match(query, @"\?t=((?<h>\d*)h)?((?<m>\d*)m)?((?<s>\d*)s?)?");
                 int gotoTime = 0;
                 if (m.Captures.Count > 0)
-                    int.TryParse(m.Groups["t"].ToString(), out gotoTime);
+                {
+                    int hours;
+                    int minutes;
+                    int seconds;
+
+                    int.TryParse(m.Groups["h"].ToString(), out hours);
+                    int.TryParse(m.Groups["m"].ToString(), out minutes);
+                    int.TryParse(m.Groups["s"].ToString(), out seconds);
+
+                    gotoTime = hours * 60 * 60 + minutes * 60 + seconds;
+                }
+
                 var song = new Song(new SongInfo
                 {
                     Title = video.Title.Substring(0, video.Title.Length - 10), // removing trailing "- You Tube"

NadekoBot/Modules/Music/MusicModule.cs

@@ -324,7 +324,7 @@ namespace NadekoBot.Modules.Music
 
                 cgb.CreateCommand(Prefix + "soundcloudpl")
                     .Alias(Prefix + "scpl")
-                    .Description($"Queue a soundcloud playlist using a link. | `{Prefix}scpl https://soundcloud.com/saratology/sets/symphony`")
+                    .Description($"Queue a soundcloud playlist using a link. | `{Prefix}scpl soundcloudseturl`")
                     .Parameter("pl", ParameterType.Unparsed)
                     .Do(async e =>
                     {
@@ -466,7 +466,7 @@ namespace NadekoBot.Modules.Music
                 //var msRegex = new Regex(@"(?<n1>\d+)>(?<n2>\d+)", RegexOptions.Compiled);
                 cgb.CreateCommand(Prefix + "movesong")
                     .Alias(Prefix + "ms")
-                    .Description($"Moves a song from one position to another. | `{Prefix} ms` 5>3")
+                    .Description($"Moves a song from one position to another. | `{Prefix} ms 5>3`")
                     .Parameter("fromto")
                     .Do(async e =>
                     {
@@ -502,7 +502,7 @@ namespace NadekoBot.Modules.Music
 
                 cgb.CreateCommand(Prefix + "setmaxqueue")
                     .Alias(Prefix + "smq")
-                    .Description($"Sets a maximum queue size. Supply 0 or no argument to have no limit.  | `{Prefix}smq` 50 or `{Prefix}smq`")
+                    .Description($"Sets a maximum queue size. Supply 0 or no argument to have no limit.  | `{Prefix}smq 50` or `{Prefix}smq`")
                     .Parameter("size", ParameterType.Unparsed)
                     .Do(async e =>
                     {

NadekoBot/Modules/Permissions/Classes/PermissionChecker.cs

@@ -4,7 +4,6 @@ using Discord.Commands.Permissions;
 using NadekoBot.Classes.JSONModels;
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace NadekoBot.Modules.Permissions.Classes
@@ -14,10 +13,8 @@ namespace NadekoBot.Modules.Permissions.Classes
     {
         public static PermissionChecker Instance { get; } = new PermissionChecker();
 
-        //key - sid:command
-        //value - userid
         private ConcurrentDictionary<string, ulong> commandCooldowns = new ConcurrentDictionary<string, ulong>();
-        private HashSet<ulong> timeBlackList { get; } = new HashSet<ulong>();
+        private ConcurrentDictionary<ulong, bool> timeBlackList { get; } = new ConcurrentDictionary<ulong, bool>();
 
         static PermissionChecker() { }
         private PermissionChecker()
@@ -26,7 +23,6 @@ namespace NadekoBot.Modules.Permissions.Classes
             {
                 while (true)
                 {
-                    //blacklist is cleared every 1.00 seconds. That is the most time anyone will be blocked
                     await Task.Delay(1000).ConfigureAwait(false);
                     timeBlackList.Clear();
                 }
@@ -43,21 +39,28 @@ namespace NadekoBot.Modules.Permissions.Classes
             if (channel.IsPrivate || channel.Server == null)
                 return command.Category == "Help";
 
+            if (user == null)
+                return false;
+
             if (ConfigHandler.IsUserBlacklisted(user.Id) ||
                 (!channel.IsPrivate &&
                  (ConfigHandler.IsServerBlacklisted(channel.Server.Id) || ConfigHandler.IsChannelBlacklisted(channel.Id))))
             {
                 return false;
             }
-            if (timeBlackList.Contains(user.Id))
+            try
+            {
+                if (timeBlackList.ContainsKey(user.Id))
                     return false;
+            }
+            catch { return false; }
 
             if (!channel.IsPrivate && !channel.Server.CurrentUser.GetPermissions(channel).SendMessages)
             {
                 return false;
             }
 
-            timeBlackList.Add(user.Id);
+            timeBlackList.TryAdd(user.Id, true);
 
             ServerPermissions perms;
             PermissionsHandler.PermissionsDict.TryGetValue(user.Server.Id, out perms);

NadekoBot/Modules/Permissions/Classes/PermissionsHandler.cs

@@ -22,7 +22,7 @@ namespace NadekoBot.Modules.Permissions.Classes
         }
 
 
-        public static void Initialize()
+        public static Task Initialize() => Task.Run(() =>
         {
             Console.WriteLine("Reading from the permission files.");
             Directory.CreateDirectory("data/permissions");
@@ -39,7 +39,7 @@ namespace NadekoBot.Modules.Permissions.Classes
                 catch { }
             }
             Console.WriteLine("Permission initialization complete.");
-        }
+        });
 
         internal static Permissions GetRolePermissionsById(Server server, ulong id)
         {
@@ -428,11 +428,13 @@ namespace NadekoBot.Modules.Permissions.Classes
         {
             var serverPerms = PermissionsDict.GetOrAdd(server.Id,
                 new ServerPermissions(server.Id, server.Name));
-            if (value == 0) {
+            if (value == 0)
+            {
                 int throwaway;
                 serverPerms.CommandCooldowns.TryRemove(commandName, out throwaway);
             }
-            else {
+            else
+            {
                 serverPerms.CommandCooldowns.AddOrUpdate(commandName, value, (str, v) => value);
             }
 

NadekoBot/Modules/Permissions/Commands/FilterInvitesCommand.cs

@@ -14,7 +14,7 @@ namespace NadekoBot.Modules.Permissions.Commands
 
         public FilterInvitesCommand(DiscordModule module) : base(module)
         {
-            NadekoBot.Client.MessageReceived += async (sender, args) =>
+            NadekoBot.OnReady += () => NadekoBot.Client.MessageReceived += async (sender, args) =>
             {
                 if (args.Channel.IsPrivate || args.User.Id == NadekoBot.Client.CurrentUser.Id) return;
                 try

NadekoBot/Modules/Permissions/Commands/FilterWordsCommand.cs

@@ -11,7 +11,7 @@ namespace NadekoBot.Modules.Permissions.Commands
     {
         public FilterWords(DiscordModule module) : base(module)
         {
-            NadekoBot.Client.MessageReceived += async (sender, args) =>
+            NadekoBot.OnReady += () => NadekoBot.Client.MessageReceived += async (sender, args) =>
             {
                 if (args.Channel.IsPrivate || args.User.Id == NadekoBot.Client.CurrentUser.Id) return;
                 try

NadekoBot/Modules/Permissions/PermissionsModule.cs

@@ -679,7 +679,7 @@ namespace NadekoBot.Modules.Permissions
                     });
 
                 cgb.CreateCommand(Prefix + "ubl")
-                    .Description($"Blacklists a mentioned user. | `{Prefix}ubl [user_mention]`")
+                    .Description($"Blacklists a mentioned user. **Bot Owner Only!**| `{Prefix}ubl [user_mention]`")
                     .Parameter("user", ParameterType.Unparsed)
                     .AddCheck(SimpleCheckers.OwnerOnly())
                     .Do(async e =>
@@ -695,7 +695,7 @@ namespace NadekoBot.Modules.Permissions
                     });
 
                 cgb.CreateCommand(Prefix + "uubl")
-                   .Description($"Unblacklists a mentioned user. | `{Prefix}uubl [user_mention]`")
+                   .Description($"Unblacklists a mentioned user. **Bot Owner Only!** | `{Prefix}uubl [user_mention]`")
                    .Parameter("user", ParameterType.Unparsed)
                    .AddCheck(SimpleCheckers.OwnerOnly())
                    .Do(async e =>
@@ -726,7 +726,7 @@ namespace NadekoBot.Modules.Permissions
                         {
                             if (!e.Message.MentionedChannels.Any()) return;
                             var ch = e.Message.MentionedChannels.First();
-                            NadekoBot.Config.UserBlacklist.Add(ch.Id);
+                            NadekoBot.Config.ChannelBlacklist.Add(ch.Id);
                             await ConfigHandler.SaveConfig().ConfigureAwait(false);
                             await e.Channel.SendMessage($"`Sucessfully blacklisted channel {ch.Name}`").ConfigureAwait(false);
                         }).ConfigureAwait(false);
@@ -741,9 +741,14 @@ namespace NadekoBot.Modules.Permissions
                         {
                             if (!e.Message.MentionedChannels.Any()) return;
                             var ch = e.Message.MentionedChannels.First();
-                            NadekoBot.Config.UserBlacklist.Remove(ch.Id);
+                            if (NadekoBot.Config.ChannelBlacklist.Contains(ch.Id))
+                            {
+                                NadekoBot.Config.ChannelBlacklist.Remove(ch.Id);
                                 await ConfigHandler.SaveConfig().ConfigureAwait(false);
-                            await e.Channel.SendMessage($"`Sucessfully blacklisted channel {ch.Name}`").ConfigureAwait(false);
+                                await e.Channel.SendMessage($"`Sucessfully unblacklisted channel {ch.Name}`").ConfigureAwait(false);
+                            }
+                            else
+                                await e.Channel.SendMessage($"`{ch.Name} was not in blacklist`").ConfigureAwait(false);
                         }).ConfigureAwait(false);
                     });
 
@@ -780,7 +785,7 @@ namespace NadekoBot.Modules.Permissions
 
                 cgb.CreateCommand(Prefix + "cmdcooldown")
                     .Alias(Prefix+ "cmdcd")
-                    .Description($"Sets a cooldown per user for a command. Set 0 to clear. | `{Prefix}cmdcd \"some cmd\" 5`")
+                    .Description($"Sets a cooldown per user for a command. Set 0 to clear. **Needs Manager Messages Permissions**| `{Prefix}cmdcd \"some cmd\" 5`")
                     .Parameter("command", ParameterType.Required)
                     .Parameter("secs",ParameterType.Required)
                     .AddCheck(SimpleCheckers.ManageMessages())

NadekoBot/Modules/Searches/Commands/OsuCommands.cs

@@ -2,6 +2,7 @@
 using NadekoBot.Classes;
 using Newtonsoft.Json.Linq;
 using System;
+using System.Globalization;
 using System.IO;
 using System.Net;
 using System.Text.RegularExpressions;
@@ -56,7 +57,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 =>
                 {
@@ -75,7 +76,7 @@ namespace NadekoBot.Modules.Searches.Commands
                         var reqString = $"https://osu.ppy.sh/api/get_beatmaps?k={NadekoBot.Creds.OsuAPIKey}&{mapId}";
                         var obj = JArray.Parse(await SearchHelper.GetResponseStringAsync(reqString).ConfigureAwait(false))[0];
                         var sb = new System.Text.StringBuilder();
-                        var starRating = Math.Round(Double.Parse($"{obj["difficultyrating"]}"), 2);
+                        var starRating = Math.Round(Double.Parse($"{obj["difficultyrating"]}", CultureInfo.InvariantCulture), 2);
                         var time = TimeSpan.FromSeconds(Double.Parse($"{obj["total_length"]}")).ToString(@"mm\:ss");
                         sb.AppendLine($"{obj["artist"]} - {obj["title"]}, mapped by {obj["creator"]}. https://osu.ppy.sh/s/{obj["beatmapset_id"]}");
                         sb.AppendLine($"{starRating} stars, {obj["bpm"]} BPM | AR{obj["diff_approach"]}, CS{obj["diff_size"]}, OD{obj["diff_overall"]} | Length: {time}");
@@ -120,7 +121,7 @@ namespace NadekoBot.Modules.Searches.Commands
                         {
                             var mapReqString = $"https://osu.ppy.sh/api/get_beatmaps?k={NadekoBot.Creds.OsuAPIKey}&b={item["beatmap_id"]}";
                             var map = JArray.Parse(await SearchHelper.GetResponseStringAsync(mapReqString).ConfigureAwait(false))[0];
-                            var pp = Math.Round(Double.Parse($"{item["pp"]}"), 2);
+                            var pp = Math.Round(Double.Parse($"{item["pp"]}", CultureInfo.InvariantCulture), 2);
                             var acc = CalculateAcc(item, m);
                             var mods = ResolveMods(Int32.Parse($"{item["enabled_mods"]}"));
                             if (mods != "+")

NadekoBot/Modules/Searches/Commands/StreamNotifications.cs

@@ -7,31 +7,35 @@ using System;
 using System.Collections.Concurrent;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Timers;
 
 namespace NadekoBot.Modules.Searches.Commands
 {
     internal class StreamNotifications : DiscordCommand
     {
-
-        private readonly Timer checkTimer = new Timer
-        {
-            Interval = new TimeSpan(0, 0, 15).TotalMilliseconds,
-        };
-
         private ConcurrentDictionary<string, Tuple<bool, string>> cachedStatuses = new ConcurrentDictionary<string, Tuple<bool, string>>();
+        private bool FirstPass { get; set; } = true;
 
         public StreamNotifications(DiscordModule module) : base(module)
         {
-
+            //start checking only after ready, because we need all servers to be initialized
-            checkTimer.Elapsed += async (s, e) =>
+            NadekoBot.OnReady += () =>
+            {
+                Task.Run(async () =>
+            {
+                await Task.Delay(60000);
+                while (true)
                 {
                     cachedStatuses.Clear();
                     try
                     {
                         var streams = SpecificConfigurations.Default.AllConfigs.SelectMany(c => c.ObservingStreams);
                         if (!streams.Any()) return;
-
+#if NADEKO_RELEASE
+                        var clr = Console.ForegroundColor;
+                        Console.ForegroundColor = ConsoleColor.Blue;
+                        Console.WriteLine($"Getting {streams.Count()} streams.");
+                        Console.ForegroundColor = clr;
+#endif
                         foreach (var stream in streams)
                         {
                             Tuple<bool, string> data;
@@ -47,6 +51,8 @@ namespace NadekoBot.Modules.Searches.Commands
                             if (data.Item1 != stream.LastStatus)
                             {
                                 stream.LastStatus = data.Item1;
+                                if (FirstPass)
+                                    continue;
                                 var server = NadekoBot.Client.GetServer(stream.ServerId);
                                 var channel = server?.GetChannel(stream.ChannelId);
                                 if (channel == null)
@@ -66,13 +72,24 @@ namespace NadekoBot.Modules.Searches.Commands
                                 await channel.SendMessage(msg).ConfigureAwait(false);
                             }
                         }
+                        FirstPass = false;
+#if NADEKO_RELEASE
+                        clr = Console.ForegroundColor;
+                        Console.ForegroundColor = ConsoleColor.Blue;
+                        Console.WriteLine($"Done getting streams.");
+                        Console.ForegroundColor = clr;
+#endif
                     }
                     catch { }
-                await ConfigHandler.SaveConfig().ConfigureAwait(false);
+                    finally
-            };
+                    {
-            checkTimer.Start();
+                        await Task.Delay(TimeSpan.FromSeconds(60));
                     }
+                }
+            });
 
+            };
+        }
         private async Task<Tuple<bool, string>> GetStreamStatus(StreamNotificationConfig stream, bool checkCache = true)
         {
             bool isLive;

NadekoBot/Modules/Searches/SearchesModule.cs

@@ -300,10 +300,11 @@ $@"🌍 **Weather for** 【{obj["target"]}】
                       {
                           var items = JObject.Parse(res);
                           var sb = new System.Text.StringBuilder();
-                          sb.AppendLine($"`Term:` {items["list"][0]["word"].ToString()}");
+                          var item = items["list"][0];
-                          sb.AppendLine($"`Definition:` {items["list"][0]["definition"].ToString()}");
+                          sb.AppendLine($"`Term:` {item["word"].ToString()}");
-                          sb.Append($"`Link:` <{await items["list"][0]["permalink"].ToString().ShortenUrl().ConfigureAwait(false)}>");
+                          sb.AppendLine($"`Definition:` {item["definition"].ToString()}");
-                          await e.Channel.SendMessage(sb.ToString());
+                          sb.Append($"`Link:` <{item["permalink"].ToString()}>");
+                          await e.Channel.SendMessage(sb.ToString()).ConfigureAwait(false);
                       }
                       catch
                       {

NadekoBot/Modules/Translator/Helpers/GoogleTranslator.cs

@@ -99,6 +99,8 @@ namespace NadekoBot.Modules.Translator.Helpers
                     { "bengali", "bn"},
                     { "bulgarian", "bg"},
                     { "catalan", "ca"},
+                    { "chinese-traditional", "zh-TW"},
+                    { "chinese-simplified", "zh-CN"},
                     { "chinese", "zh-CN"},
                     { "croatian", "hr"},
                     { "czech", "cs"},
@@ -163,6 +165,7 @@ namespace NadekoBot.Modules.Translator.Helpers
                     { "bn", "bn"},
                     { "bg", "bg"},
                     { "ca", "ca"},
+                    { "zh-TW", "zh-TW"},
                     { "zh-CN", "zh-CN"},
                     { "hr", "hr"},
                     { "cs", "cs"},

NadekoBot/Modules/Utility/Commands/InfoCommands.cs

@@ -39,7 +39,7 @@ namespace NadekoBot.Modules.Utility.Commands
                     sb.AppendLine($"`Roles:` **{server.Roles.Count()}**");
                     sb.AppendLine($"`Created At:` **{createdAt}**");
                     if (server.CustomEmojis.Count() > 0)
-                        sb.AppendLine($"`Custom Emojis:` **{string.Join(", ", server.CustomEmojis)}**");
+                        sb.AppendLine($"`Custom Emojis:` **{string.Join(", ", server.CustomEmojis.Select(em => em.Name))}**");
                     if (server.Features.Count() > 0)
                         sb.AppendLine($"`Features:` **{string.Join(", ", server.Features)}**");
                     if (!string.IsNullOrWhiteSpace(server.SplashId))

NadekoBot/Modules/Utility/Commands/Remind.cs

@@ -30,7 +30,7 @@ namespace NadekoBot.Modules.Utility.Commands
         {
             var remList = DbHandler.Instance.GetAllRows<Reminder>();
 
-            reminders = remList.Select(StartNewReminder).ToList();
+            NadekoBot.OnReady += () => reminders = remList.Select(StartNewReminder).ToList();
         }
 
         private Timer StartNewReminder(Reminder r)

NadekoBot/NadekoBot.cs

@@ -2,6 +2,7 @@
 using Discord.Audio;
 using Discord.Commands;
 using Discord.Modules;
+using NadekoBot.Classes;
 using NadekoBot.Classes.Help.Commands;
 using NadekoBot.Classes.JSONModels;
 using NadekoBot.Modules.Administration;
@@ -117,7 +118,7 @@ namespace NadekoBot
             Client = new DiscordClient(new DiscordConfigBuilder()
             {
                 MessageCacheSize = 10,
-                ConnectionTimeout = 180000,
+                ConnectionTimeout = int.MaxValue,
                 LogLevel = LogSeverity.Warning,
                 LogHandler = (s, e) =>
                     Console.WriteLine($"Severity: {e.Severity}" +
@@ -145,9 +146,6 @@ namespace NadekoBot
                 }
             });
 
-            //reply to personal messages and forward if enabled.
-            Client.MessageReceived += Client_MessageReceived;
-
             //add command service
             Client.AddService<CommandService>(commandService);
 
@@ -185,9 +183,18 @@ namespace NadekoBot
             //run the bot
             Client.ExecuteAndWait(async () =>
             {
+                await Task.Run(() =>
+                {
+                    Console.WriteLine("Specific config started initializing.");
+                    var x = SpecificConfigurations.Default;
+                    Console.WriteLine("Specific config done initializing.");
+                });
+
+                await PermissionsHandler.Initialize();
+
                 try
                 {
-                    await Client.Connect(Creds.Token).ConfigureAwait(false);
+                    await Client.Connect(Creds.Token, TokenType.Bot).ConfigureAwait(false);
                 }
                 catch (Exception ex)
                 {
@@ -197,7 +204,7 @@ namespace NadekoBot
                     return;
                 }
 #if NADEKO_RELEASE
-                await Task.Delay(150000).ConfigureAwait(false);
+                await Task.Delay(220000).ConfigureAwait(false);
 #else
                 await Task.Delay(1000).ConfigureAwait(false);
 #endif
@@ -228,9 +235,22 @@ namespace NadekoBot
                     if (string.IsNullOrWhiteSpace(request.Content))
                         e.Cancel = true;
                 };
-                PermissionsHandler.Initialize();
+#if NADEKO_RELEASE
+                Client.ClientAPI.SentRequest += (s, e) =>
+                {
+                    Console.WriteLine($"[Request of type {e.Request.GetType()} sent in {e.Milliseconds}]");
+
+                    var request = e.Request as Discord.API.Client.Rest.SendMessageRequest;
+                    if (request == null) return;
+
+                    Console.WriteLine($"[Content: { request.Content }");
+                };
+#endif
                 NadekoBot.Ready = true;
                 NadekoBot.OnReady();
+                Console.WriteLine("Ready!");
+                //reply to personal messages and forward if enabled.
+                Client.MessageReceived += Client_MessageReceived;
             });
             Console.WriteLine("Exiting...");
             Console.ReadKey();

NadekoBot/NadekoBot.csproj

@@ -13,6 +13,9 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <IsWebBootstrapper>false</IsWebBootstrapper>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
     <PublishUrl>C:\Users\Master\Desktop\NadekoBot\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -30,9 +33,6 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -161,6 +161,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>lib\ScaredFingers.UnitsConversion.dll</HintPath>
     </Reference>
+    <Reference Include="sqlite3">
+      <HintPath>Classes\lib\sqlite3.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Net" />
@@ -299,8 +302,12 @@
     <Compile Include="Classes\NadekoStats.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="App.config">
-    <None Include="packages.config" />
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
@@ -553,9 +560,7 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\SQLitePCL.native.sqlite3.v110_xp.0.9.2\build\SQLitePCL.native.sqlite3.v110_xp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCL.native.sqlite3.v110_xp.0.9.2\build\SQLitePCL.native.sqlite3.v110_xp.targets'))" />
   </Target>
-  <Import Project="..\packages\SQLitePCL.native.sqlite3.v110_xp.0.9.2\build\SQLitePCL.native.sqlite3.v110_xp.targets" Condition="Exists('..\packages\SQLitePCL.native.sqlite3.v110_xp.0.9.2\build\SQLitePCL.native.sqlite3.v110_xp.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

NadekoBot/_Models/JSONModels/Configuration.cs

@@ -90,6 +90,15 @@ namespace NadekoBot.Classes.JSONModels
             } },
             { "%mention% archer", new List<string>() {
                 "http://i.imgur.com/Bha9NhL.jpg"
+            } },
+            { "%mention% formuoli", new List<string>() {
+                "http://i.imgur.com/sCHYQhl.jpg"
+            } },
+            { "%mention% mei", new List<string>() {
+                "http://i.imgur.com/Xkrf5y7.png"
+            } },
+            { "%mention% omega yato", new List<string>() {
+                "https://cdn.discordapp.com/attachments/168617088892534784/221047921410310144/Yato_Animated.gif"
             } }
         };
 

NadekoBot/packages.config

@@ -11,11 +11,6 @@
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net46" />
   <package id="RestSharp" version="105.2.3" 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" />
-  <package id="SQLitePCL.raw" version="0.9.2" targetFramework="net452" />
-  <package id="System.Data.SQLite" version="1.0.102.0" targetFramework="net452" />
   <package id="taglib" version="2.1.0.0" targetFramework="net452" />
   <package id="VideoLibrary" version="1.3.3" targetFramework="net452" />
 </packages>

discord.net

@@ -1 +1 @@
-Subproject commit e3fd2b99a4f11954e508d6f24a0b592efa5f6390
+Subproject commit f7655320bc2b90ddb8bc9d17ae999aa76e9f5f38

docs/Commands List.md

@@ -0,0 +1,360 @@
+
+### 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! | `-donate` or `~donate`
+`-modules`, `.modules` | List all bot modules. | `-modules` or `.modules`
+`-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. **Needs Manage Server Permissions.**| `.grdel`
+`.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. **Needs Manage Server Permissions.**| `.greetmsg Welcome, %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. **Needs Manage Server Permissions.**| `.byemsg %user% has left.`
+`.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. **Needs Manage Server Permissions.**| `.greetpm`
+`.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. **Bot Owner Only!**| `.logignore`
+`.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. **Needs Manage Server Permissions.**| `.voicerpresence`
+`.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. **Needs Manage Messages Permissions.** |`.repeat 5 Hello there`
+`.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% **Bot Owner Only!**| `.adpl`
+`.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. **Bot Owner Only!**| `.rmpl`
+`.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. Needs Manage Roles and Manage Channels Permissions.** | `.cleanv+t`
+`.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`
+`.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`
+`.jcsc` | Joins current channel to an instance of cross server channel using the token. **Needs Manage Server Permissions.**| `.jcsc`
+`.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`
+`.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" Hi there %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). **Bot Owner Only.**| `.dcr index`
+`.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. **Bot Owner Only!**| `.leave 123123123331`
+`.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. **Needs Manage Server Permissions.**| `.lain`
+`.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. **Needs Manage Roles Permissions.**| `.sr @User Guest`
+`.removerole`, `.rr` | Removes a role from a given user. **Needs Manage Roles Permissions.**| `.rr @User Admin`
+`.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. **Needs Manage Roles Permissions.**| `.rar @User`
+`.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. **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. **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. **Needs Ban Permissions.**| `.sb "@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. **Needs Mute Permissions.**| `.mute "@Someguy"` or `.mute "@Someguy" "@Someguy"`
+`.unmute` | Unmutes mentioned user or users. **Needs Mute Permissions.**| `.unmute "@Someguy"` or `.unmute "@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. **Needs Deafen Permissions.** | `.undef "@Someguy"` or `.undef "@Someguy" "@Someguy"`
+`.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. **Needs Manage Channel Permissions.** | `.cvch VoiceChannelName`
+`.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. **Needs Manage Channel Permissions.** | `.ctch TextChannelName`
+`.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. **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. **Needs Manage Messages Permissions**| `.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`
+`.setname`, `.newnm` | Give the bot a new name. **Bot Owner Only!** | `.newnm BotName`
+`.newavatar`, `.setavatar` | Sets a new avatar image for the NadekoBot. Argument is a direct link to an image. **Bot Owner Only!** | `.setavatar http://i.imgur.com/xTG3a1I.jpg`
+`.setgame` | Sets the bots game. **Bot Owner Only!** | `.setgame Playing with kwoth`
+`.send` | Send a message to someone on a different server through the bot. **Bot Owner Only!** | `.send sid|u:uid Hello user!` or `.send sid|c:cid Message to channel!` (cid = channel id, sid = server id)
+`.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`
+`.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`
+
+### Utility  
+Command and aliases | Description | Usage
+----------------|--------------|-------
+`.remind` | Sends a message to you or a channel after certain amount of time. First argument is me/here/'channelname'. Second argument is time in a descending order (mo>w>d>h>m) example: 1w5d3h10m. Third argument is a (multiword)message.  | `.remind me 1d5h Do something` or `.remind #general Start now!`
+`.remindmsg` | Sets message for when the remind is triggered.  Available placeholders are %user% - user who ran the command, %message% - Message specified in the remind, %target% - target channel of the remind. **Bot Owner Only!** | `.remindmsg do something else`
+`.serverinfo`, `.sinfo` | Shows info about the server the bot is on. If no channel is supplied, it defaults to current one. |`.sinfo Some Server`
+`.channelinfo`, `.cinfo` | Shows info about the channel. If no channel is supplied, it defaults to current one. |`.cinfo #some-channel`
+`.userinfo`, `.uinfo` | Shows info about the user. If no user is supplied, it defaults a user running the command. |`.uinfo @SomeUser`
+`.whoplays` | Shows a list of users who are playing the specified game. | `.whoplays Overwatch`
+`.inrole` | Lists every person from the provided role or roles (separated by a ',') on this server. If the list is too long for 1 message, you must have Manage Messages permission. | `.inrole Role`
+`.checkmyperms` | Checks your userspecific permissions on this channel. | `.checkmyperms`
+`.stats` | Shows some basic stats for Nadeko. | `.stats`
+`.dysyd` | Shows some basic stats for Nadeko. | `.dysyd`
+`.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`
+`.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`
+`;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`
+`;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`
+`;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`
+`;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`
+`;usrpermscopy`, `;upc` | Copies BOT PERMISSIONS (not discord permissions) from one role to another. |`;upc @SomeUser ~ @SomeOtherUser`
+`;verbose`, `;v` | Sets whether to show when a command/module is blocked. | `;verbose true`
+`;srvrperms`, `;sp` | Shows banned permissions for this server. | `;sp`
+`;roleperms`, `;rp` | Shows banned permissions for a certain role. No argument means for everyone. | `;rp AwesomeRole`
+`;chnlperms`, `;cp` | Shows banned permissions for a certain channel. No argument means for this channel. | `;cp #dev`
+`;userperms`, `;up` | Shows banned permissions for a certain user. No argument means for yourself. | `;up Kwoth`
+`;srvrmdl`, `;sm` | Sets a module's permission at the server level. | `;sm "module name" enable`
+`;srvrcmd`, `;sc` | Sets a command's permission at the server level. | `;sc "command name" disable`
+`;rolemdl`, `;rm` | Sets a module's permission at the role level. | `;rm "module name" enable MyRole`
+`;rolecmd`, `;rc` | Sets a command's permission at the role level. | `;rc "command name" disable MyRole`
+`;chnlmdl`, `;cm` | Sets a module's permission at the channel level. | `;cm "module name" enable SomeChannel`
+`;chnlcmd`, `;cc` | Sets a command's permission at the channel level. | `;cc "command name" enable SomeChannel`
+`;usrmdl`, `;um` | Sets a module's permission at the user level. | `;um "module name" enable SomeUsername`
+`;usrcmd`, `;uc` | Sets a command's permission at the user level. | `;uc "command name" enable SomeUsername`
+`;allsrvrmdls`, `;asm` | Sets permissions for all modules at the server level. | `;asm [enable/disable]`
+`;allsrvrcmds`, `;asc` | Sets permissions for all commands from a certain module at the server level. | `;asc "module name" [enable/disable]`
+`;allchnlmdls`, `;acm` | Sets permissions for all modules at the channel level. | `;acm [enable/disable] SomeChannel`
+`;allchnlcmds`, `;acc` | Sets permissions for all commands from a certain module at the channel level. | `;acc "module name" [enable/disable] SomeChannel`
+`;allrolemdls`, `;arm` | Sets permissions for all modules at the role level. | `;arm [enable/disable] MyRole`
+`;allrolecmds`, `;arc` | Sets permissions for all commands from a certain module at the role level. | `;arc "module name" [enable/disable] MyRole`
+`;ubl` | Blacklists a mentioned user. **Bot Owner Only!**| `;ubl [user_mention]`
+`;uubl` | Unblacklists a mentioned user. **Bot Owner Only!** | `;uubl [user_mention]`
+`;cbl` | Blacklists a mentioned channel (#general for example). | `;cbl #some_channel`
+`;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. **Needs Manager Messages Permissions**| `;cmdcd "some cmd" 5`
+`;allcmdcooldowns`, `;acmdcds` | Shows a list of all commands and their respective cooldowns. | `;acmdcds`
+
+### Conversations  
+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 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`
+`@BotName fire` | Shows a unicode fire message. Optional parameter [x] tells her how many times to repeat the fire. | `@NadekoBot fire [x]`
+`@BotName dump` | Dumps all of the invites it can to dump.txt.** Owner Only.** | `@NadekoBot dump`
+`@BotName ab` | Try to get 'abalabahaha'| `@NadekoBot ab`
+
+### Gambling  
+Command and aliases | Description | Usage
+----------------|--------------|-------
+`$draw` | Draws a card from the deck.If you supply number [x], she draws up to 5 cards from the deck. | `$draw [x]`
+`$shuffle`, `$sh` | Reshuffles all cards back into the deck.|`$shuffle`
+`$flip` | Flips coin(s) - heads or tails, and shows an image. | `$flip` or `$flip 3`
+`$betflip`, `$bf` | Bet to guess will the result be heads or tails. Guessing award you double flowers you've bet. | `$bf 5 heads` or `$bf 3 t`
+`$roll` | Rolls 0-100. If you supply a number [x] it rolls up to 30 normal dice. If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. | `$roll` or `$roll 7` or `$roll 3d5`
+`$rolluo` | Rolls 0-100. If you supply a number [x] it rolls up to 30 normal dice (unordered). If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. | `$rolluo` or `$rolluo 7` or `$rolluo 3d5`
+`$nroll` | Rolls in a given range. | `$nroll 5` (rolls 0-5) or `$nroll 5-15`
+`$race` | Starts a new animal race. | `$race`
+`$joinrace`, `$jr` | Joins a new race. You can specify an amount of flowers for betting (optional). You will get YourBet*(participants-1) back if you win. | `$jr` or `$jr 5`
+`$raffle` | Prints a name and ID of a random user from the online list from the (optional) role. | `$raffle` or `$raffle RoleName`
+`$$$` | Check how much NadekoFlowers a person has. (Defaults to yourself) |`$$$` or `$$$ @Someone`
+`$give` | Give someone a certain amount of NadekoFlowers|`$give 1 "@SomeGuy"`
+`$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`
+
+### Games  
+Command and aliases | Description | Usage
+----------------|--------------|-------
+`>t` | Starts a game of trivia. You can add nohint to prevent hints.First player to get to 10 points wins by default. You can specify a different number. 30 seconds per question. |`>t nohint` or `>t 5 nohint`
+`>tl` | Shows a current trivia leaderboard. | `>tl`
+`>tq` | Quits current trivia after current question. | `>tq`
+`>typestart` | Starts a typing contest. | `>typestart`
+`>typestop` | Stops a typing contest on the current channel. | `>typestop`
+`>typeadd` | Adds a new article to the typing contest. Owner only. | `>typeadd wordswords`
+`>poll` | Creates a poll, only person who has manage server permission can do it. **Needs Manage Server Permissions**| `>poll Question?;Answer1;Answ 2;A_3`
+`>pollend` | Stops active poll on this server and prints the results in this channel. | `>pollend`
+`>pick` | Picks a flower planted in this channel. | `>pick`
+`>plant` | Spend a flower to plant it in this channel. (If bot is restarted or crashes, flower will be lost) | `>plant`
+`>gencurrency`, `>gc` | Toggles currency generation on this channel. Every posted message will have 2% chance to spawn a NadekoFlower. Optional parameter cooldown time in minutes, 5 minutes by default. Requires Manage Messages permission. | `>gc` or `>gc 60`
+`>leet` | Converts a text to leetspeak with 6 (1-6) severity levels | `>leet 3 Hello`
+`>choose` | Chooses a thing from a list of things | `>choose Get up;Sleep;Sleep more`
+`>8ball` | Ask the 8ball a yes/no question. | `>8ball should i do something`
+`>rps` | Play a game of rocket paperclip scissors with Nadeko. | `>rps scissors`
+`>linux` | Prints a customizable Linux interjection | `>linux Spyware Windows`
+
+### Music  
+Command and aliases | Description | Usage
+----------------|--------------|-------
+`!!next`, `!!n`, `!!skip` | Goes to the next song in the queue. You have to be in the same voice channel as the bot. | `!!n`
+`!!stop`, `!!s` | Stops the music and clears the playlist. Stays in the channel. | `!!s`
+`!!destroy`, `!!d` | Completely stops the music and unbinds the bot from the channel. (may cause weird behaviour) | `!!d`
+`!!pause`, `!!p` | Pauses or Unpauses the song. | `!!p`
+`!!queue`, `!!q`, `!!yq` | Queue a song using keywords or a link. Bot will join your voice channel.**You must be in a voice channel**. | `!!q Dream Of Venice`
+`!!soundcloudqueue`, `!!sq` | Queue a soundcloud song using keywords. Bot will join your voice channel.**You must be in a voice channel**. | `!!sq Dream Of Venice`
+`!!listqueue`, `!!lq` | Lists 15 currently queued songs per page. Default page is 1. | `!!lq` or `!!lq 2`
+`!!nowplaying`, `!!np` | Shows the song currently playing. | `!!np`
+`!!volume`, `!!vol` | Sets the music volume 0-100% | `!!vol 50`
+`!!defvol`, `!!dv` | Sets the default music volume when music playback is started (0-100). Persists through restarts. | `!!dv 80`
+`!!mute`, `!!min` | Sets the music volume to 0% | `!!min`
+`!!max` | Sets the music volume to 100%. | `!!max`
+`!!half` | Sets the music volume to 50%. | `!!half`
+`!!shuffle`, `!!sh` | Shuffles the current playlist. | `!!sh`
+`!!playlist`, `!!pl` | Queues up to 500 songs from a youtube playlist specified by a link, or keywords. | `!!pl playlist link or name`
+`!!soundcloudpl`, `!!scpl` | Queue a soundcloud playlist using a link. | `!!scpl soundcloudseturl`
+`!!localplaylst`, `!!lopl` | Queues all songs from a directory. **Bot Owner Only!** | `!!lopl C:/music/classical`
+`!!radio`, `!!ra` | Queues a radio stream from a link. It can be a direct mp3 radio stream, .m3u, .pls .asx or .xspf (Usage Video: <https://streamable.com/al54>) | `!!ra radio link here`
+`!!local`, `!!lo` | Queues a local file by specifying a full path. **Bot Owner Only!** | `!!lo C:/music/mysong.mp3`
+`!!move`, `!!mv` | Moves the bot to your voice channel. (works only if music is already playing) | `!!mv`
+`!!remove`, `!!rm` | Remove a song by its # in the queue, or 'all' to remove whole queue. | `!!rm 5`
+`!!movesong`, `!!ms` | Moves a song from one position to another. | `!! ms 5>3`
+`!!setmaxqueue`, `!!smq` | Sets a maximum queue size. Supply 0 or no argument to have no limit.  | `!!smq 50` or `!!smq`
+`!!cleanup` | Cleans up hanging voice connections. **Bot Owner Only!** | `!!cleanup`
+`!!reptcursong`, `!!rcs` | Toggles repeat of current song. | `!!rcs`
+`!!rpeatplaylst`, `!!rpl` | Toggles repeat of all songs in the queue (every song that finishes is added to the end of the queue). | `!!rpl`
+`!!save` | Saves a playlist under a certain name. Name must be no longer than 20 characters and mustn't contain dashes. | `!!save classical1`
+`!!load` | Loads a playlist under a certain name.  | `!!load classical-1`
+`!!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 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) | `!!ap`
+
+### Searches  
+Command and aliases | Description | Usage
+----------------|--------------|-------
+`~lolchamp` | Shows League Of Legends champion statistics. If there are spaces/apostrophes or in the name - omit them. Optional second parameter is a role. |`~lolchamp Riven` or `~lolchamp Annie sup`
+`~lolban` | Shows top 6 banned champions ordered by ban rate. Ban these champions and you will be Plat 5 in no time. | `~lolban`
+`~hitbox`, `~hb` | Notifies this channel when a certain user starts streaming. | `~hitbox SomeStreamer`
+`~twitch`, `~tw` | Notifies this channel when a certain user starts streaming. | `~twitch SomeStreamer`
+`~beam`, `~bm` | Notifies this channel when a certain user starts streaming. | `~beam SomeStreamer`
+`~checkhitbox`, `~chhb` | Checks if a certain user is streaming on the hitbox platform. | `~chhb SomeStreamer`
+`~checktwitch`, `~chtw` | Checks if a certain user is streaming on the twitch platform. | `~chtw SomeStreamer`
+`~checkbeam`, `~chbm` | Checks if a certain user is streaming on the beam platform. | `~chbm SomeStreamer`
+`~removestream`, `~rms` | Removes notifications of a certain streamer on this channel. | `~rms SomeGuy`
+`~liststreams`, `~ls` | Lists all streams you are following on this server. | `~ls`
+`~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`
+`~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 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 aquarion evol`
+`~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 Shingeki no kyojin`
+`~randomcat`, `~meow` | Shows a random cat image. | `~meow`
+`~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`
+`~google`, `~g` | Get a google search link for some terms. | `~google query`
+`~hs` | Searches for a Hearthstone card and shows its image. Takes a while to complete. | `~hs Ysera`
+`~ud` | Searches Urban Dictionary for a word. | `~ud Pineapple`
+`~#` | Searches Tagdef.com for a hashtag. | `~# ff`
+`~quote` | Shows a random quote. | `~quote`
+`~catfact` | Shows a random catfact from <http://catfacts-api.appspot.com/api/facts> | `~catfact`
+`~yomama`, `~ym` | Shows a random joke from <http://api.yomomma.info/> | `~ym`
+`~randjoke`, `~rj` | Shows a random joke from <http://tambal.azurewebsites.net/joke/random> | `~rj`
+`~chucknorris`, `~cn` | Shows a random chucknorris joke from <http://tambal.azurewebsites.net/joke/random> | `~cn`
+`~magicitem`, `~mi` | Shows a random magicitem from <https://1d4chan.org/wiki/List_of_/tg/%27s_magic_items> | `~mi`
+`~revav` | Returns a google reverse image search for someone's avatar. | `~revav "@SomeGuy"`
+`~revimg` | Returns a google reverse image search for an image from a link. | `~revav Image link`
+`~safebooru` | Shows a random image from safebooru with a given tag. Tag is optional but preffered. (multiple tags are appended with +) | `~safebooru yuri+kissing`
+`~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 "@SomeGuy"`
+
+### NSFW  
+Command and aliases | Description | Usage
+----------------|--------------|-------
+`~hentai` | Shows a random NSFW hentai image from gelbooru and danbooru with a given tag. Tag is optional but preffered. (multiple tags are appended with +) | `~hentai yuri+kissing`
+`~danbooru` | Shows a random hentai image from danbooru with a given tag. Tag is optional but preffered. (multiple tags are appended with +) | `~danbooru yuri+kissing`
+`~gelbooru` | Shows a random hentai image from gelbooru with a given tag. Tag is optional but preffered. (multiple tags are appended with +) | `~gelbooru yuri+kissing`
+`~rule34` | Shows a random image from rule34.xx with a given tag. Tag is optional but preffered. (multiple tags are appended with +) | `~rule34 yuri+kissing`
+`~e621` | Shows a random hentai image from e621.net with a given tag. Tag is optional but preffered. Use spaces for multiple tags. | `~e621 yuri kissing`
+`~cp` | We all know where this will lead you to. | `~cp`
+`~boobs` | Real adult content. | `~boobs`
+`~butts`, `~ass`, `~butt` | Real adult content. | `~butts` or `~ass`
+
+### 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`
+`,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`
+`,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]`
+`,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]`
+`,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]`
+
+### Pokegame  
+Command and aliases | Description | Usage
+----------------|--------------|-------
+`>attack` | Attacks a target with the given move. Use `>movelist` to see a list of moves your type can use. | `>attack "vine whip" @someguy`
+`>movelist`, `>ml` | Lists the moves you are able to use | `>ml`
+`>heal` | Heals someone. Revives those who fainted. Costs a NadekoFlower | `>heal @someone`
+`>type` | Get the poketype of the target. | `>type @someone`
+`>settype` | Set your poketype. Costs a NadekoFlower. | `>settype fire`
+
+### Translator  
+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. | `~translangs` or `~translangs language`
+
+### Customreactions  
+Command and aliases | Description | Usage
+----------------|--------------|-------
+`\o\` | Custom reaction. | `\o\`
+`/o/` | Custom reaction. | `/o/`
+`moveto` | Custom reaction. | `moveto`
+`comeatmebro` | Custom reaction. | `comeatmebro`
+`e` | Custom reaction. | `e`
+`@BotName insult`, `<@!116275390695079945> insult` | Custom reaction. | `%mention% insult`
+`@BotName praise`, `<@!116275390695079945> praise` | Custom reaction. | `%mention% praise`
+`@BotName pat`, `<@!116275390695079945> pat` | Custom reaction. | `%mention% pat`
+`@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 there?`, `<@!116275390695079945> are you there?` | Custom reaction. | `%mention% are you there?`
+`@BotName draw`, `<@!116275390695079945> draw` | Custom reaction. | `%mention% draw`
+`@BotName bb`, `<@!116275390695079945> bb` | Custom reaction. | `%mention% bb`
+`@BotName call`, `<@!116275390695079945> call` | Custom reaction. | `%mention% call`
+`@BotName disguise`, `<@!116275390695079945> disguise` | Custom reaction. | `%mention% disguise`
+`@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. **Bot Owner Only!**| `trello bind [board_id]`
+`trello unbind` | Unbinds a bot from the channel and board. **Bot Owner Only!**| `trello unbind`
+`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. **Bot Owner Only!**| `trello cards index`

docs/Contribution Guide.md

@@ -0,0 +1,7 @@
+### How to contribute
+
+1. Make Pull Requests to **DEV BRANCH**
+2. Keep 1 Pull Request to a single feature
+3. Explain what you did in the PR message
+
+Thanks for all the help ^_^

docs/Custom Reactions.md

@@ -0,0 +1,69 @@
+##Custom Reactions
+<p><strong>Every time you add or remove a custom reaction you will need to restart your bot with either <code>.restart</code> if you are hosting or Nadeko is on VPS, or <code>.die</code> if Nadeko is on Droplet</strong></p>
+<h3>Important</h3>
+<ul style="list-style-type:disc">
+<li><strong><code>.acr</code>,&nbsp;<code>.dcr</code>,&nbsp;and <code>.ecr</code> Require you to be Bot Owner</strong></li>
+<li>Adding multiple commands of the same name will make Nadeko randomly select one of the command's responses</li>
+</ul>
+###Commands and Their Use
+<table>
+<tr>
+<th>Command Name</th>
+<th>Description</th>
+<th>Example</th>
+</tr><tr>
+<td align="center"><code>.acr</code></td>
+<td>Adds a Custom Reaction</td>
+<td><code>.acr Hello Hi!</code></td>
+</tr><tr>
+<td align="center"><code>.dcr</code></td>
+<td>Deletes an entire Custom Reaction or a Specified Response Index Number</td>
+<td><code>.dcr "command name"</code>&nbsp;or&nbsp;<code>.dcr "command name" 3</code></td>
+</tr><tr>
+<td align="center"><code>.lcr</code></td>
+<td>Lists a specified page of Custom Commands</td>
+<td><code>.lcr Number</code>&nbsp;i.e&nbsp;<code>.lcr 2</code></td>
+</tr><tr>
+<td align="center"><code>.scr</code></td>
+<td>Shows all responses to a command.&nbsp;Index Number will be in brackets <code>[&nbsp;]</code></td>
+<td><code>.scr Hello</code></td>
+</tr><tr>
+<td align="center"><code>.ecr</code></td>
+<td>Edit a custom reaction, needs: reaction's name, index to change, and new multiword response.</td>
+<td><code>.ecr&nbsp;Hello&nbsp;3&nbsp;What's up</code></td></table>
+<h4>Now that we know the commands let's take a look at the arguments and placeholders available for <code>.acr</code>,</h4>
+<p><code>.addcustreact</code>&nbsp;(<code>.acr</code>)&nbsp;takes two arguments:
+<dl>
+<dt><strong>●&nbsp;First, The name of the command; this directly follows the <code>.acr</code></strong></dt>
+<dd>-&nbsp;If your command name is more than 1 word use quotation marks;<br> i.e <del><code>.acr Nice weather sure is</code></del> > <code>.acr "Nice weather" sure is</code></dd>
+<dd>-&nbsp;Now everytime someone says "Nice weather" the bot will respond with, "sure is"</dd>
+<dt><strong>●&nbsp;Next, The Response, this follows the name of the command.</strong><dt>
+<dd>-&nbsp;i.e <code>.acr "Nice weather"</code><b><i><code>sure is</code></i></b></dd></dl><p>
+###And finally on to the Placeholders
+<p>There are currently four placeholders, which we will be looking at, with many more to come in the future.<p>
+<table>
+<tr>
+<th>Placeholder</th>
+<th>How the placeholder works</th>
+<th>Examples</th>
+</tr><tr>
+<td align="center"><code>%mention%</code></td>
+<td>The&nbsp;<code>%mention%</code>&nbsp;placeholder is triggered when you type <code>@botname</code></td>
+<td><code>.acr "%mention% Hello" Hello!</code> > User input: @botname Hello | Bot Replies: Hello!</td>
+</tr><tr>
+<td align="center"><code>%target%</code></td>
+<td>The <code>%target%</code> placeholder is used to make Nadeko Mention another person</td>
+<td><code>.acr "%mention% Hello" %target% Hi!</code> > User inputs: "@botname Hello @somebody" 
+ Bot replies: "Hi @somebody"</td>
+ </tr><tr>
+ <td align="center"><code>%user%</code></td>
+ <td>The <code>%user%</code> placeholder mentions the person who said the command</td>
+ <td><code>.acr "Who am i" You are %user%!</code></td>
+ </tr><tr>
+ <td align="center"><code>%rng%</code></td>
+ <td>The <code>%rng%</code> generates a random number</td>
+ <td><code>.acr Random %rng%</code>
+ </tr></table>
+ 
+ Thanks to Nekai for being creative. <3
+

docs/Donate.md

@@ -0,0 +1,17 @@
+##Donate to NadekoBot
+
+If you want to help Nadeko and Nadeko's team by donating, you can do that in the two of the following ways:
+
+###Patreon
+
+You can donate over [Patreon][Patreon] and support the project.
+
+[![img][img]](https://www.patreon.com/nadekobot)
+
+
+###PayPal
+
+If you wish to donate over PayPal, you can send your donations to: `nadekodiscordbot@gmail.com`
+
+[Patreon]: https://www.patreon.com/nadekobot
+[img]: http://www.mister-and-me.com/wp-content/plugins/patron-button-and-widgets-by-codebard/images/patreon-medium-button.png

docs/Frequently Asked Questions.md

@@ -0,0 +1,45 @@
+Frequently Asked Questions
+####Q1: How do I get @Nadeko to join my server?
+A: Send her a Direct Message with -h to get the link. Only Server Owners can allow the bot to join
+####Q2: I want to change permissions, but it doesn't work D:
+A: To change permissions, you have to set the ;permsrole (default permission role is called `Nadeko`, you can create a role named like that and assign it to yourself). *Only the owner of the server can change permissions without having this role.*
+####Q3: Music doesn't work on a Mac?!  
+You have to build `mono` from source - [Mono Source][Mono Source]. 
+####Q5: I want to disable NSFW on my server, please?
+A: You would first have to be able to change permissions (see Q4 ), and then run `;sm NSFW disable`
+####Q6: How do I get NadekoFlowers/whatever I changed my currency to?
+A: You get NadekoFlowers by answering Trivia questions or picking them up after they have been generated with `>gc`, which you can then either plant (give away to a channel so that someone can pick it), gamble it with $betflip, $betroll and $jr, or spend on healing and setting your type in the Pokemon game.
+####Q7: I have an issue/bug/suggestion, where can I get it noticed?
+A: First of all, check [Issues][Issues] and `#suggestions` for your problem/improvement. If it's not there, create a new issue on [Issues][Issues].
+####Q8: How do I use the command XXXX?
+A: most commands have a description, with a usage guide if required; use -h command, like -h ;pr
+####Q9: Music doesn't work!?
+A: Music on @Nadeko will be re-enabled in the future, but for now your only option is to host yourself
+If you are hosting your own bot, make sure ffmpeg is working correctly; running ffmpeg in the commandline should have a response. see [Guide](guides/Windows Guide.md) for more
+####Q10: My music is still not working/very laggy?
+A: Try switching server location, try giving the bot permissions on the server you want to use it on.
+####Q12: I want to change data in the database (like NadekoFlowers or the pokemontypes of users, but how?
+A: Open data/nadekobot.sqlite using sqlitebrowser (or some alternative), Browse Data, select relevant table, change data, Write changes
+####Q13: The .greet and .bye commands doesn't work, but everything else is (From @Kong) 
+A: Set a greeting message by using .greetmsg YourMessageHere 
+and a bye-message by using .byemsg YourMessageHere
+####Q15: How to import certs on linux?
+A:
+`certmgr -ssl https://discordapp.com`  
+`certmgr -ssl https://gateway.discord.gg`
+####Q16: I want "BOT" tag with my bot and I can't follow up with Q14, is there a simple way? 
+A: Yes, you can create an application using your account and use the APP BOT USER TOKEN from here: [DiscordApp][DiscordApp]
+NOTE: This will create a new bot account
+####Q17: I made an application following Q16, but I can't add that new bot to my server, how do I invite it to my server?
+A: You need to use oauth link to add it to you server, just copy your CLIENT ID (that's in the same Developer page where you brought your token) and replace `12345678` in the link below: 
+`https://discordapp.com/oauth2/authorize?client_id=12345678&scope=bot&permissions=66186303`  
+FOLLOW THIS [DETAILED GUIDE][DETAILED GUIDE] IF IT IS HARD FOR YOU TO UNDERSTAND 
+####Q18: I'm building NadekoBot from source, but I get hundreds of (namespace) errors without changing anything!?
+A: Using Visual Studio, you can solve these errors by going to Tools -> `NuGet Package Manager -> Manage NuGet Packages` for Solution. Go to the Installed tab, select the Packages that were missing (usually `Newtonsoft.json` and `RestSharp`) and install them for all projects  
+####Q19: My bot has all permissions but it's still saying, "Failed to add roles. Bot has insufficient permissions.", how do I fix this?
+A: Discord has added few new features and roles now follow hierarchy, that means you need to place your bot role above every-other role your server has. Also do NOTE that bot can only set/add all roles below its own highest role. And can not assign it's "highest role" to anyone else.
+
+[Mono Source]:http://www.mono-project.com/docs/compiling-mono/mac/
+[Issues]: https://github.com/Kwoth/NadekoBot/issues
+[DiscordApp]: https://discordapp.com/developers/applications/me
+[DETAILED GUIDE]: http://discord.kongslien.net/guide.html

docs/JSON Explanations.md

@@ -0,0 +1,42 @@
+###Credentials.json and config.json
+**This is how unedited credentials.json looks like:**
+```json
+{
+  "Token": "",
+  "ClientId": "116275390695079945",
+  "BotId": 1231231231231,
+  "OwnerIds": [
+    123123123123,
+    5675675679845
+  ],
+  "GoogleAPIKey": "",
+  "SoundCloudClientID": "",
+  "MashapeKey": "",
+  "LOLAPIKey": "",
+  "TrelloAppKey": "",
+  "OsuAPIKey": "",
+  "CarbonKey": ""
+}
+```
+#### Required
+- **Token** - Required to log in. See this [guide](http://discord.kongslien.net/guide.html)
+- **OwnerIds** - Required for Owner-Only commands to work. Separate multiple IDs with a comma
+- **BotId** - Required for custom reactions and conversation commands to work.
+
+*BotId and OwnerIds are NOT names of the owner and the bot. If you do not know the id of your bot, put 2 random numbers in those fields, run the bot and do `.uid @MyBotName` - that will give you your bot\_id, do the same for yourself `.uid @MyName` and you will get a number to put inside brackets in OwnerIds field.*
+
+#### Optional
+- **GoogleAPIKey** - Youtube song search. Playlist queuing. URL Shortener. ~i and ~img. 
+- **SoundCloudClientID** - Needed in order to queue soundcloud songs from sc links. For the Soundcloud Api key you need a Soundcloud account. You need to create a new app on [SoundcloudApp][SoundcloudApp] and after that go here [Your SC Apps][Your SC Apps] click on the name of your created your app and copy the Client ID. Paste it into credentials.json. 
+- **MashapeKey** - Urban dictionary, hashtag search, hearthstone cards.You need to create an account on their api marketplace here [Mashape][Mashape]. After that you need to go to `market.mashape.com/YOURNAMEHERE/applications/default-application` and press GET THE KEYS in the right top corner copy paste it into your `credentials.json` and you are ready to race! 
+- **LOLAPIKey** - [Champion.gg][Champion.gg] api key needed for LoL commands
+- **TrelloAppKey** - Needed for trello commands
+- **OsuAPIKey** - needed for osu top5 and beatmap commands. 
+- **CarbonKey** - carbonitex.net key if your bot is listed there in order to send stats (probably nobody needs this)
+
+Next to your exe you must also have a `data folder` in which there is `config.jso`n (among other things) which will contain some user specific config, like should the Bot join servers, should DMs to bot be forwarded to you and a list of IDs of blacklisted users, channels and servers. If you do not have `config.json`, you should rename `config_example.json` to `config.json`.
+
+[SoundcloudApp]: http://soundcloud.com/you/apps/new
+[Your SC Apps]: http://soundcloud.com/you/apps
+[Mashape]: https://market.mashape.com/
+[Champion.gg]: www.champion.gg

docs/Permissions System.md

@@ -0,0 +1,87 @@
+# Overview
+Ever stuck handling your Nadeko permissions? Look no further than this guide!
+We'll handle a few example cases that we've seen frequently on the help channel, as well as explaining the order of permissions in general. Any command used here can be found in the [Commands list](Commands List.md#permissions)
+
+# How does it work?
+Permissions are handy to set up to limit who in your server can use what. by default, every command is enabled for everyone, except for the administration commands, like `.kick` and `.prune`, which are set to correspond to discord's permissions, (kicking and managing messages respectively here), the permissions module, which we will show in the next paragraph, and some other commands throughout the other modules that are owner-only, meaning that only someone who has his or her id in the list of owners of the bot can use them. 
+Since you may not want to allow everyone to use the NSFW module, skip the current song, pick up flowers, or attack in the pokegame, you're in need of setting up permissions.
+
+#First time setting up
+When you want to change your first permissions, you need to fulfill one of two conditions:
+* Be the owner of the server
+* Have the role set by `;permrole` (Nadeko by default)
+
+If you have neither of these, you **can't** set up permissions.
+You may want to change the `;permrole` to the role of the admins, using `;permrole Admins`.
+
+# Basics
+Most of the commands found in the list are pretty much self-explanatory. `;rolemdl NSFW disable lurkers` would disable the NSFW module for the lurkers (let them come out of the shadows!). similarly `;chnlperms #general` would show which permissions are banned *specifically* for this channel.
+Since permissions are enabled by default, the hierarchy of rulings is simple, if you disable something that affects a user, like `;sm nsfw disable`, you **can't** enable it in a particular other way, like `;cm nsfw enable #nsfw`. Now roles are an exemption to this, e.g. if all roles have music disabled except for the DJ role, you can still use music commands if you have the DJ role.
+
+By default, the bot notifies when a command can't be used. To disable this, you can use `;verbose false`.
+
+# Common Cases
+These are some common cases of particular settings of permissions.
+
+## Create a music DJ
+e.g. you only want your users to be able to see what's playing, and have a DJ role for the rest.
+- `;arc music disable all`, disable all commands of the music module for everyone.
+- `;arc music enable DJ`, give permissions to the DJ to do everything
+- `;rc "!!nowplaying" enable all`, enable the command for everyone
+- `;rc "!!getlink" enable all`, as above.
+- `;rc "!!listqueue" enable all`, as above.
+
+## Create a NSFW channel
+You want to only allow NSFW commands in the #nsfw channel.
+- `;cm nsfw disable all` disable the nsfw module in every channel.
+- `;cm nsfw enable #nsfw` re-enable the nsfw module in the #nsfw channel.
+
+
+-- *Thanks to @applemac for writing this guide*
+
+#Old Guide
+
+**NadekoBot's permissions can be set up to be very specific through commands in the Permissions module.**
+
+Each command or module can be turned on or off at: 
+- a user level (so specific users can or cannot use a command/module)  
+- a role level (so only certain roles have access to certain commands/module)
+- a channel level (so certain commands can be limited to certain channels, which can prevent music / trivia / NSFW spam in serious channels)
+- a server level. 
+
+Use .modules to see a list of modules (sets of commands).
+Use .commands [module_name] to see a list of commands in a certain module.
+
+Permissions use a semicolon as the prefix, so always start the command with a ;.
+
+Follow the semicolon with the letter of the level which you want to edit.
+- "u" for Users.
+- "r" for Roles.
+- "c" for Channels.
+- "s" for Servers.
+
+Follow the level with whether you want to edit the permissions of a command or a module.
+- "c" for Command.
+- "m" for Module.
+
+Follow with a space and then the command or module name (surround the command with quotation marks if there is a space within the command, for example "!!q" or "!!n").
+
+Follow that with another space and, to enable it, type one of the following: [1, true, t, enable], or to disable it, one of the following: [0, false, f, disable].
+
+Follow that with another space and the name of the user, role, channel. (depending on the first letter you picked)
+
+###### Examples #1
+- **;rm NSFW 0 [Role_Name]**  Disables the NSFW module for the role, <Role_Name>.
+- **;cc "!!n" 0 [Channel_Name]**  Disables skipping to the next song in the channel, <Channel_Name>.
+- **;uc "!!q" 1 [User_Name]**  Enables queuing of songs for the user, <User_Name>.
+- **;sm Gambling 0**  Disables gambling in the server.
+
+Check permissions by using the letter of the level you want to check followed by a p, and then the name of the level in which you want to check. If there is no name, it will default to yourself for users, the @everyone role for roles, and the channel in which the command is sent for channels.
+
+###### Examples #2
+- ;cp [Channel_Name]
+- ;rp [Role_Name]
+
+Insert an **a** before the level to edit the permission for all commands / modules for all users / roles / channels / server.
+
+Reference the Help command (-h) for more Permissions related commands.

docs/Readme.md

@@ -0,0 +1,29 @@
+##Readme for Commands List
+
+###Bot Owner Only
+
+- *Bot Owner Only* commands refer to the commands only the **owner** of the bot can use.
+- *Bot Owner Only* commands do **not** refer to the owner of the **server**, just the owner of the **bot**.
+- *Owner of the bot* is a person who is **hosting** his own bot, and his **ID** is inside of **credentials.json** file.
+- You are **not** the bot **owner** if you invited the bot using **Carbonitex** or other invitation links.
+
+###Music on the public Nadeko
+
+- In case you got Nadeko in your server by the invitation from **Carbonitex**, our **GitHub** invite or **help (-h)**, music is disabled.
+- Music is **disabled** due to large maintenance expenses, unless Kwoth is **testing** music module.
+- If you want to have music module on your server, you will have to **host** the bot on your PC, or any of the external servers.
+- How to **host** the bot, check the **guides** on the left side.
+
+###NadekoFlowers
+
+- NadekoFlowers is the **currency** of the public Nadeko.
+- NadekoFlowers can be earned by playing **trivia**, or other games, like betting games.
+- You can give NadekoFlowers to other users, using the command `$give X @person`.
+- You can only give flowers you **own**.
+- If you want to have **unlimited** number of flowers, you will have to **host** the bot.
+- Command `$award X @person` can only be used by the *bot owner*.
+- If you `>plant` the flower, flower will be avaliable for everyone to `>pick` it. In that case you will **lose** the flower.
+
+###Manage Permissions
+
+**These permissions refer to the permissions you can set in Discord settings for individual users or roles.**

docs/about.md

@@ -0,0 +1,13 @@
+## Terms of Use
+
+The MIT License (MIT)
+
+Copyright (c) 2016 NadekoBot Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+

docs/guides/Building from Source.md

@@ -0,0 +1,8 @@
+###Building from Source
+For easy setup and no programming knowledge, you can use [Updater](https://github.com/Kwoth/NadekoUpdater/releases/latest) or download release from [Releases](https://github.com/Kwoth/NadekoBot/releases) and follow the [Windows Guide](Windows Guide.md)
+
+In your bin/debug folder (or next to your exe if you are using release version), you must have a file called 'credentials.json' in which you will store all the necessary data to make the bot know who the owner is, and your api keys.
+
+When you clone the project, make sure to run `git submodule init` and `git submodule update` to get the correct discord.net version
+
+Make sure you've read ComprehensiveGuide to get a grasp of basic config/credentials setup and then look at "Credentials and config" chapter.

docs/guides/Docker Guide.md

@@ -0,0 +1,54 @@
+# Docker Guide with DigitalOcean
+
+#####Prerequisites
+- Digital ocean account (you can use my [reflink][reflink] to support the project and get 10$ after you register)
+- [PuTTY][PuTTY] 
+- A bot account - follow this [guide][guide]
+- $5
+- Common sense
+
+#####Guide
+- Click on the create droplet button
+![img](http://i.imgur.com/g2ayOcC.png)
+
+- Pick one click apps and select docker on 14.04 
+
+![img](http://imgur.com/065Xkme.png)
+
+- Pick any droplet size you want (5$ will work ok-ish on a few servers)
+- Pick location closest to your discord server's location
+- Pick a hostname  
+![img](http://imgur.com/ifPKB6p.png)
+
+- Click create 
+
+You will get an email from DigitalOcean with your credentials now.
+
+Open putty and type ip adress **you got in your email** with port 22  
+
+![img](http://imgur.com/Mh5ehsh.png)
+
+- Console will open and you will be prompted for a username, type `root`.  
+- Type in the password you got in the email.  
+- Confirm the password you just typed in.  
+- Type in the new password.  
+- Confirm new password.  
+
+- When you are successfully logged in, type   
+`docker run --name nadeko -v /nadeko:/config uirel/nadeko`
+
+- Wait for it to download and at one point it is going to start throwing errors due to `credentials.json` being empty  
+- CTRL+C to exit that  
+- Type `docker stop nadeko`  
+- 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/**
+
+*When you want to update the bot, just type `docker restart nadeko` as it always downloads latest prerelease*
+
+[reflink]: http://m.do.co/c/46b4d3d44795/
+[PuTTY]: http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html
+[guide]: http://discord.kongslien.net/guide.html

docs/guides/Linux Guide.md

@@ -0,0 +1,256 @@
+##Setting up NadekoBot on Linux
+
+####Setting up NadekoBot on Linux Digital Ocean Droplet
+If you want Nadeko to play music for you 24/7 without having to hosting it on your PC and want to keep it cheap, reliable and convenient as possible, you can try Nadeko on Linux Digital Ocean Droplet using the link [DigitalOcean][DigitalOcean] (and using this link will be supporting Nadeko and will give you **$10 credit**)
+
+Keep this helpful video handy [Linux Setup Video][Linux Setup Video] (thanks to klincheR) it contains how to set up the Digital Ocean droplet aswell.
+
+####Setting up NadekoBot
+Assuming you have followed the link above to created an account in Digital Ocean and video to set up the bot until you get the `IP address and root password (in email)` to login, its time to begin.
+
+#### Prerequisites
+- Download [PuTTY][PuTTY]
+- Download [CyberDuck][CyberDuck]
+
+#### Follow these steps
+
+- **Open PuTTY.exe** that you downloaded before, and paste or enter your `IP address` and then click **Open**.
+If you entered your Droplets IP address correctly, it should show **login as:** in a newly opened window.
+- Now for **login as:**, type `root` and hit enter.
+- It should then, ask for password, type the `root password` you have received in your **email address registered with Digital Ocean**, then hit Enter.
+
+*(as you are running it for the first time, it will most likely to ask you to change your root password, for that, type the "password you received through email", hit Enter, enter a "new password", hit Enter and confirm that "new password" again.*
+**SAVE that new password somewhere safe not just in mind**. After you done that, you are ready to write commands.
+
+**Copy and just paste** using **mouse right-click** (it should paste automatically)
+
+####Installing Mono
+MONO (Source: [Mono Source][Mono Source])
+
+**1)**
+
+`sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF`
+`echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list`
+`sudo apt-get update`
+
+Note if the command is not being initiated, hit **Enter**
+
+**2)**
+
+`echo "deb http://download.mono-project.com/repo/debian wheezy-apache24-compat main" | sudo 
+tee -a /etc/apt/sources.list.d/mono-xamarin.list`
+
+####Mono on Debian 8 and later
+**2.5)**
+
+`echo "deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main" | sudo 
+tee -a /etc/apt/sources.list.d/mono-xamarin.list`
+
+####Mono on CentOS 7, Fedora 19 (and later) and later
+**2.6)**
+
+`yum install yum-util`
+`rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"`
+`yum-config-manager --add-repo http://download.mono-project.com/repo/centos/`
+
+####Mono Devel
+**3)**
+
+`apt-get install mono-devel`
+
+**Type** `y` **hit Enter**
+
+####Mono Fix
+**In case you are having issues with Mono where you get a random string and the bot won't run, do this:**
+
+`sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF`
+`echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list`
+`apt-get install ca-certificates-mono`
+`mozroots --import --sync`
+
+####Installing Opus Voice Codec
+**4)**
+`sudo apt-get install libopus0 opus-tools`
+
+**Type** `y` **hit Enter**
+
+**5)**
+`sudo apt-get install libopus-dev`
+
+####FFMPEG
+
+**6)**
+`apt-get install ffmpeg`
+
+**Type** `y` **hit Enter**
+
+NOTE: if its "not installing" then, follow the guide here: [FFMPEG Help Guide][FFMPEG Help Guide]
+
+**All you need to do, if you are running UBUNTU 14.04 is initiate these:**
+
+`sudo add-apt-repository ppa:mc3man/trusty-media`
+`sudo apt-get update`
+`sudo apt-get dist-upgrade`
+
+*Before executing* `sudo apt-get install ffmpeg`
+
+**If you are running Debian 8 Jessie, please, follow these steps:**
+
+`wget http://luxcaeli.de/installer.sh && sudo bash installer.sh` (Thanks to Eleria<3)
+
+In case you are not able to install it with installer ^up there, follow these steps:
+
+`sudo apt-get update`
+`echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/debian-backports.list`
+`sudo apt-get update`
+`sudo  apt-get install ffmpeg -y`
+
+####Uncomplicated Firewall UFW
+
+**7)**
+`apt-get install ufw`
+
+**it is most likely to have it already installed so if you see it is already installed, check with following command, and/or enable it**
+
+**8)**
+`ufw status`
+
+**9)**
+`ufw enable`
+
+**Type** `y` **hit Enter**
+
+**10)**
+`sudo ufw allow ssh`
+
+####Installing Unzip
+**11)**
+`apt-get install unzip`
+
+####Installing TMUX
+**12)**
+`apt-get install tmux`
+
+**Type** `y` **hit Enter**
+
+####Importing Discord certs
+**13)**
+`certmgr -ssl https://discordapp.com`
+**14)**
+`certmgr -ssl https://gateway.discord.gg`
+
+Type `yes` and hit Enter **(three times - as it will ask for three times)**
+
+####Creating Nadeko folder
+**15)**
+Create a new folder “nadeko” or anything you prefer
+
+`mkdir nadeko`
+
+**16)**
+Move to “nadeko” folder (note `cd --` to go back the directory)
+
+`cd nadeko`
+
+####Getting NadekoBot from Releases
+
+Go to this link: [Releases][Releases] and **copy the zip file address** of the lalest version available,
+it should look like `https://github.com/Kwoth/NadekoBot/releases/download/vx.xx/NadekoBot.vx.x.zip`
+
+**17)**
+Get the correct link, type `wget`, then *paste the link*, then hit **Enter**.
+
+`wget https://github.com/Kwoth/NadekoBot/releases/download/vx.xx/NadekoBot.vx.x.zip`
+
+**^Do not copy-paste it**
+
+**18)**
+Now we need to `unzip` the downloaded zip file and to do that, type the file name as it showed in your screen or just copy from the screen, should be like ` NadekoBot.vx.x.zip`
+
+`unzip NadekoBot.vx.x.zip`
+
+**^Do not copy-paste it**
+
+####Setting up NadekoBot
+
+- Open **CyberDuck**
+- Click on **Open Connection** (top-left corner), a new window should appear.
+- You should see **FTP (File Transfer Protocol)** in drop-down.
+- Change it to **SFTP (SSH File Transfer Protocol)**
+- Now, in **Server:** paste or type in your `Digital Ocean Droplets IP address`, leave `Port: 22` (no need to change it)
+- In **Username:** type `root`
+- In **Password:** type `the new root password (you changed at the start)`
+- Click on **Connect**
+- It should show you the new folder you created.
+- Open it.
+
+####Renaming Credentials.json
+
+- Copy the `credentials_example.json` to desktop
+- EDIT it as it is guided here: [Setting up Credentials.json](Windows Guide.md#setting-up-credentialsjson-file)
+- Read here how to [Create DiscordBot application](https://github.com/miraai/NadekoBot/blob/dev/docs/guides/Windows%20Guide.md#creating-discordbot-application)
+- Rename it to `credentials.json` and paste/put it back in the folder. `(Yes, using CyberDuck)`
+- You should see two files `credentials_example.json` and `credentials.json`
+- Also if you already have nadeko setup and have `credentials.json`, `config.json`, `nadekobot.sqlite`, and `"permissions" folder`, you can just copy and paste it to the Droplets folder using CyberDuck.
+
+####Running NadekoBot
+
+Go back to **PuTTY**, `(hope its still running xD)`
+
+**19)**
+Type/ Copy and hit **Enter**.
+
+`tmux new -s nadeko`
+
+**^this will create a new session named “nadeko”** `(you can replace “nadeko” with anything you prefer and remember 
+its your session name) so you can run the bot in background without having to keep running PuTTY in the background.`
+
+`cd nadeko`
+
+**20)**
+`mono NadekoBot.exe`
+
+**CHECK THE BOT IN DISCORD, IF EVERYTHING IS WORKING**
+
+####Setting up Nadeko Music
+
+For how to set up Nadeko for music and Google API Keys, follow [Setting up NadekoBot for Music](Windows Guide.md#setting-up-nadekobot-for-music)
+
+Now time to **move bot to background** and to do that, press **CTRL+B+D** (this will ditach the nadeko session using TMUX), and you can finally close PuTTY now.
+
+Copy your CLIENT ID (that's in the same Developer page where you brought your token) and replace `12345678` in this link: `https://discordapp.com/oauth2/authorize?client_id=12345678&scope=bot&permissions=66186303` with it. Go to that link and you will be able to add your bot to your server.
+
+**NOW YOU HAVE YOUR OWN NADEKO BOT** `Thanks to Kwoth <3`
+
+####Some more Info (just in case)
+
+-If you want to **see the sessions** after logging back again, type `tmux ls`, and that will give you the list of sessions running.
+-If you want to **switch to/ see that session**, type `tmux a -t nadeko` (**nadeko** is the name of the session we created before so, replace **“nadeko”** with the session name you created.)
+-If you want to **kill** NadekoBot **session**, type `tmux kill-session -t nadeko`
+
+####Restarting Nadeko with the Server
+Open **PuTTY** and login as you have before, type `reboot` and hit Enter.
+
+####Updating Nadeko
+
+**FOLLOW THESE STEPS SERIALLY**
+
+- **-21 OR 22**
+- **-19**
+- **-16**
+- **-17**
+- **-18**
+- **-20**
+
+HIT **CTRL+B+D** and close **PuTTY**
+
+`IF YOU FACE ANY TROUBLE ANYWHERE IN THE GUIDE JUST FIND US IN NADEKO'S DISCORD SERVER`
+
+[PuTTY]: http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html
+[CyberDuck]: https://cyberduck.io
+[Linux Setup Video]: https://www.youtube.com/watch?v=icV4_WPqPQk&feature=youtu.be
+[Releases]: https://github.com/Kwoth/NadekoBot/releases
+[Readme]: https://github.com/Kwoth/NadekoBot/blob/master/README.md
+[FFMPEG Help Guide]: http://www.faqforge.com/linux/how-to-install-ffmpeg-on-ubuntu-14-04/
+[Mono Source]: http://www.mono-project.com/docs/getting-started/install/linux/
+[DigitalOcean]: http://m.do.co/c/46b4d3d44795/

docs/guides/OSX Guide.md

@@ -0,0 +1,152 @@
+### Setting Up NadekoBot on OSX
+#### Prerequisites 
+- 1) [Homebrew][Homebrew]
+- 2) Mono
+- 3) Google Account
+- 4) Soundcloud Account (if you want soundcloud support)
+- 5) Text Editor (TextWrangler, or equivalent) or outside editor such as [Atom][Atom]
+
+####Installing Homebrew
+
+`/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"`
+
+Run `brew update` to fetch the latest package data.
+####Installing dependencies
+```
+brew install git
+brew install ffmpeg
+brew update && brew upgrade ffmpeg
+brew install opus
+brew install opus-tools
+brew install opusfile
+brew install libffi
+brew install libsodium
+brew install tmux
+```
+
+####Check your `FFMPEG`
+
+**In case your `FFMPEG` wasnt installed properly**
+
+- `brew options ffmpeg`
+- `brew install ffmpeg --with-x --with-y --with-z` etc.
+- `brew update && brew upgrade` (Update formulae and Homebrew itself && Install newer versions of outdated packages)
+- `brew prune` (Remove dead symlinks from Homebrew’s prefix)
+- `brew doctor` (Check your Homebrew installation for common issues)
+- Then try `brew install ffmpeg` again.
+
+####Installing xcode-select
+Xcode command line tools. You will do this in Terminal.app by running the following command line:
+
+`xcode-select --install`
+
+A dialog box will open asking if you want to install `xcode-select`. Select install and finish the installation.
+
+####Installing Mono
+- Building Mono dependencies:
+
+`brew install autoconf automake libtool pkg-config`
+
+- Building Mono from Source:
+ 
+To build Mono from a Git Source Code checkout, you will want to have the official Mono installed on the system, as the build requires a working C# compiler to run. Once you do this, run the following commands, remember to replace PREFIX with your installation prefix that you selected:
+
+```
+PATH=$PREFIX/bin:$PATH
+git clone https://github.com/mono/mono.git
+cd mono
+CC='cc -m32' ./autogen.sh --prefix=$PREFIX --disable-nls --build=i386-apple-darwin11.2.0
+make
+make install
+```
+To build Mono in 64 bit mode instead use this to configure the build:
+
+`./autogen.sh --prefix=$PREFIX --disable-nls`
+
+####Nadeko Setup
+- Create a new folder and name it `Nadeko`.
+- Move to our `Nadeko` folder
+ 
+`cd Nadeko`
+- Go to [Releases][Releases] and copy the zip file address of the lalest version available, it should look like `https://github.com/Kwoth/NadekoBot/releases/download/vx.xx/NadekoBot.vx.x.zip`
+- Get the correct link, type `curl -O` and past the link, then hit `Enter`
+- It should be something like this:
+ 
+`curl -O https://github.com/Kwoth/NadekoBot/releases/download/vx.xx/NadekoBot.vx.x.zip`
+
+^ do not copy-paste it
+
+- Unzip the downloaded file in our `Nadeko` folder
+
+####Creating DiscordBot application
+- Go to [DiscordApp][DiscordApp].
+- Log in with your Discord account.
+- On the left side, press `New Application`.
+- Fill out the `App Name` (your bot's name, in this case), put the image you want, and add an app description(optional).
+- Create the application.
+- Once the application is created, click on `Create a Bot User` and confirm it.
+- Keep this window open for now.
+ 
+####Setting up Credentials.json file
+- In our `NadekoBot` folder you should have `.json` file named `credentials_example.json`. (Note: If you do not see a **.json** after `credentials_example.json `, do not add the `**.json**`. You most likely have `"Hide file extensions"` enabled.)
+- Rename `credentials_example.json` to `credentials.json`.
+- Open the file with your Text editor.
+- In there you will see fields like `Token`, `ClientId`, `BotId`, `OwnerIDs`.
+- In your [DiscordApp][DiscordApp], under `Bot User` part, you will see the `Token:click to reveal` part, click to reveal it.
+- Copy your bot's token, and put it between `" "` in your `credentials.json` file.
+- Copy `Client ID` and replace it with the example one in your `credentials.json` in `Client ID` **and** `BotID` field.
+- Save your `credentials.json` but keep it open. We need to put your `User ID` and owner.
+ 
+####Running NadekoBot
+- Copy/past and hit `Enter`
+ 
+`tmux new -s nadeko`
+
+^this will create a new session named “nadeko” `(you can replace “nadeko” with anything you prefer and remember its your
+session name)`.
+
+`cd nadeko`
+
+- Start NadekoBot.exe using Mono:
+ 
+`mono NadekoBot.exe`
+
+CHECK THE BOT IN DISCORD, IF EVERYTHING IS WORKING
+
+Now time to move bot to background and to do that, press CTRL+B+D (this will ditach the nadeko session using TMUX)
+
+####Inviting your bot to your server - [Invite Guide][Invite Guide]
+- Create a new server in Discord.
+- Copy your `Client ID` from your [DiscordApp][DiscordApp].
+- Replace `12345678` in this link `https://discordapp.com/oauth2/authorize?client_id=12345678&scope=bot&permissions=66186303` with your `Client ID`.
+- Link should look like this: `https://discordapp.com/oauth2/authorize?client_id=**YOUR_CLENT_ID**&scope=bot&permissions=66186303`.
+- Go to newly created link and pick the server we created, and click `Authorize`.
+- Bot should be added to your server.
+ 
+####Setting up OwnerIds
+- In the server where your bot is, in a text channel, type `.uid`
+- Your `User ID` should show, copy it.
+- Close `NadekoBot.exe`
+- Replace your `User ID` in the `credentials.json` between `[ ]` and save the changes.
+- Run `NadekoBot.exe` again.
+- Now you are the bot owner.
+- You can add `User IDs` from the other users by separating IDs with a comma if you want to have more owners.
+
+####Setting NadekoBot Music
+
+For Music Setup and API keys check [Setting up NadekoBot for Music](Windows Guide.md#setting-up-nadekobot-for-music) and [JSON Explanations](JSON Explanations.md).
+
+####Some more Info (just in case)
+
+-If you want to see the sessions after logging back again, type `tmux ls`, and that will give you the list of sessions running. 
+-If you want to switch to/ see that session, type `tmux a -t nadeko` (nadeko is the name of the session we created before so, replace `“nadeko”` with the session name you created.)
+-If you want to kill NadekoBot session, type `tmux kill-session -t nadeko`
+
+[Homebrew]: http://brew.sh/
+[Mono]: http://www.mono-project.com/docs/compiling-mono/mac/
+[Releases]: https://github.com/Kwoth/NadekoBot/releases
+[DiscordApp]: https://discordapp.com/developers/applications/me
+[Atom]: https://atom.io/
+[Invite Guide]: http://discord.kongslien.net/guide.html
+[Google Console]: https://console.developers.google.com
+[Soundcloud]: https://soundcloud.com/you/apps/new

docs/guides/Windows Guide.md

@@ -0,0 +1,117 @@
+________________________________________________________________________________
+*Thanks to @Flatbread and Mirai for making this guide*
+________________________________________________________________________________
+
+### Setting Up NadekoBot on Windows
+#### Prerequisites 
+- 1) [NET Framework][NET Framework] 4.5.2 (or 4.6)
+- 2) [FFMPEG][FFMPEG] 
+- 3) Google Account
+- 4) Soundcloud Account (if you want soundcloud support)
+- 5) [7zip][7zip] (or whatever you are using, WinRar)
+- 6) [Notepad++][Notepad++]
+
+####Guide 
+
+- Create a folder, name it `Nadeko`.
+- Head to [Updater Releases Page][Updater] and download `WINDOWS.-.nadeupdater.7z`.
+- Copy `WINDOWS.-.nadeupdater.7z` to the `Nadeko` (folder we created before) and extract everything.
+- You will see a file `NadekoUpdater.bat ` and a folder `publish ` after extraction.
+- Run/Launch/Open the file `NadekoUpdater.bat ` and you will see it running in cmd.exe asking you with **3 options** *1-3*.
+    - 1) Stable release - current stable release, but might not contain all the newest Nadeko updates.
+    - 2) Newest release - release with all features/upgrades.
+    - 3) Exit
+- Press `2` on your keyboard and hit `Enter`. Type `y` and hit `Enter` again. Downloading might take a while, so just be patient and wait. When download is done, press `3` on your keyboard and close the updater.
+- You should have a new folder named `NadekoBot` inside the `Nadeko` folder we previously created.
+
+####Creating DiscordBot application
+- Go to [DiscordApp][DiscordApp].
+- Log in with your Discord account.
+- On the left side, press `New Application`.
+- Fill out the `App Name` (your bot's name, in this case), put the image you want, and add an app description(optional).
+- Create the application.
+- Once the application is created, click on `Create a Bot User` and confirm it.
+- Keep this window open for now.
+
+####Setting up Credentials.json file
+- In our `NadekoBot` folder you should have `.json` file named `credentials_example.json`. (Note: If you do not see a **.json** after `credentials_example.json `, do not add the `**.json**`. You most likely have `"Hide file extensions"` enabled.)
+- Rename `credentials_example.json` to `credentials.json`.
+- Open the file with your [Notepad++][Notepad++].
+- In there you will see fields like `Token`, `ClientId`, `BotId`, `OwnerIDs`.
+- In your [DiscordApp][DiscordApp], under `Bot User` part, you will see the `Token:click to reveal` part, click to reveal it.
+- Copy your bot's token, and put it between `" "` in your `credentials.json` file.
+- Copy `Client ID` and replace it with the example one in your `credentials.json` in `Client ID` **and** `BotID` field.
+- Save your `credentials.json` but keep it open. We need to put your `User ID` and owner.
+
+####Inviting your bot to your server 
+- [Invite Guide][Invite Guide]
+- Create a new server in Discord.
+- Copy your `Client ID` from your [DiscordApp][DiscordApp].
+- Replace `12345678` in this link `https://discordapp.com/oauth2/authorize?client_id=12345678&scope=bot&permissions=66186303` with your `Client ID`.
+- Link should look like this: `https://discordapp.com/oauth2/authorize?client_id=**YOUR_CLENT_ID**&scope=bot&permissions=66186303`.
+- Go to newly created link and pick the server we created, and click `Authorize`.
+- Bot should be added to your server.
+
+####Starting the bot
+- Enter your `NadekoBot` folder that should be (hopefully) in your `Nadeko` folder.
+- Run `NadekoBot.exe` (Note: There is `NadekoBot.exe` and `NadekoBot.exe.config`, dont run the second one)
+- Your bot should now be online in the server we added him to.
+- Note: Your bot will be offline in case you close `NadekoBot.exe`.
+
+####Setting up OwnerIds
+- In the server where your bot is, in a text channel, type `.uid`
+- Your `User ID` should show, copy it.
+- Close `NadekoBot.exe`
+- Replace your `User ID` in the `credentials.json` between `[ ]` and save the changes.
+- Run `NadekoBot.exe` again.
+- Now you are the bot owner.
+- You can add `User IDs` from the other users by separating IDs with a comma if you want to have more owners.
+
+`*Alternatively, you can download nadekobot from` [Releases][Releases] `and extract the zip yourself. 
+That is what updater does, except it makes it easier for you to update because it doesn't overwrite 
+important files.If you are downloading releases you will have to be careful about your config, 
+credentials, and other files you edited in order to preserve your data every time you update.`
+
+________________________________________________________________________________
+
+#### Setting Up NadekoBot For Music
+##### Prerequisites
+- 1) [FFMPEG][FFMPEG] installed.
+- 2) Setting up API keys.
+
+- Follow these steps on how to setup Google API keys:
+    - Go to [Google Console][Google Console] and log in.
+    - Create a new project (name does not matter). Once the project is created, go into "Enable and manage APIs."
+    - Under the "Other Popular APIs" section, enable `URL Shortener API` and `Custom Search Api`. Under the `YouTube APIs` section, enable `YouTube Data API`.
+    - On the left tab, access `Credentials`. Click `Create Credentials` button. Click on `API Key`, and then `Server Key` in the new window that appears. Enter in a name for the `Server Key`. A new window will appear with your `Google API key`. 
+    - Copy the key.
+    - Open up `credentials.json`. 
+    - For `"GoogleAPIKey"`, fill in with the new key we copied.
+- Follow these steps on how to setup Soundcloud API key:
+    - Go to [Soundcloud][Soundcloud]. 
+    - Enter a name for the app and create it. 
+    - You will see a page with the title of your app, and a field labeled `Client ID`. Copy the ID. 
+    - In `credentials.json`, fill in `"SoundcloudClientID"` with the copied ID.
+- Restart your computer.
+
+####Manual `ffmpeg` setup 
+**Do this step in case you were not able to install `ffmpeg` with the installer.**
+
+- Create a folder named `ffmpeg` in your main Windows directory. We will use **C:\ffmpeg** (for our guide)
+- Download FFMPEG through the link https://ffmpeg.zeranoe.com/builds/ (download static build)
+- Extract it using `7zip` and place the folder `ffmpeg-xxxxx-git-xxxxx-xxxx-static` inside **C:\ffmpeg**
+- Before proceeding, check out this gif to set up `ffmpeg` PATH correctly http://i.imgur.com/aR5l1Hn.gif *(thanks to PooPeePants#7135)*
+- Go to My Computer, right click and select Properties. On the left tab, select Advanced System Settings. Under the Advanced tab, select Environmental Variables near the bottom. One of the variables should be called "Path". Add a semi-colon (;) to the end followed by your FFMPEG's **bin** install location (**for example C:\ffmpeg\ffmpeg-xxxxx-git-xxxxx-xxxx-static\bin**). Save and close.
+- Setup your API keys as explained above.
+- Restart your computer.
+
+[NET Framework]: https://www.microsoft.com/en-us/download/details.aspx?id=48130
+[FFMPEG]: https://github.com/Soundofdarkness/FFMPEG-Installer
+[7zip]: http://www.7-zip.org/download.html
+[Updater]: https://github.com/Kwoth/NadekoUpdater/releases
+[Releases]: https://github.com/Kwoth/NadekoBot/releases
+[DiscordApp]: https://discordapp.com/developers/applications/me
+[Notepad++]: https://notepad-plus-plus.org/
+[Invite Guide]: http://discord.kongslien.net/guide.html
+[Google Console]: https://console.developers.google.com
+[Soundcloud]: https://soundcloud.com/you/apps/new

docs/guides/mii-chan.md

@@ -0,0 +1,2 @@
+Docs are in the air.
+Kwoth is magic.

docs/index.md

@@ -0,0 +1,47 @@
+#NadekoBot Documentation
+
+To invite NadekoBot to your server, click on the image bellow:
+
+[![img][img]](https://discordapp.com/oauth2/authorize?client_id=170254782546575360&scope=bot&permissions=66186303)
+
+In case you need any help, hop on [NadekoBot Server][NadekoBot Server], where we can provide support.
+
+NadekoBot is an open source project, and it can be found on our [GitHub][GitHub] page.
+
+Here you can read current [Issues][Issues].
+
+If you want to contribute, be sure to PR on the **[dev][dev]** branch.
+##Content
+- [About](about.md)
+- Guides
+	- [Windows Guide](guides/Windows Guide.md)
+	- [Linux Guide](guides/Linux Guide.md)
+	- [OSX Guide](guides/OSX Guide.md)
+	- [Building from Source](guides/Building from Source.md)
+	- [Docker Guide](guides/Docker Guide.md)
+- Commands
+	- [Readme](Readme.md)
+	- [Commands List](Commands List.md)
+- [Permissions System](Permissions System.md)
+- [JSON Explanations](JSON Explanations.md)
+- [Custom Reactions](Custom Reactions.md)
+- [Frequently Asked Questions](Frequently Asked Questions.md)
+- [Contribution Guide](Contribution Guide.md)
+- [Donate](Donate.md)
+
+[img]: https://discordcdn.com/attachments/202743183774318593/210580315381563392/discord.png
+[NadekoBot Server]: https://discord.gg/0ehQwTK2RBjAxzEY
+[GitHub]: https://github.com/Kwoth/NadekoBot
+[Issues]: https://github.com/Kwoth/NadekoBot/issues
+[dev]: https://github.com/Kwoth/NadekoBot/tree/dev
+
+[Italian]: http://i.imgur.com/SsaTwOF.png?1
+[Russian]: http://i.imgur.com/wf9bc5G.png?1
+[German]: http://i.imgur.com/EM5qPzf.png?1
+[Chinese]: http://i.imgur.com/MVCNOjT.png?1
+[English]: http://i.imgur.com/jHTyZFS.png?1
+[Spanish]: http://i.imgur.com/9BsusB6.png?1
+[French]: http://i.imgur.com/g2ARPF6.png?1
+[Dutch]: http://i.imgur.com/SadddLj.png?1
+[Norwegian]: http://i.imgur.com/TCVa0V8.png?1
+[Serbian]: http://i.imgur.com/5evoUbU.png

docs/index.rst

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

mkdocs.yml

@@ -0,0 +1,22 @@
+site_name: NadekoBot
+repo_url: https://github.com/Kwoth/NadekoBot
+pages:
+- Home: index.md
+- About: about.md
+- Guides:
+    - Windows Guide: guides/Windows Guide.md
+    - Linux Guide: guides/Linux Guide.md
+    - OSX Guide: guides/OSX Guide.md
+    - Building from Source: guides/Building from Source.md
+    - Docker Guide: guides/Docker Guide.md
+- Commands:
+    - Readme: Readme.md
+    - Commands List: Commands List.md
+- Permissions System: Permissions System.md
+- JSON Explanations: JSON Explanations.md
+- Custom Reactions: Custom Reactions.md
+- Frequently Asked Questions: Frequently Asked Questions.md
+- Contribution Guide: Contribution Guide.md
+- ❤ Donate ❤: Donate.md
+
+theme: readthedocs