Merge branch '1.4' of https://github.com/Kwoth/NadekoBot into 1.4
This commit is contained in:
		@@ -1,7 +1,7 @@
 | 
			
		||||

 | 
			
		||||
[](https://discord.gg/nadekobot)
 | 
			
		||||
[](http://nadekobot.readthedocs.io/en/latest/?badge=latest)
 | 
			
		||||
[](http://nadekobot.xyz)
 | 
			
		||||
[](https://nadekobot.me)
 | 
			
		||||
[](https://discordapp.com/oauth2/authorize?client_id=170254782546575360&scope=bot&permissions=66186303)
 | 
			
		||||
[](http://nadekobot.readthedocs.io/en/latest/Commands%20List/)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -16,6 +16,7 @@ If you do not see `credentials.json` you will need to rename `credentials_exampl
 | 
			
		||||
  "GoogleApiKey": "AIzaSyDSci1sdlWQOWNVj1vlXxxxxxbk0oWMEzM",
 | 
			
		||||
  "MashapeKey": "4UrKpcWXc2mshS8RKi00000y8Kf5p1Q8kI6jsn32bmd8oVWiY7",
 | 
			
		||||
  "OsuApiKey": "4c8c8fdff8e1234581725db27fd140a7d93320d6",
 | 
			
		||||
  "PatreonAccessToken": "",
 | 
			
		||||
  "Db": null,
 | 
			
		||||
  "TotalShards": 1
 | 
			
		||||
}
 | 
			
		||||
@@ -48,9 +49,15 @@ If you do not see `credentials.json` you will need to rename `credentials_exampl
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#### Setting up credentials.json file
 | 
			
		||||
**For Windows** you can find `credentials.json` file in `NadekoBot\system` folder. 			
 | 
			
		||||
e.g. `C:\Program Files\NadekoBot\system`			
 | 
			
		||||
**For Linux** you can find `credentials.json` in `NadekoBot/src/NadekoBot` folder. 			
 | 
			
		||||
e.g. `/root/NadekoBot/src/NadekoBot`			
 | 
			
		||||
 | 
			
		||||

 | 
			
		||||
 | 
			
		||||
- In your [Discord applications page][DiscordApp], under the `Bot User` section, you will see `Token:click to reveal`, click to reveal the token. 		
 | 
			
		||||
##### Getting Bot's Token:
 | 
			
		||||
- In your [Discord applications page][DiscordApp], under the **`APP BOT USER`** section, you will see `Token:click to reveal`, click to reveal the token. 		
 | 
			
		||||
*Note: Make sure that you actually use a Token and not a Client Secret!* It is in the **App Bot User** section.
 | 
			
		||||
- Copy your bot's token, and on the **`"Token"`** line of your `credentials.json`, paste your bot token **between** the quotation marks.
 | 
			
		||||
```
 | 
			
		||||
@@ -59,6 +66,7 @@ It should look like:
 | 
			
		||||
```json
 | 
			
		||||
"Token": "MTc5MzcyXXX2MDI1ODY3MjY0.ChKs4g.I8J_R9XX0t-QY-0PzXXXiN0-7vo",
 | 
			
		||||
```
 | 
			
		||||
##### Getting Client and Bot ID:
 | 
			
		||||
- Copy the `Client ID` on the page and replace the `12312123` part of the **`"ClientId"`** line with it.
 | 
			
		||||
	- **Important: Bot ID and Client ID** will be the same in **newer bot accounts** due to recent changes by Discord.
 | 
			
		||||
	- If that's the case, **copy the same client ID** to **`"BotId"`**
 | 
			
		||||
@@ -69,6 +77,9 @@ It should look like:
 | 
			
		||||
"ClientId": 179372110000358912,
 | 
			
		||||
"BotId": 179372110000358912,
 | 
			
		||||
```
 | 
			
		||||
-----
 | 
			
		||||
##### Getting Owner ID*(s)*:		
 | 
			
		||||
 | 
			
		||||
- Go to your Discord server and attempt to mention yourself, but put a backslash at the start like shown below: 			
 | 
			
		||||
*(to make it slightly easier, add the backslash after you type the mention out)*
 | 
			
		||||
- So the message `\@fearnlj01#3535` will appear as `<@145521851676884992>` after you send the message. 
 | 
			
		||||
@@ -139,7 +150,8 @@ It should look like:
 | 
			
		||||
- **OsuAPIKey** 
 | 
			
		||||
	- Required for Osu commands
 | 
			
		||||
	- You can get this key [here.](https://osu.ppy.sh/p/api) 		
 | 
			
		||||
*You will need to log in and like the soundcloud it may take a few tries.*
 | 
			
		||||
- **PatreonAccessToken**
 | 
			
		||||
	- For Patreon creators only.
 | 
			
		||||
- **TotalShards** 
 | 
			
		||||
	- Required if the bot will be connected to more than 1500 servers. 
 | 
			
		||||
	- Most likely unnecessary to change until your bot is added to more than 1500 servers.  
 | 
			
		||||
@@ -149,10 +161,13 @@ It should look like:
 | 
			
		||||
## DB files
 | 
			
		||||
 | 
			
		||||
Nadeko saves all the settings and infomations in `NadekoBot.db` file here:		
 | 
			
		||||
`NadekoBot\src\NadekoBot\bin\Release\netcoreapp1.1\data\NadekoBot.db` (NadekoBot v1.4x) 		
 | 
			
		||||
`NadekoBot/src/NadekoBot/bin/Release/netcoreapp1.1/data/NadekoBot.db` (macOS and Linux) 		
 | 
			
		||||
`NadekoBot\system\data` (Windows)		
 | 
			
		||||
in order to open the database file you will need [DB Browser for SQLite](http://sqlitebrowser.org/).
 | 
			
		||||
 | 
			
		||||
To make changes
 | 
			
		||||
*NOTE: You don't have to worry if you don't have `NadekoBot.db` file, it gets auto created once you run the bot successfully.*		
 | 
			
		||||
 | 
			
		||||
**To make changes:**
 | 
			
		||||
 | 
			
		||||
- Copy the `NadekoBot.db` to someplace safe. (Back up)
 | 
			
		||||
- Open `NadekoBot.db`
 | 
			
		||||
@@ -166,6 +181,7 @@ To make changes
 | 
			
		||||
 | 
			
		||||
and that will save all the changes.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||

 | 
			
		||||
 | 
			
		||||
[Google Console]: https://console.developers.google.com
 | 
			
		||||
 
 | 
			
		||||
@@ -3,6 +3,7 @@
 | 
			
		||||
#### Prerequisites 
 | 
			
		||||
- [Notepad++][Notepad++] (or some other decent text editor)
 | 
			
		||||
- Windows 8 or later
 | 
			
		||||
- [.NET Core SDK (Command line / other)][.NET Core SDK]
 | 
			
		||||
- [Create 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). 
 | 
			
		||||
 | 
			
		||||
#### Guide 
 | 
			
		||||
@@ -31,3 +32,4 @@
 | 
			
		||||
[Notepad++]: https://notepad-plus-plus.org/
 | 
			
		||||
[Invite Guide]: http://discord.kongslien.net/guide.html
 | 
			
		||||
[Google Console]: https://console.developers.google.com
 | 
			
		||||
[.NET Core SDK]: https://www.microsoft.com/net/core#windowscmd
 | 
			
		||||
 
 | 
			
		||||
@@ -9,7 +9,7 @@
 | 
			
		||||
  "GoogleApiKey": "",
 | 
			
		||||
  "MashapeKey": "",
 | 
			
		||||
  "OsuApiKey": "",
 | 
			
		||||
  "SoundCloudClientId": "",
 | 
			
		||||
  "PatreonAccessToken": "",
 | 
			
		||||
  "Db": null,
 | 
			
		||||
  "TotalShards": 1
 | 
			
		||||
}
 | 
			
		||||
@@ -1,19 +1,19 @@
 | 
			
		||||
{
 | 
			
		||||
  "ClientId": 123123123,
 | 
			
		||||
  "BotId": null,
 | 
			
		||||
  "Token": "",
 | 
			
		||||
  "OwnerIds": [
 | 
			
		||||
    0
 | 
			
		||||
    105635576866156544
 | 
			
		||||
  ],
 | 
			
		||||
  "LoLApiKey": "",
 | 
			
		||||
  "GoogleApiKey": "",
 | 
			
		||||
  "MashapeKey": "",
 | 
			
		||||
  "OsuApiKey": "",
 | 
			
		||||
  "SoundCloudClientId": "",
 | 
			
		||||
  "PatreonAccessToken": "",
 | 
			
		||||
  "CarbonKey": "",
 | 
			
		||||
  "Db": {
 | 
			
		||||
    "Type": "sqlite",
 | 
			
		||||
    "ConnectionString": "Filename=./data/NadekoBot.db"
 | 
			
		||||
  },
 | 
			
		||||
  "TotalShards": 1,
 | 
			
		||||
  "PatreonAccessToken": ""
 | 
			
		||||
  "TotalShards": 1
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user