diff --git a/docs/custom-reactions.md b/docs/custom-reactions.md index d23ef66d4..90ffdd5c5 100644 --- a/docs/custom-reactions.md +++ b/docs/custom-reactions.md @@ -3,19 +3,19 @@ ### Important - For modifying **global** expressions, 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. + You must also use the commands for adding, deleting and listing these expressions in a direct message with the bot. - For modifying **local** expressions, the ones which will only work on the server that they are added on, it is required to have the **Administrator** permission. - You must also use the commands for adding, deleting and listing these reactions in the server you want the expressions to work on. + You must also use the commands for adding, deleting and listing these expressions in the server you want the expressions to work on. ### Commands and Their Use | Command Name | Description | Example | | :----------: | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------------------------------- | -| `.exadd` | Add an expression 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 expression. | `.exadd "hello" Hi there, %user%!` | -| `exl` | Lists a page of global or server expression(15 reactions / expressions per page). Running this command in a DM will list the global expression, while running it in a server will list that server's expression. | `.exl 1` | +| `.exa` | Add an expression 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 expression. | `.exadd "hello" Hi there, %user%!` | +| `exl` | Lists a page of global or server expression(15 expressions per page). Running this command in a DM will list the global expression, while running it in a server will list that server's expression. | `.exl 1` | | `.exd` | Deletes an expression 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 expression. | `.exd 5` | -#### Now that we know the commands let's take a look at an example of adding a command with `.acr`, +#### Now that we know the commands let's take a look at an example of adding a command with `.exa`, `.exadd "Nice Weather" It sure is, %user%!` @@ -35,7 +35,7 @@ Now, if that command was ran in a server, anyone on that server can make the bot If you want to disable a global expression which you do not like, and you do not want to remove it, or you are not the bot owner, you can do so by adding a new expression with the same trigger on your server, and set the response to `-`. For example: -`.acr /o/ -` +`.exa /o/ -` Now if you try to trigger `/o/`, it won't print anything even if there is a global expression with the same name. diff --git a/docs/guides/linux-guide.md b/docs/guides/linux-guide.md index c845846cc..864c3991b 100644 --- a/docs/guides/linux-guide.md +++ b/docs/guides/linux-guide.md @@ -17,7 +17,7 @@ It is recommended that you use **Ubuntu 20.04**, as there have been nearly no pr ##### Compatible operating systems: -- Ubuntu: 16.04, 18.04, 20.04, 21.04, 21.10 +- Ubuntu: 16.04, 18.04, 20.04, 21.04, 21.10 22.04 - Mint: 19, 20 - Debian: 9, 10 - CentOS: 7 @@ -63,9 +63,20 @@ Open Terminal (if you're on an installation with a window manager) and navigate 4. Run the bot (type `3` and press enter) 5. 🎉 +## **⚠ IF YOU ARE FOLLOWING THE GUIDE ABOVE, IGNORE THIS SECTION ⚠** + ## Linux Release -**⚠ IF YOU ARE FOLLOWING THE GUIDE ABOVE, IGNORE THIS SECTION ⚠** +###### Prerequisites + +1. Nadeko requires redis to function + - ubuntu installation command: `sudo apt-get install redis-server` +2. Playing music requires `ffmpeg`, `libopus`, `libsodium` and `youtube-dl` (which in turn requires python3) + - ubuntu installation command: `sudo apt-get install ffmpeg libopus0 opus-tools libopus-dev libsodium-dev -y` +3. Make sure your python is version 3+ with `python --version` + - if it's not, you can install python 3 and make it the default with: `sudo apt-get install python3.8 python-is-python3` + +*You can use nadeko bash script [prerequisites installer](https://gitlab.com/Kwoth/nadeko-bash-installer/-/blob/v4/n-prereq.sh) as a reference* ##### Installation Instructions @@ -92,19 +103,6 @@ Open Terminal (if you're on an installation with a window manager) and navigate ##### Release Update Instructions -###### Prerequisites - -1. Nadeko requires redis to function - - ubuntu installation command: `sudo apt-get install redis-server` -2. Playing music requires `ffmpeg`, `libopus`, `libsodium` and `youtube-dl` (which in turn requires python3) - - ubuntu installation command: `sudo apt-get install ffmpeg libopus0 opus-tools libopus-dev libsodium-dev -y` -3. Make sure your python is version 3+ with `python --version` - - if it's not, you can install python 3 and make it the default with: `sudo apt-get install python3.8 python-is-python3` - -*You can use nadeko bash script [prerequisites installer](https://gitlab.com/Kwoth/nadeko-bash-installer/-/blob/v4/n-prereq.sh) as a reference* - -###### Installation - 1. Stop the bot 2. Download the latest release from - Look for the file called "x.x.x-linux-x64-build.tar" (where `X.X.X` is a version, for example 3.0.4) and download it diff --git a/docs/guides/windows-guide.md b/docs/guides/windows-guide.md index a46127c87..101ea5024 100644 --- a/docs/guides/windows-guide.md +++ b/docs/guides/windows-guide.md @@ -63,9 +63,9 @@ You can still install them manually: - [ffmpeg-32bit] | [ffmpeg-64bit] - Download the **appropriate version** for your system (32 bit if you're running a 32 bit OS, or 64 if you're running a 64bit OS). Unzip it, and move `ffmpeg.exe` to a path that's in your PATH environment variable. If you don't know what that is, then just move the `ffmpeg.exe` file to NadekoBot/system - [youtube-dl] - Click to download the file. Then put `youtube-dl.exe` in a path that's in your PATH environment variable. If you don't know what that is, then just move the `youtube-dl.exe` file to NadekoBot/system -### Windows From Source +## **⚠ IF YOU ARE FOLLOWING THE GUIDE ABOVE, IGNORE THIS SECTION ⚠** -⚠ IF YOU ARE FOLLOWING THE GUIDE ABOVE, IGNORE THIS SECTION ⚠ +### Windows From Source ##### Prerequisites diff --git a/docs/permissions-system.md b/docs/permissions-system.md index dd8d71689..146406834 100644 --- a/docs/permissions-system.md +++ b/docs/permissions-system.md @@ -77,8 +77,8 @@ Say you want to only enable NSFW commands for a specific role, just do the follo If you don't want server or global Expressions, just block the module that controls their usage: -1. `.sm Expressions disable` - - Disables the ActualCustomReactions module from being used +1. `.sm ActualExpressions disable` + - Disables the ActualExpression module from being used **Note**: The `Expressions` module controls the usage of Expressions. The `Expressions` module controls commands related to Expressions (such as `.acr`, `.lcr`, `.crca`, etc). diff --git a/mkdocs.yml b/mkdocs.yml index 163039b32..9dc07e26d 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -92,4 +92,3 @@ nav: - medusa/snek-lifecycle.md - Contribution Guide: contribution-guide.md - Donate: donate.md - - License: license.md diff --git a/src/NadekoBot/Modules/Administration/GreetBye/GreetService.cs b/src/NadekoBot/Modules/Administration/GreetBye/GreetService.cs index 97d4fad31..f3c089496 100644 --- a/src/NadekoBot/Modules/Administration/GreetBye/GreetService.cs +++ b/src/NadekoBot/Modules/Administration/GreetBye/GreetService.cs @@ -606,4 +606,4 @@ public class GreetService : INService, IReadyExecutor } #endregion -} \ No newline at end of file +}