diff --git a/.gitignore b/.gitignore
index d9b88ac7..30036293 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,85 @@
+#Manually added files
+
+src/NadekoBot/credentials.json
+src/NadekoBot/data/NadekoBot.db
+src/NadekoBot/musicdata
+
+# Created by https://www.gitignore.io/api/visualstudio,visualstudiocode,windows,linux,macos
+
+### VisualStudioCode ###
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+
+
+### Windows ###
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+
+### macOS ###
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+
+### VisualStudio ###
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
@@ -6,16 +88,154 @@
*.user
*.userosscache
*.sln.docstates
-*.pfx
-.vs
-obj/
+
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
-**/src/NadekoBot/bin
-Tests/bin
-src/NadekoBot/credentials.json
-src/NadekoBot/project.lock.json
-src/NadekoBot/data/*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
# NuGet Packages
*.nupkg
@@ -25,12 +245,109 @@ src/NadekoBot/data/*
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
-NadekoBot/bin/Debug/data/nadekobot.sqlite
-NadekoBot/bin/Debug/data/config.json
-NadekoBot/bin/Debug/data/ServerSpecificConfigs.json
-NadekoBot.sln.iml
-.idea/workspace.xml
-.idea/vcs.xml
-.idea/modules.xml
-NadekoBot/bin/Debug/data/config_xnaas.json
-src/NadekoBot/project.lock.json
\ No newline at end of file
+# NuGet v3's project.json files produces more ignoreable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+node_modules/
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/
+
+### VisualStudio Patch ###
+build/
\ No newline at end of file
diff --git a/NadekoBot.sln b/NadekoBot.sln
index 48336ef6..e844576d 100644
--- a/NadekoBot.sln
+++ b/NadekoBot.sln
@@ -16,29 +16,45 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Discord.Net", "discord.net\
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Discord.Net.Commands", "discord.net\src\Discord.Net.Commands\Discord.Net.Commands.xproj", "{078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}"
EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "tests", "src\tests\tests.xproj", "{14CBADA0-971C-44E3-B331-C7D01DD74F0B}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
+ GlobalNadeko|Any CPU = GlobalNadeko|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{45EC1473-C678-4857-A544-07DFE0D0B478}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{45EC1473-C678-4857-A544-07DFE0D0B478}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {45EC1473-C678-4857-A544-07DFE0D0B478}.GlobalNadeko|Any CPU.ActiveCfg = GlobalNadeko|Any CPU
+ {45EC1473-C678-4857-A544-07DFE0D0B478}.GlobalNadeko|Any CPU.Build.0 = GlobalNadeko|Any CPU
{45EC1473-C678-4857-A544-07DFE0D0B478}.Release|Any CPU.ActiveCfg = Release|Any CPU
{45EC1473-C678-4857-A544-07DFE0D0B478}.Release|Any CPU.Build.0 = Release|Any CPU
{91E9E7BD-75C9-4E98-84AA-2C271922E5C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{91E9E7BD-75C9-4E98-84AA-2C271922E5C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {91E9E7BD-75C9-4E98-84AA-2C271922E5C2}.GlobalNadeko|Any CPU.ActiveCfg = GlobalNadeko|Any CPU
+ {91E9E7BD-75C9-4E98-84AA-2C271922E5C2}.GlobalNadeko|Any CPU.Build.0 = GlobalNadeko|Any CPU
{91E9E7BD-75C9-4E98-84AA-2C271922E5C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{91E9E7BD-75C9-4E98-84AA-2C271922E5C2}.Release|Any CPU.Build.0 = Release|Any CPU
{078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}.GlobalNadeko|Any CPU.ActiveCfg = GlobalNadeko|Any CPU
+ {078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}.GlobalNadeko|Any CPU.Build.0 = GlobalNadeko|Any CPU
{078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {14CBADA0-971C-44E3-B331-C7D01DD74F0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {14CBADA0-971C-44E3-B331-C7D01DD74F0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {14CBADA0-971C-44E3-B331-C7D01DD74F0B}.GlobalNadeko|Any CPU.ActiveCfg = GlobalNadeko|Any CPU
+ {14CBADA0-971C-44E3-B331-C7D01DD74F0B}.GlobalNadeko|Any CPU.Build.0 = GlobalNadeko|Any CPU
+ {14CBADA0-971C-44E3-B331-C7D01DD74F0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {14CBADA0-971C-44E3-B331-C7D01DD74F0B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{45EC1473-C678-4857-A544-07DFE0D0B478} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
+ {14CBADA0-971C-44E3-B331-C7D01DD74F0B} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
EndGlobalSection
EndGlobal
diff --git a/NuGet.Config b/NuGet.Config
new file mode 100644
index 00000000..36bf7319
--- /dev/null
+++ b/NuGet.Config
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/discord.net b/discord.net
index b51408de..06e2a2d0 160000
--- a/discord.net
+++ b/discord.net
@@ -1 +1 @@
-Subproject commit b51408def863ee5f4273478efa65eb50e4008487
+Subproject commit 06e2a2d019bfa7613bea2f0c698d5ff3bf34bbf0
diff --git a/docs/Commands List.md b/docs/Commands List.md
new file mode 100644
index 00000000..70dd28a0
--- /dev/null
+++ b/docs/Commands List.md
@@ -0,0 +1,293 @@
+
+### Administration
+Command and aliases | Description | Usage
+----------------|--------------|-------
+`.resetperms` | Resets BOT's permissions module on this server to the default value. | `.resetperms` **Requires Administrator server permission.**
+`.restart` | Restarts the bot. Might not work. | `.restart` **Bot owner only.**
+`.delmsgoncmd` | Toggles the automatic deletion of user's successful command message to prevent chat flood. **Server Manager Only.** | `.delmsgoncmd` **Requires Administrator server permission.**
+`.setrole` `.sr` | Sets a role for a given user. | `.sr @User Guest` **Requires ManageRoles server permission.**
+`.removerole` `.rr` | Removes a role from a given user. | `.rr @User Admin` **Requires ManageRoles server permission.**
+`.renamerole` `.renr` | Renames a role. Roles you are renaming must be lower than bot's highest role. | `.renr "First role" SecondRole` **Requires ManageRoles server permission.**
+`.removeallroles` `.rar` | Removes all roles from a mentioned user. | `.rar @User` **Requires ManageRoles server permission.**
+`.createrole` `.cr` | Creates a role with a given name. | `.cr Awesome Role` **Requires ManageRoles server permission.**
+`.rolecolor` `.rc` | Set a role's color to the hex or 0-255 rgb color value provided. | `.rc Admin 255 200 100` or `.rc Admin ffba55` **Requires ManageRoles server permission.**
+`.ban` `.b` | Bans a user by id or name with an optional message. | `.b "@some Guy" Your behaviour is toxic.` **Requires BanMembers server permission.**
+`.softban` `.sb` | Bans and then unbans a user by id or name with an optional message. | `.sb "@some Guy" Your behaviour is toxic.` **Requires BanMembers server permission.**
+`.kick` `.k` | Kicks a mentioned user. | `.k "@some Guy" Your behaviour is toxic.` **Requires KickMembers server permission.**
+`.mute` | Mutes a mentioned user in a voice channel. | `.mute @Someone` **Requires MuteMembers server permission.**
+`.unmute` | Unmutes mentioned user or users. | `.unmute "@Someguy"` or `.unmute "@Someguy" "@Someguy"` **Requires MuteMembers server permission.**
+`.deafen` `.deaf` | Deafens mentioned user or users. | `.deaf "@Someguy"` or `.deaf "@Someguy" "@Someguy"` **Requires DeafenMembers server permission.**
+`.undeafen` `.undef` | Undeafens mentioned user or users. | `.undef "@Someguy"` or `.undef "@Someguy" "@Someguy"` **Requires DeafenMembers server permission.**
+`.delvoichanl` `.dvch` | Deletes a voice channel with a given name. | `.dvch VoiceChannelName` **Requires ManageChannels server permission.**
+`.creatvoichanl` `.cvch` | Creates a new voice channel with a given name. | `.cvch VoiceChannelName` **Requires ManageChannels server permission.**
+`.deltxtchanl` `.dtch` | Deletes a text channel with a given name. | `.dtch TextChannelName` **Requires ManageChannels server permission.**
+`.creatxtchanl` `.ctch` | Creates a new text channel with a given name. | `.ctch TextChannelName` **Requires ManageChannels server permission.**
+`.settopic` `.st` | Sets a topic on the current channel. | `.st My new topic` **Requires ManageChannels server permission.**
+`.setchanlname` `.schn` | Changed the name of the current channel. | `.schn NewName` **Requires ManageChannels server permission.**
+`.prune` `.clr` | `.prune` removes all nadeko's messages in the last 100 messages.`.prune X` removes last X messages from the channel (up to 100)`.prune @Someone` removes all Someone's messages in the last 100 messages.`.prune @Someone X` removes last X 'Someone's' messages in the channel. | `.prune` or `.prune 5` or `.prune @Someone` or `.prune @Someone X`
+`.die` | Works only for the owner. Shuts the bot down. | `@NadekoBot die` **Bot owner only.**
+`.setname` `.newnm` | Give the bot a new name. | `.newnm BotName` **Bot owner only.**
+`.setavatar` `.setav` | Sets a new avatar image for the NadekoBot. Argument is a direct link to an image. | `.setav http://i.imgur.com/xTG3a1I.jpg` **Bot owner only.**
+`.setgame` | Sets the bots game. | `.setgame Playing with kwoth` **Bot owner only.**
+`.send` | Sends a message to someone on a different server through the bot. Separate server and channel/user ids with `|` and prepend channel id with `c:` and user id with `u:`. | `.send serverid|c:channelid` or `.send serverid|u:userid` **Bot owner only.**
+`.announce` | Sends a message to all servers' general channel bot is connected to. | `.announce Useless spam` **Bot owner only.**
+`.savechat` | Saves a number of messages to a text file and sends it to you. | `.savechat 150` **Bot owner only.**
+`.mentionrole` `.menro` | Mentions every person from the provided role or roles (separated by a ',') on this server. Requires you to have mention everyone permission. | `.menro RoleName` **Requires MentionEveryone server permission.**
+`.donators` | List of lovely people who donated to keep this project alive. | `.donators`
+`.donadd` | Add a donator to the database. **Kwoth Only** | `.donadd Donate Amount` **Bot owner only.**
+`.autoassignrole` `.aar` | Automaticaly assigns a specified role to every user who joins the server. | `.aar` to disable, `.aar Role Name` to enable **Requires ManageRoles server permission.**
+`.scsc` | Starts an instance of cross server channel. You will get a token as a DM that other people will use to tune in to the same instance. | `.scsc` **Bot owner only.**
+`.jcsc` | Joins current channel to an instance of cross server channel using the token. | `.jcsc TokenHere` **Requires ManageServer server permission.**
+`.lcsc` | Leaves Cross server channel instance from this channel. | `.lcsc` **Requires ManageServer server permission.**
+`.fwmsgs` | Toggles forwarding of non-command messages sent to bot's DM to the bot owners | `.fwmsgs` **Bot owner only.**
+`.fwtoall` | Toggles whether messages will be forwarded to all bot owners or only to the first one specified in the credentials.json | `.fwtoall` **Bot owner only.**
+`.logserver` | Logs server activity in this channel. | `.logserver` **Requires Administrator server permission.** **Bot owner only.**
+`.logignore` | Toggles whether the .logserver command ignores this channel. Useful if you have hidden admin channel and public log channel. | `.logignore` **Requires Administrator server permission.** **Bot owner only.**
+`.userpresence` | Starts logging to this channel when someone from the server goes online/offline/idle. | `.userpresence` **Requires Administrator server permission.**
+`.voicepresence` | Toggles logging to this channel whenever someone joins or leaves a voice channel you are in right now. | `.voicepresence` **Requires Administrator server permission.**
+`.repeatinvoke` `.repinv` | Immediately shows the repeat message and restarts the timer. | `.repinv` **Requires ManageMessages server permission.**
+`.repeat` | Repeat a message every X minutes. If no parameters are specified, repeat is disabled. | `.repeat 5 Hello there`
+`.migratedata` | Migrate data from old bot configuration | `.migratedata` **Bot owner only.**
+`.rotateplaying` `.ropl` | Toggles rotation of playing status of the dynamic strings you specified earlier. | `.ropl` **Bot owner only.**
+`.addplaying` `.adpl` | Adds a specified string to the list of playing strings to rotate. Supported placeholders: %servers%, %users%, %playing%, %queued% | `.adpl` **Bot owner only.**
+`.listplaying` `.lipl` | Lists all playing statuses with their corresponding number. | `.lipl` **Bot owner only.**
+`.removeplaying` `.rmpl` `.repl` | Removes a playing string on a given number. | `.rmpl` **Bot owner only.**
+`.slowmode` | Toggles slow mode. When ON, users will be able to send only 1 message every 5 seconds. | `.slowmode` **Requires ManageMessages server permission.**
+`.asar` | Adds a role, or list of roles separated by whitespace(use quotations for multiword roles) to the list of self-assignable roles. | `.asar Gamer` **Requires ManageRoles server permission.**
+`.rsar` | Removes a specified role from the list of self-assignable roles. | `.rsar` **Requires ManageRoles server permission.**
+`.lsar` | Lists all self-assignable roles. | `.lsar`
+`.togglexclsar` `.tesar` | Toggles whether the self-assigned roles are exclusive. (So that any person can have only one of the self assignable roles) | `.tesar` **Requires ManageRoles server permission.**
+`.iam` | Adds a role to you that you choose. Role must be on a list of self-assignable roles. | `.iam Gamer`
+`.iamnot` `.iamn` | Removes a role to you that you choose. Role must be on a list of self-assignable roles. | `.iamn Gamer`
+`.leave` | Makes Nadeko leave the server. Either name or id required. | `.leave 123123123331` **Bot owner only.**
+`.greetdel` `.grdel` | Toggles automatic deletion of greet messages. | `.greetdel` **Requires ManageServer server permission.**
+`.greet` | Toggles anouncements on the current channel when someone joins the server. | `.greet` **Requires ManageServer server permission.**
+`.greetmsg` | Sets a new join announcement message which will be shown in the server's channel. Type %user% if you want to mention the new member. Using it with no message will show the current greet message. | `.greetmsg Welcome, %user%.` **Requires ManageServer server permission.**
+`.greetdm` | Toggles whether the greet messages will be sent in a DM (This is separate from greet - you can have both, any or neither enabled). | `.greetdm` **Requires ManageServer server permission.**
+`.greetdmmsg` | Sets a new join announcement message which will be sent to the user who joined. Type %user% if you want to mention the new member. Using it with no message will show the current DM greet message. | `.greetdmmsg Welcome to the server, %user%`. **Requires ManageServer server permission.**
+`.bye` | Toggles anouncements on the current channel when someone leaves the server. | `.bye` **Requires ManageServer server permission.**
+`.byemsg` | Sets a new leave announcement message. Type %user% if you want to mention the new member. Using it with no message will show the current bye message. | `.byemsg %user% has left.` **Requires ManageServer server permission.**
+`.byedel` | Toggles automatic deletion of bye messages. | `.byedel` **Requires ManageServer server permission.**
+`.voice+text` `.v+t` | Creates a text channel for each voice channel only users in that voice channel can see.If you are server owner, keep in mind you will see them all the time regardless. | `.voice+text` **Requires ManageRoles server permission.** **Requires ManageChannels server permission.**
+`.cleanvplust` `.cv+t` | Deletes all text channels ending in `-voice` for which voicechannels are not found. **Use at your own risk. Needs Manage Roles and Manage Channels Permissions.** | `.cleanv+t` **Requires ManageChannels server permission.** **Requires ManageRoles server permission.**
+
+### ClashOfClans
+Command and aliases | Description | Usage
+----------------|--------------|-------
+`,createwar` `,cw` | Creates a new war by specifying a size (>10 and multiple of 5) and enemy clan name. | `,cw 15 The Enemy Clan`
+`,startwar` `,sw` | Starts a war with a given number. | `,sw 15`
+`,listwar` `,lw` | Shows the active war claims by a number. Shows all wars in a short way if no number is specified. | `,lw [war_number] or ,lw`
+`,claim` `,call` `,c` | Claims a certain base from a certain war. You can supply a name in the third optional argument to claim in someone else's place. | `,call [war_number] [base_number] [optional_other_name]`
+`,claimfinish1` `,cf1` | Finish your claim with 1 star if you destroyed a base. First argument is the war number, optional second argument finishes for someone else. | `,cf1 2 SomeGirl`
+`,claimfinish2` `,cf2` | Finish your claim with 2 stars if you destroyed a base. First argument is the war number, optional second argument finishes for someone else. | `,cf2 1 SomeGuy`
+`,claimfinish` `,cf` | Finish your claim with 3 stars if you destroyed a base. First argument is the war number, optional second argument finishes for someone else. | `,cf 1 Someone`
+`,endwar` `,ew` | Ends the war with a given index. | `,ew [war_number]`
+`,unclaim` `,ucall` `,uc` | Removes your claim from a certain war. Optional second argument denotes a person in whose place to unclaim | `,uc [war_number] [optional_other_name]`
+
+### CustomReactions
+Command and aliases | Description | Usage
+----------------|--------------|-------
+`#addcustreact` `#acr` | Add a custom reaction with a trigger and a response. Running this command in server requires Administration permission. Running this command in DM is Bot Owner only and adds a new global custom reaction. Guide here: | `.acr "hello" Hi there %user%`
+`#listcustreact` `#lcr` | Lists global or server custom reactions (15 commands per page). Running the command in DM will list global custom reactions, while running it in server will list that server's custom reactions. | `.lcr 1`
+`#delcustreact` `#dcr` | Deletes a custom reaction on a specific index. If ran in DM, it is bot owner only and deletes a global custom reaction. If ran in a server, it requires Administration priviledges and removes server custom reaction. | `.dcr 5`
+
+### Gambling
+Command and aliases | Description | Usage
+----------------|--------------|-------
+`xraffle` | Prints a name and ID of a random user from the online list from the (optional) role. | `$raffle` or `$raffle RoleName`
+`xcash` `x$$` | Check how much NadekoFlowers a person has. (Defaults to yourself) | `$$$` or `$$$ @SomeGuy`
+`xgive` | Give someone a certain amount of currency. | `$give 1 "@SomeGuy"`
+`xaward` | Awards someone a certain amount of currency. | `$award 100 @person` **Bot owner only.**
+`xtake` | Takes a certain amount of flowers from someone. | `$take 1 "@someguy"` **Bot owner only.**
+`xbetroll` `xbr` | Bets a certain amount of NadekoFlowers and rolls a dice. Rolling over 66 yields x2 flowers, over 90 - x3 and 100 x10. | `$br 5`
+`xleaderboard` `xlb` | Displays bot currency leaderboard. | `$lb`
+`xrace` | Starts a new animal race. | `$race`
+`xjoinrace` `xjr` | Joins a new race. You can specify an amount of flowers for betting (optional). You will get YourBet*(participants-1) back if you win. | `$jr` or `$jr 5`
+`xroll` | Rolls 0-100. If you supply a number [x] it rolls up to 30 normal dice. If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. | `$roll` or `$roll 7` or `$roll 3d5`
+`xrolluo` | Rolls X normal dice (up to 30) unordered. If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. | `$rolluo` or `$rolluo 7` or `$rolluo 3d5`
+`xnroll` | Rolls in a given range. | `$nroll 5` (rolls 0-5) or `$nroll 5-15`
+`xdraw` | Draws a card from the deck.If you supply number X, she draws up to 5 cards from the deck. | `$draw` or `$draw 5`
+`xshuffle` `xsh` | Reshuffles all cards back into the deck. | `$sh`
+`xflip` | Flips coin(s) - heads or tails, and shows an image. | `$flip` or `$flip 3`
+`xbetflip` `xbf` | Bet to guess will the result be heads or tails. Guessing awards you double flowers you've bet. | `$bf 5 heads` or `$bf 3 t`
+
+### Games
+Command and aliases | Description | Usage
+----------------|--------------|-------
+`>choose` | Chooses a thing from a list of things | `>choose Get up;Sleep;Sleep more`
+`>8ball` | Ask the 8ball a yes/no question. | `>8ball should I do something`
+`>rps` | Play a game of rocket paperclip scissors with Nadeko. | `>rps scissors`
+`>linux` | Prints a customizable Linux interjection | `>linux Spyware Windows`
+`>leet` | Converts a text to leetspeak with 6 (1-6) severity levels | `>leet 3 Hello`
+`>poll` | Creates a poll, only person who has manage server permission can do it. | `>poll Question?;Answer1;Answ 2;A_3`
+`>pollend` | Stops active poll on this server and prints the results in this channel. | `>pollend`
+`>pick` | Picks a flower planted in this channel. | `>pick`
+`>plant` | Spend a flower to plant it in this channel. (If bot is restarted or crashes, flower will be lost) | `>plant`
+`>gencurrency` `>gc` | Toggles currency generation on this channel. Every posted message will have chance to spawn a NadekoFlower. Chance is specified by the Bot Owner. (default is 2%) | `>gc` **Requires ManageMessages server permission.**
+`>typestart` | Starts a typing contest. | `>typestart`
+`>typestop` | Stops a typing contest on the current channel. | `>typestop`
+`>typeadd` | Adds a new article to the typing contest. | `>typeadd wordswords` **Bot owner only.**
+`>trivia` `>t` | Starts a game of trivia. You can add nohint to prevent hints.First player to get to 10 points wins by default. You can specify a different number. 30 seconds per question. | `>t nohint` or `>t 5 nohint`
+`>tl` | Shows a current trivia leaderboard. | `>tl`
+`>tq` | Quits current trivia after current question. | `>tq`
+
+### Help
+Command and aliases | Description | Usage
+----------------|--------------|-------
+`-modules` `-mdls` | Lists all bot modules. | `-modules`
+`-commands` `-cmds` | List all of the bot's commands from a certain module. You can either specify full, or only first few letters of the module name. | `-commands Administration` or `-cmds Admin`
+`-help` `-h` | Either shows a help for a single command, or DMs you help link if no arguments are specified. | `-h !!q` or `-h`
+`-hgit` | Generates the commandlist.md file. | `-hgit` **Bot owner only.**
+`-readme` `-guide` | Sends a readme and a guide links to the channel. | `-readme` or `-guide`
+`-donate` | Instructions for helping the project financially. | `-donate`
+
+### Music
+Command and aliases | Description | Usage
+----------------|--------------|-------
+`!!next` `!!n` | Goes to the next song in the queue. You have to be in the same voice channel as the bot. | `!!n`
+`!!stop` `!!s` | Stops the music and clears the playlist. Stays in the channel. | `!!s`
+`!!destroy` `!!d` | Completely stops the music and unbinds the bot from the channel. (may cause weird behaviour) | `!!d`
+`!!pause` `!!p` | Pauses or Unpauses the song. | `!!p`
+`!!queue` `!!q` `!!yq` | Queue a song using keywords or a link. Bot will join your voice channel.**You must be in a voice channel**. | `!!q Dream Of Venice`
+`!!soundcloudqueue` `!!sq` | Queue a soundcloud song using keywords. Bot will join your voice channel.**You must be in a voice channel**. | `!!sq Dream Of Venice`
+`!!listqueue` `!!lq` | Lists 15 currently queued songs per page. Default page is 1. | `!!lq` or `!!lq 2`
+`!!nowplaying` `!!np` | Shows the song currently playing. | `!!np`
+`!!volume` `!!vol` | Sets the music volume 0-100% | `!!vol 50`
+`!!defvol` `!!dv` | Sets the default music volume when music playback is started (0-100). Persists through restarts. | `!!dv 80`
+`!!shuffle` `!!sh` | Shuffles the current playlist. | `!!sh`
+`!!playlist` `!!pl` | Queues up to 500 songs from a youtube playlist specified by a link, or keywords. | `!!pl playlist link or name`
+`!!soundcloudpl` `!!scpl` | Queue a soundcloud playlist using a link. | `!!scpl soundcloudseturl`
+`!!localplaylst` `!!lopl` | Queues all songs from a directory. | `!!lopl C:/music/classical` **Bot owner only.**
+`!!radio` `!!ra` | Queues a radio stream from a link. It can be a direct mp3 radio stream, .m3u, .pls .asx or .xspf (Usage Video: ) | `!!ra radio link here`
+`!!local` `!!lo` | Queues a local file by specifying a full path. | `!!lo C:/music/mysong.mp3` **Bot owner only.**
+`!!move` `!!mv` | Moves the bot to your voice channel. (works only if music is already playing) | `!!mv`
+`!!remove` `!!rm` | Remove a song by its # in the queue, or 'all' to remove whole queue. | `!!rm 5`
+`!!movesong` `!!ms` | Moves a song from one position to another. | `!! ms 5>3`
+`!!setmaxqueue` `!!smq` | Sets a maximum queue size. Supply 0 or no argument to have no limit. | `!!smq 50` or `!!smq`
+`!!reptcursong` `!!rcs` | Toggles repeat of current song. | `!!rcs`
+`!!rpeatplaylst` `!!rpl` | Toggles repeat of all songs in the queue (every song that finishes is added to the end of the queue). | `!!rpl`
+`!!save` | Saves a playlist under a certain name. Name must be no longer than 20 characters and mustn't contain dashes. | `!!save classical1`
+`!!load` | Loads a playlist under a certain name. | `!!load classical-1`
+`!!playlists` `!!pls` | Lists all playlists. Paginated. 20 per page. Default page is 0. | `!!pls 1`
+`!!deleteplaylist` `!!delpls` | Deletes a saved playlist. Only if you made it or if you are the bot owner. | `!!delpls animu-5`
+`!!goto` | Goes to a specific time in seconds in a song. | `!!goto 30`
+`!!getlink` `!!gl` | Shows a link to the song in the queue by index, or the currently playing song by default. | `!!gl`
+`!!autoplay` `!!ap` | Toggles autoplay - When the song is finished, automatically queue a related youtube song. (Works only for youtube songs and when queue is empty) | `!!ap`
+
+### NSFW
+Command and aliases | Description | Usage
+----------------|--------------|-------
+`~hentai` | Shows a 2 random images (from gelbooru and danbooru) with a given tag. Tag is optional but preferred. Only 1 tag allowed. | `~hentai yuri`
+`~danbooru` | Shows a random hentai image from danbooru with a given tag. Tag is optional but preffered. (multiple tags are appended with +) | `~danbooru yuri+kissing`
+`~gelbooru` | Shows a random hentai image from gelbooru with a given tag. Tag is optional but preffered. (multiple tags are appended with +) | `~gelbooru yuri+kissing`
+`~rule34` | Shows a random image from rule34.xx with a given tag. Tag is optional but preffered. (multiple tags are appended with +) | `~rule34 yuri+kissing`
+`~e621` | Shows a random hentai image from e621.net with a given tag. Tag is optional but preffered. Use spaces for multiple tags. | `~e621 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`
+
+### Permissions
+Command and aliases | Description | Usage
+----------------|--------------|-------
+`;verbose` `;v` | Sets whether to show when a command/module is blocked. | `;verbose true`
+`;permrole` `;pr` | Sets a role which can change permissions. Or supply no parameters to find out the current one. Default one is 'Nadeko'. | `;pr role`
+`;listperms` `;lp` | Lists whole permission chain with their indexes. You can specify an optional page number if there are a lot of permissions. | `;lp` or `;lp 3`
+`;removeperm` `;rp` | Removes a permission from a given position | `;rp 1`
+`;moveperm` `;mp` | Moves permission from one position to another. | `;mp 2 4`
+`;srvrcmd` `;sc` | Sets a command's permission at the server level. | `;sc "command name" disable`
+`;srvrmdl` `;sm` | Sets a module's permission at the server level. | `;sm "module name" enable`
+`;usrcmd` `;uc` | Sets a command's permission at the user level. | `;uc "command name" enable SomeUsername`
+`;usrmdl` `;um` | Sets a module's permission at the user level. | `;um "module name" enable SomeUsername`
+`;rolecmd` `;rc` | Sets a command's permission at the role level. | `;rc "command name" disable MyRole`
+`;rolemdl` `;rm` | Sets a module's permission at the role level. | `;rm "module name" enable MyRole`
+`;chnlcmd` `;cc` | Sets a command's permission at the channel level. | `;cc "command name" enable SomeChannel`
+`;chnlmdl` `;cm` | Sets a module's permission at the channel level. | `;cm "module name" enable SomeChannel`
+`;allchnlmdls` `;acm` | Enable or disable all modules in a specified channel. | `;acm enable #SomeChannel`
+`;allrolemdls` `;arm` | Enable or disable all modules for a specific role. | `;arm [enable/disable] MyRole`
+`;allusrmdls` `;aum` | Enable or disable all modules for a specific user. | `;aum enable @someone`
+`;allsrvrmdls` `;asm` | Enable or disable all modules for your server. | `;asm [enable/disable]`
+`;ubl` | Either [add]s or [rem]oves a user specified by a mention or ID from a blacklist. | `;ubl add @SomeUser` or `;ubl rem 12312312313` **Bot owner only.**
+`;cbl` | Either [add]s or [rem]oves a channel specified by an ID from a blacklist. | `;cbl rem 12312312312` **Bot owner only.**
+`;sbl` | Either [add]s or [rem]oves a server specified by a Name or ID from a blacklist. | `;sbl add 12312321312` or `;sbl rem SomeTrashServer` **Bot owner only.**
+`;cmdcooldown` `;cmdcd` | Sets a cooldown per user for a command. Set to 0 to remove the cooldown. | `;cmdcd "some cmd" 5`
+`;allcmdcooldowns` `;acmdcds` | Shows a list of all commands and their respective cooldowns. | `;acmdcds`
+`;srvrfilterinv` `;sfi` | Toggles automatic deleting of invites posted in the server. Does not affect Bot Owner. | `;sfi`
+`;chnlfilterinv` `;cfi` | Toggles automatic deleting of invites posted in the channel. Does not negate the .srvrfilterinv enabled setting. Does not affect Bot Owner. | `;cfi`
+`;srvrfilterwords` `;sfw` | Toggles automatic deleting of messages containing forbidden words on the server. Does not affect Bot Owner. | `;sfw`
+`;chnlfilterwords` `;cfw` | Toggles automatic deleting of messages containing banned words on the channel. Does not negate the .srvrfilterwords enabled setting. Does not affect bot owner. | `;cfw`
+`;fw` | Adds or removes (if it exists) a word from the list of filtered words. Use` ;sfw` or `;cfw` to toggle filtering. | `;fw poop`
+`;lstfilterwords` `;lfw` | Shows a list of filtered words. | `;lfw`
+
+### Searches
+Command and aliases | Description | Usage
+----------------|--------------|-------
+`~weather` `~we` | Shows weather data for a specified city and a country. BOTH ARE REQUIRED. Use country abbrevations. | `~we Moscow RF`
+`~youtube` `~yt` | Searches youtubes and shows the first result | `~yt query`
+`~imdb` | Queries imdb for movies or series, show first result. | `~imdb Batman vs Superman`
+`~randomcat` `~meow` | Shows a random cat image. | `~meow`
+`~randomdog` `~woof` | Shows a random dog image. | `~woof`
+`~img` `~i` | Pulls the first image found using a search parameter. Use ~ir for different results. | `~i cute kitten`
+`~ir` | Pulls a random image using a search parameter. | `~ir cute kitten`
+`~lmgtfy` | Google something for an idiot. | `~lmgtfy query`
+`~google` `~g` | Get a google search link for some terms. | `~google query`
+`~hearthstone` `~hs` | Searches for a Hearthstone card and shows its image. Takes a while to complete. | `~hs Ysera`
+`~urbandict` `~ud` | Searches Urban Dictionary for a word. | `~ud Pineapple`
+`~#` | Searches Tagdef.com for a hashtag. | `~# ff`
+`~catfact` | Shows a random catfact from | `~catfact`
+`~revav` | Returns a google reverse image search for someone's avatar. | `~revav "@SomeGuy"`
+`~revimg` | Returns a google reverse image search for an image from a link. | `~revimg Image link`
+`~safebooru` | Shows a random image from safebooru with a given tag. Tag is optional but preffered. (multiple tags are appended with +) | `~safebooru yuri+kissing`
+`~wikipedia` `~wiki` | Gives you back a wikipedia link | `~wiki query`
+`~color` `~clr` | Shows you what color corresponds to that hex. | `~clr 00ff00`
+`~videocall` | Creates a private video call link for you and other mentioned people. The link is sent to mentioned people via a private message. | `~videocall "@SomeGuy"`
+`~av` `~avatar` | Shows a mentioned person's avatar. | `~av "@SomeGuy"`
+`~lolban` | Shows top banned champions ordered by ban rate. | `~lolban`
+`~memelist` | Pulls a list of memes you can use with `~memegen` from http://memegen.link/templates/ | `~memelist`
+`~memegen` | Generates a meme from memelist with top and bottom text. | `~memegen biw "gets iced coffee" "in the winter"`
+`~translate` `~trans` | Translates from>to text. From the given language to the destination language. | `~trans en>fr Hello`
+`~translangs` | Lists the valid languages for translation. | `~translangs`
+`~anime` `~ani` `~aq` | Queries anilist for an anime and shows the first result. | `~ani aquarion evol`
+`~manga` `~mang` `~mq` | Queries anilist for a manga and shows the first result. | `~mq Shingeki no kyojin`
+`~yomama` `~ym` | Shows a random joke from | `~ym`
+`~randjoke` `~rj` | Shows a random joke from | `~rj`
+`~chucknorris` `~cn` | Shows a random chucknorris joke from | `~cn`
+`~wowjoke` | Get one of Kwoth's penultimate WoW jokes. | `~wowjoke`
+`~magicitem` `~mi` | Shows a random magicitem from | `~mi`
+`~osu` | Shows osu stats for a player. | `~osu Name` or `~osu Name taiko`
+`~osub` | Shows information about an osu beatmap. | `~osub https://osu.ppy.sh/s/127712`
+`~osu5` | Displays a user's top 5 plays. | `~osu5 Name`
+`~pokemon` `~poke` | Searches for a pokemon. | `~poke Sylveon`
+`~pokemonability` `~pokeab` | Searches for a pokemon ability. | `~pokeab "water gun"`
+`~hitbox` `~hb` | Notifies this channel when a certain user starts streaming. | `~hitbox SomeStreamer` **Requires ManageMessages server permission.**
+`~twitch` `~tw` | Notifies this channel when a certain user starts streaming. | `~twitch SomeStreamer` **Requires ManageMessages server permission.**
+`~beam` `~bm` | Notifies this channel when a certain user starts streaming. | `~beam SomeStreamer` **Requires ManageMessages server permission.**
+`~liststreams` `~ls` | Lists all streams you are following on this server. | `~ls`
+`~removestream` `~rms` | Removes notifications of a certain streamer on this channel. | `~rms SomeGuy` **Requires ManageMessages server permission.**
+`~checkstream` `~cs` | Checks if a user is online on a certain streaming platform. | `~cs twitch MyFavStreamer`
+
+### Utility
+Command and aliases | Description | Usage
+----------------|--------------|-------
+`.whosplaying` `.whpl` | Shows a list of users who are playing the specified game. | `.whpl Overwatch`
+`.inrole` | Lists every person from the provided role or roles (separated by a ',') on this server. If the list is too long for 1 message, you must have Manage Messages permission. | `.inrole Role`
+`.checkmyperms` | Checks your userspecific permissions on this channel. | `.checkmyperms`
+`.userid` `.uid` | Shows user ID. | `.uid` or `.uid "@SomeGuy"`
+`.channelid` `.cid` | Shows current channel ID. | `.cid`
+`.serverid` `.sid` | Shows current server ID. | `.sid`
+`.roles` | List all roles on this server or a single user if specified. | `.roles`
+`.channeltopic` `.ct` | Sends current channel's topic as a message. | `.ct`
+`.stats` | Shows some basic stats for Nadeko. | `.stats`
+`.showemojis` `.se` | Shows a name and a link to every SPECIAL emoji in the message. | `.se A message full of SPECIALemojis`
+`.calculate` `.calc` | Evaluate a mathematical expression. | `.calc 1+1`
+`.calcops` | Shows all available operations in .calc command | `.calcops`
+`.serverinfo` `.sinfo` | Shows info about the server the bot is on. If no channel is supplied, it defaults to current one. | `.sinfo Some Server`
+`.channelinfo` `.cinfo` | Shows info about the channel. If no channel is supplied, it defaults to current one. | `.cinfo #some-channel`
+`.userinfo` `.uinfo` | Shows info about the user. If no user is supplied, it defaults a user running the command. | `.uinfo @SomeUser`
+`...` | Shows a random quote with a specified name. | `... abc`
+`..` | Adds a new quote with the specified name and message. | `.. sayhi Hi`
+`.deletequote` `.delq` | Deletes a random quote with the specified keyword. You have to either be server Administrator or the creator of the quote to delete it. | `.delq abc`
+`.delallq` `.daq` | Deletes all quotes on a specified keyword. | `.delallq kek` **Requires Administrator server permission.**
+`.remind` | Sends a message to you or a channel after certain amount of time. First argument is me/here/'channelname'. Second argument is time in a descending order (mo>w>d>h>m) example: 1w5d3h10m. Third argument is a (multiword)message. | `.remind me 1d5h Do something` or `.remind #general Start now!`
+`.remindtemplate` | Sets message for when the remind is triggered. Available placeholders are %user% - user who ran the command, %message% - Message specified in the remind, %target% - target channel of the remind. | `.remindtemplate %user%, you gotta do %message%!` **Bot owner only.**
+`.convertlist` | List of the convertible dimensions and currencies. | `.convertlist`
+`.convert` | Convert quantities. Use `.convertlist` to see supported dimensions and currencies. | `.convert m km 1000`
diff --git a/docs/Contribution Guide.md b/docs/Contribution Guide.md
new file mode 100644
index 00000000..2818756c
--- /dev/null
+++ b/docs/Contribution Guide.md
@@ -0,0 +1,7 @@
+### How to contribute
+
+1. Make Pull Requests to the **1.0 BRANCH**
+2. Keep 1 Pull Request to a single feature
+3. Explain what you did in the PR message
+
+Thanks for all the help ^_^
diff --git a/docs/Custom Reactions.md b/docs/Custom Reactions.md
new file mode 100644
index 00000000..d2e6f40d
--- /dev/null
+++ b/docs/Custom Reactions.md
@@ -0,0 +1,41 @@
+##Custom Reactions
+###Important
+* For modifying **global** custom reactions, the ones which will work across all the servers your bot is connected to, you **must** be a Bot Owner.
+You must also use the commands for adding, deleting and listing these reactions in a direct message with the bot.
+* For modifying **local** custom reactions, the ones which will only work on the server that they are added on, require you to have the **Administrator** permission.
+You must also use the commands for adding, deleting and listing these reactions in the server you want the custom reactions to work on.
+
+###Commands and Their Use
+| Command Name | Description | Example |
+|:------------:|-------------|---------|
+|`.acr`|Add a custom reaction with a trigger and a response. Running this command in a server requries the Administrator permission. Running this command in DM is Bot Owner only, and adds a new global custom reaction. Guide [here](http://nadekobot.readthedocs.io/en/1.0/Custom%20Reactions/)|`.acr "hello" Hi there, %user%!`|
+|`.lcr`|Lists a page of global or server custom reactions (15 reactions per page). Running this command in a DM will list the global custom reactions, while running it in a server will list that server's custom reactions.|`.lcr 1`|
+|`.dcr`|Deletes a custom reaction based on the provided index. Running this command in a server requires the Administrator permission. Running this command in DM is Bot Owner only, and will delete a global custom reaction.|`.dcr 5`|
+
+
+####Now that we know the commands let's take a look at an example of adding a command with `.acr`,
+`.acr "Nice Weather" It sure is, %user%!`
+
+This command can be split into two different arguments:
+
+* The trigger, `"Nice Weather"`
+* And the response, `It sure is, %user%!`
+
+An important thing to note about the triger is that, to be more than one word, we had to wrap it with quotation marks, `"Like this"` otherwise, only the first word would have been recognised as the trigger, and the second word would have been recognised as part of the response.
+
+There's no special requirement for the formatting of the response, so we could just write it in exactly the same way we want it to respond, albeit with a placeholder - which will be explained in this next section.
+
+Now, if that command was ran in a server, anyone on that server can make the bot mention them, saying `It sure is, @Username` anytime they say "Nice Weather". If the command is ran in a direct message with the bot, then the custom reaction can be used on every server the bot is connected to.
+
+###Placeholders!
+There are currently three different placeholders which we will look at, with more placeholders potentially coming in the future.
+
+| Placeholder | Description | Example Usage | Usage |
+|:-----------:|-------------|---------------|-------|
+|`%mention`|The `%mention%` placeholder is triggered when you type `@BotName` - It's important to note that if you've given the bot a custom nickname, this trigger won't work!|```.acr "Hello %mention%" I, %mention%, also say hello!```|Input: "Hello @BotName" Output: "I, @BotName, also say hello!"|
+|`%user%`|The `%user%` placeholder mentions the person who said the command|`.acr "Who am I?" You are %user%!`|Input: "Who am I?" Output: "You are @Username!"|
+|`%rng%`|The `%rng%` placeholder generates a random number between 0 and 10|`.acr "Random number" %rng%`|Input: "Random number" Output: "2"|
+
+[//]: # (|`%target%`|The `%target%` placeholder is used to make Nadeko Mention another person or phrase|`.acr "Say this: " %target%|Input: "Say this: I, @BotName, am a parrot!". Output: "I, @BotName, am a parrot!".|)
+
+ Thanks to Nekai for being creative. <3
diff --git a/docs/Donate.md b/docs/Donate.md
new file mode 100644
index 00000000..b33eed3a
--- /dev/null
+++ b/docs/Donate.md
@@ -0,0 +1,17 @@
+##Donate to NadekoBot
+
+If you want to help Nadeko and Nadeko's team by donating, you can do that in the two of the following ways:
+
+###Patreon
+
+You can donate over [Patreon][Patreon] and support the project.
+
+[![img][img]](https://www.patreon.com/nadekobot)
+
+
+###PayPal
+
+If you wish to donate over PayPal, you can send your donations to: `nadekodiscordbot@gmail.com`
+
+[Patreon]: https://www.patreon.com/nadekobot
+[img]: http://www.mister-and-me.com/wp-content/plugins/patron-button-and-widgets-by-codebard/images/patreon-medium-button.png
diff --git a/docs/Frequently Asked Questions.md b/docs/Frequently Asked Questions.md
new file mode 100644
index 00000000..e3c30ba3
--- /dev/null
+++ b/docs/Frequently Asked Questions.md
@@ -0,0 +1,77 @@
+#Frequently Asked Questions
+
+
+###Question 1: How do I get Nadeko to join my server?
+----
+**Answer:** Simply send Nadeko a Direct Message with -h and follow the link. **Only People with the Manage Server permission can add the bot to the server**
+
+###Question 2: I want to change permissions, but it isn't working!
+----
+**Answer:** You must have the ;permrole (by default this is the "Nadeko" role, for more details on permissions check [here](http://nadekobot.readthedocs.io/en/1.0/Permissions%20System/ "Permissions"). If you have a role called `Nadeko` but can't assign it, just create a new Role and assign that instead.)
+
+###Question 3: I want to disable NSFW on my server.
+----
+**Answer:** To disable the NSFW Module for your server type, `;sm NSFW disable`. If this does not work refer to Question 2.
+
+###Question 4: How do I get NadekoFlowers/Currency?
+----
+**Answer:** You can get NadekoFlowers by picking them up after they have been generated with `>gc`, which you can then either plant (give away to a channel so that someone can pick it), or gamble with for potentinal profit with `$betflip`, `$betroll` and `$jr`
+
+###Question 5: I have an issue/bug/suggestion, where do I put it so it gets noticed?
+-----------
+**Answer:** First, check [issues](https://github.com/Kwoth/NadekoBot/issues "GitHub NadekoBot Issues"), then check the `#suggestions` channel in the Nadeko [help server](https://discord.gg/0ehQwTK2RBjAxzEY).
+
+If your problem or suggestion is not there, feel free to request/notify us about it either in the Issues section of GitHub for issues or in the `#suggestions` channel on the Nadeko help server for suggestions.
+
+###Question 6: How do I use this command?
+--------
+**Answer:** You can see the description and usage of certain commands by using `-h command` **i.e** `-h ;sm`.
+
+The whole list of commands can be found [here](http://nadekobot.readthedocs.io/en/1.0/Commands%20List/ "Command List")
+
+###Question 7: Music isn't working?
+----
+**Answer:** Music is disabled on public Nadeko due to large hosting costs, it will be re-enabled later in the future for donators.
+
+**If you would like music in the meantime, you must host Nadeko yourself**. Be sure you have FFMPEG installed correctly, and have followed the [guide](http://nadekobot.readthedocs.io/en/1.0/guides/Windows%20Guide/) carefully.
+
+###Question 8: My music is still not working/very laggy?
+----
+**Answer:** Try changing your discord [location][1], if this doesn't work be sure you have enabled the correct permissions for Nadeko and rebooted since installing FFMPEG.
+[1]: https://support.discordapp.com/hc/en-us/articles/216661717-How-do-I-change-my-Voice-Server-Region-
+
+###Question 9: I want to change data in the database (like NadekoFlowers or the pokemontypes of users, but how?
+----
+**Answer:** Open `/data/NadekoBot.db` using sqlitebrowser (or some alternative), Browse Data, select relevant table, change data, Write changes
+
+###Question 10: The .greet and .bye commands doesn't work, but everything else is (From @Kong)
+-----
+**Answer:** Set a greeting message by using `.greetmsg YourMessageHere` and a bye-message by using `.byemsg YourMessageHere`. Don't forget that `.greet` and `.bye` only apply to users joining a server, not coming online/offline.
+
+###Question 11: How do I import certs on linux?
+-------
+**Answer:**
+
+`certmgr -ssl https://discordapp.com`
+
+`certmgr -ssl https://gateway.discord.gg`
+
+###Question 12: I made an application, but I can't add that new bot to my server, how do I invite it to my server?
+----
+**Answer:** You need to use oauth link to add it to you server, just copy your CLIENT ID (that's in the same Developer page where you brought your token) and replace `12345678` in the link below: https://discordapp.com/oauth2/authorize?client_id=12345678&scope=bot&permissions=66186303
+
+Follow this Detailed [Guide](http://discord.kongslien.net/guide.html) if you do not understand.
+
+###Question 13: I'm building NadekoBot from source, but I get hundreds of (namespace) errors without changing anything!?
+-----
+**Answer:** Using Visual Studio, you can solve these errors by going to `Tools` -> `NuGet Package Manager` -> `Manage NuGet Packages for Solution`. Go to the Installed tab, select the Packages that were missing (usually `Newtonsoft.json` and `RestSharp`) and install them for all projects
+
+###Question 14: My bot has all permissions but it's still saying, "Failed to add roles. Bot has insufficient permissions.". How do I fix this?
+----------
+**Answer:** Discord has added a few new features and roles now follow hierarchy. This means you need to place your bot's role above every-other role your server has. [Here's](https://support.discordapp.com/hc/en-us/articles/214836687-Role-Management-101) a link to Discords role management 101.
+
+###Question 15: I've broken permissions and am stuck, can I reset permissions?
+----------
+**Answer:** Yes, there is a way, in one easy command! Just run `.resetperms`
+
+**Please Note:** *The bot can only set/add all roles below its own highest role. It can not assign it's "highest role" to anyone else.*
diff --git a/docs/JSON Explanations.md b/docs/JSON Explanations.md
new file mode 100644
index 00000000..304e9e0e
--- /dev/null
+++ b/docs/JSON Explanations.md
@@ -0,0 +1,60 @@
+###Setting up your Credentials
+If you do not see `credentials.json` you will need to rename `credentials_example.json` to `credentials.json`.
+
+**This is how the unedited credentials look:**
+```json
+{
+ "Token": "",
+ "ClientId": "116275390695079945",
+ "BotId": 1231231231231,
+ "OwnerIds": [
+ 123123123123,
+ 5675675679845
+ ],
+ "GoogleAPIKey": "",
+ "SoundCloudClientID": "",
+ "MashapeKey": "",
+ "LOLAPIKEY": "",
+ "TrelloAPPKey": "",
+ "OsuAPIKey": "",
+ "CarbonKey": "",
+}
+```
+####Required Parts
++ **Token** - Required to log in. Refer to this [guide](http://discord.kongslien.net/guide.html)
++ **OwnerIds** - Required for the **Owner-Only** commands. Seperate multiple Id's with a comma.
++ **BotId** - Required for custom reactions and conversation commands to work.
+ + **Important : Bot ID and Client ID are the same in newer bot accounts due to recent Discord API changes.**
+
+_BotId and the OwnerIds are **NOT** the names of the owner and the bot. If you do not know the id of your bot, keep the two random numbers in those fields and
+run the bot then do `.uid @MyBotName` - this will give you your bot_id.
+Do the same for yourself with `.uid @MyName` Put these numbers in their respective field of the credentials._
+
+Setting up your API keys
+====================
+####This part is completely optional, **However it is necessary for music to work properly**
++ **GoogleAPIKey** - Required for Youtube Song Search, Playlist queuing, and URL Shortener. `~i` and `~img`.
+ + You can get this api Key [here](https://console.developers.google.com/apis)
++ **SoundCloudClientID** - Required to queue soundloud songs from sc links.
+ + You will need to create a new app [here](http://soundcloud.com/you/apps). **Please note you must be logged into SoundCloud**
+ + You should come to a page that looks like this ![Imgur](http://i.imgur.com/RAZ2HDM.png)
+ + Simply click Register a new application and enter a name.
+ + After naming your app you will be brought to this page: ![Imgur](http://i.imgur.com/GH1gjKK.png) Copy the Client ID and click "save app" then paste the Client Id it into your `credentials.json`
++ **MashapeKey** - 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/)
++ **TrelloAppKey** - Required for the trello commands.
+ + You can get this key [here](https://trello.com/app-key) **Be sure you are logged into Trello first**
++ **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**
++ **CarbonKey** -This key is for Carobnitex.net stats.
+ + Most likely unnecessary **Needed only if your bot is listed on Carbonitex.net**
+
+Config.json
+===========
+In the folder where `NadekoBot.exe` is located you should also see a `Data` folder. In this folder you will find `config.json` among other files.
+`config.json` contains user specific commands, such as: if DM's sent to the bot are forwarded to you, Blacklisted Ids, Servers, and channels...etc.
+
+**If you do not see** `config.json` **you need to rename** `config_example.json` **to** `config.json`
diff --git a/docs/Permissions System.md b/docs/Permissions System.md
new file mode 100644
index 00000000..3494c09f
--- /dev/null
+++ b/docs/Permissions System.md
@@ -0,0 +1,84 @@
+Permissions Overview
+===================
+Have you ever felt confused or even overwhelmed when trying to set Nadeko's permissions? In this guide we will be explaining how to use the
+permission commands correctly and even cover a few common questions! Every command we discuss here can be found in the [Commands List](http://nadekobot.readthedocs.io/en/1.0/Commands%20List/#permissions).
+
+**To see the old guide for versions 0.9 and below, see [here](http://nadekobot.readthedocs.io/en/latest/Permissions%20System/)**
+
+Why do we use the Permissions Commands?
+------------------------------
+Permissions are very handy at setting who can use what commands in a server. By default, the NSFW module is blocked, but nothing else is. If something is a bot owner only command, it can only be ran by the bot owner, the person who is running the bot, or has their id in [`credentials.json`](http://nadekobot.readthedocs.io/en/1.0/JSON%20Explanations/ "Setting up your credentials").
+
+The administration module still requires that you have the correct permissions on discord to be able to use these commands, so for users to be able to use commands like `.kick` and `.prune`, they need kick and mange messages permissions respectively.
+
+With the permissions system it possible to restrict who can skip the current song, pick NadekoFlowers or use the NSFW module.
+
+First Time Setup
+------------------
+To change permissions you **must** meet the following requirement:
+
+**Have the role specified by `;permrole` (By default, this is Nadeko)**
+
+If you have an existing role called "Nadeko" but can't assign it to yourself, create a new role called "Nadeko" and assign that to yourself.
+
+If you would like to set a different role, such as "Admins", to be the role required to edit permissions, do `;permrole Admins` (you must have the current permission role to be able to do this).
+
+Basics & Hierarchy
+-----
+The [Commands List](http://nadekobot.readthedocs.io/en/1.0/Commands%20List/#permissions) is a great resource which lists **all** the available commands, however we'll go over a few commands here.
+
+Firstly, let's explain how the permissions system works - It's simple once you figure out how each command works!
+The permissions system works as a chain, everytime a command is used, the permissions chain is checked. Starting from the top of the chain, the command is compared to a rule, if it isn't either allowed or disallowed by that rule it proceeds to check the next rule all the way till it reaches the bottom rule, which allows all commands.
+
+To view this permissions chain, do `;listperms`, with the top of the chain being rule number 1, shown at the top of the message.
+
+If you want to remove a permission from the chain of permissions, do `;removeperm X` to remove rule number X and similarly, do `;moveperm X Y` to move rule number X to number Y (moving, not swapping!).
+
+As an example, if you wanted to enable NSFW for a certain role, say "Lewd", you could do `;rolemdl NSFW enable Lewd`.
+This adds the rule to the top of the permissions chain so even if the default `;sm NSFW disabled` rule exists, the "Lewd" role will be able to use the NSFW module.
+
+If you want the bot to notify users why they can't use a command or module, use `;verbose true` and Nadeko will tell you what rule is preventing the command.
+
+Commonly Asked Questions
+---------------
+
+###How do I create a music DJ?
+To allow users to only see the current song and have a DJ role for queuing follow these five steps:
+
+1. `;sm Music disable`
+
+ * Disables music commands for everybody
+
+2. `;sc !!nowplaying enable`
+
+ * Enables the "nowplaying" command for everyone
+
+3. `;sc !!getlink enable`
+
+ * Enables the "getlink" command for everyone
+
+4. `;sc !!listqueue enable`
+
+ * Enables the "listqueue" command for everyone
+
+5. `;rm Music enable DJ`
+
+ * Enables all the music commands only for the DJ role
+
+
+###How do I create a NSFW channel?
+Say you want to only enable NSFW commands in the #NSFW channel, just do the following two steps.
+
+1. `;sm NSFW disable`
+ * Disables the NSFW module from being used
+
+2. `;cm NSFW enable #NSFW`
+ * Enables the NSFW module for use in the #NSFW channel
+
+###I've broken permissions and am stuck, can I reset permissions?
+Yes, there is a way, in one easy command!
+
+1. `.resetperms`
+ * This resets the permission chain back to default, with only NSFW disabled
+
+_-- Thanks to @applemac for providing the template for this guide_
diff --git a/docs/Readme.md b/docs/Readme.md
new file mode 100644
index 00000000..4268c8c3
--- /dev/null
+++ b/docs/Readme.md
@@ -0,0 +1,29 @@
+##Readme for Commands List
+
+###Bot Owner Only
+
+- *Bot Owner Only* commands refer to the commands only the **owner** of the bot can use.
+- *Bot Owner Only* commands do **not** refer to the owner of the **server**, just the owner of the **bot**.
+- *Owner of the bot* is a person who is **hosting** their own bot, and their **ID** is inside of **credentials.json** file.
+- You are **not** the bot **owner** if you invited the bot using **Carbonitex** or other invitation links.
+
+###Music on the public Nadeko
+
+- In case you got Nadeko in your server by the invitation from **Carbonitex**, our **GitHub** invite or **help (-h)**, music is disabled.
+- Music is **disabled** due to large maintenance expenses, unless Kwoth is **testing** music module.
+- If you want to have music module on your server, you will have to **host** the bot on your PC, or any of the external servers.
+- How to **host** the bot, check the **guides** on the left side.
+
+###NadekoFlowers
+
+- NadekoFlowers is the **currency** of the public Nadeko.
+- NadekoFlowers can be `>pick`ed after Nadeko plants a flower randomly after `>gc` has been used on a channel
+- You can give NadekoFlowers to other users, using the command `$give X @person`.
+- You can only give flowers you **own**.
+- If you want to have **unlimited** number of flowers, you will have to **host** the bot.
+- Commands `$award X @person` and `$take X @person` can only be used by the *bot owner*.
+- If you `>plant` the flower, flower will be avaliable for everyone to `>pick` it. In that case you will **lose** the flower.
+
+###Manage Permissions
+
+**These permissions refer to the permissions you can set in Discord settings for individual users or roles.**
diff --git a/docs/about.md b/docs/about.md
new file mode 100644
index 00000000..8435eda2
--- /dev/null
+++ b/docs/about.md
@@ -0,0 +1,13 @@
+## Terms of Use
+
+The MIT License (MIT)
+
+Copyright (c) 2016 NadekoBot Team
+
+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:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
diff --git a/docs/commandlist.md b/docs/commandlist.md
deleted file mode 100644
index 516eff12..00000000
--- a/docs/commandlist.md
+++ /dev/null
@@ -1,363 +0,0 @@
-######For more information and how to setup your own NadekoBot, go to: **http://github.com/Kwoth/NadekoBot/**
-######You can donate on patreon: `https://patreon.com/nadekobot`
-######or paypal: `nadekodiscordbot@gmail.com`
-
-#NadekoBot List Of Commands
-Version: `NadekoBot v0.9.6054.4837`
-### Help
-Command and aliases | Description | Usage
-----------------|--------------|-------
-`-h`, `-help`, `@BotName help`, `@BotName h`, `~h` | Either shows a help for a single command, or PMs you help link if no arguments are specified. | `-h !m q` or just `-h`
-`-hgit` | Generates the commandlist.md file. **Bot Owner Only!** | `-hgit`
-`-readme`, `-guide` | Sends a readme and a guide links to the channel. | `-readme` or `-guide`
-`-donate`, `~donate` | Instructions for helping the project! | `{Prefix}donate` or `~donate`
-`-modules`, `.modules` | List all bot modules. | `{Prefix}modules` or `.modules`
-`-commands`, `.commands` | List all of the bot's commands from a certain module. | `{Prefix}commands` or `.commands`
-
-### Administration
-Command and aliases | Description | Usage
-----------------|--------------|-------
-`.grdel` | Toggles automatic deletion of greet and bye messages. | `.grdel`
-`.greet` | Toggles anouncements on the current channel when someone joins the server. | `.greet`
-`.greetmsg` | Sets a new join announcement message. Type %user% if you want to mention the new member. Using it with no message will show the current greet message. | `.greetmsg Welcome to the server, %user%.`
-`.bye` | Toggles anouncements on the current channel when someone leaves the server. | `.bye`
-`.byemsg` | Sets a new leave announcement message. Type %user% if you want to mention the new member. Using it with no message will show the current bye message. | `.byemsg %user% has left the server.`
-`.byepm` | Toggles whether the good bye messages will be sent in a PM or in the text channel. | `.byepm`
-`.greetpm` | Toggles whether the greet messages will be sent in a PM or in the text channel. | `.greetpm`
-`.spmom` | Toggles whether mentions of other offline users on your server will send a pm to them. | `.spmom`
-`.logserver` | Toggles logging in this channel. Logs every message sent/deleted/edited on the server. **Bot Owner Only!** | `.logserver`
-`.logignore` | Toggles whether the .logserver command ignores this channel. Useful if you have hidden admin channel and public log channel. | `.logignore`
-`.userpresence` | Starts logging to this channel when someone from the server goes online/offline/idle. | `.userpresence`
-`.voicepresence` | Toggles logging to this channel whenever someone joins or leaves a voice channel you are in right now. | `{Prefix}voicerpresence`
-`.repeatinvoke`, `.repinv` | Immediately shows the repeat message and restarts the timer. | `{Prefix}repinv`
-`.repeat` | Repeat a message every X minutes. If no parameters are specified, repeat is disabled. Requires manage messages. | `.repeat 5 Hello there`
-`.rotateplaying`, `.ropl` | Toggles rotation of playing status of the dynamic strings you specified earlier. | `.ropl`
-`.addplaying`, `.adpl` | Adds a specified string to the list of playing strings to rotate. Supported placeholders: %servers%, %users%, %playing%, %queued%, %trivia% | `.adpl`
-`.listplaying`, `.lipl` | Lists all playing statuses with their corresponding number. | `.lipl`
-`.removeplaying`, `.repl`, `.rmpl` | Removes a playing string on a given number. | `.rmpl`
-`.slowmode` | Toggles slow mode. When ON, users will be able to send only 1 message every 5 seconds. | `.slowmode`
-`.cleanv+t`, `.cv+t` | Deletes all text channels ending in `-voice` for which voicechannels are not found. **Use at your own risk.** | `.cleanv+t`
-`.voice+text`, `.v+t` | Creates a text channel for each voice channel only users in that voice channel can see.If you are server owner, keep in mind you will see them all the time regardless. | `.voice+text`
-`.scsc` | Starts an instance of cross server channel. You will get a token as a DM that other people will use to tune in to the same instance. | `.scsc`
-`.jcsc` | Joins current channel to an instance of cross server channel using the token. | `.jcsc`
-`.lcsc` | Leaves Cross server channel instance from this channel. | `.lcsc`
-`.asar` | Adds a role, or list of roles separated by whitespace(use quotations for multiword roles) to the list of self-assignable roles. | .asar Gamer
-`.rsar` | Removes a specified role from the list of self-assignable roles. | `.rsar`
-`.lsar` | Lists all self-assignable roles. | `.lsar`
-`.togglexclsar`, `.tesar` | toggle whether the self-assigned roles should be exclusive | `.tesar`
-`.iam` | Adds a role to you that you choose. Role must be on a list of self-assignable roles. | .iam Gamer
-`.iamnot`, `.iamn` | Removes a role to you that you choose. Role must be on a list of self-assignable roles. | .iamn Gamer
-`.addcustreact`, `.acr` | Add a custom reaction. Guide here: **Bot Owner Only!** | `.acr "hello" I love saying hello to %user%`
-`.listcustreact`, `.lcr` | Lists custom reactions (paginated with 30 commands per page). Use 'all' instead of page number to get all custom reactions DM-ed to you. | `.lcr 1`
-`.showcustreact`, `.scr` | Shows all possible responses from a single custom reaction. | `.scr %mention% bb`
-`.editcustreact`, `.ecr` | Edits a custom reaction, arguments are custom reactions name, index to change, and a (multiword) message **Bot Owner Only** | `.ecr "%mention% disguise" 2 Test 123`
-`.delcustreact`, `.dcr` | Deletes a custom reaction with given name (and index). | `.dcr index`
-`.autoassignrole`, `.aar` | Automaticaly assigns a specified role to every user who joins the server. Type `.aar` to disable, `.aar Role Name` to enable
-`.leave` | Makes Nadeko leave the server. Either name or id required. | `.leave 123123123331`
-`.listincidents`, `.lin` | List all UNREAD incidents and flags them as read. | `.lin`
-`.listallincidents`, `.lain` | Sends you a file containing all incidents and flags them as read. | `.lain`
-`.delmsgoncmd` | Toggles the automatic deletion of user's successful command message to prevent chat flood. Server Manager Only. | `.delmsgoncmd`
-`.restart` | Restarts the bot. Might not work. **Bot Owner Only** | `.restart`
-`.setrole`, `.sr` | Sets a role for a given user. | `.sr @User Guest`
-`.removerole`, `.rr` | Removes a role from a given user. | `.rr @User Admin`
-`.renamerole`, `.renr` | Renames a role. Role you are renaming must be lower than bot's highest role. | `.renr "First role" SecondRole`
-`.removeallroles`, `.rar` | Removes all roles from a mentioned user. | `.rar @User`
-`.createrole`, `.cr` | Creates a role with a given name. | `.cr Awesome Role`
-`.rolecolor`, `.rc` | Set a role's color to the hex or 0-255 rgb color value provided. | `.rc Admin 255 200 100` or `.rc Admin ffba55`
-`.ban`, `.b` | Bans a user by id or name with an optional message. | `.b "@some Guy" Your behaviour is toxic.`
-`.softban`, `.sb` | Bans and then unbans a user by id or name with an optional message. | `.sb "@some Guy" Your behaviour is toxic.`
-`.kick`, `.k` | Kicks a mentioned user. | `.k "@some Guy" Your behaviour is toxic.`
-`.mute` | Mutes mentioned user or users. | `.mute "@Someguy"` or `.mute "@Someguy" "@Someguy"`
-`.unmute` | Unmutes mentioned user or users. | `.unmute "@Someguy"` or `.unmute "@Someguy" "@Someguy"`
-`.deafen`, `.deaf` | Deafens mentioned user or users | `.deaf "@Someguy"` or `.deaf "@Someguy" "@Someguy"`
-`.undeafen`, `.undef` | Undeafens mentioned user or users | `.undef "@Someguy"` or `.undef "@Someguy" "@Someguy"`
-`.delvoichanl`, `.dvch` | Deletes a voice channel with a given name. | `.dvch VoiceChannelName`
-`.creatvoichanl`, `.cvch` | Creates a new voice channel with a given name. | `.cvch VoiceChannelName`
-`.deltxtchanl`, `.dtch` | Deletes a text channel with a given name. | `.dtch TextChannelName`
-`.creatxtchanl`, `.ctch` | Creates a new text channel with a given name. | `.ctch TextChannelName`
-`.settopic`, `.st` | Sets a topic on the current channel. | `.st My new topic`
-`.setchanlname`, `.schn` | Changed the name of the current channel.| `.schn NewName`
-`.heap` | Shows allocated memory - **Bot Owner Only!** | `.heap`
-`.prune`, `.clr` | `.prune` removes all nadeko's messages in the last 100 messages.`.prune X` removes last X messages from the channel (up to 100)`.prune @Someone` removes all Someone's messages in the last 100 messages.`.prune @Someone X` removes last X 'Someone's' messages in the channel. | `.prune` or `.prune 5` or `.prune @Someone` or `.prune @Someone X`
-`.die` | Shuts the bot down and notifies users about the restart. **Bot Owner Only!** | `.die`
-`.setname`, `.newnm` | Give the bot a new name. **Bot Owner Only!** | .newnm BotName
-`.newavatar`, `.setavatar` | Sets a new avatar image for the NadekoBot. Argument is a direct link to an image. **Bot Owner Only!** | `.setavatar https://i.ytimg.com/vi/WDudkR1eTMM/maxresdefault.jpg`
-`.setgame` | Sets the bots game. **Bot Owner Only!** | `.setgame Playing with kwoth`
-`.send` | Send a message to someone on a different server through the bot. **Bot Owner Only!** | `.send serverid|u:user_id Send this to a user!` or `.send serverid|c:channel_id Send this to a channel!`
-`.mentionrole`, `.menro` | Mentions every person from the provided role or roles (separated by a ',') on this server. Requires you to have mention everyone permission. | `.menro RoleName`
-`.unstuck` | Clears the message queue. **Bot Owner Only!** | `.unstuck`
-`.donators` | List of lovely people who donated to keep this project alive.
-`.donadd` | Add a donator to the database. | `.donadd Donate Amount`
-`.announce` | Sends a message to all servers' general channel bot is connected to.**Bot Owner Only!** | `.announce Useless spam`
-`.savechat` | Saves a number of messages to a text file and sends it to you. **Bot Owner Only** | `.savechat 150`
-
-### Utility
-Command and aliases | Description | Usage
-----------------|--------------|-------
-`.remind` | Sends a message to you or a channel after certain amount of time. First argument is me/here/'channelname'. Second argument is time in a descending order (mo>w>d>h>m) example: 1w5d3h10m. Third argument is a (multiword)message. | `.remind me 1d5h Do something` or `.remind #general Start now!`
-`.remindmsg` | Sets message for when the remind is triggered. Available placeholders are %user% - user who ran the command, %message% - Message specified in the remind, %target% - target channel of the remind. **Bot Owner Only!** | `.remindmsg do something else`
-`.serverinfo`, `.sinfo` | Shows info about the server the bot is on. If no channel is supplied, it defaults to current one. | `.sinfo Some Server`
-`.channelinfo`, `.cinfo` | Shows info about the channel. If no channel is supplied, it defaults to current one. | `.cinfo #some-channel`
-`.userinfo`, `.uinfo` | Shows info about the user. If no user is supplied, it defaults a user running the command. | `.uinfo @SomeUser`
-`.whoplays` | Shows a list of users who are playing the specified game. | `.whoplays Overwatch`
-`.inrole` | Lists every person from the provided role or roles (separated by a ',') on this server. If the list is too long for 1 message, you must have Manage Messages permission. | `.inrole Role`
-`.checkmyperms` | Checks your userspecific permissions on this channel. | `.checkmyperms`
-`.stats` | Shows some basic stats for Nadeko. | `.stats`
-`.dysyd` | Shows some basic stats for Nadeko. | `.dysyd`
-`.userid`, `.uid` | Shows user ID. | `.uid` or `.uid "@SomeGuy"`
-`.channelid`, `.cid` | Shows current channel ID. | `.cid`
-`.serverid`, `.sid` | Shows current server ID. | `.sid`
-`.roles` | List all roles on this server or a single user if specified.
-`.channeltopic`, `.ct` | Sends current channel's topic as a message. | `.ct`
-
-### Permissions
-Command and aliases | Description | Usage
-----------------|--------------|-------
-`;chnlfilterinv`, `;cfi` | Enables or disables automatic deleting of invites on the channel.If no channel supplied, it will default to current one. Use ALL to apply to all existing channels at once. | ;cfi enable #general-chat
-`;srvrfilterinv`, `;sfi` | Enables or disables automatic deleting of invites on the server. | ;sfi disable
-`;chnlfilterwords`, `;cfw` | Enables or disables automatic deleting of messages containing banned words on the channel.If no channel supplied, it will default to current one. Use ALL to apply to all existing channels at once. | ;cfw enable #general-chat
-`;addfilterword`, `;afw` | Adds a new word to the list of filtered words | ;afw poop
-`;rmvfilterword`, `;rfw` | Removes the word from the list of filtered words | ;rw poop
-`;lstfilterwords`, `;lfw` | Shows a list of filtered words | ;lfw
-`;srvrfilterwords`, `;sfw` | Enables or disables automatic deleting of messages containing forbidden words on the server. | ;sfw disable
-`;permrole`, `;pr` | Sets a role which can change permissions. Or supply no parameters to find out the current one. Default one is 'Nadeko'. | `;pr role`
-`;rolepermscopy`, `;rpc` | Copies BOT PERMISSIONS (not discord permissions) from one role to another. | `;rpc Some Role ~ Some other role`
-`;chnlpermscopy`, `;cpc` | Copies BOT PERMISSIONS (not discord permissions) from one channel to another. | `;cpc Some Channel ~ Some other channel`
-`;usrpermscopy`, `;upc` | Copies BOT PERMISSIONS (not discord permissions) from one role to another. | `;upc @SomeUser ~ @SomeOtherUser`
-`;verbose`, `;v` | Sets whether to show when a command/module is blocked. | `;verbose true`
-`;srvrperms`, `;sp` | Shows banned permissions for this server. | `;sp`
-`;roleperms`, `;rp` | Shows banned permissions for a certain role. No argument means for everyone. | `;rp AwesomeRole`
-`;chnlperms`, `;cp` | Shows banned permissions for a certain channel. No argument means for this channel. | `;cp #dev`
-`;userperms`, `;up` | Shows banned permissions for a certain user. No argument means for yourself. | `;up Kwoth`
-`;srvrmdl`, `;sm` | Sets a module's permission at the server level. | `;sm "module name" enable`
-`;srvrcmd`, `;sc` | Sets a command's permission at the server level. | `;sc "command name" disable`
-`;rolemdl`, `;rm` | Sets a module's permission at the role level. | `;rm "module name" enable MyRole`
-`;rolecmd`, `;rc` | Sets a command's permission at the role level. | `;rc "command name" disable MyRole`
-`;chnlmdl`, `;cm` | Sets a module's permission at the channel level. | `;cm "module name" enable SomeChannel`
-`;chnlcmd`, `;cc` | Sets a command's permission at the channel level. | `;cc "command name" enable SomeChannel`
-`;usrmdl`, `;um` | Sets a module's permission at the user level. | `;um "module name" enable SomeUsername`
-`;usrcmd`, `;uc` | Sets a command's permission at the user level. | `;uc "command name" enable SomeUsername`
-`;allsrvrmdls`, `;asm` | Sets permissions for all modules at the server level. | `;asm [enable/disable]`
-`;allsrvrcmds`, `;asc` | Sets permissions for all commands from a certain module at the server level. | `;asc "module name" [enable/disable]`
-`;allchnlmdls`, `;acm` | Sets permissions for all modules at the channel level. | `;acm [enable/disable] SomeChannel`
-`;allchnlcmds`, `;acc` | Sets permissions for all commands from a certain module at the channel level. | `;acc "module name" [enable/disable] SomeChannel`
-`;allrolemdls`, `;arm` | Sets permissions for all modules at the role level. | `;arm [enable/disable] MyRole`
-`;allrolecmds`, `;arc` | Sets permissions for all commands from a certain module at the role level. | `;arc "module name" [enable/disable] MyRole`
-`;ubl` | Blacklists a mentioned user. | `;ubl [user_mention]`
-`;uubl` | Unblacklists a mentioned user. | `;uubl [user_mention]`
-`;cbl` | Blacklists a mentioned channel (#general for example). | `;cbl #some_channel`
-`;cubl` | Unblacklists a mentioned channel (#general for example). | `;cubl #some_channel`
-`;sbl` | Blacklists a server by a name or id (#general for example). **BOT OWNER ONLY** | `;sbl [servername/serverid]`
-`;cmdcooldown`, `;cmdcd` | Sets a cooldown per user for a command. Set 0 to clear. | `;cmdcd "some cmd" 5`
-`;allcmdcooldowns`, `;acmdcds` | Shows a list of all commands and their respective cooldowns.
-
-### Conversations
-Command and aliases | Description | Usage
-----------------|--------------|-------
-`..` | Adds a new quote with the specified name (single word) and message (no limit). | `.. abc My message`
-`...` | Shows a random quote with a specified name. | `... abc`
-`..qdel`, `..quotedelete` | Deletes all quotes with the specified keyword. You have to either be bot owner or the creator of the quote to delete it. | `..qdel abc`
-`@BotName rip` | Shows a grave image of someone with a start year | @NadekoBot rip @Someone 2000
-`@BotName die` | Works only for the owner. Shuts the bot down. | `@NadekoBot die`
-`@BotName do you love me` | Replies with positive answer only to the bot owner. | `@NadekoBot do you love me`
-`@BotName how are you`, `@BotName how are you?` | Replies positive only if bot owner is online. | `@NadekoBot how are you`
-`@BotName fire` | Shows a unicode fire message. Optional parameter [x] tells her how many times to repeat the fire. | `@NadekoBot fire [x]`
-`@BotName dump` | Dumps all of the invites it can to dump.txt.** Owner Only.** | `@NadekoBot dump`
-`@BotName ab` | Try to get 'abalabahaha'| `@NadekoBot ab`
-
-### Gambling
-Command and aliases | Description | Usage
-----------------|--------------|-------
-`$draw` | Draws a card from the deck.If you supply number [x], she draws up to 5 cards from the deck. | `$draw [x]`
-`$shuffle`, `$sh` | Reshuffles all cards back into the deck.|`$shuffle`
-`$flip` | Flips coin(s) - heads or tails, and shows an image. | `$flip` or `$flip 3`
-`$betflip`, `$bf` | Bet to guess will the result be heads or tails. Guessing award you double flowers you've bet. | `$bf 5 heads` or `$bf 3 t`
-`$roll` | Rolls 0-100. If you supply a number [x] it rolls up to 30 normal dice. If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. | `$roll` or `$roll 7` or `$roll 3d5`
-`$rolluo` | Rolls 0-100. If you supply a number [x] it rolls up to 30 normal dice (unordered). If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. | `$roll` or `$roll` 7 or `$roll 3d5`
-`$nroll` | Rolls in a given range. | `$nroll 5` (rolls 0-5) or `$nroll 5-15`
-`$race` | Starts a new animal race. | `$race`
-`$joinrace`, `$jr` | Joins a new race. You can specify an amount of flowers for betting (optional). You will get YourBet*(participants-1) back if you win. | `$jr` or `$jr 5`
-`$raffle` | Prints a name and ID of a random user from the online list from the (optional) role. | `$raffle` or `$raffle RoleName`
-`$$$` | Check how much NadekoFlowers a person has. (Defaults to yourself) | `$$$` or `$$$ @Someone`
-`$give` | Give someone a certain amount of NadekoFlowers|`$give 1 "@SomeGuy"`
-`$award` | Gives someone a certain amount of flowers. **Bot Owner Only!** | `$award 100 @person`
-`$take` | Takes a certain amount of flowers from someone. **Bot Owner Only!** | `$take 1 "@someguy"`
-`$betroll`, `$br` | Bets a certain amount of NadekoFlowers and rolls a dice. Rolling over 66 yields x2 flowers, over 90 - x3 and 100 x10. | `$br 5`
-`$leaderboard`, `$lb` | Displays bot currency leaderboard | $lb
-
-### Games
-Command and aliases | Description | Usage
-----------------|--------------|-------
-`>t` | Starts a game of trivia. You can add nohint to prevent hints.First player to get to 10 points wins by default. You can specify a different number. 30 seconds per question. | `>t nohint` or `>t 5 nohint`
-`>tl` | Shows a current trivia leaderboard. | `>tl`
-`>tq` | Quits current trivia after current question. | `>tq`
-`>typestart` | Starts a typing contest. | `>typestart`
-`>typestop` | Stops a typing contest on the current channel. | `>typestop`
-`>typeadd` | Adds a new article to the typing contest. Owner only. | `>typeadd wordswords`
-`>poll` | Creates a poll, only person who has manage server permission can do it. | `>poll Question?;Answer1;Answ 2;A_3`
-`>pollend` | Stops active poll on this server and prints the results in this channel. | `>pollend`
-`>pick` | Picks a flower planted in this channel. | `>pick`
-`>plant` | Spend a flower to plant it in this channel. (If bot is restarted or crashes, flower will be lost) | `>plant`
-`>gencurrency`, `>gc` | Toggles currency generation on this channel. Every posted message will have 2% chance to spawn a NadekoFlower. Optional parameter cooldown time in minutes, 5 minutes by default. Requires Manage Messages permission. | `>gc` or `>gc 60`
-`>leet` | Converts a text to leetspeak with 6 (1-6) severity levels | `>leet 3 Hello`
-`>choose` | Chooses a thing from a list of things | `>choose Get up;Sleep;Sleep more`
-`>8ball` | Ask the 8ball a yes/no question. | `>8ball should i do something`
-`>rps` | Play a game of rocket paperclip scissors with Nadeko. | `>rps scissors`
-`>linux` | Prints a customizable Linux interjection | `>linux Spyware Windows`
-
-### Music
-Command and aliases | Description | Usage
-----------------|--------------|-------
-`!!next`, `!!n`, `!!skip` | Goes to the next song in the queue. You have to be in the same voice channel as the bot. | `!!n`
-`!!stop`, `!!s` | Stops the music and clears the playlist. Stays in the channel. | `!!s`
-`!!destroy`, `!!d` | Completely stops the music and unbinds the bot from the channel. (may cause weird behaviour) | `!!d`
-`!!pause`, `!!p` | Pauses or Unpauses the song. | `!!p`
-`!!queue`, `!!q`, `!!yq` | Queue a song using keywords or a link. Bot will join your voice channel.**You must be in a voice channel**. | `!!q Dream Of Venice`
-`!!soundcloudqueue`, `!!sq` | Queue a soundcloud song using keywords. Bot will join your voice channel.**You must be in a voice channel**. | `!!sq Dream Of Venice`
-`!!listqueue`, `!!lq` | Lists 15 currently queued songs per page. Default page is 1. | `!!lq` or `!!lq 2`
-`!!nowplaying`, `!!np` | Shows the song currently playing. | `!!np`
-`!!volume`, `!!vol` | Sets the music volume 0-100% | `!!vol 50`
-`!!defvol`, `!!dv` | Sets the default music volume when music playback is started (0-100). Persists through restarts. | `!!dv 80`
-`!!mute`, `!!min` | Sets the music volume to 0% | `!!min`
-`!!max` | Sets the music volume to 100%. | `!!max`
-`!!half` | Sets the music volume to 50%. | `!!half`
-`!!shuffle`, `!!sh` | Shuffles the current playlist. | `!!sh`
-`!!playlist`, `!!pl` | Queues up to 500 songs from a youtube playlist specified by a link, or keywords. | `!!pl playlist link or name`
-`!!soundcloudpl`, `!!scpl` | Queue a soundcloud playlist using a link. | `!!scpl https://soundcloud.com/saratology/sets/symphony`
-`!!localplaylst`, `!!lopl` | Queues all songs from a directory. **Bot Owner Only!** | `!!lopl C:/music/classical`
-`!!radio`, `!!ra` | Queues a radio stream from a link. It can be a direct mp3 radio stream, .m3u, .pls .asx or .xspf (Usage Video: ) | `!!ra radio link here`
-`!!local`, `!!lo` | Queues a local file by specifying a full path. **Bot Owner Only!** | `!!lo C:/music/mysong.mp3`
-`!!move`, `!!mv` | Moves the bot to your voice channel. (works only if music is already playing) | `!!mv`
-`!!remove`, `!!rm` | Remove a song by its # in the queue, or 'all' to remove whole queue. | `!!rm 5`
-`!!movesong`, `!!ms` | Moves a song from one position to another. | `!! ms` 5>3
-`!!setmaxqueue`, `!!smq` | Sets a maximum queue size. Supply 0 or no argument to have no limit. | `!!smq` 50 or `!!smq`
-`!!cleanup` | Cleans up hanging voice connections. **Bot Owner Only!** | `!!cleanup`
-`!!reptcursong`, `!!rcs` | Toggles repeat of current song. | `!!rcs`
-`!!rpeatplaylst`, `!!rpl` | Toggles repeat of all songs in the queue (every song that finishes is added to the end of the queue). | `!!rpl`
-`!!save` | Saves a playlist under a certain name. Name must be no longer than 20 characters and mustn't contain dashes. | `!!save classical1`
-`!!load` | Loads a playlist under a certain name. | `!!load classical-1`
-`!!playlists`, `!!pls` | Lists all playlists. Paginated. 20 per page. Default page is 0. | `!!pls 1`
-`!!deleteplaylist`, `!!delpls` | Deletes a saved playlist. Only if you made it or if you are the bot owner. | `!!delpls animu-5`
-`!!goto` | Goes to a specific time in seconds in a song. | `!!goto 30`
-`!!getlink`, `!!gl` | Shows a link to the currently playing song.
-`!!autoplay`, `!!ap` | Toggles autoplay - When the song is finished, automatically queue a related youtube song. (Works only for youtube songs and when queue is empty)
-
-### Searches
-Command and aliases | Description | Usage
-----------------|--------------|-------
-`~lolchamp` | Shows League Of Legends champion statistics. If there are spaces/apostrophes or in the name - omit them. Optional second parameter is a role. | `~lolchamp Riven` or `~lolchamp Annie sup`
-`~lolban` | Shows top 6 banned champions ordered by ban rate. Ban these champions and you will be Plat 5 in no time. | `~lolban`
-`~hitbox`, `~hb` | Notifies this channel when a certain user starts streaming. | `~hitbox SomeStreamer`
-`~twitch`, `~tw` | Notifies this channel when a certain user starts streaming. | `~twitch SomeStreamer`
-`~beam`, `~bm` | Notifies this channel when a certain user starts streaming. | `~beam SomeStreamer`
-`~checkhitbox`, `~chhb` | Checks if a certain user is streaming on the hitbox platform. | `~chhb SomeStreamer`
-`~checktwitch`, `~chtw` | Checks if a certain user is streaming on the twitch platform. | `~chtw SomeStreamer`
-`~checkbeam`, `~chbm` | Checks if a certain user is streaming on the beam platform. | `~chbm SomeStreamer`
-`~removestream`, `~rms` | Removes notifications of a certain streamer on this channel. | `~rms SomeGuy`
-`~liststreams`, `~ls` | Lists all streams you are following on this server. | `~ls`
-`~convert` | Convert quantities from>to. | `~convert m>km 1000`
-`~convertlist` | List of the convertable dimensions and currencies.
-`~wowjoke` | Get one of Kwoth's penultimate WoW jokes. | `~wowjoke`
-`~calculate`, `~calc` | Evaluate a mathematical expression. | ~calc 1+1
-`~osu` | Shows osu stats for a player. | `~osu Name` or `~osu Name taiko`
-`~osu b` | Shows information about an osu beatmap. | `~osu b` https://osu.ppy.sh/s/127712`
-`~osu top5` | Displays a user's top 5 plays. | ~osu top5 Name
-`~pokemon`, `~poke` | Searches for a pokemon. | `~poke Sylveon`
-`~pokemonability`, `~pokeab` | Searches for a pokemon ability. | `~pokeab "water gun"`
-`~memelist` | Pulls a list of memes you can use with `~memegen` from http://memegen.link/templates/ | `~memelist`
-`~memegen` | Generates a meme from memelist with top and bottom text. | `~memegen biw "gets iced coffee" "in the winter"`
-`~we` | Shows weather data for a specified city and a country. BOTH ARE REQUIRED. Use country abbrevations. | `~we Moscow RF`
-`~yt` | Searches youtubes and shows the first result | `~yt query`
-`~ani`, `~anime`, `~aq` | Queries anilist for an anime and shows the first result. | `~aq aquerion evol`
-`~imdb` | Queries imdb for movies or series, show first result. | `~imdb query`
-`~mang`, `~manga`, `~mq` | Queries anilist for a manga and shows the first result. | `~mq query`
-`~randomcat`, `~meow` | Shows a random cat image.
-`~randomdog`, `~woof` | Shows a random dog image.
-`~i` | Pulls the first image found using a search parameter. Use ~ir for different results. | `~i cute kitten`
-`~ir` | Pulls a random image using a search parameter. | `~ir cute kitten`
-`~lmgtfy` | Google something for an idiot. | `~lmgtfy query`
-`~google`, `~g` | Get a google search link for some terms. | `~google query`
-`~hs` | Searches for a Hearthstone card and shows its image. Takes a while to complete. | `~hs Ysera`
-`~ud` | Searches Urban Dictionary for a word. | `~ud Pineapple`
-`~#` | Searches Tagdef.com for a hashtag. | `~# ff`
-`~quote` | Shows a random quote. | `~quote`
-`~catfact` | Shows a random catfact from | `~catfact`
-`~yomama`, `~ym` | Shows a random joke from | `~ym`
-`~randjoke`, `~rj` | Shows a random joke from | `~rj`
-`~chucknorris`, `~cn` | Shows a random chucknorris joke from | `~cn`
-`~magicitem`, `~mi` | Shows a random magicitem from | `~mi`
-`~revav` | Returns a google reverse image search for someone's avatar. | `~revav "@SomeGuy"`
-`~revimg` | Returns a google reverse image search for an image from a link. | `~revav Image link`
-`~safebooru` | Shows a random image from safebooru with a given tag. Tag is optional but preffered. (multiple tags are appended with +) | `~safebooru yuri+kissing`
-`~wiki` | Gives you back a wikipedia link | `~wiki query`
-`~clr` | Shows you what color corresponds to that hex. | `~clr 00ff00`
-`~videocall` | Creates a private video call link for you and other mentioned people. The link is sent to mentioned people via a private message. | `~videocall "@SomeGuy"`
-`~av`, `~avatar` | Shows a mentioned person's avatar. | `~av @X`
-
-### NSFW
-Command and aliases | Description | Usage
-----------------|--------------|-------
-`~hentai` | Shows a random NSFW hentai image from gelbooru and danbooru with a given tag. Tag is optional but preffered. (multiple tags are appended with +) | `~hentai yuri+kissing`
-`~danbooru` | Shows a random hentai image from danbooru with a given tag. Tag is optional but preffered. (multiple tags are appended with +) | `~danbooru yuri+kissing`
-`~gelbooru` | Shows a random hentai image from gelbooru with a given tag. Tag is optional but preffered. (multiple tags are appended with +) | `~gelbooru yuri+kissing`
-`~rule34` | Shows a random image from rule34.xx with a given tag. Tag is optional but preffered. (multiple tags are appended with +) | `~rule34 yuri+kissing`
-`~e621` | Shows a random hentai image from e621.net with a given tag. Tag is optional but preffered. Use spaces for multiple tags. | `~e621 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`
-
-### ClashOfClans
-Command and aliases | Description | Usage
-----------------|--------------|-------
-`,createwar`, `,cw` | Creates a new war by specifying a size (>10 and multiple of 5) and enemy clan name. | ,cw 15 The Enemy Clan
-`,startwar`, `,sw` | Starts a war with a given number.
-`,listwar`, `,lw` | Shows the active war claims by a number. Shows all wars in a short way if no number is specified. | ,lw [war_number] or ,lw
-`,claim`, `,call`, `,c` | Claims a certain base from a certain war. You can supply a name in the third optional argument to claim in someone else's place. | ,call [war_number] [base_number] [optional_other_name]
-`,claimfinish`, `,cf`, `,cf3`, `,claimfinish3` | Finish your claim with 3 stars if you destroyed a base. Optional second argument finishes for someone else. | ,cf [war_number] [optional_other_name]
-`,claimfinish2`, `,cf2` | Finish your claim with 2 stars if you destroyed a base. Optional second argument finishes for someone else. | ,cf [war_number] [optional_other_name]
-`,claimfinish1`, `,cf1` | Finish your claim with 1 stars if you destroyed a base. Optional second argument finishes for someone else. | ,cf [war_number] [optional_other_name]
-`,unclaim`, `,uncall`, `,uc` | Removes your claim from a certain war. Optional second argument denotes a person in whose place to unclaim | ,uc [war_number] [optional_other_name]
-`,endwar`, `,ew` | Ends the war with a given index. | ,ew [war_number]
-
-### Pokegame
-Command and aliases | Description | Usage
-----------------|--------------|-------
-`>attack` | Attacks a target with the given move. Use `>movelist` to see a list of moves your type can use. | `>attack "vine whip" @someguy`
-`>movelist`, `>ml` | Lists the moves you are able to use | `>ml`
-`>heal` | Heals someone. Revives those who fainted. Costs a NadekoFlower | `>heal @someone`
-`>type` | Get the poketype of the target. | `>type @someone`
-`>settype` | Set your poketype. Costs a NadekoFlower. | `>settype fire`
-
-### Translator
-Command and aliases | Description | Usage
-----------------|--------------|-------
-`~translate`, `~trans` | Translates from>to text. From the given language to the destiation language. | `~trans en>fr Hello`
-`~translangs` | List the valid languages for translation. | `{Prefix}translangs` or `{Prefix}translangs language`
-
-### Customreactions
-Command and aliases | Description | Usage
-----------------|--------------|-------
-`\o\` | Custom reaction. | \o\
-`/o/` | Custom reaction. | /o/
-`moveto` | Custom reaction. | moveto
-`comeatmebro` | Custom reaction. | comeatmebro
-`e` | Custom reaction. | e
-`@BotName insult`, `<@!116275390695079945> insult` | Custom reaction. | %mention% insult
-`@BotName praise`, `<@!116275390695079945> praise` | Custom reaction. | %mention% praise
-`@BotName pat`, `<@!116275390695079945> pat` | Custom reaction. | %mention% pat
-`@BotName cry`, `<@!116275390695079945> cry` | Custom reaction. | %mention% cry
-`@BotName are you real?`, `<@!116275390695079945> are you real?` | Custom reaction. | %mention% are you real?
-`@BotName are you there?`, `<@!116275390695079945> are you there?` | Custom reaction. | %mention% are you there?
-`@BotName draw`, `<@!116275390695079945> draw` | Custom reaction. | %mention% draw
-`@BotName bb`, `<@!116275390695079945> bb` | Custom reaction. | %mention% bb
-`@BotName call`, `<@!116275390695079945> call` | Custom reaction. | %mention% call
-`@BotName disguise`, `<@!116275390695079945> disguise` | Custom reaction. | %mention% disguise
-`~hentai` | Custom reaction. | ~hentai
-
-### Trello
-Command and aliases | Description | Usage
-----------------|--------------|-------
-`trello bind` | Bind a trello bot to a single channel. You will receive notifications from your board when something is added or edited. | `trello bind [board_id]`
-`trello unbind` | Unbinds a bot from the channel and board.
-`trello lists`, `trello list` | Lists all lists yo ;)
-`trello cards` | Lists all cards from the supplied list. You can supply either a name or an index. | `trello cards index`
diff --git a/docs/guides/Building from Source.md b/docs/guides/Building from Source.md
new file mode 100644
index 00000000..557dc3c3
--- /dev/null
+++ b/docs/guides/Building from Source.md
@@ -0,0 +1,8 @@
+###Building from Source
+For easy setup and no programming knowledge, you can use [Updater](https://github.com/Kwoth/NadekoUpdater/releases/latest) or download release from [Releases](https://github.com/Kwoth/NadekoBot/releases) and follow the [Windows Guide](Windows Guide.md)
+
+In your bin/debug folder (or next to your exe if you are using release version), you must have a file called 'credentials.json' in which you will store all the necessary data to make the bot know who the owner is, and your api keys.
+
+When you clone the project, make sure to run `git submodule init` and `git submodule update` to get the correct discord.net version
+
+Make sure you've read ComprehensiveGuide to get a grasp of basic config/credentials setup and then look at "Credentials and config" chapter.
diff --git a/docs/DockerGuide.md b/docs/guides/Docker Guide.md
similarity index 97%
rename from docs/DockerGuide.md
rename to docs/guides/Docker Guide.md
index 5a87bc22..1c0bb3c4 100644
--- a/docs/DockerGuide.md
+++ b/docs/guides/Docker Guide.md
@@ -1,6 +1,6 @@
-## Docker guide with digitalocean
+# Docker Guide with DigitalOcean
-#####Prerequisites:
+#####Prerequisites
- Digital ocean account (you can use my [reflink][reflink] to support the project and get 10$ after you register)
- [PuTTY][PuTTY]
- A bot account - follow this [guide][guide]
diff --git a/docs/LinuxSetup.md b/docs/guides/Linux Guide.md
similarity index 80%
rename from docs/LinuxSetup.md
rename to docs/guides/Linux Guide.md
index 0272affc..c60eb5c3 100644
--- a/docs/LinuxSetup.md
+++ b/docs/guides/Linux Guide.md
@@ -1,9 +1,9 @@
-#Setting up NadekoBot on Linux
+##Setting up NadekoBot on Linux
####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][DigitalOcean] (and using this link will be supporting Nadeko and will give you **$10 credit**)
+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][DigitalOcean] (and using this link will be supporting Nadeko and will give you **$10 credit**)
-######Keep this helpful video handy [Linux Setup Video][Linux Setup Video] (thanks to klincheR) it contains how to set up the Digital Ocean droplet aswell.
+Keep this helpful video handy [Linux Setup Video][Linux Setup Video] (thanks to klincheR) it contains how to set up the Digital Ocean droplet aswell.
####Setting up NadekoBot
Assuming you have followed the link above to created an account in Digital Ocean and video to set up the bot until you get the `IP address and root password (in email)` to login, its time to begin.
@@ -24,47 +24,52 @@ If you entered your Droplets IP address correctly, it should show **login as:**
**Copy and just paste** using **mouse right-click** (it should paste automatically)
-######MONO (Source: [Mono Source][Mono Source])
+####Installing Mono
+MONO (Source: [Mono Source][Mono Source])
-**1) Installing Mono**
+**1)**
`sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF`
-
`echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list`
-
`sudo apt-get update`
Note if the command is not being initiated, hit **Enter**
**2)**
-`echo "deb http://download.mono-project.com/repo/debian wheezy-apache24-compat main" | sudo tee -a /etc/apt/sources.list.d/mono-xamarin.list`
+`echo "deb http://download.mono-project.com/repo/debian wheezy-apache24-compat main" | sudo
+tee -a /etc/apt/sources.list.d/mono-xamarin.list`
+####Mono on Debian 8 and later
**2.5)**
-*ONLY DEBIAN 8 and later*
-`echo "deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main" | sudo tee -a /etc/apt/sources.list.d/mono-xamarin.list`
+`echo "deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main" | sudo
+tee -a /etc/apt/sources.list.d/mono-xamarin.list`
+####Mono on CentOS 7, Fedora 19 (and later) and later
**2.6)**
-*ONLY CentOS 7, Fedora 19 (and later)*
`yum install yum-util`
-
`rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"`
-
`yum-config-manager --add-repo http://download.mono-project.com/repo/centos/`
+####Mono Devel
**3)**
-*Mono Devel*
`apt-get install mono-devel`
**Type** `y` **hit Enter**
+####Mono Fix
+**In case you are having issues with Mono where you get a random string and the bot won't run, do this:**
+`sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF`
+`echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list`
+`apt-get install ca-certificates-mono`
+`mozroots --import --sync`
+
+####Installing Opus Voice Codec
**4)**
-Opus Voice Codec
-
`sudo apt-get install libopus0 opus-tools`
**Type** `y` **hit Enter**
@@ -72,17 +77,6 @@ Opus Voice Codec
**5)**
`sudo apt-get install libopus-dev`
-**In case you are having issues with Mono where you get a random string and the bot won't run, do this:**
-
-`sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF`
-
-`echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list`
-
-`apt-get install ca-certificates-mono`
-
-`mozroots --import --sync`
-
-
####FFMPEG
**6)**
@@ -95,9 +89,7 @@ NOTE: if its "not installing" then, follow the guide here: [FFMPEG Help Guide][F
**All you need to do, if you are running UBUNTU 14.04 is initiate these:**
`sudo add-apt-repository ppa:mc3man/trusty-media`
-
`sudo apt-get update`
-
`sudo apt-get dist-upgrade`
*Before executing* `sudo apt-get install ffmpeg`
@@ -109,11 +101,8 @@ NOTE: if its "not installing" then, follow the guide here: [FFMPEG Help Guide][F
In case you are not able to install it with installer ^up there, follow these steps:
`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`
####Uncomplicated Firewall UFW
@@ -134,30 +123,25 @@ In case you are not able to install it with installer ^up there, follow these st
**10)**
`sudo ufw allow ssh`
-
-
+####Installing Unzip
**11)**
-Unzip
-
`apt-get install unzip`
+####Installing TMUX
**12)**
-TMUX
-
`apt-get install tmux`
**Type** `y` **hit Enter**
-####NOW WE NEED TO IMPORT SOME DISCORD CERTS
+####Importing Discord certs
**13)**
`certmgr -ssl https://discordapp.com`
-
**14)**
`certmgr -ssl https://gateway.discord.gg`
Type `yes` and hit Enter **(three times - as it will ask for three times)**
-
+####Creating Nadeko folder
**15)**
Create a new folder “nadeko” or anything you prefer
@@ -168,7 +152,7 @@ Move to “nadeko” folder (note `cd --` to go back the directory)
`cd nadeko`
-**NOW WE NEED TO GET NADEKO FROM RELEASES**
+####Getting NadekoBot from Releases
Go to this link: [Releases][Releases] and **copy the zip file address** of the lalest version available,
it should look like `https://github.com/Kwoth/NadekoBot/releases/download/vx.xx/NadekoBot.vx.x.zip`
@@ -181,14 +165,13 @@ Get the correct link, type `wget`, then *paste the link*, then hit **Enter**.
**^Do not copy-paste it**
**18)**
-
Now we need to `unzip` the downloaded zip file and to do that, type the file name as it showed in your screen or just copy from the screen, should be like ` NadekoBot.vx.x.zip`
`unzip NadekoBot.vx.x.zip`
**^Do not copy-paste it**
-#####NOW TO SETUP NADEKO
+####Setting up NadekoBot
- Open **CyberDuck**
- Click on **Open Connection** (top-left corner), a new window should appear.
@@ -201,15 +184,16 @@ Now we need to `unzip` the downloaded zip file and to do that, type the file nam
- It should show you the new folder you created.
- Open it.
-#####MAKE SURE YOU READ THE README BEFORE PROCEEDING
+####Renaming Credentials.json
- Copy the `credentials_example.json` to desktop
-- EDIT it as it is guided here: [Readme][Readme]
+- EDIT it as it is guided here: [Setting up Credentials.json](Windows Guide.md#setting-up-credentialsjson-file)
+- Read here how to [Create DiscordBot application](https://github.com/miraai/NadekoBot/blob/dev/docs/guides/Windows%20Guide.md#creating-discordbot-application)
- Rename it to `credentials.json` and paste/put it back in the folder. `(Yes, using CyberDuck)`
- You should see two files `credentials_example.json` and `credentials.json`
- Also if you already have nadeko setup and have `credentials.json`, `config.json`, `nadekobot.sqlite`, and `"permissions" folder`, you can just copy and paste it to the Droplets folder using CyberDuck.
-######TIME TO RUN
+####Running NadekoBot
Go back to **PuTTY**, `(hope its still running xD)`
@@ -218,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`
@@ -227,33 +212,33 @@ Type/ Copy and hit **Enter**.
**CHECK THE BOT IN DISCORD, IF EVERYTHING IS WORKING**
-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.
+####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 detach 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.
**NOW YOU HAVE YOUR OWN NADEKO BOT** `Thanks to Kwoth <3`
-######SOME MORE INFO (JUST TO KNOW):
+####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.)
-
-**21)**
-If you want to **kill** NadekoBot **session**, type `tmux kill-session -t nadeko`
-######TO RESTART YOUR BOT ALONG WITH THE WHOLE SERVER (for science):
-**22)**
+####Restarting Nadeko with the Server
Open **PuTTY** and login as you have before, type `reboot` and hit Enter.
-######IF YOU WANT TO UPDATE YOUR BOT
+####Updating Nadeko
**FOLLOW THESE STEPS SERIALLY**
-- **-21 OR 22**
-- **-19**
- **-16**
- **-17**
- **-18**
+- **-19**
- **-20**
HIT **CTRL+B+D** and close **PuTTY**
diff --git a/docs/guides/OSX Guide.md b/docs/guides/OSX Guide.md
new file mode 100644
index 00000000..4fed4867
--- /dev/null
+++ b/docs/guides/OSX Guide.md
@@ -0,0 +1,167 @@
+### Setting Up NadekoBot on OSX
+#### Prerequisites
+- 1) [Homebrew][Homebrew]
+- 2) Mono
+- 3) Google Account
+- 4) Soundcloud Account (if you want soundcloud support)
+- 5) Text Editor (TextWrangler, or equivalent) or outside editor such as [Atom][Atom]
+
+####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
+```
+brew install git
+brew install ffmpeg
+brew update && brew upgrade ffmpeg
+brew install opus
+brew install opus-tools
+brew install opusfile
+brew install libffi
+brew install libsodium
+brew install tmux
+```
+
+####Check your `FFMPEG`
+
+**In case your `FFMPEG` wasnt installed properly**
+
+- `brew options ffmpeg`
+- `brew install ffmpeg --with-x --with-y --with-z` etc.
+- `brew update && brew upgrade` (Update formulae and Homebrew itself && Install newer versions of outdated packages)
+- `brew prune` (Remove dead symlinks from Homebrew’s prefix)
+- `brew doctor` (Check your Homebrew installation for common issues)
+- Then try `brew install ffmpeg` again.
+
+####Installing xcode-select
+Xcode command line tools. You will do this in Terminal.app by running the following command line:
+
+`xcode-select --install`
+
+A dialog box will open asking if you want to install `xcode-select`. Select install and finish the installation.
+
+####Installing Mono
+- Building Mono dependencies:
+
+`brew install autoconf automake libtool pkg-config`
+
+- Building Mono from Source:
+
+To build Mono from a Git Source Code checkout, you will want to have the official Mono installed on the system, as the build requires a working C# compiler to run. Once you do this, run the following commands, remember to replace PREFIX with your installation prefix that you selected:
+
+```
+PATH=$PREFIX/bin:$PATH
+git clone https://github.com/mono/mono.git
+cd mono
+CC='cc -m32' ./autogen.sh --prefix=$PREFIX --disable-nls --build=i386-apple-darwin11.2.0
+make
+make install
+```
+To build Mono in 64 bit mode instead use this to configure the build:
+
+`./autogen.sh --prefix=$PREFIX --disable-nls`
+
+####Nadeko Setup
+- Create a new folder and name it `Nadeko`.
+- Move to our `Nadeko` folder
+
+`cd Nadeko`
+- Go to [Releases][Releases] and copy the zip file address of the lalest version available, it should look like `https://github.com/Kwoth/NadekoBot/releases/download/vx.xx/NadekoBot.vx.x.zip`
+- Get the correct link, type `curl -O` and past the link, then hit `Enter`
+- It should be something like this:
+
+`curl -O https://github.com/Kwoth/NadekoBot/releases/download/vx.xx/NadekoBot.vx.x.zip`
+
+^ do not copy-paste it
+
+- Unzip the downloaded file in our `Nadeko` folder
+
+####Creating DiscordBot application
+- Go to [DiscordApp][DiscordApp].
+- Log in with your Discord account.
+- On the left side, press `New Application`.
+- Fill out the `App Name` (your bot's name, in this case), put the image you want, and add an app description(optional).
+- Create the application.
+- Once the application is created, click on `Create a Bot User` and confirm it.
+- Keep this window open for now.
+
+####Setting up Credentials.json file
+- In our `NadekoBot` folder you should have `.json` file named `credentials_example.json`. (Note: If you do not see a **.json** after `credentials_example.json `, do not add the `**.json**`. You most likely have `"Hide file extensions"` enabled.)
+- Rename `credentials_example.json` to `credentials.json`.
+- Open the file with your Text editor.
+- In there you will see fields like `Token`, `ClientId`, `BotId`, `OwnerIDs`.
+- In your [DiscordApp][DiscordApp], under `Bot User` part, you will see the `Token:click to reveal` part, click to reveal it.
+- Copy your bot's token, and put it between `" "` in your `credentials.json` file.
+- Copy `Client ID` and replace it with the example one in your `credentials.json` in `Client ID` **and** `BotID` field.
+- Save your `credentials.json` but keep it open. We need to put your `User ID` and owner.
+
+####Running NadekoBot
+- Copy/past 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)`.
+
+or if you want to use Screen, run:
+
+`screen -S nadeko`
+
+^this will create a new screen named “nadeko” `(you can replace “nadeko” with anything you prefer and remember its your
+screen name)`.
+
+`cd nadeko`
+
+- Start NadekoBot.exe using Mono:
+
+`mono NadekoBot.exe`
+
+CHECK THE BOT IN DISCORD, IF EVERYTHING IS WORKING
+
+Now time to move bot to background and to do that, press CTRL+B+D (this will ditach the nadeko session using TMUX)
+
+*if you used Screen press CTRL+A+D (this will detach the nadeko screen)*
+
+####Inviting your bot to your server - [Invite Guide][Invite Guide]
+- Create a new server in Discord.
+- Copy your `Client ID` from your [DiscordApp][DiscordApp].
+- Replace `12345678` in this link `https://discordapp.com/oauth2/authorize?client_id=12345678&scope=bot&permissions=66186303` with your `Client ID`.
+- Link should look like this: `https://discordapp.com/oauth2/authorize?client_id=**YOUR_CLENT_ID**&scope=bot&permissions=66186303`.
+- Go to newly created link and pick the server we created, and click `Authorize`.
+- Bot should be added to your server.
+
+####Setting up OwnerIds
+- In the server where your bot is, in a text channel, type `.uid`
+- Your `User ID` should show, copy it.
+- Close `NadekoBot.exe`
+- Replace your `User ID` in the `credentials.json` between `[ ]` and save the changes.
+- Run `NadekoBot.exe` again.
+- Now you are the bot owner.
+- You can add `User IDs` from the other users by separating IDs with a comma if you want to have more owners.
+
+####Setting NadekoBot Music
+
+For Music Setup and API keys check [Setting up NadekoBot for Music](Windows Guide.md#setting-up-nadekobot-for-music) and [JSON Explanations](JSON Explanations.md).
+
+####Some more Info - 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`
+
+####Some more Info - Screen
+
+-If you want to see the sessions after logging back again, type `screen -ls`, and that will give you the list of screens.
+-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`
+
+[Homebrew]: http://brew.sh/
+[Mono]: http://www.mono-project.com/docs/compiling-mono/mac/
+[Releases]: https://github.com/Kwoth/NadekoBot/releases
+[DiscordApp]: https://discordapp.com/developers/applications/me
+[Atom]: https://atom.io/
+[Invite Guide]: http://discord.kongslien.net/guide.html
+[Google Console]: https://console.developers.google.com
+[Soundcloud]: https://soundcloud.com/you/apps/new
diff --git a/docs/ComprehensiveGuide.md b/docs/guides/Windows Guide.md
similarity index 86%
rename from docs/ComprehensiveGuide.md
rename to docs/guides/Windows Guide.md
index 1666d345..5d1a680d 100644
--- a/docs/ComprehensiveGuide.md
+++ b/docs/guides/Windows Guide.md
@@ -11,10 +11,10 @@ ________________________________________________________________________________
- 5) [7zip][7zip] (or whatever you are using, WinRar)
- 6) [Notepad++][Notepad++]
-####Guide:
+####Guide
- Create a folder, name it `Nadeko`.
-- Head to [Releases][Releases]* and download `WINDOWS.-.nadeupdater.7z`.
+- Head to [Updater Releases Page][Updater] and download `WINDOWS.-.nadeupdater.7z`.
- Copy `WINDOWS.-.nadeupdater.7z` to the `Nadeko` (folder we created before) and extract everything.
- You will see a file `NadekoUpdater.bat ` and a folder `publish ` after extraction.
- Run/Launch/Open the file `NadekoUpdater.bat ` and you will see it running in cmd.exe asking you with **3 options** *1-3*.
@@ -40,11 +40,11 @@ ________________________________________________________________________________
- In there you will see fields like `Token`, `ClientId`, `BotId`, `OwnerIDs`.
- In your [DiscordApp][DiscordApp], under `Bot User` part, you will see the `Token:click to reveal` part, click to reveal it.
- Copy your bot's token, and put it between `" "` in your `credentials.json` file.
-- Copy `Client ID` and replace it with the example one in your `credentials.json`.
-- Copy `Bot ID` and replace it with the example one in your `credentials.json`.
+- Copy `Client ID` and replace it with the example one in your `credentials.json` in `Client ID` **and** `BotID` field.
- Save your `credentials.json` but keep it open. We need to put your `User ID` and owner.
-####Inviting your bot to your server [Invite Guide][Invite Guide]
+####Inviting your bot to your server
+- [Invite Guide][Invite Guide]
- Create a new server in Discord.
- Copy your `Client ID` from your [DiscordApp][DiscordApp].
- Replace `12345678` in this link `https://discordapp.com/oauth2/authorize?client_id=12345678&scope=bot&permissions=66186303` with your `Client ID`.
@@ -58,7 +58,7 @@ ________________________________________________________________________________
- Your bot should now be online in the server we added him to.
- Note: Your bot will be offline in case you close `NadekoBot.exe`.
-####Setting up OwnerIds:
+####Setting up OwnerIds
- In the server where your bot is, in a text channel, type `.uid`
- Your `User ID` should show, copy it.
- Close `NadekoBot.exe`
@@ -67,7 +67,10 @@ ________________________________________________________________________________
- Now you are the bot owner.
- You can add `User IDs` from the other users by separating IDs with a comma if you want to have more owners.
-`*Alternatively, you can download nadekobot from [Releases][Releases] and extract the zip yourself. That is what updater does, except it makes it easier for you to update because it doesn't overwrite important files. If you are downloading releases you will have to be careful about your config, credentials, and other files you edited in order to preserve your data every time you update.`
+`*Alternatively, you can download nadekobot from` [Releases][Releases] `and extract the zip yourself.
+That is what updater does, except it makes it easier for you to update because it doesn't overwrite
+important files.If you are downloading releases you will have to be careful about your config,
+credentials, and other files you edited in order to preserve your data every time you update.`
________________________________________________________________________________
@@ -80,7 +83,7 @@ ________________________________________________________________________________
- Go to [Google Console][Google Console] and log in.
- Create a new project (name does not matter). Once the project is created, go into "Enable and manage APIs."
- Under the "Other Popular APIs" section, enable `URL Shortener API` and `Custom Search Api`. Under the `YouTube APIs` section, enable `YouTube Data API`.
- - On the left tab, access `Credentials`. Click `Create Credentials` button. Click on `API Key`, and then `Server Key` in the new window that appears. Enter in a name for the `Server Key`. A new window will appear with your `Google API key`.
+ - On the left tab, access `Credentials`. Click `Create Credentials` button. Click on `API Key`. A new window will appear with your `Google API key`.
- Copy the key.
- Open up `credentials.json`.
- For `"GoogleAPIKey"`, fill in with the new key we copied.
@@ -91,8 +94,9 @@ ________________________________________________________________________________
- In `credentials.json`, fill in `"SoundcloudClientID"` with the copied ID.
- Restart your computer.
-##### Prerequisites for manual `ffmpeg` setup:
+####Manual `ffmpeg` setup
**Do this step in case you were not able to install `ffmpeg` with the installer.**
+
- Create a folder named `ffmpeg` in your main Windows directory. We will use **C:\ffmpeg** (for our guide)
- Download FFMPEG through the link https://ffmpeg.zeranoe.com/builds/ (download static build)
- Extract it using `7zip` and place the folder `ffmpeg-xxxxx-git-xxxxx-xxxx-static` inside **C:\ffmpeg**
@@ -104,7 +108,8 @@ ________________________________________________________________________________
[NET Framework]: https://www.microsoft.com/en-us/download/details.aspx?id=48130
[FFMPEG]: https://github.com/Soundofdarkness/FFMPEG-Installer
[7zip]: http://www.7-zip.org/download.html
-[Releases]: //github.com/Kwoth/NadekoUpdater/releases/tag/v1.0
+[Updater]: https://github.com/Kwoth/NadekoUpdater/releases
+[Releases]: https://github.com/Kwoth/NadekoBot/releases
[DiscordApp]: https://discordapp.com/developers/applications/me
[Notepad++]: https://notepad-plus-plus.org/
[Invite Guide]: http://discord.kongslien.net/guide.html
diff --git a/docs/guides/mii-chan.md b/docs/guides/mii-chan.md
new file mode 100644
index 00000000..76be958b
--- /dev/null
+++ b/docs/guides/mii-chan.md
@@ -0,0 +1,2 @@
+Docs are in the air.
+Kwoth is magic.
diff --git a/docs/index.md b/docs/index.md
index 9cec30e0..aa8c9251 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1 +1,47 @@
-Hai, this will be docs of nakeda
\ No newline at end of file
+#NadekoBot Documentation
+
+To invite NadekoBot to your server, click on the image bellow:
+
+[![img][img]](https://discordapp.com/oauth2/authorize?client_id=170254782546575360&scope=bot&permissions=66186303)
+
+In case you need any help, hop on the [NadekoBot Server][NadekoBot Server], where we can provide support.
+
+NadekoBot is an open source project, and it can be found on our [GitHub][GitHub] page.
+
+Here you can read current [Issues][Issues].
+
+If you want to contribute, be sure to PR on the **[1.0][1.0]** branch.
+##Content
+- [About](about.md)
+- Guides
+ - [Windows Guide](guides/Windows Guide.md)
+ - [Linux Guide](guides/Linux Guide.md)
+ - [OSX Guide](guides/OSX Guide.md)
+ - [Building from Source](guides/Building from Source.md)
+ - [Docker Guide](guides/Docker Guide.md)
+- Commands
+ - [Readme](Readme.md)
+ - [Commands List](Commands List.md)
+- [Permissions System](Permissions System.md)
+- [JSON Explanations](JSON Explanations.md)
+- [Custom Reactions](Custom Reactions.md)
+- [Frequently Asked Questions](Frequently Asked Questions.md)
+- [Contribution Guide](Contribution Guide.md)
+- [Donate](Donate.md)
+
+[img]: https://discordcdn.com/attachments/202743183774318593/210580315381563392/discord.png
+[NadekoBot Server]: https://discord.gg/0ehQwTK2RBjAxzEY
+[GitHub]: https://github.com/Kwoth/NadekoBot
+[Issues]: https://github.com/Kwoth/NadekoBot/issues
+[1.0]: https://github.com/Kwoth/NadekoBot/tree/1.0
+
+[Italian]: http://i.imgur.com/SsaTwOF.png?1
+[Russian]: http://i.imgur.com/wf9bc5G.png?1
+[German]: http://i.imgur.com/EM5qPzf.png?1
+[Chinese]: http://i.imgur.com/MVCNOjT.png?1
+[English]: http://i.imgur.com/jHTyZFS.png?1
+[Spanish]: http://i.imgur.com/9BsusB6.png?1
+[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]: http://i.imgur.com/5evoUbU.png
diff --git a/docs/index.rst b/docs/index.rst
deleted file mode 100644
index 9cec30e0..00000000
--- a/docs/index.rst
+++ /dev/null
@@ -1 +0,0 @@
-Hai, this will be docs of nakeda
\ No newline at end of file
diff --git a/docs/license.md b/docs/license.md
deleted file mode 100644
index ad9c4e5f..00000000
--- a/docs/license.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2015 Master 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:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/src/NadekoBot/Attributes/LocalizedAlias.cs b/src/NadekoBot/Attributes/Aliases.cs
similarity index 52%
rename from src/NadekoBot/Attributes/LocalizedAlias.cs
rename to src/NadekoBot/Attributes/Aliases.cs
index 97f808aa..ee6e18ad 100644
--- a/src/NadekoBot/Attributes/LocalizedAlias.cs
+++ b/src/NadekoBot/Attributes/Aliases.cs
@@ -9,9 +9,9 @@ using System.Threading.Tasks;
namespace NadekoBot.Attributes
{
- public class LocalizedAliasAttribute : AliasAttribute
+ public class Aliases : AliasAttribute
{
- public LocalizedAliasAttribute([CallerMemberName] string memberName = "") : base(Localization.LoadCommandString(memberName.ToLowerInvariant() + "_text").Split(' ').Skip(1).ToArray())
+ public Aliases([CallerMemberName] string memberName = "") : base(Localization.LoadCommandString(memberName.ToLowerInvariant() + "_cmd").Split(' ').Skip(1).ToArray())
{
}
}
diff --git a/src/NadekoBot/Attributes/Description.cs b/src/NadekoBot/Attributes/Description.cs
new file mode 100644
index 00000000..a6f32c74
--- /dev/null
+++ b/src/NadekoBot/Attributes/Description.cs
@@ -0,0 +1,14 @@
+using Discord.Commands;
+using NadekoBot.Services;
+using System.Runtime.CompilerServices;
+
+namespace NadekoBot.Attributes
+{
+ public class Description : SummaryAttribute
+ {
+ public Description([CallerMemberName] string memberName="") : base(Localization.LoadCommandString(memberName.ToLowerInvariant() + "_desc"))
+ {
+
+ }
+ }
+}
diff --git a/src/NadekoBot/Attributes/LocalizedCommand.cs b/src/NadekoBot/Attributes/LocalizedCommand.cs
deleted file mode 100644
index dcb96537..00000000
--- a/src/NadekoBot/Attributes/LocalizedCommand.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Discord.Commands;
-using NadekoBot.Services;
-using System.Linq;
-using System.Runtime.CompilerServices;
-
-namespace NadekoBot.Attributes
-{
- public class LocalizedCommandAttribute : CommandAttribute
- {
- public LocalizedCommandAttribute([CallerMemberName] string memberName="") : base(Localization.LoadCommandString(memberName.ToLowerInvariant() + "_text").Split(' ')[0])
- {
-
- }
- }
-}
diff --git a/src/NadekoBot/Attributes/LocalizedDescription.cs b/src/NadekoBot/Attributes/LocalizedDescription.cs
deleted file mode 100644
index 470b6113..00000000
--- a/src/NadekoBot/Attributes/LocalizedDescription.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Discord.Commands;
-using NadekoBot.Services;
-using System.Runtime.CompilerServices;
-
-namespace NadekoBot.Attributes
-{
- public class LocalizedDescriptionAttribute : DescriptionAttribute
- {
- public LocalizedDescriptionAttribute([CallerMemberName] string memberName="") : base(Localization.LoadCommandString(memberName.ToLowerInvariant()+"_desc"))
- {
-
- }
- }
-}
diff --git a/src/NadekoBot/Attributes/LocalizedSummary.cs b/src/NadekoBot/Attributes/LocalizedSummary.cs
deleted file mode 100644
index 9ded83bc..00000000
--- a/src/NadekoBot/Attributes/LocalizedSummary.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Discord.Commands;
-using NadekoBot.Services;
-using System.Runtime.CompilerServices;
-
-namespace NadekoBot.Attributes
-{
- public class LocalizedSummaryAttribute : SummaryAttribute
- {
- public LocalizedSummaryAttribute([CallerMemberName] string memberName="") : base(Localization.LoadCommandString(memberName.ToLowerInvariant() + "_summary"))
- {
-
- }
- }
-}
diff --git a/src/NadekoBot/Attributes/NadekoCommand.cs b/src/NadekoBot/Attributes/NadekoCommand.cs
new file mode 100644
index 00000000..ab473cbb
--- /dev/null
+++ b/src/NadekoBot/Attributes/NadekoCommand.cs
@@ -0,0 +1,15 @@
+using Discord.Commands;
+using NadekoBot.Services;
+using System.Linq;
+using System.Runtime.CompilerServices;
+
+namespace NadekoBot.Attributes
+{
+ public class NadekoCommand : CommandAttribute
+ {
+ public NadekoCommand([CallerMemberName] string memberName="") : base(Localization.LoadCommandString(memberName.ToLowerInvariant() + "_cmd").Split(' ')[0])
+ {
+
+ }
+ }
+}
diff --git a/src/NadekoBot/Attributes/NadekoModule.cs b/src/NadekoBot/Attributes/NadekoModule.cs
index 68f7db5f..8ac94523 100644
--- a/src/NadekoBot/Attributes/NadekoModule.cs
+++ b/src/NadekoBot/Attributes/NadekoModule.cs
@@ -30,22 +30,22 @@ namespace NadekoBot.Attributes
}
}
- public NadekoModuleAttribute(string moduleName, string defaultPrefix) : base(GetModulePrefix(moduleName) ?? defaultPrefix)
+ public NadekoModuleAttribute(string moduleName, string defaultPrefix) : base(GetModulePrefix(moduleName, defaultPrefix))
{
AppendSpace = false;
}
- private static string GetModulePrefix(string moduleName)
+ private static string GetModulePrefix(string moduleName, string defaultPrefix)
{
- string prefix;
- if (ModulePrefixes.TryGetValue(moduleName, out prefix))
+ string prefix = null;
+ if (!ModulePrefixes.TryGetValue(moduleName, out prefix))
{
- Console.WriteLine("Cache hit");
- return prefix;
+ NadekoBot.ModulePrefixes.TryAdd(moduleName, defaultPrefix);
+ NLog.LogManager.GetCurrentClassLogger().Warn("Prefix not found for {0}. Will use default one: {1}", moduleName, defaultPrefix);
}
+
- Console.WriteLine("Cache not hit for " + moduleName);
- return null;
+ return prefix ?? defaultPrefix;
}
}
}
diff --git a/src/NadekoBot/Attributes/OwnerOnlyAttribute.cs b/src/NadekoBot/Attributes/OwnerOnlyAttribute.cs
index 8236f1d1..f04b6ef2 100644
--- a/src/NadekoBot/Attributes/OwnerOnlyAttribute.cs
+++ b/src/NadekoBot/Attributes/OwnerOnlyAttribute.cs
@@ -1,11 +1,12 @@
-//using System.Threading.Tasks;
-//using Discord.Commands;
-//using Discord;
+using System.Threading.Tasks;
+using Discord.Commands;
+using Discord;
-//namespace NadekoBot.Attributes {
-// public class OwnerOnlyAttribute : PreconditionAttribute
-// {
-// public override Task CheckPermissions(IUserMessage context, Command executingCommand, object moduleInstance) =>
-// Task.FromResult((NadekoBot.Credentials.IsOwner(context.Author) ? PreconditionResult.FromSuccess() : PreconditionResult.FromError("Not owner")));
-// }
-//}
\ No newline at end of file
+namespace NadekoBot.Attributes
+{
+ public class OwnerOnlyAttribute : PreconditionAttribute
+ {
+ public override Task CheckPermissions(IUserMessage context, Command executingCommand, object moduleInstance) =>
+ Task.FromResult((NadekoBot.Credentials.IsOwner(context.Author) ? PreconditionResult.FromSuccess() : PreconditionResult.FromError("Not owner")));
+ }
+}
\ No newline at end of file
diff --git a/src/NadekoBot/Attributes/Usage.cs b/src/NadekoBot/Attributes/Usage.cs
new file mode 100644
index 00000000..b3e18519
--- /dev/null
+++ b/src/NadekoBot/Attributes/Usage.cs
@@ -0,0 +1,14 @@
+using Discord.Commands;
+using NadekoBot.Services;
+using System.Runtime.CompilerServices;
+
+namespace NadekoBot.Attributes
+{
+ public class Usage : RemarksAttribute
+ {
+ public Usage([CallerMemberName] string memberName="") : base(Localization.LoadCommandString(memberName.ToLowerInvariant()+"_usage"))
+ {
+
+ }
+ }
+}
diff --git a/src/NadekoBot/DataStructures/ConcurrentHashSet.cs b/src/NadekoBot/DataStructures/ConcurrentHashSet.cs
new file mode 100644
index 00000000..019f7a87
--- /dev/null
+++ b/src/NadekoBot/DataStructures/ConcurrentHashSet.cs
@@ -0,0 +1,774 @@
+// License MIT
+// Source: https://github.com/i3arnon/ConcurrentHashSet
+
+using ConcurrentCollections;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+
+namespace System.Collections.Concurrent
+{
+ ///
+ /// Represents a thread-safe hash-based unique collection.
+ ///
+ /// The type of the items in the collection.
+ ///
+ /// All public members of are thread-safe and may be used
+ /// concurrently from multiple threads.
+ ///
+ [DebuggerDisplay("Count = {Count}")]
+ public sealed class ConcurrentHashSet : IReadOnlyCollection, ICollection
+ {
+ private const int DefaultCapacity = 31;
+ private const int MaxLockNumber = 1024;
+
+ private readonly IEqualityComparer _comparer;
+ private readonly bool _growLockArray;
+
+ private int _budget;
+ private volatile Tables _tables;
+
+ private static int DefaultConcurrencyLevel => PlatformHelper.ProcessorCount;
+
+ ///
+ /// Gets the number of items contained in the .
+ ///
+ /// The number of items contained in the .
+ /// Count has snapshot semantics and represents the number of items in the
+ /// at the moment when Count was accessed.
+ public int Count {
+ get {
+ var count = 0;
+ var acquiredLocks = 0;
+ try
+ {
+ AcquireAllLocks(ref acquiredLocks);
+
+ for (var i = 0; i < _tables.CountPerLock.Length; i++)
+ {
+ count += _tables.CountPerLock[i];
+ }
+ }
+ finally
+ {
+ ReleaseLocks(0, acquiredLocks);
+ }
+
+ return count;
+ }
+ }
+
+ ///
+ /// Gets a value that indicates whether the is empty.
+ ///
+ /// true if the is empty; otherwise,
+ /// false.
+ public bool IsEmpty {
+ get {
+ var acquiredLocks = 0;
+ try
+ {
+ AcquireAllLocks(ref acquiredLocks);
+
+ for (var i = 0; i < _tables.CountPerLock.Length; i++)
+ {
+ if (_tables.CountPerLock[i] != 0)
+ {
+ return false;
+ }
+ }
+ }
+ finally
+ {
+ ReleaseLocks(0, acquiredLocks);
+ }
+
+ return true;
+ }
+ }
+
+ ///
+ /// Initializes a new instance of the
+ /// class that is empty, has the default concurrency level, has the default initial capacity, and
+ /// uses the default comparer for the item type.
+ ///
+ public ConcurrentHashSet()
+ : this(DefaultConcurrencyLevel, DefaultCapacity, true, EqualityComparer.Default)
+ {
+ }
+
+ ///
+ /// Initializes a new instance of the
+ /// class that is empty, has the specified concurrency level and capacity, and uses the default
+ /// comparer for the item type.
+ ///
+ /// The estimated number of threads that will update the
+ /// concurrently.
+ /// The initial number of elements that the
+ /// can contain.
+ /// is
+ /// less than 1.
+ /// is less than
+ /// 0.
+ public ConcurrentHashSet(int concurrencyLevel, int capacity)
+ : this(concurrencyLevel, capacity, false, EqualityComparer.Default)
+ {
+ }
+
+ ///
+ /// Initializes a new instance of the
+ /// class that contains elements copied from the specified , has the default concurrency
+ /// level, has the default initial capacity, and uses the default comparer for the item type.
+ ///
+ /// The whose elements are copied to
+ /// the new
+ /// .
+ /// is a null reference.
+ public ConcurrentHashSet(IEnumerable collection)
+ : this(collection, EqualityComparer.Default)
+ {
+ }
+
+ ///
+ /// Initializes a new instance of the
+ /// class that is empty, has the specified concurrency level and capacity, and uses the specified
+ /// .
+ ///
+ /// The
+ /// implementation to use when comparing items.
+ /// is a null reference.
+ public ConcurrentHashSet(IEqualityComparer comparer)
+ : this(DefaultConcurrencyLevel, DefaultCapacity, true, comparer)
+ {
+ }
+
+ ///
+ /// Initializes a new instance of the
+ /// class that contains elements copied from the specified , has the default concurrency level, has the default
+ /// initial capacity, and uses the specified
+ /// .
+ ///
+ /// The whose elements are copied to
+ /// the new
+ /// .
+ /// The
+ /// implementation to use when comparing items.
+ /// is a null reference
+ /// (Nothing in Visual Basic). -or-
+ /// is a null reference (Nothing in Visual Basic).
+ ///
+ public ConcurrentHashSet(IEnumerable collection, IEqualityComparer comparer)
+ : this(comparer)
+ {
+ if (collection == null) throw new ArgumentNullException(nameof(collection));
+
+ InitializeFromCollection(collection);
+ }
+
+
+ ///
+ /// Initializes a new instance of the
+ /// class that contains elements copied from the specified ,
+ /// has the specified concurrency level, has the specified initial capacity, and uses the specified
+ /// .
+ ///
+ /// The estimated number of threads that will update the
+ /// concurrently.
+ /// The whose elements are copied to the new
+ /// .
+ /// The implementation to use
+ /// when comparing items.
+ ///
+ /// is a null reference.
+ /// -or-
+ /// is a null reference.
+ ///
+ ///
+ /// is less than 1.
+ ///
+ public ConcurrentHashSet(int concurrencyLevel, IEnumerable collection, IEqualityComparer comparer)
+ : this(concurrencyLevel, DefaultCapacity, false, comparer)
+ {
+ if (collection == null) throw new ArgumentNullException(nameof(collection));
+ if (comparer == null) throw new ArgumentNullException(nameof(comparer));
+
+ InitializeFromCollection(collection);
+ }
+
+ ///
+ /// Initializes a new instance of the
+ /// class that is empty, has the specified concurrency level, has the specified initial capacity, and
+ /// uses the specified .
+ ///
+ /// The estimated number of threads that will update the
+ /// concurrently.
+ /// The initial number of elements that the
+ /// can contain.
+ /// The
+ /// implementation to use when comparing items.
+ ///
+ /// is less than 1. -or-
+ /// is less than 0.
+ ///
+ /// is a null reference.
+ public ConcurrentHashSet(int concurrencyLevel, int capacity, IEqualityComparer comparer)
+ : this(concurrencyLevel, capacity, false, comparer)
+ {
+ }
+
+ private ConcurrentHashSet(int concurrencyLevel, int capacity, bool growLockArray, IEqualityComparer comparer)
+ {
+ if (concurrencyLevel < 1) throw new ArgumentOutOfRangeException(nameof(concurrencyLevel));
+ if (capacity < 0) throw new ArgumentOutOfRangeException(nameof(capacity));
+ if (comparer == null) throw new ArgumentNullException(nameof(comparer));
+
+ // The capacity should be at least as large as the concurrency level. Otherwise, we would have locks that don't guard
+ // any buckets.
+ if (capacity < concurrencyLevel)
+ {
+ capacity = concurrencyLevel;
+ }
+
+ var locks = new object[concurrencyLevel];
+ for (var i = 0; i < locks.Length; i++)
+ {
+ locks[i] = new object();
+ }
+
+ var countPerLock = new int[locks.Length];
+ var buckets = new Node[capacity];
+ _tables = new Tables(buckets, locks, countPerLock);
+
+ _growLockArray = growLockArray;
+ _budget = buckets.Length / locks.Length;
+ _comparer = comparer;
+ }
+
+ ///
+ /// Adds the specified item to the .
+ ///
+ /// The item to add.
+ /// true if the items was added to the
+ /// successfully; false if it already exists.
+ /// The
+ /// contains too many items.
+ public bool Add(T item) =>
+ AddInternal(item, _comparer.GetHashCode(item), true);
+
+ ///
+ /// Removes all items from the .
+ ///
+ public void Clear()
+ {
+ var locksAcquired = 0;
+ try
+ {
+ AcquireAllLocks(ref locksAcquired);
+
+ var newTables = new Tables(new Node[DefaultCapacity], _tables.Locks, new int[_tables.CountPerLock.Length]);
+ _tables = newTables;
+ _budget = Math.Max(1, newTables.Buckets.Length / newTables.Locks.Length);
+ }
+ finally
+ {
+ ReleaseLocks(0, locksAcquired);
+ }
+ }
+
+ ///
+ /// Determines whether the contains the specified
+ /// item.
+ ///
+ /// The item to locate in the .
+ /// true if the contains the item; otherwise, false.
+ public bool Contains(T item)
+ {
+ var hashcode = _comparer.GetHashCode(item);
+
+ // We must capture the _buckets field in a local variable. It is set to a new table on each table resize.
+ var tables = _tables;
+
+ var bucketNo = GetBucket(hashcode, tables.Buckets.Length);
+
+ // We can get away w/out a lock here.
+ // The Volatile.Read ensures that the load of the fields of 'n' doesn't move before the load from buckets[i].
+ var current = Volatile.Read(ref tables.Buckets[bucketNo]);
+
+ while (current != null)
+ {
+ if (hashcode == current.Hashcode && _comparer.Equals(current.Item, item))
+ {
+ return true;
+ }
+ current = current.Next;
+ }
+
+ return false;
+ }
+
+ ///
+ /// Attempts to remove the item from the .
+ ///
+ /// The item to remove.
+ /// true if an item was removed successfully; otherwise, false.
+ public bool TryRemove(T item)
+ {
+ var hashcode = _comparer.GetHashCode(item);
+ while (true)
+ {
+ var tables = _tables;
+
+ int bucketNo, lockNo;
+ GetBucketAndLockNo(hashcode, out bucketNo, out lockNo, tables.Buckets.Length, tables.Locks.Length);
+
+ lock (tables.Locks[lockNo])
+ {
+ // If the table just got resized, we may not be holding the right lock, and must retry.
+ // This should be a rare occurrence.
+ if (tables != _tables)
+ {
+ continue;
+ }
+
+ Node previous = null;
+ for (var current = tables.Buckets[bucketNo]; current != null; current = current.Next)
+ {
+ Debug.Assert((previous == null && current == tables.Buckets[bucketNo]) || previous.Next == current);
+
+ if (hashcode == current.Hashcode && _comparer.Equals(current.Item, item))
+ {
+ if (previous == null)
+ {
+ Volatile.Write(ref tables.Buckets[bucketNo], current.Next);
+ }
+ else
+ {
+ previous.Next = current.Next;
+ }
+
+ tables.CountPerLock[lockNo]--;
+ return true;
+ }
+ previous = current;
+ }
+ }
+
+ return false;
+ }
+ }
+
+ IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+ /// Returns an enumerator that iterates through the .
+ /// An enumerator for the .
+ ///
+ /// The enumerator returned from the collection is safe to use concurrently with
+ /// reads and writes to the collection, however it does not represent a moment-in-time snapshot
+ /// of the collection. The contents exposed through the enumerator may contain modifications
+ /// made to the collection after was called.
+ ///
+ public IEnumerator GetEnumerator()
+ {
+ var buckets = _tables.Buckets;
+
+ for (var i = 0; i < buckets.Length; i++)
+ {
+ // The Volatile.Read ensures that the load of the fields of 'current' doesn't move before the load from buckets[i].
+ var current = Volatile.Read(ref buckets[i]);
+
+ while (current != null)
+ {
+ yield return current.Item;
+ current = current.Next;
+ }
+ }
+ }
+
+ void ICollection.Add(T item) => Add(item);
+
+ bool ICollection.IsReadOnly => false;
+
+ void ICollection.CopyTo(T[] array, int arrayIndex)
+ {
+ if (array == null) throw new ArgumentNullException(nameof(array));
+ if (arrayIndex < 0) throw new ArgumentOutOfRangeException(nameof(arrayIndex));
+
+ var locksAcquired = 0;
+ try
+ {
+ AcquireAllLocks(ref locksAcquired);
+
+ var count = 0;
+
+ for (var i = 0; i < _tables.Locks.Length && count >= 0; i++)
+ {
+ count += _tables.CountPerLock[i];
+ }
+
+ if (array.Length - count < arrayIndex || count < 0) //"count" itself or "count + arrayIndex" can overflow
+ {
+ throw new ArgumentException("The index is equal to or greater than the length of the array, or the number of elements in the set is greater than the available space from index to the end of the destination array.");
+ }
+
+ CopyToItems(array, arrayIndex);
+ }
+ finally
+ {
+ ReleaseLocks(0, locksAcquired);
+ }
+ }
+
+ bool ICollection.Remove(T item) => TryRemove(item);
+
+ private void InitializeFromCollection(IEnumerable collection)
+ {
+ foreach (var item in collection)
+ {
+ AddInternal(item, _comparer.GetHashCode(item), false);
+ }
+
+ if (_budget == 0)
+ {
+ _budget = _tables.Buckets.Length / _tables.Locks.Length;
+ }
+ }
+
+ private bool AddInternal(T item, int hashcode, bool acquireLock)
+ {
+ while (true)
+ {
+ int bucketNo, lockNo;
+
+ var tables = _tables;
+ GetBucketAndLockNo(hashcode, out bucketNo, out lockNo, tables.Buckets.Length, tables.Locks.Length);
+
+ var resizeDesired = false;
+ var lockTaken = false;
+ try
+ {
+ if (acquireLock)
+ Monitor.Enter(tables.Locks[lockNo], ref lockTaken);
+
+ // If the table just got resized, we may not be holding the right lock, and must retry.
+ // This should be a rare occurrence.
+ if (tables != _tables)
+ {
+ continue;
+ }
+
+ // Try to find this item in the bucket
+ Node previous = null;
+ for (var current = tables.Buckets[bucketNo]; current != null; current = current.Next)
+ {
+ Debug.Assert((previous == null && current == tables.Buckets[bucketNo]) || previous.Next == current);
+ if (hashcode == current.Hashcode && _comparer.Equals(current.Item, item))
+ {
+ return false;
+ }
+ previous = current;
+ }
+
+ // The item was not found in the bucket. Insert the new item.
+ Volatile.Write(ref tables.Buckets[bucketNo], new Node(item, hashcode, tables.Buckets[bucketNo]));
+ checked
+ {
+ tables.CountPerLock[lockNo]++;
+ }
+
+ //
+ // If the number of elements guarded by this lock has exceeded the budget, resize the bucket table.
+ // It is also possible that GrowTable will increase the budget but won't resize the bucket table.
+ // That happens if the bucket table is found to be poorly utilized due to a bad hash function.
+ //
+ if (tables.CountPerLock[lockNo] > _budget)
+ {
+ resizeDesired = true;
+ }
+ }
+ finally
+ {
+ if (lockTaken)
+ Monitor.Exit(tables.Locks[lockNo]);
+ }
+
+ //
+ // The fact that we got here means that we just performed an insertion. If necessary, we will grow the table.
+ //
+ // Concurrency notes:
+ // - Notice that we are not holding any locks at when calling GrowTable. This is necessary to prevent deadlocks.
+ // - As a result, it is possible that GrowTable will be called unnecessarily. But, GrowTable will obtain lock 0
+ // and then verify that the table we passed to it as the argument is still the current table.
+ //
+ if (resizeDesired)
+ {
+ GrowTable(tables);
+ }
+
+ return true;
+ }
+ }
+
+ private static int GetBucket(int hashcode, int bucketCount)
+ {
+ var bucketNo = (hashcode & 0x7fffffff) % bucketCount;
+ Debug.Assert(bucketNo >= 0 && bucketNo < bucketCount);
+ return bucketNo;
+ }
+
+ private static void GetBucketAndLockNo(int hashcode, out int bucketNo, out int lockNo, int bucketCount, int lockCount)
+ {
+ bucketNo = (hashcode & 0x7fffffff) % bucketCount;
+ lockNo = bucketNo % lockCount;
+
+ Debug.Assert(bucketNo >= 0 && bucketNo < bucketCount);
+ Debug.Assert(lockNo >= 0 && lockNo < lockCount);
+ }
+
+ private void GrowTable(Tables tables)
+ {
+ const int maxArrayLength = 0X7FEFFFFF;
+ var locksAcquired = 0;
+ try
+ {
+ // The thread that first obtains _locks[0] will be the one doing the resize operation
+ AcquireLocks(0, 1, ref locksAcquired);
+
+ // Make sure nobody resized the table while we were waiting for lock 0:
+ if (tables != _tables)
+ {
+ // We assume that since the table reference is different, it was already resized (or the budget
+ // was adjusted). If we ever decide to do table shrinking, or replace the table for other reasons,
+ // we will have to revisit this logic.
+ return;
+ }
+
+ // Compute the (approx.) total size. Use an Int64 accumulation variable to avoid an overflow.
+ long approxCount = 0;
+ for (var i = 0; i < tables.CountPerLock.Length; i++)
+ {
+ approxCount += tables.CountPerLock[i];
+ }
+
+ //
+ // If the bucket array is too empty, double the budget instead of resizing the table
+ //
+ if (approxCount < tables.Buckets.Length / 4)
+ {
+ _budget = 2 * _budget;
+ if (_budget < 0)
+ {
+ _budget = int.MaxValue;
+ }
+ return;
+ }
+
+ // Compute the new table size. We find the smallest integer larger than twice the previous table size, and not divisible by
+ // 2,3,5 or 7. We can consider a different table-sizing policy in the future.
+ var newLength = 0;
+ var maximizeTableSize = false;
+ try
+ {
+ checked
+ {
+ // Double the size of the buckets table and add one, so that we have an odd integer.
+ newLength = tables.Buckets.Length * 2 + 1;
+
+ // Now, we only need to check odd integers, and find the first that is not divisible
+ // by 3, 5 or 7.
+ while (newLength % 3 == 0 || newLength % 5 == 0 || newLength % 7 == 0)
+ {
+ newLength += 2;
+ }
+
+ Debug.Assert(newLength % 2 != 0);
+
+ if (newLength > maxArrayLength)
+ {
+ maximizeTableSize = true;
+ }
+ }
+ }
+ catch (OverflowException)
+ {
+ maximizeTableSize = true;
+ }
+
+ if (maximizeTableSize)
+ {
+ newLength = maxArrayLength;
+
+ // We want to make sure that GrowTable will not be called again, since table is at the maximum size.
+ // To achieve that, we set the budget to int.MaxValue.
+ //
+ // (There is one special case that would allow GrowTable() to be called in the future:
+ // calling Clear() on the ConcurrentHashSet will shrink the table and lower the budget.)
+ _budget = int.MaxValue;
+ }
+
+ // Now acquire all other locks for the table
+ AcquireLocks(1, tables.Locks.Length, ref locksAcquired);
+
+ var newLocks = tables.Locks;
+
+ // Add more locks
+ if (_growLockArray && tables.Locks.Length < MaxLockNumber)
+ {
+ newLocks = new object[tables.Locks.Length * 2];
+ Array.Copy(tables.Locks, 0, newLocks, 0, tables.Locks.Length);
+ for (var i = tables.Locks.Length; i < newLocks.Length; i++)
+ {
+ newLocks[i] = new object();
+ }
+ }
+
+ var newBuckets = new Node[newLength];
+ var newCountPerLock = new int[newLocks.Length];
+
+ // Copy all data into a new table, creating new nodes for all elements
+ for (var i = 0; i < tables.Buckets.Length; i++)
+ {
+ var current = tables.Buckets[i];
+ while (current != null)
+ {
+ var next = current.Next;
+ int newBucketNo, newLockNo;
+ GetBucketAndLockNo(current.Hashcode, out newBucketNo, out newLockNo, newBuckets.Length, newLocks.Length);
+
+ newBuckets[newBucketNo] = new Node(current.Item, current.Hashcode, newBuckets[newBucketNo]);
+
+ checked
+ {
+ newCountPerLock[newLockNo]++;
+ }
+
+ current = next;
+ }
+ }
+
+ // Adjust the budget
+ _budget = Math.Max(1, newBuckets.Length / newLocks.Length);
+
+ // Replace tables with the new versions
+ _tables = new Tables(newBuckets, newLocks, newCountPerLock);
+ }
+ finally
+ {
+ // Release all locks that we took earlier
+ ReleaseLocks(0, locksAcquired);
+ }
+ }
+
+ public int RemoveWhere(Func predicate)
+ {
+ var elems = this.Where(predicate);
+ var removed = 0;
+ foreach (var elem in elems)
+ {
+ if (this.TryRemove(elem))
+ removed++;
+ }
+ return removed;
+ }
+
+ private void AcquireAllLocks(ref int locksAcquired)
+ {
+ // First, acquire lock 0
+ AcquireLocks(0, 1, ref locksAcquired);
+
+ // Now that we have lock 0, the _locks array will not change (i.e., grow),
+ // and so we can safely read _locks.Length.
+ AcquireLocks(1, _tables.Locks.Length, ref locksAcquired);
+ Debug.Assert(locksAcquired == _tables.Locks.Length);
+ }
+
+ private void AcquireLocks(int fromInclusive, int toExclusive, ref int locksAcquired)
+ {
+ Debug.Assert(fromInclusive <= toExclusive);
+ var locks = _tables.Locks;
+
+ for (var i = fromInclusive; i < toExclusive; i++)
+ {
+ var lockTaken = false;
+ try
+ {
+ Monitor.Enter(locks[i], ref lockTaken);
+ }
+ finally
+ {
+ if (lockTaken)
+ {
+ locksAcquired++;
+ }
+ }
+ }
+ }
+
+ private void ReleaseLocks(int fromInclusive, int toExclusive)
+ {
+ Debug.Assert(fromInclusive <= toExclusive);
+
+ for (var i = fromInclusive; i < toExclusive; i++)
+ {
+ Monitor.Exit(_tables.Locks[i]);
+ }
+ }
+
+ private void CopyToItems(T[] array, int index)
+ {
+ var buckets = _tables.Buckets;
+ for (var i = 0; i < buckets.Length; i++)
+ {
+ for (var current = buckets[i]; current != null; current = current.Next)
+ {
+ array[index] = current.Item;
+ index++; //this should never flow, CopyToItems is only called when there's no overflow risk
+ }
+ }
+ }
+
+ private sealed class Tables
+ {
+ public readonly Node[] Buckets;
+ public readonly object[] Locks;
+
+ public volatile int[] CountPerLock;
+
+ public Tables(Node[] buckets, object[] locks, int[] countPerLock)
+ {
+ Buckets = buckets;
+ Locks = locks;
+ CountPerLock = countPerLock;
+ }
+ }
+
+ private sealed class Node
+ {
+ public readonly T Item;
+ public readonly int Hashcode;
+
+ public volatile Node Next;
+
+ public Node(T item, int hashcode, Node next)
+ {
+ Item = item;
+ Hashcode = hashcode;
+ Next = next;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/NadekoBot/DataStructures/PlatformHelper.cs b/src/NadekoBot/DataStructures/PlatformHelper.cs
new file mode 100644
index 00000000..d0b5a4ba
--- /dev/null
+++ b/src/NadekoBot/DataStructures/PlatformHelper.cs
@@ -0,0 +1,25 @@
+using System;
+
+namespace ConcurrentCollections
+{
+ internal static class PlatformHelper
+ {
+ private const int ProcessorCountRefreshIntervalMs = 30000;
+
+ private static volatile int _processorCount;
+ private static volatile int _lastProcessorCountRefreshTicks;
+
+ internal static int ProcessorCount {
+ get {
+ var now = Environment.TickCount;
+ if (_processorCount == 0 || (now - _lastProcessorCountRefreshTicks) >= ProcessorCountRefreshIntervalMs)
+ {
+ _processorCount = Environment.ProcessorCount;
+ _lastProcessorCountRefreshTicks = now;
+ }
+
+ return _processorCount;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/NadekoBot/Migrations/20160910180231_first.Designer.cs b/src/NadekoBot/Migrations/20161011200458_first.Designer.cs
similarity index 70%
rename from src/NadekoBot/Migrations/20160910180231_first.Designer.cs
rename to src/NadekoBot/Migrations/20161011200458_first.Designer.cs
index 1097f981..3cb606dd 100644
--- a/src/NadekoBot/Migrations/20160910180231_first.Designer.cs
+++ b/src/NadekoBot/Migrations/20161011200458_first.Designer.cs
@@ -8,7 +8,7 @@ using NadekoBot.Services.Database.Impl;
namespace NadekoBot.Migrations
{
[DbContext(typeof(NadekoSqliteContext))]
- [Migration("20160910180231_first")]
+ [Migration("20161011200458_first")]
partial class first
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -25,6 +25,8 @@ namespace NadekoBot.Migrations
b.Property("ItemId");
+ b.Property("Type");
+
b.HasKey("Id");
b.HasIndex("BotConfigId");
@@ -49,12 +51,16 @@ namespace NadekoBot.Migrations
b.Property("CurrencySign");
- b.Property("DontJoinServers");
+ b.Property("DMHelpString");
b.Property("ForwardMessages");
b.Property("ForwardToAllOwners");
+ b.Property("HelpString");
+
+ b.Property("MigrationVersion");
+
b.Property("RemindMessageFormat");
b.Property("RotatingStatuses");
@@ -108,6 +114,24 @@ namespace NadekoBot.Migrations
b.ToTable("ClashOfClans");
});
+ modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("CommandName");
+
+ b.Property("GuildConfigId");
+
+ b.Property("Seconds");
+
+ b.HasKey("Id");
+
+ b.HasIndex("GuildConfigId");
+
+ b.ToTable("CommandCooldown");
+ });
+
modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
{
b.Property("Id")
@@ -141,6 +165,26 @@ namespace NadekoBot.Migrations
b.ToTable("Currency");
});
+ modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("GuildId");
+
+ b.Property("IsRegex");
+
+ b.Property("OwnerOnly");
+
+ b.Property("Response");
+
+ b.Property("Trigger");
+
+ b.HasKey("Id");
+
+ b.ToTable("CustomReactions");
+ });
+
modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
{
b.Property("Id")
@@ -176,6 +220,42 @@ namespace NadekoBot.Migrations
b.ToTable("EightBallResponses");
});
+ modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("ChannelId");
+
+ b.Property("GuildConfigId");
+
+ b.Property("GuildConfigId1");
+
+ b.HasKey("Id");
+
+ b.HasIndex("GuildConfigId");
+
+ b.HasIndex("GuildConfigId1");
+
+ b.ToTable("FilterChannelId");
+ });
+
+ modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("GuildConfigId");
+
+ b.Property("Word");
+
+ b.HasKey("Id");
+
+ b.HasIndex("GuildConfigId");
+
+ b.ToTable("FilteredWord");
+ });
+
modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
{
b.Property("Id")
@@ -187,8 +267,6 @@ namespace NadekoBot.Migrations
b.Property("GuildId");
- b.Property("LastStatus");
-
b.Property("Type");
b.Property("Username");
@@ -200,6 +278,22 @@ namespace NadekoBot.Migrations
b.ToTable("FollowedStream");
});
+ modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("ChannelId");
+
+ b.Property("GuildConfigId");
+
+ b.HasKey("Id");
+
+ b.HasIndex("GuildConfigId");
+
+ b.ToTable("GCChannelId");
+ });
+
modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
{
b.Property("Id")
@@ -229,7 +323,9 @@ namespace NadekoBot.Migrations
b.Property("ExclusiveSelfAssignedRoles");
- b.Property("GenerateCurrencyChannelId");
+ b.Property("FilterInvites");
+
+ b.Property("FilterWords");
b.Property("GreetMessageChannelId");
@@ -237,12 +333,18 @@ namespace NadekoBot.Migrations
b.Property("LogSettingId");
+ b.Property("PermissionRole");
+
+ b.Property("RootPermissionId");
+
b.Property("SendChannelByeMessage");
b.Property("SendChannelGreetMessage");
b.Property("SendDmGreetMessage");
+ b.Property("VerbosePermissions");
+
b.Property("VoicePlusTextEnabled");
b.HasKey("Id");
@@ -252,6 +354,8 @@ namespace NadekoBot.Migrations
b.HasIndex("LogSettingId");
+ b.HasIndex("RootPermissionId");
+
b.ToTable("GuildConfigs");
});
@@ -308,8 +412,6 @@ namespace NadekoBot.Migrations
b.Property("MessageDeleted");
- b.Property("MessageReceived");
-
b.Property("MessageUpdated");
b.Property("UserBanned");
@@ -336,7 +438,7 @@ namespace NadekoBot.Migrations
b.Property("Id")
.ValueGeneratedOnAdd();
- b.Property("BotConfigId");
+ b.Property("BotConfigId");
b.Property("ModuleName");
@@ -349,6 +451,47 @@ namespace NadekoBot.Migrations
b.ToTable("ModulePrefixes");
});
+ modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("Author");
+
+ b.Property("AuthorId");
+
+ b.Property("Name");
+
+ b.HasKey("Id");
+
+ b.ToTable("MusicPlaylists");
+ });
+
+ modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("NextId");
+
+ b.Property("PrimaryTarget");
+
+ b.Property("PrimaryTargetId");
+
+ b.Property("SecondaryTarget");
+
+ b.Property("SecondaryTargetName");
+
+ b.Property("State");
+
+ b.HasKey("Id");
+
+ b.HasIndex("NextId")
+ .IsUnique();
+
+ b.ToTable("Permission");
+ });
+
modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
{
b.Property("Id")
@@ -365,6 +508,30 @@ namespace NadekoBot.Migrations
b.ToTable("PlayingStatus");
});
+ modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("MusicPlaylistId");
+
+ b.Property("Provider");
+
+ b.Property("ProviderType");
+
+ b.Property("Query");
+
+ b.Property("Title");
+
+ b.Property("Uri");
+
+ b.HasKey("Id");
+
+ b.HasIndex("MusicPlaylistId");
+
+ b.ToTable("PlaylistSong");
+ });
+
modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
{
b.Property("Id")
@@ -466,20 +633,6 @@ namespace NadekoBot.Migrations
b.ToTable("SelfAssignableRoles");
});
- modelBuilder.Entity("NadekoBot.Services.Database.Models.TypingArticle", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
-
- b.Property("Author");
-
- b.Property("Text");
-
- b.HasKey("Id");
-
- b.ToTable("TypingArticles");
- });
-
modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
{
b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
@@ -495,6 +648,13 @@ namespace NadekoBot.Migrations
.OnDelete(DeleteBehavior.Cascade);
});
+ modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+ {
+ b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+ .WithMany("CommandCooldowns")
+ .HasForeignKey("GuildConfigId");
+ });
+
modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
{
b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
@@ -502,6 +662,24 @@ namespace NadekoBot.Migrations
.HasForeignKey("BotConfigId");
});
+ modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+ {
+ b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+ .WithMany("FilterInvitesChannelIds")
+ .HasForeignKey("GuildConfigId");
+
+ b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+ .WithMany("FilterWordsChannelIds")
+ .HasForeignKey("GuildConfigId1");
+ });
+
+ modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+ {
+ b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+ .WithMany("FilteredWords")
+ .HasForeignKey("GuildConfigId");
+ });
+
modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
{
b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
@@ -509,11 +687,22 @@ namespace NadekoBot.Migrations
.HasForeignKey("GuildConfigId");
});
+ modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+ {
+ b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+ .WithMany("GenerateCurrencyChannelIds")
+ .HasForeignKey("GuildConfigId");
+ });
+
modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
{
b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
.WithMany()
.HasForeignKey("LogSettingId");
+
+ b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+ .WithMany()
+ .HasForeignKey("RootPermissionId");
});
modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
@@ -532,10 +721,16 @@ namespace NadekoBot.Migrations
modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
{
- b.HasOne("NadekoBot.Services.Database.Models.BotConfig", "BotConfig")
+ b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
.WithMany("ModulePrefixes")
- .HasForeignKey("BotConfigId")
- .OnDelete(DeleteBehavior.Cascade);
+ .HasForeignKey("BotConfigId");
+ });
+
+ modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+ {
+ b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+ .WithOne("Previous")
+ .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
});
modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
@@ -545,6 +740,14 @@ namespace NadekoBot.Migrations
.HasForeignKey("BotConfigId");
});
+ modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+ {
+ b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+ .WithMany("Songs")
+ .HasForeignKey("MusicPlaylistId")
+ .OnDelete(DeleteBehavior.Cascade);
+ });
+
modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
{
b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
diff --git a/src/NadekoBot/Migrations/20160910180231_first.cs b/src/NadekoBot/Migrations/20161011200458_first.cs
similarity index 69%
rename from src/NadekoBot/Migrations/20160910180231_first.cs
rename to src/NadekoBot/Migrations/20161011200458_first.cs
index c24604f5..155508a6 100644
--- a/src/NadekoBot/Migrations/20160910180231_first.cs
+++ b/src/NadekoBot/Migrations/20161011200458_first.cs
@@ -20,9 +20,11 @@ namespace NadekoBot.Migrations
CurrencyName = table.Column(nullable: true),
CurrencyPluralName = table.Column(nullable: true),
CurrencySign = table.Column(nullable: true),
- DontJoinServers = table.Column(nullable: false),
+ DMHelpString = table.Column(nullable: true),
ForwardMessages = table.Column(nullable: false),
ForwardToAllOwners = table.Column(nullable: false),
+ HelpString = table.Column(nullable: true),
+ MigrationVersion = table.Column(nullable: false),
RemindMessageFormat = table.Column(nullable: true),
RotatingStatuses = table.Column(nullable: false)
},
@@ -78,6 +80,23 @@ namespace NadekoBot.Migrations
table.PrimaryKey("PK_Currency", x => x.Id);
});
+ migrationBuilder.CreateTable(
+ name: "CustomReactions",
+ columns: table => new
+ {
+ Id = table.Column(nullable: false)
+ .Annotation("Autoincrement", true),
+ GuildId = table.Column(nullable: true),
+ IsRegex = table.Column(nullable: false),
+ OwnerOnly = table.Column(nullable: false),
+ Response = table.Column(nullable: true),
+ Trigger = table.Column(nullable: true)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_CustomReactions", x => x.Id);
+ });
+
migrationBuilder.CreateTable(
name: "Donators",
columns: table => new
@@ -107,7 +126,6 @@ namespace NadekoBot.Migrations
LogUserPresence = table.Column(nullable: false),
LogVoicePresence = table.Column(nullable: false),
MessageDeleted = table.Column(nullable: false),
- MessageReceived = table.Column(nullable: false),
MessageUpdated = table.Column(nullable: false),
UserBanned = table.Column(nullable: false),
UserJoined = table.Column(nullable: false),
@@ -122,6 +140,45 @@ namespace NadekoBot.Migrations
table.PrimaryKey("PK_LogSettings", x => x.Id);
});
+ migrationBuilder.CreateTable(
+ name: "MusicPlaylists",
+ columns: table => new
+ {
+ Id = table.Column(nullable: false)
+ .Annotation("Autoincrement", true),
+ Author = table.Column(nullable: true),
+ AuthorId = table.Column(nullable: false),
+ Name = table.Column(nullable: true)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_MusicPlaylists", x => x.Id);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "Permission",
+ columns: table => new
+ {
+ Id = table.Column(nullable: false)
+ .Annotation("Autoincrement", true),
+ NextId = table.Column(nullable: true),
+ PrimaryTarget = table.Column(nullable: false),
+ PrimaryTargetId = table.Column(nullable: false),
+ SecondaryTarget = table.Column(nullable: false),
+ SecondaryTargetName = table.Column(nullable: true),
+ State = table.Column(nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_Permission", x => x.Id);
+ table.ForeignKey(
+ name: "FK_Permission_Permission_NextId",
+ column: x => x.NextId,
+ principalTable: "Permission",
+ principalColumn: "Id",
+ onDelete: ReferentialAction.Restrict);
+ });
+
migrationBuilder.CreateTable(
name: "Quotes",
columns: table => new
@@ -187,20 +244,6 @@ namespace NadekoBot.Migrations
table.PrimaryKey("PK_SelfAssignableRoles", x => x.Id);
});
- migrationBuilder.CreateTable(
- name: "TypingArticles",
- columns: table => new
- {
- Id = table.Column(nullable: false)
- .Annotation("Autoincrement", true),
- Author = table.Column(nullable: true),
- Text = table.Column(nullable: true)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_TypingArticles", x => x.Id);
- });
-
migrationBuilder.CreateTable(
name: "BlacklistItem",
columns: table => new
@@ -208,7 +251,8 @@ namespace NadekoBot.Migrations
Id = table.Column(nullable: false)
.Annotation("Autoincrement", true),
BotConfigId = table.Column(nullable: true),
- ItemId = table.Column(nullable: false)
+ ItemId = table.Column(nullable: false),
+ Type = table.Column(nullable: false)
},
constraints: table =>
{
@@ -247,7 +291,7 @@ namespace NadekoBot.Migrations
{
Id = table.Column(nullable: false)
.Annotation("Autoincrement", true),
- BotConfigId = table.Column(nullable: false),
+ BotConfigId = table.Column(nullable: true),
ModuleName = table.Column(nullable: true),
Prefix = table.Column(nullable: true)
},
@@ -259,7 +303,7 @@ namespace NadekoBot.Migrations
column: x => x.BotConfigId,
principalTable: "BotConfig",
principalColumn: "Id",
- onDelete: ReferentialAction.Cascade);
+ onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
@@ -326,44 +370,6 @@ namespace NadekoBot.Migrations
onDelete: ReferentialAction.Cascade);
});
- migrationBuilder.CreateTable(
- name: "GuildConfigs",
- columns: table => new
- {
- Id = table.Column(nullable: false)
- .Annotation("Autoincrement", true),
- AutoAssignRoleId = table.Column(nullable: false),
- AutoDeleteByeMessages = table.Column(nullable: false),
- AutoDeleteGreetMessages = table.Column(nullable: false),
- AutoDeleteGreetMessagesTimer = table.Column(nullable: false),
- AutoDeleteSelfAssignedRoleMessages = table.Column(nullable: false),
- ByeMessageChannelId = table.Column(nullable: false),
- ChannelByeMessageText = table.Column(nullable: true),
- ChannelGreetMessageText = table.Column(nullable: true),
- DefaultMusicVolume = table.Column(nullable: false),
- DeleteMessageOnCommand = table.Column(nullable: false),
- DmGreetMessageText = table.Column(nullable: true),
- ExclusiveSelfAssignedRoles = table.Column(nullable: false),
- GenerateCurrencyChannelId = table.Column(nullable: true),
- GreetMessageChannelId = table.Column(nullable: false),
- GuildId = table.Column(nullable: false),
- LogSettingId = table.Column(nullable: true),
- SendChannelByeMessage = table.Column(nullable: false),
- SendChannelGreetMessage = table.Column(nullable: false),
- SendDmGreetMessage = table.Column(nullable: false),
- VoicePlusTextEnabled = table.Column(nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_GuildConfigs", x => x.Id);
- table.ForeignKey(
- name: "FK_GuildConfigs_LogSettings_LogSettingId",
- column: x => x.LogSettingId,
- principalTable: "LogSettings",
- principalColumn: "Id",
- onDelete: ReferentialAction.Restrict);
- });
-
migrationBuilder.CreateTable(
name: "IgnoredLogChannels",
columns: table => new
@@ -404,6 +410,146 @@ namespace NadekoBot.Migrations
onDelete: ReferentialAction.Restrict);
});
+ migrationBuilder.CreateTable(
+ name: "PlaylistSong",
+ columns: table => new
+ {
+ Id = table.Column(nullable: false)
+ .Annotation("Autoincrement", true),
+ MusicPlaylistId = table.Column(nullable: true),
+ Provider = table.Column(nullable: true),
+ ProviderType = table.Column(nullable: false),
+ Query = table.Column(nullable: true),
+ Title = table.Column(nullable: true),
+ Uri = table.Column(nullable: true)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_PlaylistSong", x => x.Id);
+ table.ForeignKey(
+ name: "FK_PlaylistSong_MusicPlaylists_MusicPlaylistId",
+ column: x => x.MusicPlaylistId,
+ principalTable: "MusicPlaylists",
+ principalColumn: "Id",
+ onDelete: ReferentialAction.Cascade);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "GuildConfigs",
+ columns: table => new
+ {
+ Id = table.Column(nullable: false)
+ .Annotation("Autoincrement", true),
+ AutoAssignRoleId = table.Column(nullable: false),
+ AutoDeleteByeMessages = table.Column(nullable: false),
+ AutoDeleteGreetMessages = table.Column(nullable: false),
+ AutoDeleteGreetMessagesTimer = table.Column(nullable: false),
+ AutoDeleteSelfAssignedRoleMessages = table.Column(nullable: false),
+ ByeMessageChannelId = table.Column(nullable: false),
+ ChannelByeMessageText = table.Column(nullable: true),
+ ChannelGreetMessageText = table.Column(nullable: true),
+ DefaultMusicVolume = table.Column(nullable: false),
+ DeleteMessageOnCommand = table.Column(nullable: false),
+ DmGreetMessageText = table.Column(nullable: true),
+ ExclusiveSelfAssignedRoles = table.Column(nullable: false),
+ FilterInvites = table.Column(nullable: false),
+ FilterWords = table.Column(nullable: false),
+ GreetMessageChannelId = table.Column(nullable: false),
+ GuildId = table.Column(nullable: false),
+ LogSettingId = table.Column(nullable: true),
+ PermissionRole = table.Column(nullable: true),
+ RootPermissionId = table.Column(nullable: true),
+ SendChannelByeMessage = table.Column(nullable: false),
+ SendChannelGreetMessage = table.Column(nullable: false),
+ SendDmGreetMessage = table.Column(nullable: false),
+ VerbosePermissions = table.Column(nullable: false),
+ VoicePlusTextEnabled = table.Column(nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_GuildConfigs", x => x.Id);
+ table.ForeignKey(
+ name: "FK_GuildConfigs_LogSettings_LogSettingId",
+ column: x => x.LogSettingId,
+ principalTable: "LogSettings",
+ principalColumn: "Id",
+ onDelete: ReferentialAction.Restrict);
+ table.ForeignKey(
+ name: "FK_GuildConfigs_Permission_RootPermissionId",
+ column: x => x.RootPermissionId,
+ principalTable: "Permission",
+ principalColumn: "Id",
+ onDelete: ReferentialAction.Restrict);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "CommandCooldown",
+ columns: table => new
+ {
+ Id = table.Column(nullable: false)
+ .Annotation("Autoincrement", true),
+ CommandName = table.Column(nullable: true),
+ GuildConfigId = table.Column(nullable: true),
+ Seconds = table.Column(nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_CommandCooldown", x => x.Id);
+ table.ForeignKey(
+ name: "FK_CommandCooldown_GuildConfigs_GuildConfigId",
+ column: x => x.GuildConfigId,
+ principalTable: "GuildConfigs",
+ principalColumn: "Id",
+ onDelete: ReferentialAction.Restrict);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "FilterChannelId",
+ columns: table => new
+ {
+ Id = table.Column(nullable: false)
+ .Annotation("Autoincrement", true),
+ ChannelId = table.Column(nullable: false),
+ GuildConfigId = table.Column(nullable: true),
+ GuildConfigId1 = table.Column(nullable: true)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_FilterChannelId", x => x.Id);
+ table.ForeignKey(
+ name: "FK_FilterChannelId_GuildConfigs_GuildConfigId",
+ column: x => x.GuildConfigId,
+ principalTable: "GuildConfigs",
+ principalColumn: "Id",
+ onDelete: ReferentialAction.Restrict);
+ table.ForeignKey(
+ name: "FK_FilterChannelId_GuildConfigs_GuildConfigId1",
+ column: x => x.GuildConfigId1,
+ principalTable: "GuildConfigs",
+ principalColumn: "Id",
+ onDelete: ReferentialAction.Restrict);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "FilteredWord",
+ columns: table => new
+ {
+ Id = table.Column(nullable: false)
+ .Annotation("Autoincrement", true),
+ GuildConfigId = table.Column(nullable: true),
+ Word = table.Column(nullable: true)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_FilteredWord", x => x.Id);
+ table.ForeignKey(
+ name: "FK_FilteredWord_GuildConfigs_GuildConfigId",
+ column: x => x.GuildConfigId,
+ principalTable: "GuildConfigs",
+ principalColumn: "Id",
+ onDelete: ReferentialAction.Restrict);
+ });
+
migrationBuilder.CreateTable(
name: "FollowedStream",
columns: table => new
@@ -413,7 +559,6 @@ namespace NadekoBot.Migrations
ChannelId = table.Column(nullable: false),
GuildConfigId = table.Column(nullable: true),
GuildId = table.Column(nullable: false),
- LastStatus = table.Column(nullable: false),
Type = table.Column(nullable: false),
Username = table.Column(nullable: true)
},
@@ -428,6 +573,26 @@ namespace NadekoBot.Migrations
onDelete: ReferentialAction.Restrict);
});
+ migrationBuilder.CreateTable(
+ name: "GCChannelId",
+ columns: table => new
+ {
+ Id = table.Column(nullable: false)
+ .Annotation("Autoincrement", true),
+ ChannelId = table.Column(nullable: false),
+ GuildConfigId = table.Column(nullable: true)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_GCChannelId", x => x.Id);
+ table.ForeignKey(
+ name: "FK_GCChannelId_GuildConfigs_GuildConfigId",
+ column: x => x.GuildConfigId,
+ principalTable: "GuildConfigs",
+ principalColumn: "Id",
+ onDelete: ReferentialAction.Restrict);
+ });
+
migrationBuilder.CreateIndex(
name: "IX_BlacklistItem_BotConfigId",
table: "BlacklistItem",
@@ -438,6 +603,11 @@ namespace NadekoBot.Migrations
table: "ClashCallers",
column: "ClashWarId");
+ migrationBuilder.CreateIndex(
+ name: "IX_CommandCooldown_GuildConfigId",
+ table: "CommandCooldown",
+ column: "GuildConfigId");
+
migrationBuilder.CreateIndex(
name: "IX_Currency_UserId",
table: "Currency",
@@ -455,11 +625,31 @@ namespace NadekoBot.Migrations
table: "EightBallResponses",
column: "BotConfigId");
+ migrationBuilder.CreateIndex(
+ name: "IX_FilterChannelId_GuildConfigId",
+ table: "FilterChannelId",
+ column: "GuildConfigId");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_FilterChannelId_GuildConfigId1",
+ table: "FilterChannelId",
+ column: "GuildConfigId1");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_FilteredWord_GuildConfigId",
+ table: "FilteredWord",
+ column: "GuildConfigId");
+
migrationBuilder.CreateIndex(
name: "IX_FollowedStream_GuildConfigId",
table: "FollowedStream",
column: "GuildConfigId");
+ migrationBuilder.CreateIndex(
+ name: "IX_GCChannelId_GuildConfigId",
+ table: "GCChannelId",
+ column: "GuildConfigId");
+
migrationBuilder.CreateIndex(
name: "IX_GuildConfigs_GuildId",
table: "GuildConfigs",
@@ -471,6 +661,11 @@ namespace NadekoBot.Migrations
table: "GuildConfigs",
column: "LogSettingId");
+ migrationBuilder.CreateIndex(
+ name: "IX_GuildConfigs_RootPermissionId",
+ table: "GuildConfigs",
+ column: "RootPermissionId");
+
migrationBuilder.CreateIndex(
name: "IX_IgnoredLogChannels_LogSettingId",
table: "IgnoredLogChannels",
@@ -486,11 +681,22 @@ namespace NadekoBot.Migrations
table: "ModulePrefixes",
column: "BotConfigId");
+ migrationBuilder.CreateIndex(
+ name: "IX_Permission_NextId",
+ table: "Permission",
+ column: "NextId",
+ unique: true);
+
migrationBuilder.CreateIndex(
name: "IX_PlayingStatus_BotConfigId",
table: "PlayingStatus",
column: "BotConfigId");
+ migrationBuilder.CreateIndex(
+ name: "IX_PlaylistSong_MusicPlaylistId",
+ table: "PlaylistSong",
+ column: "MusicPlaylistId");
+
migrationBuilder.CreateIndex(
name: "IX_RaceAnimals_BotConfigId",
table: "RaceAnimals",
@@ -517,21 +723,36 @@ namespace NadekoBot.Migrations
migrationBuilder.DropTable(
name: "ClashCallers");
+ migrationBuilder.DropTable(
+ name: "CommandCooldown");
+
migrationBuilder.DropTable(
name: "ConversionUnits");
migrationBuilder.DropTable(
name: "Currency");
+ migrationBuilder.DropTable(
+ name: "CustomReactions");
+
migrationBuilder.DropTable(
name: "Donators");
migrationBuilder.DropTable(
name: "EightBallResponses");
+ migrationBuilder.DropTable(
+ name: "FilterChannelId");
+
+ migrationBuilder.DropTable(
+ name: "FilteredWord");
+
migrationBuilder.DropTable(
name: "FollowedStream");
+ migrationBuilder.DropTable(
+ name: "GCChannelId");
+
migrationBuilder.DropTable(
name: "IgnoredLogChannels");
@@ -544,6 +765,9 @@ namespace NadekoBot.Migrations
migrationBuilder.DropTable(
name: "PlayingStatus");
+ migrationBuilder.DropTable(
+ name: "PlaylistSong");
+
migrationBuilder.DropTable(
name: "Quotes");
@@ -559,20 +783,23 @@ namespace NadekoBot.Migrations
migrationBuilder.DropTable(
name: "SelfAssignableRoles");
- migrationBuilder.DropTable(
- name: "TypingArticles");
-
migrationBuilder.DropTable(
name: "ClashOfClans");
migrationBuilder.DropTable(
name: "GuildConfigs");
+ migrationBuilder.DropTable(
+ name: "MusicPlaylists");
+
migrationBuilder.DropTable(
name: "BotConfig");
migrationBuilder.DropTable(
name: "LogSettings");
+
+ migrationBuilder.DropTable(
+ name: "Permission");
}
}
}
diff --git a/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs b/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs
index 92d2ea09..ee91013c 100644
--- a/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs
+++ b/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs
@@ -24,6 +24,8 @@ namespace NadekoBot.Migrations
b.Property("ItemId");
+ b.Property("Type");
+
b.HasKey("Id");
b.HasIndex("BotConfigId");
@@ -48,12 +50,16 @@ namespace NadekoBot.Migrations
b.Property("CurrencySign");
- b.Property("DontJoinServers");
+ b.Property("DMHelpString");
b.Property("ForwardMessages");
b.Property("ForwardToAllOwners");
+ b.Property("HelpString");
+
+ b.Property("MigrationVersion");
+
b.Property("RemindMessageFormat");
b.Property("RotatingStatuses");
@@ -107,6 +113,24 @@ namespace NadekoBot.Migrations
b.ToTable("ClashOfClans");
});
+ modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("CommandName");
+
+ b.Property