diff --git a/.gitignore b/.gitignore index c79b3a910..af3d75808 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ src/NadekoBot/creds.yml src/NadekoBot/Command Errors*.txt src/NadekoBot/creds.yml -# credentials file before and after migrations +# credentials file before and after v3 src/NadekoBot/credentials.json src/NadekoBot/old_credentials.json src/NadekoBot/credentials.json.bak @@ -256,7 +256,7 @@ PublishScripts/ !**/packages/build/ # Uncomment if necessary however generally it will be regenerated when needed #!**/packages/repositories.config -# NuGet v3's project.json files produces more ignoreable files +# NuGet v4's project.json files produces more ignoreable files *.nuget.props *.nuget.targets diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4e0e10ea..acb44dc36 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,7 +50,7 @@ build: # - if: $CI_COMMIT_TAG # script: # - | -# release-cli create --name "NadekoBot v$CI_COMMIT_TAG" --description "## [Changelog](https://gitlab.com/Kwoth/nadekobot/-/blob/v3/CHANGELOG.md#$(echo "$CI_COMMIT_TAG" | sed "s/\.//g")-$(date +%d%m%Y))" --tag-name $CI_COMMIT_TAG \ +# release-cli create --name "NadekoBot v$CI_COMMIT_TAG" --description "## [Changelog](https://gitlab.com/Kwoth/nadekobot/-/blob/v4/CHANGELOG.md#$(echo "$CI_COMMIT_TAG" | sed "s/\.//g")-$(date +%d%m%Y))" --tag-name $CI_COMMIT_TAG \ # --assets-link "{\"name\":\"${LINUX_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${LINUX_X64_RELEASE}\"}" \ # --assets-link "{\"name\":\"${WIN_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${WIN_X64_RELEASE}\"}" @@ -91,11 +91,11 @@ test: # name: amazon/aws-cli # entrypoint: [""] # script: -# - sed -i "s/_INSTALLER_FILE_NAME_/$INSTALLER_FILE_NAME/g" releases-v3.json -# - sed -i "s/_VERSION_/$CI_COMMIT_TAG/g" releases-v3.json +# - sed -i "s/_INSTALLER_FILE_NAME_/$INSTALLER_FILE_NAME/g" releases-v4.json +# - sed -i "s/_VERSION_/$CI_COMMIT_TAG/g" releases-v4.json # - aws --version # - aws --endpoint-url $AWS_SERVICE_URL s3api put-object --bucket "$AWS_BUCKET_NAME" --key "dl/bot/$INSTALLER_FILE_NAME" --acl public-read --body "$INSTALLER_OUTPUT_DIR/$INSTALLER_FILE_NAME" -# - aws --endpoint-url $AWS_SERVICE_URL s3api put-object --bucket "$AWS_BUCKET_NAME" --key "dl/bot/releases-v3.json" --acl public-read --body "releases-v3.json" +# - aws --endpoint-url $AWS_SERVICE_URL s3api put-object --bucket "$AWS_BUCKET_NAME" --key "dl/bot/releases-v4.json" --acl public-read --body "releases-v4.json" #docker-build: # # Use the official docker image. diff --git a/CHANGELOG.md b/CHANGELOG.md index e30b63d9b..09914bbbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,7 @@ Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog. - Removed `.bce` - use `.config` or `.config bot` specifically for bot config - Removed obsolete placeholders: %users% %servers% %userfull% %username% %userdiscrim% %useravatar% %id% %uid% %chname% %cid% %sid% %members% %server_time% %shardid% %time% %mention% - Removed some obsolete commands and strings +- Removed code which migrated 2.x to v3 credentials, settings, etc... ## [3.0.13] - 14.04.2021 diff --git a/NuGet.Config b/NuGet.Config deleted file mode 100644 index e27a9cbbc..000000000 --- a/NuGet.Config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/README.md b/README.md index ffb550e29..edbe7a4ef 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Discord](https://discordapp.com/api/guilds/117523346618318850/widget.png)](https://discord.gg/nadekobot) -[![Documentation Status](https://readthedocs.org/projects/nadekobot/badge/?version=latest)](http://nadekobot.readthedocs.io/en/v3/?badge=v3) +[![Documentation Status](https://readthedocs.org/projects/nadekobot/badge/?version=latest)](http://nadekobot.readthedocs.io/en/v4/?badge=v4) [![Discord Bots](https://discordbots.org/api/widget/status/116275390695079945.svg)](https://top.gg/bot/116275390695079945) @@ -10,6 +10,5 @@ [![nadeko2](https://cdn.nadeko.bot/tutorial/docs-bot.png)](https://nadeko.bot/commands) ### Useful links -- ❗ [2.x to v3 migration guide](https://nadekobot.readthedocs.io/en/v3/guides/migration-guide/) -- [Self hosting Guides and Docs](https://nadekobot.readthedocs.io/en/v3) +- [Self hosting Guides and Docs](https://nadekobot.readthedocs.io/en/v4) - [Discord support server](https://discord.nadeko.bot) diff --git a/docs/contribution-guide.md b/docs/contribution-guide.md index ead523a77..eb5a301fd 100644 --- a/docs/contribution-guide.md +++ b/docs/contribution-guide.md @@ -1,6 +1,6 @@ # How to contribute -1. Make Merge Requests to the [**v3 branch**](https://gitlab.com/Kwoth/nadekobot/tree/v3) +1. Make Merge Requests to the [**v4 branch**](https://gitlab.com/Kwoth/nadekobot/tree/v4) 2. Keep a single Merge Request to a single feature 3. Fill out the MR template diff --git a/docs/guides/docker-guide.md b/docs/guides/docker-guide.md index c4f3281e6..780dd3bf2 100644 --- a/docs/guides/docker-guide.md +++ b/docs/guides/docker-guide.md @@ -2,8 +2,6 @@ # DO NOT USE YET - WORK IN PROGRESS -Upgrade from 2.x to v3 does not work because the file is mount readonly - ### Docker Compose ```yml version: "3.7" diff --git a/docs/guides/linux-guide.md b/docs/guides/linux-guide.md index 9b1e3300f..b7e880a43 100644 --- a/docs/guides/linux-guide.md +++ b/docs/guides/linux-guide.md @@ -1,10 +1,7 @@ # Setting up NadekoBot on Linux -## Please **READ** the [Migration] section if you are still on on Nadeko **2.x** - | Table of Contents | | :-------------------------------------------------- | -| [Migration] | | [Linux From Source] | | [Source Update Instructions] | | [Linux Release] | @@ -14,12 +11,6 @@ | [Systemd + Script] | | [Setting up Nadeko on a VPS (Digital Ocean)] | -## Migration - -### ⚠ If you're already hosting NadekoBot, _You **MUST** update to latest version of 2.x and **run your bot at least once**_ before upgrading to v3. ⚠ - -#### [**LINUX MIGRATION INSTRUCTIONS**](../migration-guide/#linux) - #### Operating System Compatibility It is recommended that you use **Ubuntu 20.04**, as there have been nearly no problems with it. Also, **32-bit systems are incompatible**. @@ -307,7 +298,6 @@ If you are running your droplet for the first time, it will most likely ask you After that, your droplet should be ready for use. [Follow the guide from the beginning](#linux-from-source) to set Nadeko up on your newly created VPS. -[Migration]: #migration [Linux From Source]: #linux-from-source [Source Update Instructions]: #source-update-instructions [Linux Release]: #linux-release diff --git a/docs/guides/migration-guide.md b/docs/guides/migration-guide.md deleted file mode 100644 index 3ff1224f1..000000000 --- a/docs/guides/migration-guide.md +++ /dev/null @@ -1,66 +0,0 @@ -# Migration instructions (2.x to v3) - -## Windows - -1. Run your NadekoBot Updater first, and **make sure your bot is updated to at least 2.46.5** - - **Run your 2.46.5 Bot** and make sure it works, and then **stop it** - - Close your old NadekoBot Updater -2. Get the new NadekoBot v3 Updater [here](https://dl.nadeko.bot/v3) -3. Click on the + icon to add a new bot -4. Next to the path, click on the folder icon and select the folder where your 2.46.5 bot is - - ℹ In case you're not sure where it's located, you can open your old updater and see it -5. If you've selected the correct path, you should have an **Update** button available, click it -6. You're done; you can now run your bot, and you can uninstall your old updater if you no longer have 2.x bots -7. 🎉 - -## Linux - -1. In order to migrate a bot hosted on **Linux**, first update your current version to the latest 2.x version using the 2.x installer, run the bot, and make sure it works. Then: - - Run the **old** installer with `cd ~ && wget -N https://github.com/Kwoth/NadekoBot-BashScript/raw/1.9/linuxAIO.sh && bash linuxAIO.sh` - - Run option **1** again - - You **MUST** Run the bot now to ensure database is ready for migration - - Type `.stats` and ensure the version is `2.46.5` or later - - Stop the bot -2. Make sure your bot's folder is called `NadekoBot` - - Run `cd ~ && ls` - - 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. - - 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) -4. Make sure your permissions, custom reactions, credentials, and other data is preserved - - `.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-guide/#update-instructions) - -## Manual - -⚠ NOT RECOMMENDED -⚠ NadekoBot v3 requires [.net 5](https://dotnet.microsoft.com/download/dotnet/5.0) - -1. In order to migrate a bot hosted **on Linux or from source on Windows** - - First update your current version to the latest 2.x version using the 2.x installer - - Then you **must** run the bot to prepare the database for the migration, and make sure the bot works prior to upgrade. - Then: -2. Rename your old nadeko bot folder to `nadekobot_2x` - - `mv NadekoBot nadekobot_2x` -3. Build the new version and move old data to the output folder - 1. Clone the v3 branch to a separate folder - - `git clone https://gitlab.com/kwoth/nadekobot -b v3 --depth 1` - 2. Build the bot - - `dotnet publish -c Release -o output/ src/NadekoBot/` - 3. Copy old data - - ⚠ Be sure you copy the correct command for your system! - - **Windows:** `cp -r -fo nadekobot_2x/src/NadekoBot/data nadekobot/src/NadekoBot/data` - - **Linux:** `cp -rf nadekobot_2x/src/NadekoBot/data nadekobot/src/NadekoBot/data` - 4. Copy the database - - `cp nadekobot_2x/src/NadekoBot/bin/Release/netcoreapp2.1/data/NadekoBot.db nadekobot/output/data` - 5. Copy your credentials - - `cp nadekobot_2x/src/NadekoBot/credentials.json nadekobot/output/` -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. diff --git a/docs/guides/windows-guide.md b/docs/guides/windows-guide.md index f1943f22a..2f85d1203 100644 --- a/docs/guides/windows-guide.md +++ b/docs/guides/windows-guide.md @@ -1,9 +1,3 @@ -## 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. - -#### [Windows migration instructions](../migration-guide#windows) - ## Setting Up NadekoBot on Windows With the Updater | Table of Contents| @@ -84,7 +78,7 @@ You can still install them manually: Open PowerShell (press windows button on your keyboard and type powershell, it should show up; alternatively, right click the start menu and select Windows PowerShell), and navigate to the location where you want to install the bot (for example `cd ~/Desktop/`) -1. `git clone https://gitlab.com/kwoth/nadekobot -b v3 --depth 1` +1. `git clone https://gitlab.com/kwoth/nadekobot -b v4 --depth 1` 2. `cd nadekobot` 3. `dotnet publish -c Release -o output/ src/NadekoBot/` 4. `cd output` @@ -128,7 +122,7 @@ In order to use music commands, you need ffmpeg and youtube-dl installed. - [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, just move the `ffmpeg.exe` file to `NadekoBot/output`. - [youtube-dl] - Click to download the file, then move `youtube-dl.exe` to a path that's in your PATH environment variable. If you don't know what that is, just move the `youtube-dl.exe` file to `NadekoBot/system`. -[Updater]: https://dl.nadeko.bot/v3 +[Updater]: https://dl.nadeko.bot/ [Notepad++]: https://notepad-plus-plus.org/ [.net]: https://dotnet.microsoft.com/download/dotnet/5.0 [Redis]: https://github.com/MicrosoftArchive/redis/releases/download/win-3.0.504/Redis-x64-3.0.504.msi diff --git a/mkdocs.yml b/mkdocs.yml index b768f3b74..29ef64f80 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -72,7 +72,6 @@ markdown_extensions: nav: - Home: index.md - Guides: - - ❗ Migration Guide: guides/migration-guide.md - Windows Guide: guides/windows-guide.md - Linux Guide: guides/linux-guide.md - OSX Guide: guides/osx-guide.md