From cbaa0eb1b312c5848582d6366e77bd9310acb472 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 5 Aug 2016 04:45:28 +0200 Subject: [PATCH 1/5] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7f57978b..9806d403 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # NadekoBot ## [Click here to invite Nadeko to your Discord server](https://discordapp.com/oauth2/authorize?client_id=170254782546575360&scope=bot&permissions=66186303) -## [Click here for a list of commands](https://github.com/Kwoth/NadekoBot/blob/master/commandlist.md) -## INSTRUCTIONS, FAQ ---> [Wiki](https://github.com/Kwoth/NadekoBot/wiki) +## [Click here for a list of commands](http://nadekobot.readthedocs.io/en/latest/Commands%20List/) +## Instructions, FAQ, other info ---> [Documentation](http://nadekobot.readthedocs.io/en/latest) You might want to join my discord server where i can provide help etc. https://discord.gg/0ehQwTK2RBjAxzEY From 0f48077d50d2416c5d9f43cb003c21836ce9fab2 Mon Sep 17 00:00:00 2001 From: miraai Date: Thu, 11 Aug 2016 20:31:12 +0200 Subject: [PATCH 2/5] minor fixes --- docs/guides/Linux Guide.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/guides/Linux Guide.md b/docs/guides/Linux Guide.md index a388aab5..365ab6ee 100644 --- a/docs/guides/Linux Guide.md +++ b/docs/guides/Linux Guide.md @@ -202,7 +202,8 @@ 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.` +**^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` @@ -211,6 +212,10 @@ Type/ Copy and hit **Enter**. **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. From e3a53546bd15e30e2b9e110959198bc25320c72d Mon Sep 17 00:00:00 2001 From: Seregy Date: Thu, 11 Aug 2016 21:53:00 +0300 Subject: [PATCH 3/5] Invariant Culture for parsing in osu commands --- NadekoBot/Modules/Searches/Commands/OsuCommands.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/NadekoBot/Modules/Searches/Commands/OsuCommands.cs b/NadekoBot/Modules/Searches/Commands/OsuCommands.cs index 5907fc6c..6d95b72e 100644 --- a/NadekoBot/Modules/Searches/Commands/OsuCommands.cs +++ b/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; @@ -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 != "+") From 0460cbe23007c94142500cb03a1d5ee2fc471b21 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 12 Aug 2016 05:31:33 +0200 Subject: [PATCH 4/5] Updated widget due to discord api changes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9806d403..68c18bbe 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ![img](https://ci.appveyor.com/api/projects/status/gmu6b3ltc80hr3k9?svg=true) -[![Discord](https://discordapp.com/api/servers/117523346618318850/widget.png)](https://discord.gg/0ehQwTK2RBjAxzEY) +[![Discord](https://discordapp.com/api/guilds/117523346618318850/widget.png)](https://discord.gg/0ehQwTK2RBjAxzEY) [![Documentation Status](https://readthedocs.org/projects/nadekobot/badge/?version=latest)](http://nadekobot.readthedocs.io/en/latest/?badge=latest) # NadekoBot From 7c64ccb2afe168802f9db48f647a62d228880297 Mon Sep 17 00:00:00 2001 From: blitz4694 Date: Thu, 18 Aug 2016 07:33:48 +1000 Subject: [PATCH 5/5] Fixed a spelling mistake --- NadekoBot/Modules/Administration/AdministrationModule.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NadekoBot/Modules/Administration/AdministrationModule.cs b/NadekoBot/Modules/Administration/AdministrationModule.cs index 356f804f..24effe3a 100644 --- a/NadekoBot/Modules/Administration/AdministrationModule.cs +++ b/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.`"); });