Merge remote-tracking branch 'upstream/1.9' into 1.9

ScarletKuro · Apr 20, 2020 · 6c979c8 · 6c979c8
2 parents 997b0de + 0a2f47b
commit 6c979c8
Show file tree

Hide file tree

Showing 24 changed files with 49 additions and 169 deletions.
diff --git a/.gitignore b/.gitignore
@@ -359,4 +359,5 @@ __pycache__/
 # tools/
 
 ### VisualStudio Patch ###
-build/
+build/
+site/
diff --git a/NadekoBot.Core/Modules/Searches/Searches.cs b/NadekoBot.Core/Modules/Searches/Searches.cs
@@ -347,7 +347,7 @@ public async Task Google([Leftover] string query = null)
                     {
                         var aTag = elem.QuerySelector("a") as IHtmlAnchorElement; // <h3> -> <a>
                         var href = aTag?.Href;
-                        var name = aTag?.Children.FirstOrDefault()?.TextContent;
+                        var name = aTag?.QuerySelector("h3")?.TextContent;
                         if (href == null || name == null)
                             return null;
 

diff --git a/docs/Commands List.md b/docs/Commands List.md
diff --git a/docs/Frequently Asked Questions.md b/docs/Frequently Asked Questions.md
diff --git a/docs/Bce Guide.md → docs/bce-guide.md b/docs/Bce Guide.md → docs/bce-guide.md
diff --git a/docs/cmds.json b/docs/cmds.json
@@ -1372,7 +1372,7 @@
         ".addcustreact",
         ".acr"
       ],
-      "Description": "Add a custom reaction with a trigger and a response. Running this command in server requires the Administration permission. Running this command in DM is Bot Owner only and adds a new global custom reaction. Guide here: <http://nadekobot.readthedocs.io/en/latest/Custom%20Reactions/>",
+      "Description": "Add a custom reaction with a trigger and a response. Running this command in server requires the Administration permission. Running this command in DM is Bot Owner only and adds a new global custom reaction. Guide here: <http://nadekobot.readthedocs.io/en/latest/custom-reactions/>",
       "Usage": [
         ".acr \"hello\" Hi there %user%"
       ],

diff --git a/docs/cmds_new.json b/docs/cmds_new.json
@@ -1761,7 +1761,7 @@
         ".addcustreact",
         ".acr"
       ],
-      "Description": "Add a custom reaction with a trigger and a response. Running this command in server requires the Administration permission. Running this command in DM is Bot Owner only and adds a new global custom reaction. Guide here: <http://nadekobot.readthedocs.io/en/latest/Custom%20Reactions/>",
+      "Description": "Add a custom reaction with a trigger and a response. Running this command in server requires the Administration permission. Running this command in DM is Bot Owner only and adds a new global custom reaction. Guide here: <http://nadekobot.readthedocs.io/en/latest/custom-reactions/>",
       "Usage": [
         ".acr \"hello\" Hi there %user%"
       ],

diff --git a/docs/Readme.md → docs/commands-readme.md b/docs/Readme.md → docs/commands-readme.md
diff --git a/docs/Contribution Guide.md → docs/contribution-guide.md b/docs/Contribution Guide.md → docs/contribution-guide.md
diff --git a/docs/Custom Reactions.md → docs/custom-reactions.md b/docs/Custom Reactions.md → docs/custom-reactions.md
@@ -41,4 +41,4 @@ Now if you try to trigger `/o/`, it won't print anything.
 
 ### Placeholders!
 
-To learn about placeholders, go [here](Placeholders.md)
+To learn about placeholders, go [here](placeholders.md)
diff --git a/docs/Donate.md → docs/donate.md b/docs/Donate.md → docs/donate.md
diff --git a/docs/guides/docker-guide.md b/docs/guides/docker-guide.md
@@ -0,0 +1,5 @@
+## Setting up NadekoBot with docker
+
+#### Hosting nadeko with docker is not officially supported until the next major version (3.0)
+##### If you've been previously hosting with docker, please move to one of the other hosting options
+##### You may ask for guidance on our [discord server](https://discord.nadeko.bot).
diff --git a/docs/guides/From Source.md → docs/guides/from-source.md b/docs/guides/From Source.md → docs/guides/from-source.md
@@ -23,7 +23,7 @@ This is the recommended way of installing Nadeko from source. If you don't want
 - Redis
     - Windows 64 bit: Download and install the [latest msi][Redis]. Don't forget to [add it to the path environment variable](https://i.imgur.com/uUby6Xw.png) during the installation process.
     - Windows 32 bit: Skip this step
