Merge pull request #1189 from Kwoth/dev

Removed a bad joke

docs/Commands List.md

@@ -274,7 +274,6 @@ Commands and aliases | Description | Usage
 `~rule34` | Shows a random image from rule34.xx with a given tag. Tag is optional but preferred. (multiple tags are appended with +)  | `~rule34 yuri+kissing`
 `~danbooru` | Shows a random hentai image from danbooru with a given tag. Tag is optional but preferred. (multiple tags are appended with +)  | `~danbooru yuri+kissing`
 `~gelbooru` | Shows a random hentai image from gelbooru with a given tag. Tag is optional but preferred. (multiple tags are appended with +)  | `~gelbooru 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`
 

docs/guides/Linux Guide.md

@@ -38,7 +38,7 @@ If you entered your Droplets IP address correctly, it should show **login as:**
 - The bot should have been added to your server.
 
 #### Getting NadekoBot
-#####Part I
+##### Part I - Downloading the installer
 Use the following command to get and run `linuxAIO.sh`		
 (Remember **Do Not** rename the file **linuxAIO.sh**)
 
@@ -55,7 +55,8 @@ You should see these following options after using the above command:
 6. Set up credentials.json (if you have downloaded the bot already)
 7. To exit
 ```
-#####Part II (Optional)
+##### Part II - Downloading Nadekobot prerequisites
+
 **If** you are running NadekoBot for the first time on your system and never had any *prerequisites* installed and have Ubuntu, Debian or CentOS, Press `5` and `enter` key, then `y` when you see the following:
 ```
 Welcome to NadekoBot Auto Prerequisites Installer.
