Merge branch 'dev' into 1.4
This commit is contained in:
Master Kwoth
commit
f5523c8469
@ -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`
|
||||
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
##Setting up NadekoBot on Linux
|
||||
## Setting up NadekoBot on Linux
|
||||
|
||||
####Setting up NadekoBot on Linux Digital Ocean Droplet
|
||||
#### 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](http://m.do.co/c/46b4d3d44795/) (and using this link will be supporting Nadeko and will give you **$10 credit**)
|
||||
|
||||
####Setting up NadekoBot
|
||||
#### Setting up NadekoBot
|
||||
Assuming you have followed the link above to setup an account and Droplet with 64bit OS in Digital Ocean and got the `IP address and root password (in email)` to login, its time to get started.
|
||||
|
||||
**Go through this whole guide before setting up Nadeko**
|
||||
|
||||
####Prerequisites
|
||||
#### Prerequisites
|
||||
- Download [PuTTY](http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html)
|
||||
- Download [WinSCP](https://winscp.net/eng/download.php) *(optional)*
|
||||
|
||||
####Starting up
|
||||
#### Starting up
|
||||
|
||||
- **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.
|
||||
@ -24,7 +24,7 @@ If you entered your Droplets IP address correctly, it should show **login as:**
|
||||
|
||||
**NOTE:** Copy the commands, and just paste them using **mouse single right-click.**
|
||||
|
||||
####Creating and Inviting bot
|
||||
#### Creating and Inviting bot
|
||||
|
||||
- Read here how to [create a DiscordBot application](http://nadekobot.readthedocs.io/en/latest/guides/Windows%20Guide/#creating-discordbot-application)
|
||||
- [Visual Invite Guide](http://discord.kongslien.net/guide.html) **(Note: Client ID is your Bot ID)**
|
||||
@ -37,8 +37,8 @@ If you entered your Droplets IP address correctly, it should show **login as:**
|
||||
- Go to the newly created link and pick the server we created, and click `Authorize`
|
||||
- The bot should have been added to your server.
|
||||
|
||||
####Getting NadekoBot
|
||||
#####Part I
|
||||
#### Getting NadekoBot
|
||||
##### 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.
|
||||
#####Part III
|
||||
Once *prerequisites* finish installing,
|
||||
|
||||
##### 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)
|
||||
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)*
|
||||
##### Part IV - Setting up credentials
|
||||
|
||||
- [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,17 +103,17 @@ 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)
|
||||
|
||||
[Check this when you need to **restart** your **NadekoBot** anytime later along with tmux session.](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#restarting-nadeko)
|
||||
|
||||
####Running NadekoBot
|
||||
#### Running NadekoBot
|
||||
|
||||
**Create a new Session:**
|
||||
|
||||
@ -147,9 +148,9 @@ 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
|
||||
#### Restarting Nadeko
|
||||
|
||||
**Restarting NadekoBot:**
|
||||
|
||||
@ -166,7 +167,7 @@ Open **PuTTY** and login as you have before, type `reboot` and hit Enter.
|
||||
- `tmux kill-session -t nadeko` (don't forget to replace "nadeko" to what ever you named your bot's session)
|
||||
- [Run the bot again.](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#running-nadekobot)
|
||||
|
||||
####Updating Nadeko
|
||||
#### Updating Nadeko
|
||||
|
||||
- Connect to the terminal through **PuTTY**.
|
||||
- `tmux kill-session -t nadeko` (don't forget to replace **nadeko** in the command with the name of your bot's session)
|
||||
@ -177,130 +178,21 @@ 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)
|
||||
|
||||
|
||||
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.)
|
||||
- If you want to **kill** NadekoBot **session**, type `tmux kill-session -t nadeko`
|
||||
|
||||
`yum -y install git`
|
||||
|
||||
**NOTE:** If the command is not being initiated, hit **Enter**
|
||||
|
||||
#####Installing .NET Core SDK
|
||||
|
||||
|
||||
|
||||
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
|
||||
|
||||
|
||||
|
||||
Ubuntu:
|
||||
|
||||
`sudo apt-get install libopus0 opus-tools libopus-dev libsodium-dev -y`
|
||||
|
||||
CentOS:
|
||||
|
||||
`yum -y install opus opus-devel`
|
||||
|
||||
#####Installing FFMPEG
|
||||
|
||||
|
||||
|
||||
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
|
||||
|
||||
|
||||
|
||||
Ubuntu:
|
||||
|
||||
`sudo apt-get install tmux -y`
|
||||
|
||||
Centos:
|
||||
|
||||
`yum -y install tmux`
|
||||
|
||||
####Guide for Advance Users (Optional)
|
||||
#### Guide for Advance Users (Optional)
|
||||
|
||||
**Skip this step if you are a Regular User or New to Linux.**
|
||||
|
||||
@ -317,7 +209,7 @@ Centos:
|
||||
- It will then ask "File Name to Write" (rename), just hit `Enter` and Done.
|
||||
- You can now move to [Running NadekoBot](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#running-nadekobot)
|
||||
|
||||
####Setting up SFTP
|
||||
#### Setting up SFTP
|
||||
|
||||
- Open **WinSCP**
|
||||
- Click on **New Site** (top-left corner).
|
||||
@ -330,7 +222,7 @@ Centos:
|
||||
- It should show you the NadekoBot folder which was created by git earlier on the right-hand side window.
|
||||
- Open that folder, then open the `src` folder, followed by another `NadekoBot` folder and you should see `credentials.json` there.
|
||||
|
||||
####Setting up credentials.json
|
||||
#### Setting up credentials.json
|
||||
|
||||
- Copy the `credentials.json` to desktop
|
||||
- EDIT it as it is guided here: [Setting up credentials.json](http://nadekobot.readthedocs.io/en/latest/guides/Windows%20Guide/#setting-up-credentialsjson-file)
|
||||
@ -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):
|
||||
|
||||
|
||||
|
||||
`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
|
||||
|
||||
@ -6,14 +6,15 @@
|
||||
- Soundcloud Account (if you want soundcloud support)
|
||||
- Text Editor (TextWrangler, or equivalent) or outside editor such as [Atom][Atom]
|
||||
|
||||
####Installing Homebrew
|
||||
#### 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
|
||||
#### Installing dependencies
|
||||
```
|
||||
brew install wget
|
||||
brew install git
|
||||
brew install ffmpeg
|
||||
brew update && brew upgrade ffmpeg
|
||||
@ -26,7 +27,7 @@ brew install libsodium
|
||||
brew install tmux
|
||||
```
|
||||
|
||||
####Installing .NET Core SDK
|
||||
#### Installing .NET Core SDK
|
||||
|
||||
- `ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/`
|
||||
- `ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/`
|
||||
@ -34,7 +35,7 @@ brew install tmux
|
||||
- Open the `.pkg` file you downloaded and install it.
|
||||
- `ln -s /usr/local/share/dotnet/dotnet /usr/local/bin`
|
||||
|
||||
####Check your `FFMPEG`
|
||||
#### Check your `FFMPEG`
|
||||
|
||||
**In case your `FFMPEG` wasnt installed properly (Optional)**
|
||||
|
||||
@ -45,7 +46,7 @@ brew install tmux
|
||||
- `brew doctor` (Check your Homebrew installation for common issues)
|
||||
- Then try `brew install ffmpeg` again.
|
||||
|
||||
####Installing xcode-select
|
||||
#### Installing xcode-select
|
||||
|
||||
Xcode command line tools. You will do this in Terminal.app by running the following command line:
|
||||
|
||||
@ -53,7 +54,7 @@ Xcode command line tools. You will do this in Terminal.app by running the follow
|
||||
|
||||
A dialog box will open asking if you want to install `xcode-select`. Select install and finish the installation.
|
||||
|
||||
####Downloading and building Nadeko
|
||||
#### Downloading and building Nadeko
|
||||
|
||||
Use the following command to get and run `linuxAIO.sh`:
|
||||
(Remember **DO NOT** rename the file `linuxAIO.sh`)
|
||||
@ -69,7 +70,7 @@ Choose either `1` or `2` then press `enter` key.
|
||||
Once Installation is completed you should see the options again.
|
||||
Next, choose `5` to exit.
|
||||
|
||||
####Creating and Inviting bot
|
||||
#### Creating and Inviting bot
|
||||
|
||||
- Read here how to [create a DiscordBot application](http://nadekobot.readthedocs.io/en/latest/guides/Windows%20Guide/#creating-discordbot-application)
|
||||
- [Visual Invite Guide](http://discord.kongslien.net/guide.html) *NOTE: Client ID is your Bot ID*
|
||||
@ -79,17 +80,17 @@ Next, choose `5` to exit.
|
||||
- Go to the newly created link and pick the server we created, and click `Authorize`.
|
||||
- The bot should have been added to your server.
|
||||
|
||||
####Setting up Credentials.json file
|
||||
#### Setting up Credentials.json file
|
||||
- Open up the `NadekoBot` folder, which should be in your home directory, then `NadekoBot` folder then `src` folder and then the additonal `NadekoBot` folder.
|
||||
- EDIT it as it is guided here: [Setting up credentials.json](http://nadekobot.readthedocs.io/en/latest/guides/Windows%20Guide/#setting-up-credentialsjson-file)
|
||||
- **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`.
|
||||
- **If** you have Nadeko 0.9x follow the [Upgrading Guide](http://nadekobot.readthedocs.io/en/latest/guides/Upgrading%20Guide/)
|
||||
|
||||
####Setting NadekoBot Music
|
||||
#### Setting NadekoBot Music
|
||||
|
||||
For Music Setup and API keys check [Setting up NadekoBot for Music](http://nadekobot.readthedocs.io/en/latest/guides/Windows%20Guide/#setting-up-nadekobot-for-music) and [JSON Explanations](http://nadekobot.readthedocs.io/en/latest/JSON%20Explanations/).
|
||||
|
||||
####Running NadekoBot
|
||||
#### Running NadekoBot
|
||||
|
||||
- Using tmux
|
||||
|
||||
@ -123,7 +124,7 @@ Choose `4` To Run the bot with Auto Restart.
|
||||
Now time to move bot to background and to do that, press CTRL+B+D (this will detach the nadeko session using TMUX)
|
||||
If you used Screen press CTRL+A+D (this will detach the nadeko screen)
|
||||
|
||||
####Updating Nadeko
|
||||
#### Updating Nadeko
|
||||
|
||||
- Connect to the terminal.
|
||||
- `tmux kill-session -t nadeko` [(don't forget to replace **nadeko** in the command to what ever you named your bot's session)](http://nadekobot.readthedocs.io/en/latest/guides/OSX%20Guide/#some-more-info)
|
||||
@ -134,7 +135,7 @@ If you used Screen press CTRL+A+D (this will detach the nadeko screen)
|
||||
- Choose either `3` or `4` to run the bot again with **normally** or **auto restart** respectively.
|
||||
- Done. You can close terminal now.
|
||||
|
||||
####Some more Info
|
||||
#### Some more Info
|
||||
|
||||
**TMUX**
|
||||
|
||||
@ -148,7 +149,7 @@ If you used Screen press CTRL+A+D (this will detach the nadeko screen)
|
||||
- If you want to switch to/ see that screen, type `screen -r nadeko` (nadeko is the name of the screen we created before so, replace `nadeko` with the screen name you created.)
|
||||
- If you want to kill the NadekoBot screen, type `screen -X -S nadeko quit`
|
||||
|
||||
####Alternative Method to Install Nadeko
|
||||
#### Alternative Method to Install Nadeko
|
||||
|
||||
**METHOD I**
|
||||
|
||||
|
||||
@ -13,7 +13,7 @@ ________________________________________________________________________________
|
||||
- 6) [Notepad++][Notepad++]
|
||||
- 7) Windows 8 or later
|
||||
|
||||
####Guide
|
||||
#### Guide
|
||||
- Make sure you have installed both [Git][Git] and the [.NET Core SDK][.NET Core SDK].
|
||||
- Create a **new folder** anywhere you like and name it `Nadeko`.
|
||||
- Next, [Right-Click on this link](https://github.com/Kwoth/NadekoBotInstallerWin/raw/master/NadekoInstaller.bat) and select **Save link as** and save the file `NadekoInstaller.bat` inside the `Nadeko` folder that we created earlier. (Please **DO NOT** rename the file `NadekoInstaller.bat`.)
|
||||
@ -24,8 +24,9 @@ ________________________________________________________________________________
|
||||
- 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.
|
||||
|
||||
|
||||
####Creating DiscordBot application
|
||||
#### Creating DiscordBot application
|
||||
- Go to [the Discord developer application page][DiscordApp].
|
||||
- Log in with your Discord account.
|
||||
- On the left side, press `New Application`.
|
||||
@ -33,8 +34,9 @@ ________________________________________________________________________________
|
||||
- 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.
|
||||
|
||||
|
||||
####Setting up credentials.json file
|
||||
#### 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.)
|
||||
- If you mess up the setup of `credentials.json`, rename `credentials_example.json` to `credentials.json`.
|
||||
- Open the file with [Notepad++][Notepad++].
|
||||
@ -48,16 +50,18 @@ ________________________________________________________________________________
|
||||
- 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.
|
||||
|
||||
|
||||
####Inviting your bot to your server
|
||||
#### Inviting your bot to your server
|
||||
- [Invite Guide][Invite Guide]
|
||||
- Copy your `Client ID` from your [applications page][DiscordApp].
|
||||
- Replace the `12345678` in this link `https://discordapp.com/oauth2/authorize?client_id=12345678&scope=bot&permissions=66186303` with your `Client ID`.
|
||||
- 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.
|
||||
|
||||
|
||||
####Starting the bot
|
||||
#### Starting the bot
|
||||
- Go to the `Nadeko` folder that we have created earlier, and run the `NadekoInstaller.bat` file as Administrator.
|
||||
- From the options,
|
||||
- Choose `3` to **run the bot normally**.
|
||||
@ -65,7 +69,7 @@ ________________________________________________________________________________
|
||||
- Choose `4` to **run the bot with auto restart**.
|
||||
(with auto restart the bot will restart itself if it disconnects by the use of `.die` command. Useful if you want to have restart function for any reason.)
|
||||
|
||||
####Updating NadekoBot
|
||||
#### Updating NadekoBot
|
||||
- Make sure the bot is closed and is not running (Run `.die` in a connected server to ensure it's not running).
|
||||
- Once that's checked, go to the `Nadeko` folder.
|
||||
- Run the `NadekoInstaller.bat` file.
|
||||
|
||||
@ -162,5 +162,5 @@ GOTO end
|
||||
ECHO.
|
||||
ECHO Installation complete!
|
||||
ECHO.
|
||||
PAUSE
|
||||
del Latest.bat
|
||||
timeout /t 5
|
||||
del Latest.bat
|
||||
|
||||
@ -162,5 +162,5 @@ GOTO end
|
||||
ECHO.
|
||||
ECHO Installation complete!
|
||||
ECHO.
|
||||
PAUSE
|
||||
del Stable.bat
|
||||
timeout /t 5
|
||||
del Stable.bat
|
||||
|
||||
1555
src/NadekoBot/Migrations/20170501103455_patreon-id.Designer.cs
generated
Normal file
1555
src/NadekoBot/Migrations/20170501103455_patreon-id.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
24
src/NadekoBot/Migrations/20170501103455_patreon-id.cs
Normal file
24
src/NadekoBot/Migrations/20170501103455_patreon-id.cs
Normal file
@ -0,0 +1,24 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
namespace NadekoBot.Migrations
|
||||
{
|
||||
public partial class patreonid : Migration
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "PatreonUserId",
|
||||
table: "RewardedUsers",
|
||||
nullable: true);
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "PatreonUserId",
|
||||
table: "RewardedUsers");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -966,6 +966,8 @@ namespace NadekoBot.Migrations
|
||||
|
||||
b.Property<DateTime>("LastReward");
|
||||
|
||||
b.Property<string>("PatreonUserId");
|
||||
|
||||
b.Property<ulong>("UserId");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
@ -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()
|
||||
{
|
||||
|
||||
@ -173,13 +173,14 @@ namespace NadekoBot.Modules.Utility
|
||||
using (var uow = DbHandler.UnitOfWork())
|
||||
{
|
||||
var users = uow._context.Set<RewardedUser>();
|
||||
var usr = users.FirstOrDefault(x => x.UserId == userId);
|
||||
var usr = users.FirstOrDefault(x => x.PatreonUserId == data.User.id);
|
||||
|
||||
if (usr == null)
|
||||
{
|
||||
users.Add(new RewardedUser()
|
||||
{
|
||||
UserId = userId,
|
||||
PatreonUserId = data.User.id,
|
||||
LastReward = now,
|
||||
AmountRewardedThisMonth = amount,
|
||||
});
|
||||
@ -194,6 +195,7 @@ namespace NadekoBot.Modules.Utility
|
||||
{
|
||||
usr.LastReward = now;
|
||||
usr.AmountRewardedThisMonth = amount;
|
||||
usr.PatreonUserId = data.User.id;
|
||||
|
||||
await CurrencyHandler.AddCurrencyAsync(userId, "Patreon reward - recurring", amount, uow).ConfigureAwait(false);
|
||||
|
||||
@ -207,6 +209,7 @@ namespace NadekoBot.Modules.Utility
|
||||
|
||||
usr.LastReward = now;
|
||||
usr.AmountRewardedThisMonth = amount;
|
||||
usr.PatreonUserId = data.User.id;
|
||||
|
||||
await CurrencyHandler.AddCurrencyAsync(usr.UserId, "Patreon reward - update", toAward, uow).ConfigureAwait(false);
|
||||
|
||||
|
||||
@ -5,6 +5,7 @@ namespace NadekoBot.Services.Database.Models
|
||||
public class RewardedUser : DbEntity
|
||||
{
|
||||
public ulong UserId { get; set; }
|
||||
public string PatreonUserId { get; set; }
|
||||
public int AmountRewardedThisMonth { get; set; }
|
||||
public DateTime LastReward { get; set; }
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user