-- [Create a Discord Bot application](http://nadekobot.readthedocs.io/en/latest/JSON%20Explanations/#creating-discord-bot-application) and [invite the bot to your server](http://nadekobot.readthedocs.io/en/latest/JSON%20Explanations/#inviting-your-bot-to-your-server).
+- [Create a Discord Bot application](../../jsons-explained/#creating-discord-bot-application) and [invite the bot to your server](../../jsons-explained/#inviting-your-bot-to-your-server).
 
 **Optional**
 
@@ -59,7 +59,7 @@ If you want Nadeko to play music, do the following:
 ```
 
 - Run Option `1` to download Nadeko (type 1 and press Enter). Once it's done, it should take you back to the main menu.
-- Run Option `4` to [set up your credentials](http://nadekobot.readthedocs.io/en/latest/JSON%20Explanations/). Paste the info as requested.
+- Run Option `4` to [set up your credentials](../../jsons-explained). Paste the info as requested.
     - **If your Windows is 32-bit**, run Option `14` now. Otherwise, ignore this step.
 - Nadeko should be ready to launch. Run Option `2` to test it out. If everything goes well, Nadeko should appear as online on your Discord server and respond to commands. Once you're done with testing, type **`.die`** to shut it down and return to the installer's main menu.
 
@@ -89,7 +89,7 @@ This is the *"hard"* way of installing Nadeko. If you're here, we are assuming y
 - Redis
     - Windows 64 bit: Download and install the [latest msi][Redis]. Don't forget to [add it to the path environment variable](https://i.imgur.com/uUby6Xw.png) during the installation process.
     - Windows 32 bit: Download [redis-server.exe](https://github.com/MaybeGoogle/NadekoFiles/blob/master/x86%20Prereqs/redis-server.exe?raw=true) and store it somewhere accessible.
-- [Create a Discord Bot application](http://nadekobot.readthedocs.io/en/latest/JSON%20Explanations/#creating-discord-bot-application) and [invite the bot to your server](http://nadekobot.readthedocs.io/en/latest/JSON%20Explanations/#inviting-your-bot-to-your-server).
+- [Create a Discord Bot application](../../jsons-explained/#creating-discord-bot-application) and [invite the bot to your server](../../jsons-explained/#inviting-your-bot-to-your-server).
 
 **Optional**
 If you want Nadeko to play music, do the following:
@@ -104,7 +104,7 @@ If you want Nadeko to play music, do the following:
 
 - Open command prompt (`cmd.exe`) and run the following command to download the source:
 - `git clone -b 1.9 https://gitlab.com/Kwoth/NadekoBot`
-- On Windows Explorer, go to `NadekoBot/src/NadekoBot` and edit the `credentials.json` file according to this [guide](http://nadekobot.readthedocs.io/en/latest/JSON%20Explanations/#setting-up-credentialsjson-file).
+- On Windows Explorer, go to `NadekoBot/src/NadekoBot` and edit the `credentials.json` file according to this [guide](../../jsons-explained/#setting-up-credentialsjson-file).
 - Add these 2 arguments to your credentials file:
 
 ```js
@@ -163,6 +163,5 @@ Other useful commands:
 [Git]: https://git-scm.com/downloads
 [Visual C++ 2010 (x86)]: https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x86.exe
 [Visual C++ 2017]: https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads
-[SourceGuide]: https://nadekobot.readthedocs.io/en/latest/guides/From%20Source/
 [ffmpeg]: https://ffmpeg.zeranoe.com/builds/
 [youtube-dl]: https://rg3.github.io/youtube-dl/download.html
diff --git a/docs/guides/Linux Guide.md → docs/guides/linux-guide.md b/docs/guides/Linux Guide.md → docs/guides/linux-guide.md
@@ -59,7 +59,7 @@ Once it finishes, the installer should automatically take you back to the main m
 #### Installing Nadeko
 
 - Choose Option `1` to get the **most updated build of NadekoBot**. When the installation is complete, you will see the options again.
-- If you haven't [set up your Discord bot application](http://nadekobot.readthedocs.io/en/latest/JSON%20Explanations/#creating-discord-bot-application) and [invited the bot to your server](http://nadekobot.readthedocs.io/en/latest/JSON%20Explanations/#inviting-your-bot-to-your-server) yet, do it now.
+- If you haven't [set up your Discord bot application](../../jsons-explained/#creating-discord-bot-application) and [invited the bot to your server](../../jsons-explained/#inviting-your-bot-to-your-server) yet, do it now.
     - Only the ClientID, Bot Token and OwnerID are required. Everything else is optional.
     - The Google API Key is required if you want Nadeko to play music.
 - Once you have acquired them, choose Option `5` to set up your credentials.
@@ -248,7 +248,7 @@ Assuming you have followed the link above to setup an account and a Droplet with
 
 - Download [PuTTY](http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html)
 - Download [WinSCP](https://winscp.net/eng/download.php) *(optional)*
-- [Create and invite the bot](http://nadekobot.readthedocs.io/en/latest/JSON%20Explanations/#creating-discord-bot-application).
+- [Create and invite the bot](../../jsons-explained/#creating-discord-bot-application).
 
 #### Starting up
 

diff --git a/docs/guides/OSX Guide.md → docs/guides/osx-guide.md b/docs/guides/OSX Guide.md → docs/guides/osx-guide.md
@@ -14,7 +14,7 @@
 
 - OSX 10.12 (Sierra) or higher (needed for .NET Core 2.x).
 - [Homebrew](http://brew.sh/). 
-- [Create a Discord Bot application](http://nadekobot.readthedocs.io/en/latest/JSON%20Explanations/#creating-discord-bot-application) and [invite the bot to your server](http://nadekobot.readthedocs.io/en/latest/JSON%20Explanations/#inviting-your-bot-to-your-server).  
+- [Create a Discord Bot application](../../jsons-explained/#creating-discord-bot-application) and [invite the bot to your server](../../jsons-explained/#inviting-your-bot-to-your-server).  
 
 #### Installing Homebrew
 
@@ -50,7 +50,7 @@ ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/
 - Use the following command to download and run the installer. (PS: **Do not** rename the **`linuxAIO.sh`** file)  
 `cd ~ && wget -N https://github.com/Kwoth/NadekoBot-BashScript/raw/1.9/linuxAIO.sh && bash linuxAIO.sh`  
 - Choose Option `1` to download Nadeko. Once installation is completed you should see the options again.  
-- Choose Option `5` to set up your credentials according to this [guide](http://nadekobot.readthedocs.io/en/latest/JSON%20Explanations/#setting-up-credentialsjson-file), or find and edit the `credentials.json` file manually.  
+- Choose Option `5` to set up your credentials according to this [guide](../../jsons-explained/#setting-up-credentialsjson-file), or find and edit the `credentials.json` file manually.  
 - Choose Option `2` to **Run Nadeko (Normally)**.  
 - Check in your Discord server if your new bot is working properly. Once you're done testing, type `.die` on Discord to shut it down. The Terminal should automatically return to the main menu.
 
@@ -147,7 +147,7 @@ Now check your Discord server, the bot should be online.
 
 #### Help! My music isn't working!
 
-Make sure you have the [Google API Key](http://nadekobot.readthedocs.io/en/latest/JSON%20Explanations/#setting-up-your-api-keys) in your `credentials.json`
+Make sure you have the [Google API Key](../../jsons-explained/#setting-up-your-api-keys) in your `credentials.json`
 If music still isn't working, try reinstalling ffmpeg:
 
 - `brew update && brew upgrade` (Update formulae and Homebrew itself && Install newer versions of outdated packages)

diff --git a/docs/guides/Windows Guide.md → docs/guides/windows-guide.md b/docs/guides/Windows Guide.md → docs/guides/windows-guide.md
@@ -17,7 +17,7 @@
 - Windows 8 or later (64-bit)
 - [dotNET Core 2.1 SDK][dotNET] (restart Windows after installation)
 - [Redis][Redis] (supplied with the updater)
-- [Create a Discord Bot application](http://nadekobot.readthedocs.io/en/latest/JSON%20Explanations/#creating-discord-bot-application) and [invite the bot to your server](http://nadekobot.readthedocs.io/en/latest/JSON%20Explanations/#inviting-your-bot-to-your-server).
+- [Create a Discord Bot application](../../jsons-explained#creating-discord-bot-application) and [invite the bot to your server](../../jsons-explained/#inviting-your-bot-to-your-server).
 
 **Optional**
 
@@ -37,7 +37,7 @@
 
 *If you happen to close the wizard with that option unchecked, you can easily find the credentials file in `C:\Program Files\NadekoBot\system`.*
 
-- [Set up the credentials.json](http://nadekobot.readthedocs.io/en/latest/JSON%20Explanations/#setting-up-credentialsjson-file) file.
+- [Set up the credentials.json](../../jsons-explained) file.
 
 #### Starting the bot
 
@@ -67,6 +67,6 @@ You can still install them manually:
 [Redis]: https://github.com/MicrosoftArchive/redis/releases/download/win-3.0.504/Redis-x64-3.0.504.msi
 [Visual C++ 2010 (x86)]: https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x86.exe
 [Visual C++ 2017 (x64)]: https://aka.ms/vs/15/release/vc_redist.x64.exe
-[SourceGuide]: https://nadekobot.readthedocs.io/en/latest/guides/From%20Source/
+[SourceGuide]: ../guides/from-source
 [ffmpeg]: https://ffmpeg.zeranoe.com/builds/
 [youtube-dl]: https://rg3.github.io/youtube-dl/download.html
diff --git a/docs/index.md b/docs/index.md
@@ -10,29 +10,6 @@ NadekoBot is an open source project, and it can be found on our [GitLab][GitLab]
 
 Here you can read current [Issues][Issues].
 
-If you want to contribute, be sure to PR on the current **[default][repo]** branch.
-
-## Content
-
-- [About](about.md)
-- Guides
-    - [Windows Guide](guides/Windows Guide.md)
-    - [Linux Guide](guides/Linux Guide.md)
-    - [OSX Guide](guides/OSX Guide.md)
-    - [From Source](guides/From Source.md)
-- Commands
-    - [Readme](Readme.md)
-    - [Commands List][cmd_list]
-- Features Explained
-    - [Permissions System](Permissions System.md)
-    - [JSON Explanations](JSON Explanations.md)
-    - [Custom Reactions](Custom Reactions.md)
-    - [Placeholders](Placeholders.md)
-    - [Bot Config](Bce Guide.md)
-- [Frequently Asked Questions](Frequently Asked Questions.md)
-- [Contribution Guide](Contribution Guide.md)
-- [Donate](Donate.md)
-
 [img]: https://cdn.discordapp.com/attachments/202743183774318593/210580315381563392/discord.png
 [NadekoBot Server]: https://discord.nadeko.bot/
 [GitLab]: https://gitlab.com/Kwoth/nadekobot

diff --git a/docs/JSON Explanations.md → docs/jsons-explained.md b/docs/JSON Explanations.md → docs/jsons-explained.md
@@ -120,9 +120,6 @@ It should look like this:
     - Required for Urban Disctionary, Hashtag search, and Hearthstone cards.
     - You need to create an account on their [api marketplace](https://market.mashape.com/), after that go to `market.mashape.com/YOURNAMEHERE/applications/default-application` and press **Get the keys** in the top right corner.
     - Copy the key and paste it into `credentials.json`
-- **LoLApiKey**
-    - Required for all League of Legends commands.
-    - You can get this key [here](http://api.champion.gg/).
 - **OsuApiKey**
     - Required for Osu commands
     - You can get this key [here](https://osu.ppy.sh/p/api).

diff --git a/docs/about.md → docs/license.md b/docs/about.md → docs/license.md
@@ -1,4 +1,4 @@
-Copyright 2019 Kwoth
+Copyright 2020 Kwoth
 
 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:
-Original file line number
+Diff line change
@@ Expand Up / @@ -359,4 +359,5 @@ __pycache__/ @@
     # tools/
     ### VisualStudio Patch ###
-    build/
+    build/
+    site/
Original file line number	Diff line number	Diff line change
Expand Up		@@ -41,4 +41,4 @@ Now if you try to trigger `/o/`, it won't print anything.

		### Placeholders!

		To learn about placeholders, go [here](Placeholders.md)
		To learn about placeholders, go [here](placeholders.md)