From a89e3989a3dcfae0a1122c2d50dcff91e158ae3a Mon Sep 17 00:00:00 2001 From: Ene <4186225-Kieteyuku@users.noreply.gitlab.com> Date: Sun, 5 Sep 2021 06:49:09 +0000 Subject: [PATCH] Guide improvements part 2 + rsar fix for v3 --- docs/guides/linux-guide.md | 18 +++++++++--------- docs/guides/migration-guide.md | 8 ++++---- .../data/strings/commands/commands.en-US.yml | 6 ++++-- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/docs/guides/linux-guide.md b/docs/guides/linux-guide.md index a861b9172..6d87b063e 100644 --- a/docs/guides/linux-guide.md +++ b/docs/guides/linux-guide.md @@ -1,8 +1,8 @@ ## Migration from 2.x -⚠ If you're already hosting NadekoBot, You **MUST** update to latest version of 2.x and **run your bot at least once** before switching over to v3. +##### ⚠ If you're already hosting NadekoBot, _You **MUST** update to latest version of 2.x and **run your bot at least once**_ before switching over to v3. -#### [Linux migration instructions](migration-instructions#linux) +#### [Linux migration instructions](https://nadekobot.readthedocs.io/en/v3/guides/migration-guide/#linux) ## Linux From Source @@ -17,9 +17,9 @@ Open Terminal (if you're on an installation with a window manager) and navigate 5. Copy the creds.yml template `cp nadekobot/output/creds_example.yml nadekobot/output/creds.yml` 6. Open `nadekobot/output/creds.yml` with your favorite text editor. We will use nano here - `nano nadekobot/output/creds.yml` -7. [Enter your bot's token](#creds-guide) +7. [Enter your bot's token](https://nadekobot.readthedocs.io/en/v3/creds-guide/) - After you're done, you can close nano (and save the file) by inputting, in order - - `CTRL`+`X` + - `CTRL` + `X` - `Y` - `Enter` 8. Run the bot (type `3` and press enter) @@ -39,7 +39,7 @@ Open Terminal (if you're on an installation with a window manager) and navigate 1. Download the latest release from - Look for the file called "X.XX.X-linux-x64-build.tar" (where X.XX.X is a series of numbers) and download it 2. Untar it - ⚠ Make sure that you change X.XX.X to the same series of numbers as in step 1! + - ⚠ Make sure that you change X.XX.X to the same series of numbers as in step 1! - `tar xf X.XX.X-linux-x64-build.tar` 3. Rename the `nadekobot-linux-x64` to `nadekobot` - `mv nadekobot-linux-x64 nadekobot` @@ -51,7 +51,7 @@ Open Terminal (if you're on an installation with a window manager) and navigate - `nano nadekobot/output/creds.yml` 8. [Enter your bot's token](#creds-guide) - After you're done, you can close nano (and save the file) by inputting, in order - - `CTRL`+`X` + - `CTRL` + `X` - `Y` - `Enter` 9. Run the bot @@ -63,7 +63,7 @@ Open Terminal (if you're on an installation with a window manager) and navigate 2. Download the latest release from - Look for the file called "X.XX.X-linux-x64-build.tar" (where X.XX.X is a series of numbers) and download it 3. Untar it - ⚠ Make sure that you change X.XX.X to the same series of numbers as in step 2! + - ⚠ Make sure that you change X.XX.X to the same series of numbers as in step 2! - `tar xf 2.99.8-linux-x64-build.tar` 4. Rename the old nadekobot directory to nadekobot-old (remove your old backup first if you have one, or back it up under a different name) - `rm -rf nadekobot-old 2>/dev/null` @@ -71,7 +71,7 @@ Open Terminal (if you're on an installation with a window manager) and navigate 5. Rename the new nadekobot directory to nadekobot - `mv nadekobot-linux-x64 nadekobot` 6. Remove old strings and aliases to avoid overwriting the updated versions of those files - ⚠ If you've modified said files, back them up instead + - ⚠ If you've modified said files, back them up instead - `rm nadekobot-old/data/aliases.yml` - `rm -r nadekobot-old/data/strings` 7. Copy old data @@ -98,4 +98,4 @@ rm -r nadekobot-old/data/strings && \ cp -RT nadekobot-old/data/ nadekobot/data/ && \ cp nadekobot-old/creds.yml nadekobot/ && \ cd nadekobot && chmod +x NadekoBot -``` \ No newline at end of file +``` diff --git a/docs/guides/migration-guide.md b/docs/guides/migration-guide.md index 835551f52..33918c909 100644 --- a/docs/guides/migration-guide.md +++ b/docs/guides/migration-guide.md @@ -21,10 +21,10 @@ - Stop the bot 2. Make sure your bot's folder is called `NadekoBot` - Run `cd ~ && ls` - - Confirm there is a folder NadekoBot + - Confirm there is a folder called NadekoBot (not nadekobot, in all lowercase) 3. Migrate your bot's data using the new installer: - Run the **new** installer `cd ~ && wget -N https://gitlab.com/Kwoth/nadeko-bash-installer/-/raw/master/linuxAIO.sh && bash linuxAIO.sh` - - The installer should notify you that your data is ready for migration in a message above the menu + - The installer should notify you that your data is ready for migration in a message above the menu. - Install prerequisites (type `1` and press enter), and make sure it is successful - Download NadekoBot v3 (type `2` and press enter) - Run the bot (type `3` and press enter) @@ -32,7 +32,7 @@ - `.stats` to ensure owner id (credentials) is correct - `.lcr` to see custom reactions - `.lp` to list permissions -5. 🎉 Enjoy. If you want to learn how to update the bot, click (here)[#linux-updating-the-bot]. +5. 🎉 Enjoy. If you want to learn how to update the bot, click (here)[https://nadekobot.readthedocs.io/en/v3/guides/linux-guide/#update-instructions]. ## Manual @@ -58,4 +58,4 @@ 4. Run the bot - `cd nadekobot/output` - `dotnet NadekoBot.dll` -5. That's it. Just make sure that when you're updating the bot, you're properly backing up your old data. \ No newline at end of file +5. That's it. Just make sure that when you're updating the bot, you're properly backing up your old data. diff --git a/src/NadekoBot/data/strings/commands/commands.en-US.yml b/src/NadekoBot/data/strings/commands/commands.en-US.yml index f18276fc8..5adadf538 100644 --- a/src/NadekoBot/data/strings/commands/commands.en-US.yml +++ b/src/NadekoBot/data/strings/commands/commands.en-US.yml @@ -137,7 +137,9 @@ asar: rsar: desc: "Removes a specified role from the list of self-assignable roles." args: - - "" + - "Gamer" + - "Alliance" + - "Horde" lsar: desc: "Lists self-assignable roles. Shows 20 roles per page." args: @@ -2075,4 +2077,4 @@ nhentai: desc: "Shows basic information about a hentai with the specified id, or a valid nhentai search query." args: - "273426" - - "cute girl" \ No newline at end of file + - "cute girl"