@@ -63,10 +64,11 @@ Would you like to continue?
 ```
 That will install all the prerequisites your system need to run NadekoBot.
 
-If you prefer to install them [manually](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#installing-manually-optional), click on the link. *(Optional)*
+(Optional) **If** you want to install it manually, you can try finding it [here](https://github.com/Kwoth/NadekoBot-BashScript/blob/master/nadekoautoinstaller.sh)
 
-Once *prerequisites* finish installing.
+Once *prerequisites* finish installing,
-#####Part III
+
+##### Part III - Installing Nadeko
 Choose either 
 `1` to get the **most updated build of NadekoBot** 
 or 
@@ -76,8 +78,7 @@ and then press `enter` key.
 Once Installation is completed you should see the options again.
 
 Next, check out:
-#####Part IV (Optional)
+##### Part IV - Setting up credentials
-If you prefer to skip this step and want to do it [manually](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#setting-up-sftp) or already have the `credentials.json` file, click on the link. *(Optional)*
 
 - [1. Setting up credentials.json](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#setting-up-credentialsjson)
 - [2. To Get the Google API](http://nadekobot.readthedocs.io/en/latest/guides/Windows%20Guide/#setting-up-nadekobot-for-music)
@@ -102,11 +103,11 @@ You will be asked to enter the required informations, just follow the on-screen
 
 (If you want to skip any optional infos, just press `enter` key without typing/pasting anything.)		
 Once done,		
-#####Part V
+##### Part V - Checking if Nadeko is working
 You should see the options again.	
-Next, press `3` to **Run Nadeko (Normally)**	
+Next, press `3` to **Run Nadeko (Normally)**.
 Check in your discord server if your new bot is working properly.	
-#####Part VI
+##### Part VI - Running Nadeko on tmux
 If your bot is working properly in your server, type `.die` to **shut down the bot**, then press `7` to **exit**.
 Next, [Run your bot again with **tmux**.](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#running-nadekobot)	
 
@@ -147,7 +148,7 @@ See how that happens:
 
 **Now check your Discord, the bot should be online**
 
-Next to **move the bot to background** and to do that, press **CTRL+B+D** (that will detach the nadeko session using TMUX) and you can finally close **PuTTY** if you want.
+Next to **move the bot to background** and to do that, press **CTRL+B, release, D** (that will detach the nadeko session using TMUX) and you can finally close **PuTTY** if you want.
 
 #### Restarting Nadeko
 
@@ -177,128 +178,19 @@ Open **PuTTY** and login as you have before, type `reboot` and hit Enter.
 - Choose either `3` or `4` to run the bot again with **normally** or **auto restart** respectively.
 - Done. You can close **PuTTY** now.
 
-####Installing Manually (Optional)
+#### Setting up Music
 
-#####Installing Git
+To set up Nadeko for music and Google API Keys, follow [Setting up NadekoBot for Music](http://nadekobot.readthedocs.io/en/latest/guides/Windows%20Guide/#setting-up-nadekobot-for-music)
 
-![img1](https://cdn.discordapp.com/attachments/251504306010849280/251504416019054592/git.gif)
+Once done, go back to **PuTTY**
 
-Ubuntu: 
+#### Some more Info
 
-`sudo apt-get install git -y`
+##### Info about tmux
 
-CentOS: 
+- 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.)
-`yum -y install git`
+- If you want to **kill** NadekoBot **session**, type `tmux kill-session -t nadeko`
-
-**NOTE:** If the command is not being initiated, hit **Enter**
-
-#####Installing .NET Core SDK
-
-![img2](https://cdn.discordapp.com/attachments/251504306010849280/251504746987388938/dotnet.gif)
-
-Go to [this link](https://www.microsoft.com/net/core#ubuntu) (for Ubuntu) or to [this link](https://www.microsoft.com/net/core#linuxcentos) (for CentOS) provided by microsoft for instructions on how to get the most up to date version of the dotnet core sdk!  
-Make sure that you're on the correct page for your distribution of linux as the guides are different for the various distributions.		
-Install the **currently supported version** `1.0.0-preview2-1-003177`.		
-You can find it [here](https://github.com/dotnet/core/blob/master/release-notes/download-archives/1.1-preview2.1-download.md) if you prefer manual installing `dpkg` files.
-
-We'll go over the steps here for few linux distributions, accurate as of March 08, 2017:
-**NOTE:** .NET CORE SDK only supports 64-bit Linux Operating Systems (Raspberry Pis are not supported because of this)
-
-**Ubuntu x64 17.04 & 16.10**
-```sh
-sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ yakkety main" > /etc/apt/sources.list.d/dotnetdev.list'
-sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893
-sudo apt-get update && sudo apt-get install dotnet-dev-1.0.0-preview2.1-003177 -y
-```
-
-**Ubuntu x64 16.04**
-```sh
-sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ xenial main" > /etc/apt/sources.list.d/dotnetdev.list'
-sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893
-sudo apt-get update && sudo apt-get install dotnet-dev-1.0.0-preview2.1-003177 -y
-```
-
-**Ubuntu x64 14.04**
-```sh
-sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list'
-sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893
-sudo apt-get update && sudo apt-get install dotnet-dev-1.0.0-preview2.1-003177 -y
-```
-
-**Debian 8 x64**
-```sh
-sudo apt-get install curl libunwind8 gettext -y
-curl -sSL -o dotnet.tar.gz https://go.microsoft.com/fwlink/?LinkID=835021
-sudo mkdir -p /opt/dotnet && sudo tar zxf dotnet.tar.gz -C /opt/dotnet
-sudo ln -s /opt/dotnet/dotnet /usr/local/bin
-```
-
-**CentOS 7 x64**
-```sh
-sudo yum install libunwind libicu -y
-curl -sSL -o dotnet.tar.gz https://go.microsoft.com/fwlink/?LinkID=835019
-sudo mkdir -p /opt/dotnet && sudo tar zxf dotnet.tar.gz -C /opt/dotnet
-sudo ln -s /opt/dotnet/dotnet /usr/local/bin
-```
-
-#####Installing Opus Voice Codec and libsodium
-
-![img3](https://cdn.discordapp.com/attachments/251504306010849280/251505294654308353/libopus.gif)
-
-Ubuntu: 
-
-`sudo apt-get install libopus0 opus-tools libopus-dev libsodium-dev -y`
-
-CentOS: 
-
-`yum -y install opus opus-devel`
-
-#####Installing FFMPEG
-
-![img4](https://cdn.discordapp.com/attachments/251504306010849280/251505443111829505/ffmpeg.gif)
-
-Ubuntu:
-
-`apt-get install ffmpeg -y`
-
-Centos: 
-
-```sh
-yum -y install http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm epel-release
-yum -y install ffmpeg
-```
-
-**NOTE:** If you are running **UBUNTU 14.04**, you must run these first:
-
-```sh
-sudo add-apt-repository ppa:mc3man/trusty-media
-sudo apt-get update
-sudo apt-get dist-upgrade
-```
-
-**Before executing:** `sudo apt-get install ffmpeg`
-
-
-**NOTE:** If you are running **Debian 8 Jessie**, please, follow these steps:
-
-```sh
-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
-```
-
-#####Installing TMUX
-
-![img5](https://cdn.discordapp.com/attachments/251504306010849280/251505519758409728/tmux.gif)
-
-Ubuntu: 
-
-`sudo apt-get install tmux -y`
-
-Centos: 
-
-`yum -y install tmux`
 
 #### Guide for Advance Users (Optional)
 
@@ -338,39 +230,5 @@ Centos:
 - **If** you already have Nadeko 1.0 setup and have `credentials.json` and `NadekoBot.db`, you can just copy and paste the `credentials.json` to `NadekoBot/src/NadekoBot` and `NadekoBot.db` to `NadekoBot/src/NadekoBot/bin/Release/netcoreapp1.0/data` using WinSCP.
 - **If** you have Nadeko 0.9x follow the [Upgrading Guide](http://nadekobot.readthedocs.io/en/latest/guides/Upgrading%20Guide/)
 
-####Setting up Music
 
-To set up Nadeko for music and Google API Keys, follow [Setting up NadekoBot for Music](http://nadekobot.readthedocs.io/en/latest/guides/Windows%20Guide/#setting-up-nadekobot-for-music)
-
-Once done, go back to **PuTTY**
-
-####Some more Info
-
-#####Info about tmux
-
-- 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`
-
-#####Alternative way to Install
-
-If the [Nadeko installer](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#getting-nadekobot) shows any kind error, check if you have the `linuxAIO.sh` file and make sure its not renamed or if you want to manually install the bot. Use the following command(s):
-
-![img6](https://cdn.discordapp.com/attachments/251504306010849280/251505587089571850/getting_nadeko.gif)
-
-`cd ~ && curl -L https://github.com/Kwoth/NadekoBot-BashScript/raw/master/nadeko_installer.sh | sh`
-
-**OR**
-
-```sh
-cd ~ && git clone -b dev --recursive --depth 1 https://github.com/Kwoth/NadekoBot.git
-cd ~/NadekoBot/discord.net/src/Discord.Net && dotnet restore && cd ../Discord.Net.Commands && dotnet restore && cd ../../../src/NadekoBot/ && dotnet restore && dotnet build --configuration Release
-```
-  
-If you are getting error using the above steps try:
-
-```sh
-cd ~/NadekoBot/discord.net && dotnet restore -s https://dotnet.myget.org/F/dotnet-core/api/v3/index.json && dotnet restore
-cd ~/NadekoBot/src/NadekoBot/ && dotnet restore && dotnet build --configuration Release
-```
 [img7]: https://cdn.discordapp.com/attachments/251504306010849280/251505766370902016/setting_up_credentials.gif

docs/guides/OSX Guide.md

@@ -14,6 +14,7 @@ Run `brew update` to fetch the latest package data.
 
 #### Installing dependencies
 ```
+brew install wget
 brew install git
 brew install ffmpeg
 brew update && brew upgrade ffmpeg

docs/guides/Windows Guide.md

@@ -24,6 +24,7 @@ ________________________________________________________________________________
 - Wait a while for the file to finish installing, it'll display it's progress in the command prompt.
 - You should now have a new folder named `NadekoBot` inside the `Nadeko` folder we previously created.
 - Once Installation is completed, press any key to close the command prompt.
+![img1](http://i.imgur.com/O1dY9eW.gif)
 
 #### Creating DiscordBot application
 - Go to [the Discord developer application page][DiscordApp].
@@ -33,6 +34,7 @@ ________________________________________________________________________________
 - Create the application.
 - Click on `Create a Bot User` and confirm that you do want to add a bot to this app.
 - Keep this window open for now.
+![img2](http://i.imgur.com/x3jWudH.gif)
 
 #### Setting up credentials.json file
 - In our `NadekoBot` folder you should see a `src` folder, then *another* `NadekoBot` folder, in this final folder, you should see a `.json` file named `credentials.json`. (Note: If you do not see a `.json` after `credentials.json`, do not add the `.json`. You most likely have **"Hide file extensions"** enabled.)
@@ -48,6 +50,7 @@ ________________________________________________________________________________
 - The message will appear as a mention if done correctly, copy the numbers from the message you sent (`145521851676884992`) and replace the ID (By default, the ID is `105635576866156544`) on the `OwnerIds` section with your user ID shown earlier.
 - Save `credentials.json` (make sure you aren't saving it as `credentials.json.txt`)
 - If done correctly, you are now the bot owner. You can add multiple owners by seperating each owner ID with a comma within the square brackets.
+![img3](http://i.imgur.com/QwKMnTG.gif)
 
 #### Inviting your bot to your server 
 - [Invite Guide][Invite Guide]
@@ -56,6 +59,7 @@ ________________________________________________________________________________
 - The link should now look like this: `https://discordapp.com/oauth2/authorize?client_id=**YOUR_CLENT_ID_HERE**&scope=bot&permissions=66186303`.
 - Go to the newly created link and pick the server we created, and click `Authorize`.
 - The bot should have been added to your server.
+![img4](http://i.imgur.com/aFK7InR.gif)
 
 #### Starting the bot
 - Go to the `Nadeko` folder that we have created earlier, and run the `NadekoInstaller.bat` file as Administrator.

src/NadekoBot/Modules/NSFW/NSFW.cs

@@ -212,12 +212,6 @@ namespace NadekoBot.Modules.NSFW
         public Task Gelbooru([Remainder] string tag = null)
             => InternalDapiCommand(tag, Searches.Searches.DapiSearchType.Gelbooru);
 
-        [NadekoCommand, Usage, Description, Aliases]
-        public async Task Cp()
-        {
-            await Context.Channel.SendMessageAsync("http://i.imgur.com/MZkY1md.jpg").ConfigureAwait(false);
-        }
-
         [NadekoCommand, Usage, Description, Aliases]
         public async Task Boobs()
         {

src/NadekoBot/Resources/ResponseStrings.Designer.cs

@@ -944,7 +944,7 @@ namespace NadekoBot.Resources {
         }
         
         /// <summary>
-        ///    Looks up a localized string similar to You are not in voice channel on this server..
+        ///    Looks up a localized string similar to You are not in a voice channel on this server..
         /// </summary>
         public static string administration_not_in_voice {
             get {

src/NadekoBot/Resources/ResponseStrings.resx

@@ -2441,7 +2441,7 @@ Owner ID: {2}</value>
     <value>{0} is a Game Voice Channel now.</value>
   </data>
   <data name="administration_not_in_voice" xml:space="preserve">
-    <value>You are not in voice channel on this server.</value>
+    <value>You are not in a voice channel on this server.</value>
   </data>
   <data name="gambling_item" xml:space="preserve">
     <value>Item</value>