From 4258583bef8207fe4a7eb0bd987f0d0024d31655 Mon Sep 17 00:00:00 2001 From: miraai Date: Fri, 12 Aug 2016 01:17:32 +0200 Subject: [PATCH 1/6] Update index.md --- docs/index.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index d1ed849b..49a402b7 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,5 +1,5 @@ #NadekoBot Documentation -[![English][English]](link) [![German][German]](link) [![Norwegian][Norwegian]](link) [![Chinese][Chinese]](link) [![Italian][Italian]](link) [![Spanish][Spanish]](link) [![French][French]](link) [![Dutch][Dutch]](link) [![Russian][Russian]](link) +[![English][English]](link) [![German][German]](link) [![Norwegian][Norwegian]](link) [![Chinese][Chinese]](link) [![Italian][Italian]](link) [![Spanish][Spanish]](link) [![French][French]](http://nadekobotfrance.readthedocs.io/fr/latest/) [![Dutch][Dutch]](link) [![Serbian][Serbian]](link) [![Russian][Russian]](link) To invite NadekoBot to your server, click on the image bellow: @@ -46,3 +46,4 @@ If you want to contribute, be sure to PR on the **[dev][dev]** branch. [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]: https://images-2.discordapp.net/.eJwFwVEOwiAMANC78C-VUibuNg0jbAmshNYv49197-s-q7vdnWZTd4Dj0iLr8GqyuFXfRFqvPC_1RQawGZdz1NsUwiunDVPAjJi3kJEAQyTMRPQmpEjxmUDrQwf37ufd3O8PJj4i4g.EJW-cekqknU54_wLTGLNySbM-IM.png From 16ef73be21ca29454c34e3f87556fbc496d453e6 Mon Sep 17 00:00:00 2001 From: miraai Date: Fri, 12 Aug 2016 01:18:41 +0200 Subject: [PATCH 2/6] Update index.md --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index 49a402b7..4d8a3fcf 100644 --- a/docs/index.md +++ b/docs/index.md @@ -46,4 +46,4 @@ If you want to contribute, be sure to PR on the **[dev][dev]** branch. [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]: https://images-2.discordapp.net/.eJwFwVEOwiAMANC78C-VUibuNg0jbAmshNYv49197-s-q7vdnWZTd4Dj0iLr8GqyuFXfRFqvPC_1RQawGZdz1NsUwiunDVPAjJi3kJEAQyTMRPQmpEjxmUDrQwf37ufd3O8PJj4i4g.EJW-cekqknU54_wLTGLNySbM-IM.png +[Serbian]: http://i.imgur.com/5evoUbU.png From 2f2b1a21819befff3386b08cd94af553c379fa52 Mon Sep 17 00:00:00 2001 From: miraai Date: Thu, 11 Aug 2016 20:31:12 +0200 Subject: [PATCH 3/6] 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 6502b971fb23af99e004069f8fc09c7e46a5d7ca Mon Sep 17 00:00:00 2001 From: Seregy Date: Thu, 11 Aug 2016 21:53:00 +0300 Subject: [PATCH 4/6] 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 e2b797c27c567094256a6d62402e952628620794 Mon Sep 17 00:00:00 2001 From: miraai Date: Sun, 14 Aug 2016 17:59:50 +0200 Subject: [PATCH 5/6] deleted flags until i find a solution for the size --- docs/index.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/index.md b/docs/index.md index 4d8a3fcf..e2ba4343 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,6 +1,4 @@ #NadekoBot Documentation -[![English][English]](link) [![German][German]](link) [![Norwegian][Norwegian]](link) [![Chinese][Chinese]](link) [![Italian][Italian]](link) [![Spanish][Spanish]](link) [![French][French]](http://nadekobotfrance.readthedocs.io/fr/latest/) [![Dutch][Dutch]](link) [![Serbian][Serbian]](link) [![Russian][Russian]](link) - To invite NadekoBot to your server, click on the image bellow: From 975079686c7f0edf91dfe38d41a31218b4b3dab8 Mon Sep 17 00:00:00 2001 From: miraai Date: Sun, 14 Aug 2016 18:00:47 +0200 Subject: [PATCH 6/6] Update Linux Guide.md --- docs/guides/Linux Guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guides/Linux Guide.md b/docs/guides/Linux Guide.md index 365ab6ee..cc2b2bdc 100644 --- a/docs/guides/Linux Guide.md +++ b/docs/guides/Linux Guide.md @@ -222,7 +222,7 @@ Copy your CLIENT ID (that's in the same Developer page where you brought your to **NOW YOU HAVE YOUR OWN NADEKO BOT** `Thanks to Kwoth <3` -####Some more Info (just in case): +####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.)