Updated changelog

Updated Linux guide to list the following supported versions.

See merge request Kwoth/nadekobot!221

.dockerignore

@@ -1,8 +1,6 @@
 # Ignore all files
 *
 
-# Use Nadeko.Medusa project
-!src/Nadeko.Medusa/**
 # Use NadekoBot project
 !src/NadekoBot/**
 # Use NadekoBot.Coordinator project

.gitignore

@@ -1,11 +1,5 @@
 #Manually added files
 
-# medusa stuff
-!src/NadekoBot/data/medusae/medusa.yml
-src/NadekoBot/data/medusae/**
-
-# other
-
 command_errors*.txt
 output/
 src/NadekoBot/output
@@ -14,7 +8,7 @@ src/NadekoBot/creds.yml
 src/NadekoBot/Command Errors*.txt
 
 src/NadekoBot/creds.yml
-# credentials file before and after v3
+# credentials file before and after migrations
 src/NadekoBot/credentials.json 
 src/NadekoBot/old_credentials.json 
 src/NadekoBot/credentials.json.bak
@@ -262,7 +256,7 @@ PublishScripts/
 !**/packages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
 #!**/packages/repositories.config
-# NuGet v4's project.json files produces more ignoreable files
+# NuGet v3's project.json files produces more ignoreable files
 *.nuget.props
 *.nuget.targets
 

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: mcr.microsoft.com/dotnet/sdk:6.0
+image: mcr.microsoft.com/dotnet/sdk:5.0
 
 stages:
   - build
@@ -7,7 +7,6 @@ stages:
   - release
   - publish-windows
   - upload-windows-updater-release
-  - publish-medusa-package
 
 variables:
   project: "NadekoBot"
@@ -19,12 +18,12 @@ variables:
   PACKAGE_REGISTRY_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/NadekoBot-build/${CI_COMMIT_TAG}"
   INSTALLER_OUTPUT_DIR: "nadeko-installers/${CI_COMMIT_TAG}"
   INSTALLER_FILE_NAME: "nadeko-setup-${CI_COMMIT_TAG}.exe"
-
+  
 build:
   stage: build
   script:
-    - "dotnet publish -c Release -r linux-x64 --self-contained -o $LINUX_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
-    - "dotnet publish -c Release -r win7-x64 --self-contained -o $WIN_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
+    - "dotnet publish -c Release -r linux-x64 -o $LINUX_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
+    - "dotnet publish -c Release -r win7-x64 -o $WIN_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
   artifacts:
     paths:
       - "$LINUX_X64_OUTPUT_DIR/"
@@ -35,7 +34,7 @@ upload-builds:
   image: alpine:latest
   rules:
     - if: $CI_COMMIT_TAG
-  script:
+  script:    
     - apk add --no-cache curl tar zip
     - "tar cvf $LINUX_X64_RELEASE $LINUX_X64_OUTPUT_DIR/*"
     - "zip -r $WIN_X64_RELEASE $WIN_X64_OUTPUT_DIR/*"
@@ -51,7 +50,7 @@ release:
     - if: $CI_COMMIT_TAG
   script:
     - |
-      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 \
+      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 \
         --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}\"}"
 
@@ -64,20 +63,20 @@ test:
     - "dotnet test"
 
 publish-windows:
-  stage: publish-windows
+  stage: publish-windows 
   rules:
-    - if: "$CI_COMMIT_TAG"
+    - if: '$CI_COMMIT_TAG'
   image: scottyhardy/docker-wine
   before_script:
-    - choco install dotnet-6.0-runtime --version=6.0.4 -y
-    - choco install dotnet-6.0-sdk --version=6.0.202 -y
+    - choco install dotnet-5.0-runtime -y
+    - choco install dotnet-5.0-sdk -y
     - choco install innosetup -y
   artifacts:
     paths:
       - "$INSTALLER_OUTPUT_DIR/$INSTALLER_FILE_NAME"
   script:
     - dotnet clean
-    - dotnet restore -f --no-cache -v n
+    - dotnet restore
     - dotnet publish -c Release --runtime win7-x64 /p:Version=$CI_COMMIT_TAG src/NadekoBot
     - $env:NADEKOBOT_INSTALL_VERSION = $CI_COMMIT_TAG
     - iscc.exe "/O+" ".\exe_builder.iss"
@@ -87,28 +86,17 @@ publish-windows:
 upload-windows-updater-release:
   stage: upload-windows-updater-release
   rules:
-    - if: "$CI_COMMIT_TAG"
-  image:
+    - if: '$CI_COMMIT_TAG'
+  image: 
     name: amazon/aws-cli
     entrypoint: [""]
-  script:
+  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
     - 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"
 
-publish-medusa-package:
-  stage: publish-medusa-package
-  rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_TAG
-  script:
-    - LAST_TAG=$(git describe --tags --abbrev=0)
-    - if [ $CI_COMMIT_TAG ];then MEDUSA_VERSION="$CI_COMMIT_TAG"; else MEDUSA_VERSION="$LAST_TAG-$CI_COMMIT_SHA"; fi
-    - cd src/Nadeko.Medusa/
-    - dotnet pack -c Release /p:Version=$MEDUSA_VERSION -o bin/Release/packed
-    - dotnet nuget push bin/Release/packed/ --source https://www.myget.org/F/nadeko/api/v2/package --api-key "$MYGET_API_KEY"
-
 docker-build:
   # Use the official docker image.
   image: docker:latest
@@ -125,13 +113,13 @@ docker-build:
         tag=""
         echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'"
       else
-        tag=":$CI_COMMIT_SHA"
+        tag=":$CI_COMMIT_REF_SLUG"
         echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
       fi
     - docker build --pull -t "$CI_REGISTRY_IMAGE${tag}" .
     - docker push "$CI_REGISTRY_IMAGE${tag}"
   # Run this job in a branch where a Dockerfile exists
   rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_TAG
+    - if: $CI_COMMIT_BRANCH
       exists:
         - Dockerfile

CHANGELOG.md

@@ -1,372 +1,15 @@
-
 # Changelog
 
 Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
 
-## [4.2.4] - 17.06.2022
+## [3.0.13] - 14.04.2021
 
 ### Fixed
 
-- Fixed `.crypto`, you will still need coinmarketcapApiKey in `creds.yml` in order to make it run consistently as the key is shared
-
-## [4.2.3] - 17.06.2022
-
-### Fixed
-
-- Fixed `.timely` nullref bug and made it nicer
-- Fixed `.streamrole` not updating in real time!
-- Disabling specific Global Expressions should now work with `.sc` (and other permission commands)
-
-## [4.2.2] - 15.06.2022
-
-### Fixed
-
-- Added missing Patron Tiers and fixed Patron pledge update bugs
-- Prevented creds_example.yml error in docker containers from crashing it
-
-### Changed
-
-- Rss feeds will now show error counter before deletion
-
-## [4.2.1] - 14.06.2022
-
-### Added
-
-- Localized strings updated
-
-### Fixed
-
-- Fixed `.exexport`, `.savechat`, and `.quoteexport`
-- Fixed plaintext-only embeds
-- Fixed greet message footer not showing origin server
-
-## [4.2.0] - 14.06.2022
-
-### Added
-
-- Added `data/searches.yml` file which configures some of the new search functionality
-  The file comments explaining what each property does.
-  Explained briefly here:
-  ```yml
-  # what will be used for .google command. Either google (official api) or searx
-  webSearchEngine: Google
-  # what will be used for .img command. Either google (official api) or searx
-  imgSearchEngine: Google
-  # how will yt results be retrieved: ytdataapi or ytdl or ytdlp
-  ytProvider: YtDataApiv3
-  # in case web or img search is set to searx, the following instances will be used:
-  searxInstances: []
-  # in case ytProvider is set to invidious, the following instances will be used
-  invidiousInstances: []
-  ```
-- Added new properties to `creds.yml`. google -> searchId and google -> searchImageId.
-- These properties are used as `cx` (google api query parameter) in case you've setup your `data/searches.yml` to use the official google api.
-  `searchId` is used for web search
-  `searchimageId` is used for image search
-  ```yml
-  google:
-      searchId: ""
-      searchImageId: ""
-  ```
-- Check `creds_example.yml` for comments explaining how to obtain them.
-
-#### Patronage system added
-- Added `data/patron.yml` for configuration
-- Implemented only for patreon so far
-- Patreon subscription code completely rewritten
-- Users who pledge on patreon get benefits based on the amount they pledged
-- Public nadeko only. But selfhosters can adapt it to their own patreon pages by configuring their patreon credentials in `creds.yml` and enabling the system in `data/patron.yml` file.
-  - Most of the patronage system strings are hardcoded atm, so if you wish to use this system on selfhosts, you will have to modify the source
-- Pledge amounts are split into tiers. This is not configurable atm.
-  - Tier I - 1$ - 4.99$ a month
-  - Tier V - 5$ - 9.99$ a month
-  - Tier X - 10$ - 19.99$ a month
-  - Tier XX - 20$ - 49.99$ a month
-  - Tier L - 50$ - 99.99$ a month
-  - Tier C - 100$+ a month
-- Rewards and command quotas for each of the tiers are configurable
-- Limitations to certain features are also configurable. ex:
-```yml
-quotas:
-    features:
-        "rero:max_count":
-            x: 50
-```
-- ^ this setting would set the maximum number of reaction roles to be 50 for a user who is in Patron Tier X
-- Read the comments in the .yml file for (much) more info
-- Quota system allows the owner to set up hourly, daily and monthly quota usage for each tier
-- Quota system applies to entire server owner by a patron
-  - Patron spends own quota by using the commands on any server
-  - Any user on *any* server owned by a patron spends that patron's quota
-- When users subscribe to patreon they will receive a welcome message
-  - If you're enabling patron system for a selfhost, you will want to edit it
-
-Added `.patron` and `.patronmessage` commands
-- `.patron` checks your patronage status, and quotas. Requires patron system to be enabled.
-- `.patronmessage` (owner only) sends message to all patrons with the specified tier or higher. Supports embeds
-
-- Added a fake `.cmdcd` command `cleverbot:response` which can be used to limit how often users can talk to the cleverbot.
-
-### Changed
-
-- CurrencyReward now support adding additional flowers to patrons.
-- `.donate` command completely reworked.
-  - Works only on public bot (OnlyPublicBotAttribute)
-  - Guides user on how to donate to support the project
-  - Added interaction explaining selfhosting
-
-- `.google` reimplemented. It now has 2 modes configurable in `data/searches.yml` under the `webSearchengine` property
-  - If set to `google`, official custom search api will be used. You will need to set googleapikey and google.searchId in `creds.yml`
-  - if set to `searx` one of the instances specified in the `searxInstances:` property will be randomly chosen for each request
-    - instances must have `format=json` allowed (public ones usually don't allow it)
-    - instances are specified as a fully qualified url, example: `https://my.cool.searx.instance.io`
-- `.image` reimplemented. Same as `.google` - it uses either `google` official api (in which case it uses `google.searchImageId` from `creds.yml`) or `searx`
-
-- `.youtube` reimplemented. It will use a `ytProvider:` property from `data/searches.yml` to determine how to retrieve results
-  - `ytdataapi` will use the official google api (requires `GoogleApiKey` specified in `creds.yml`) and YoutubeDataApi enabled in the dev console
-  - `ytdl` will use `youtube-dl` program from the host machine. It must be downloaded and it's location must be added to path env variable.
-  - `ytdlp` will use `yt-dlp` program from the host machine. Same as `youtube-dl` - must be in path env variable.
-  - `invidious` will use one of invidious instances specified in the `invidiousInstances` property. Very good. 
-
-- `.google`, `.youtube` and `.image` moved to the new Search group
-
-Note: Results of each `.youtube` query will be cached for 1 hour to improve perfomance
-- Removed 30 second `.ping` ratelimit on public nadeko
-
-- xp image generation changes
-  - In case you have default settings, your xp image will look slightly different
-  - If you've modified xp_template.json, your xp image might look broken. Your old template will be saved in xp_template.json.old
-  - Xp number outline is now slightly thicker
-  - Xp number will now have Center vertical and horizontal alignment
-  - LastLevelUp no longer supported
-
-- Some commands will now use timestamp tags for better user experience
-- `.prune` was slightly slowed down to avoid ratelimits
-- `.wof` moved from it's own group to the default Gambling group
-- `.feed` urls which error for more than 100 times will be automatically removed.
-- `.ve` is now enabled by default
-
-- [dev] nadeko interaction slightly improved to make it less nonsense (they still don't make sense)  
-- [dev] RewardedUsers table slightly changed to make it more general  
-- [dev] renamed `// todo`s which aren't planned soon to `// FUTURE`  
-- [dev] currency rewards have been reimplemented and moved to a separate service  
-
-### Fixed
- 
-- `.rh` no longer needs quotes for multi word roles
-- `.deletexp` will now properly delete server xp too
-- Fixed `.crypto` sparklines
-- [dev] added support for configs to properly parse enums without case sensitivity (ConfigParsers.InsensitiveEnum)
-- [dev] Fixed a bug in .gencmdlist  
-- [dev] small fixes to creds provider  
-
-### Removed
-
-- `.ddg` removed.
-- [dev] removed some dead code and comments
-
-## [4.1.6] - 14.05.2022
-
-### Fixed
-
-- Fixed windows release and updated packages
-
-## [4.1.5] - 11.05.2022
-
-### Changed
-
-- `.clubdesc <msg>` will now have a nicer response
-
-### Fixed
-
-- `.give` DM will once again show an amount
-- Fixed an issue with filters not working and with custom reactions no longer being able to override commands.
-- Fixed `.stock` command
-
-## [4.1.4] - 06.05.2022
-
-### Fixed
-
-- Fixed `.yun`
-
-## [4.1.3] - 06.05.2022
-
-### Added 
-
-- Added support for embed arrays in commands such as .say, .greet, .bye, etc...
-  - Website to create them is live at eb.nadeko.bot (old one is moved to oldeb.nadeko.bot)
-  - Embed arrays don't have a plainText property (it's renamed to 'content')
-  - Embed arrays use color hex values instead of an integer
-  - Old embed format will still work
-  - There shouldn't be any breaking changes
-- Added `.stondel` command which, when toggled, will make the bot delete online stream messages on the server when the stream goes offline
-- Added a simple bank system.
-  - Users can deposit, withdraw and check the balance of their currency in the bank.
-  - Users can't check other user's bank balances.
-- Added a button on a .$ command which, when clicked, sends you a message with your bank balance that only you can see.
-- Added `.h <command group>`  
-  - Using this command will list all commands in the specified group
-  - Atm only .bank is a proper group (`.h bank`)
-- Added "Bank Accounts" entry to `.economy`
-
-### Changed
-
-- Reaction roles rewritten completely 
-  - Supports multiple exclusivity groups per message 
-  - Supports level requirements
-  - However they can only be added one by one
-  - Use the following commands for more information 
-    - `.h .reroa`
-    - `.h .reroli`
-    - `.h .rerot`
-    - `.h .rerorm`
-    - `.h .rerodela`
-- Pagination is now using buttons instead of reactions
-- Bot will now support much higher XP values for global and server levels
-- [dev] Small change and generation perf improvement for the localized response strings
-
-
-### Fixed
-
-- Fixed `.deletexp` command
-- `.give` command should send DMs again
-- `.modules` command now has a medusa module description
-
-## [4.1.2] - 16.04.2022
-
-### Fixed
-
-- Fixed an issue with missing `.dll` files in release versions
-
-## [4.1.0] - 16.04.2022
-
-### Added
-
-- NadekoBot now supports mysql, postgresql and sqlite
-  - To change the db nadeko will use, simply change the `db type` in `creds.yml`
-  - There is no migration code right now, which means that if you want to switch to another system you'll either have to manually export/import your database or start fresh
-- Medusa system
-  - A massive new feature which allows developers to create custom modules/plugins/cogs 
-  - They can be load/unloaded/updated at runtime without restarting the bot
-
-### Changed
-
-- Minor club rework
-  - Clubs names are now case sensitive (owo and OwO can be 2 different clubs)
-  - Removed discriminators
-    - Current discriminators which are greater than 1 are appended to clubnames to avoid duplicates, you can rename your club with `.clubrename` to remove it
-    - Most of the clubs with #1 discriminator no longer have it (For example MyClub#1 will now just be MyClub)
-- [dev] A lot of refactoring and slight functionality changes within Nadeko's behavior system and command handler which were required in order to support the medusa system
-
-### Removed
-
-  - Removed `.clublevelreq` command as it doesn't serve much purpose
-
-## [4.0.6] - 21.03.2022
-
-### Fixed
-
-- Fixed voice presence logging
-- Fixed .clubaccept, .clubban, .clubkick and .clubunban commands
-
-## [4.0.5] - 21.03.2022
-
-### Fixed
-
-- Fixed several bugs in the currency code
-- Fixed some potential memory leaks
-- Fixed some response strings
-
-## [4.0.4] - 04.03.2022
-
-### Fixed
-
-- Fixed the `id` which shows up when you add a new Expression
-- Fixed some strings which were still referring to "CustomReaction(s)" instead of "Expression(s)" 
-
-## [4.0.3] - 04.03.2022
-
-### Fixed
-
-- Console should no longer spam numbers when `.antispam` is enabled
-
-## [4.0.2] - 03.03.2022
-
-### Fixed
-
-- Fixed `.rero` not working due to a bug introduced in 4.0
-
-## [4.0.1] - 03.03.2022
-
-### Added
-
-- Added `usePrivilegedIntents` to creds.yml if you don't have or don't want (?) to use them
-- Added a human-readable, detailed error message if logging in fails due to missing privileged intents
-
-## [4.0.0] - 02.03.2022
-
-### Added
-- Added `.deleteemptyservers` command
-- Added `.curtr <id>` which lets you see full information about one of your own transactions with the specified id
-- Added trovo.live support for stream notifications (`.stadd`) 
-- Added unclaimed waifu decay functionality
-  - Added 3 new settings to `data/gambling.yml` to control it:
-    - waifu.decay.percent - How much % to subtract from unclaimed waifu
-    - waifu.decay.hourInterval - How often to decay the price 
-    - waifu.decay.minPrice - Unclaimed waifus with price lower than the one specified here will not be affected by the decay
-- Added `currency.transactionsLifetime` to `data/gambling.yml` Any transaction older than the number of days specified will be automatically deleted
-- Added `.stock` command to check stock prices and charts
-- Re-added `.qap / .queueautoplay` 
-
-### Changed
-- CustomReactions module (and customreactions db table) has been renamed to Expressions.
-  - This was done to remove confusion about how it relates to discord Reactions (it doesn't, it was created and named before discord reactions existed) 
-  - Expression command now start with ex/expr and end with the name of the action or setting. 
-  - For example `.exd` (`.dcr`) is expression delete, `.exa` (`.acr`)
-  - Permissions (`.lp`) be automatically updated with "ACTUALEXPRESSIONS", "EXPRESSIONS" instead of "ACTUALCUSTOMREACTIONS" and "CUSTOMREACTIONS"
-  - Permissions for `.ecr` (now `.exe`), `.scr` (now `.exs`), `.dcr` (now `.exd`), `.acr` (now `.exa`), `.lcr` (now `.exl`) will be automatically updated
-  - If you have custom permissions for other CustomReaction commands
-  - Some of the old aliases like `.acr` `.dcr` `.lcr` and a few others have been kept
-- Currency output format improvement (will use guild locale now for some commands)
-- `.crypto` will now also show CoinMarketCap rank
-- Waifus can now be claimed for much higher prices (int -> long)
-- Several strings and commands related to music have been changed
-  - Changed `.ms / .movesong` to `.tm / .trackmove` but kept old aliases
-  - Changed ~~song~~ -> `track` throughout music module strings
-- Improved .curtrs (It will now have a lot more useful data in the database, show Tx ids, and be partially localized)
-  - [dev] Reason renamed to Note
-  - [dev] Added Type, Extra, OtherId fields to the database
-- [dev] CommandStrings will now use methodname as the key, and **not** the command name (first entry in aliases.yml)
-  - In other words aliases.yml and commands.en-US.yml will use the same keys (once again)
-- [dev] Reorganized module and submodule folders  
-- [dev] Permissionv2 db table renamed to Permissions 
-- [dev] Moved FilterWordsChannelId to a separate table
-
-### Fixed
-- Fixed twitch stream notifications (rewrote it to use the new api)
-- Fixed an extra whitespace in usage part of command help if the command has no arguments
-- Possible small fix for `.prune` ratelimiting
-- `.gvc` should now properly trigger when a user is already in a gvc and changes his activity
-- `.gvc` should now properly detect multiple activities
-- Fixed reference to non-existent command in bot.yml
-- Comment indentation in .yml files should now make more sense
-- Fixed `.warn` punishments not being applied properly when using weighted warnings
-- Fixed embed color when disabling `.antialt`
-
-### Removed
-- 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.01.2022
-
-### Fixed
-
-- Fixed `.greetdm` causing ratelimits during raids
+- Fixed `.greetdm` causing ratelimits during raids 
 - Fixed `.gelbooru`
 
-## [3.0.12] - 06.01.2022
+## [3.0.12] - 06.01.2021
 
 ### Fixed
 - `.smch` Fixed
@@ -763,4 +406,4 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
 ### Removed
 
 - Removed admin requirement on `.scrm` as it didn't make sense
-- Some Music commands are removed because of the complexity they bring in with little value (if you *really* want them back, you can open an issue and specify your *good* reason)
+- Some Music commands are removed because of the complexity they bring in with little value (if you *really* want them back, you can open an issue and specify your *good* reason)

Dockerfile

@@ -1,7 +1,6 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:5.0-buster-slim AS build
 WORKDIR /source
 
-COPY src/Nadeko.Medusa/*.csproj src/Nadeko.Medusa/
 COPY src/NadekoBot/*.csproj src/NadekoBot/
 COPY src/NadekoBot.Coordinator/*.csproj src/NadekoBot.Coordinator/
 COPY src/NadekoBot.Generators/*.csproj src/NadekoBot.Generators/
@@ -19,20 +18,18 @@ RUN set -xe; \
     chmod +x /app/NadekoBot
 
 # final stage/image
-FROM mcr.microsoft.com/dotnet/runtime:6.0
+FROM mcr.microsoft.com/dotnet/runtime:5.0-buster-slim
 WORKDIR /app
 
 RUN set -xe; \
     useradd -m nadeko; \
     apt-get update; \
-    apt-get install -y --no-install-recommends libopus0 libsodium23 libsqlite3-0 curl ffmpeg python3 python3-pip sudo; \
-    update-alternatives --install /usr/bin/python python /usr/bin/python3.9 1; \
+    apt-get install -y libopus0 libsodium23 libsqlite3-0 curl ffmpeg python3 python3-pip sudo; \
+    update-alternatives --install /usr/bin/python python /usr/bin/python3.7 1; \
     echo 'Defaults>nadeko env_keep+="ASPNETCORE_* DOTNET_* NadekoBot_* shard_id total_shards TZ"' > /etc/sudoers.d/nadeko; \
-    pip3 install --no-cache-dir --upgrade youtube-dl; \
-    apt-get purge -y python3-pip; \
-    chmod +x /usr/local/bin/youtube-dl; \
-    apt-get autoremove -y; \
-    apt-get autoclean -y
+    pip3 install --upgrade youtube-dl; \
+    apt-get remove -y python3-pip; \
+    chmod +x /usr/local/bin/youtube-dl
 
 COPY --from=build /app ./
 COPY docker-entrypoint.sh /usr/local/sbin
@@ -40,6 +37,6 @@ COPY docker-entrypoint.sh /usr/local/sbin
 ENV shard_id=0
 ENV total_shards=1
 
-VOLUME [ "/app/data" ]
+VOLUME [ "app/data" ]
 ENTRYPOINT [ "/usr/local/sbin/docker-entrypoint.sh" ]
-CMD dotnet NadekoBot.dll "$shard_id" "$total_shards"
+CMD dotnet NadekoBot.dll "$shard_id" "$total_shards"

NadekoBot.sln

@@ -11,7 +11,6 @@ ProjectSection(SolutionItems) = preProject
 	LICENSE.md = LICENSE.md
 	README.md = README.md
 	.gitlab-ci.yml = .gitlab-ci.yml
-	Dockerfile = Dockerfile
 EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NadekoBot", "src\NadekoBot\NadekoBot.csproj", "{45EC1473-C678-4857-A544-07DFE0D0B478}"
@@ -28,8 +27,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.Generators", "src
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.VotesApi", "src\NadekoBot.VotesApi\NadekoBot.VotesApi.csproj", "{3BC82CFE-BEE7-451F-986B-17EDD1570C4F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nadeko.Medusa", "src\Nadeko.Medusa\Nadeko.Medusa.csproj", "{E685977E-31A4-46F4-A5D7-4E3E39E82E43}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -73,12 +70,6 @@ Global
 		{3BC82CFE-BEE7-451F-986B-17EDD1570C4F}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU
 		{3BC82CFE-BEE7-451F-986B-17EDD1570C4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3BC82CFE-BEE7-451F-986B-17EDD1570C4F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E685977E-31A4-46F4-A5D7-4E3E39E82E43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E685977E-31A4-46F4-A5D7-4E3E39E82E43}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E685977E-31A4-46F4-A5D7-4E3E39E82E43}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU
-		{E685977E-31A4-46F4-A5D7-4E3E39E82E43}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU
-		{E685977E-31A4-46F4-A5D7-4E3E39E82E43}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E685977E-31A4-46F4-A5D7-4E3E39E82E43}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -91,7 +82,6 @@ Global
 		{AE9B7F8C-81D7-4401-83A3-643B38258374} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
 		{3BC3BDF8-1A0B-45EB-AB2B-C0891D4D37B8} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
 		{3BC82CFE-BEE7-451F-986B-17EDD1570C4F} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
-		{E685977E-31A4-46F4-A5D7-4E3E39E82E43} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5F3F555C-855F-4BE8-B526-D062D3E8ACA4}

NuGet.Config

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="Discord.Net" value="https://www.myget.org/F/discord-net/api/v3/index.json" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+    <add key="Kwoth-myget" value="https://www.myget.org/F/kwoth/api/v3/index.json" />
+  </packageSources>
+</configuration>

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/v4/?badge=v4)
+[![Documentation Status](https://readthedocs.org/projects/nadekobot/badge/?version=latest)](http://nadekobot.readthedocs.io/en/v3/?badge=v3)
 [![Discord Bots](https://discordbots.org/api/widget/status/116275390695079945.svg)](https://top.gg/bot/116275390695079945)  
 
   
@@ -10,5 +10,6 @@
 [![nadeko2](https://cdn.nadeko.bot/tutorial/docs-bot.png)](https://nadeko.bot/commands)
 
 ### Useful links
-- [Self hosting Guides and Docs](https://nadekobot.readthedocs.io/en/v4)
+- ❗ [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)
 - [Discord support server](https://discord.nadeko.bot)

docs/contribution-guide.md

@@ -1,6 +1,6 @@
 # How to contribute
 
-1. Make Merge Requests to the [**v4 branch**](https://gitlab.com/Kwoth/nadekobot/tree/v4)
+1. Make Merge Requests to the [**v3 branch**](https://gitlab.com/Kwoth/nadekobot/tree/v3)
 2. Keep a single Merge Request to a single feature
 3. Fill out the MR template
 

docs/creds-guide.md

@@ -13,11 +13,11 @@ This document aims to guide you through the process of creating a Discord accoun
 - Click on the `Add a Bot` button and confirm that you do want to add a bot to this app.
 - **Optional:** Add bot's avatar and description.
 - Copy your Token to `creds.yml` as shown above.
-- Scroll down to the **`Privileged Gateway Intents`** section
-    - **Enable the following:**
-         - **PRESENCE INTENT**
-         - **SERVER MEMBERS INTENT**
-         - **MESSAGE CONTENT INTENT**
+- Scroll down to the `Privileged Gateway Intents` section
+    - Enabled the following:
+        - PRESENCE INTENT
+        - SERVER MEMBERS INTENT
+        - MESSAGE CONTENT INTENT
 
 These are required for a number of features to function properly, and all should be on.
 

docs/custom-reactions.md

@@ -1,23 +1,23 @@
-## Expressions
+## Custom Reactions / Expressions
 
 ### 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 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 expressions in the server you want the expressions to work on.
+- 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, 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 custom reactions to work on.
 
 ### Commands and Their Use
 
 | Command Name | Description                                                                                                                                                                                                                                                                                | Example                          |
 | :----------: | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------------------------------- |
-| `.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`                           |
+|    `.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. | `.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 `.exa`,
+#### Now that we know the commands let's take a look at an example of adding a command with `.acr`,
 
-`.exadd "Nice Weather" It sure is, %user%!`
+`.acr "Nice Weather" It sure is, %user%!`
 
 This command can be split into two different arguments:
 
@@ -28,16 +28,16 @@ An important thing to note about the triger is that, to be more than one word, w
 
 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 expression can be used on every server the bot is connected to.
+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.
 
-### Block global Expressions
+### Block global Custom Reactions
 
-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 `-`.
+If you want to disable a global custom reaction 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 Custom Reaction with the same trigger on your server, and set the response to `-`.
 
 For example:
-`.exa /o/ -`
+`.acr /o/ -`
 
-Now if you try to trigger `/o/`, it won't print anything even if there is a global expression with the same name.
+Now if you try to trigger `/o/`, it won't print anything even if there is a global custom reaction with the same name.
 
 ### Placeholders!
 

docs/donate.md

@@ -10,7 +10,7 @@ Donating to us also gives you the following benefits:
 - A hoisted **Donators role** in our [Discord server][discord-server]
 - Access to exclusive **#noticed** text and voice channels
 - **1000 flowers** on the public bot per dollar donated (after fees)
-- **Expressions** on the public bot for [Patreon pledges][patreon] of $5 or higher
+- **Custom Reactions** on the public bot for [Patreon pledges][patreon] of $5 or higher
 
 ## Patreon
 

docs/guides/docker-guide.md

@@ -1,25 +1,20 @@
 # Setting up NadekoBot with Docker
 
-# WORK IN PROGRESS
+# DO NOT USE YET - WORK IN PROGRESS
 
-### Installation
+Upgrade from 2.x to v3 does not work because the file is mount readonly
 
-1. Create a `/srv/nadeko` folder 
-  - `mkdir -p /srv/nadeko`
-2. Create a `docker-compose.yml`
-  - nano `docker-compose.yml`
-  - copy the following contents into it:
-##### docker-compose.yml 
+### Docker Compose 
 ```yml
 version: "3.7"
 services:
   nadeko:
-    image: registry.gitlab.com/kwoth/nadekobot:latest
+    image: registry.gitlab.com/veovis/nadekobot:v3-docker
     depends_on:
       - redis
     environment:
       TZ: Europe/Paris
-      NadekoBot_RedisOptions: redis,name=nadeko
+      #NadekoBot_RedisOptions: redis,name=nadeko
       #NadekoBot_ShardRunCommand: dotnet
       #NadekoBot_ShardRunArguments: /app/NadekoBot.dll {0} {1}
     volumes:
@@ -34,12 +29,6 @@ services:
     volumes:
       - /srv/nadeko/redis-data:/data
 ```
-3. Save your file and run docker compose
-  - `docker-compose up`  
-4. Edit creds in `/srv/nadeko/conf/creds.yml`
-5. Run it again with
-  - `docker-compose up`
-
 ### Updating
 - `cd /srv/nadeko`
 - `docker-compose pull`

docs/guides/linux-guide.md

@@ -1,15 +1,8 @@
-# Setting up NadekoBot on Linux
+## Migration from 2.x 
 
-| Table of Contents                                   |
-| :-------------------------------------------------- |
-| [Linux From Source]                                 |
-| [Source Update Instructions]                        |
-| [Linux Release]                                     |
-| [Release Update Instructions]                       |
-| [Tmux (Preferred Method)]                           |
-| [Systemd]                                           |
-| [Systemd + Script]                                  |
-| [Setting up Nadeko on a VPS (Digital Ocean)]        |
+##### ⚠ 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-guide/#linux)
 
 #### Operating System Compatibility
 
@@ -17,7 +10,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 22.04
+- Ubuntu: 16.04, 18.04, 20.04, 21.04, 21.10
 - Mint: 19, 20
 - Debian: 9, 10
 - CentOS: 7
@@ -26,24 +19,14 @@ It is recommended that you use **Ubuntu 20.04**, as there have been nearly no pr
 
 ## Linux From Source 
 
-##### Migration from v3 -> v4
-
-Follow the following few steps only if you're migrating from v3. If not, skip to installation instructions.
-
-Use the new installer script:  `cd ~ && wget -N https://gitlab.com/Kwoth/nadeko-bash-installer/-/raw/v4/linuxAIO.sh && bash linuxAIO.sh`
-> - Install prerequisites (type `1` and press `enter`)
-> - Download (type `2` and press `enter`)
-> - Run (type `3` and press `enter`)
-> - Done
+Open Terminal (if you're on an installation with a window manager) and navigate to the location where you want to install the bot (for example `cd ~`) 
 
 ##### Installation Instructions
 
-Open Terminal (if you're on an installation with a window manager) and navigate to the location where you want to install the bot (for example `cd ~`) 
-
-1. Download and run the **new** installer script `cd ~ && wget -N https://gitlab.com/Kwoth/nadeko-bash-installer/-/raw/v4/linuxAIO.sh && bash linuxAIO.sh`
+1. Download and run the **new** installer script `cd ~ && wget -N https://gitlab.com/Kwoth/nadeko-bash-installer/-/raw/master/linuxAIO.sh && bash linuxAIO.sh`
 2. Install prerequisites (type `1` and press enter)
 3. Download the bot (type `2` and press enter)
-4. Exit the installer (type `6` and press enter)
+4. Exit the installer (type `5` and press enter)
 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`
@@ -52,31 +35,19 @@ Open Terminal (if you're on an installation with a window manager) and navigate
        - `CTRL` + `X`
        - `Y`
        - `Enter`
-8. Run the installer script again `cd ~ && wget -N https://gitlab.com/Kwoth/nadeko-bash-installer/-/raw/v4/linuxAIO.sh && bash linuxAIO.sh`
-9. Run the bot (type `3` and press enter)
+8. Run the bot (type `3` and press enter)
 
-##### Source Update Instructions
+##### Update Instructions
 
-1. ⚠ Stop the bot ⚠
-2. Update and run the **new** installer script `cd ~ && wget -N https://gitlab.com/Kwoth/nadeko-bash-installer/-/raw/v4/linuxAIO.sh && bash linuxAIO.sh`
+1. ⚠ Stop the bot
+2. Update and run the **new** installer script `cd ~ && wget -N https://gitlab.com/Kwoth/nadeko-bash-installer/-/raw/master/linuxAIO.sh && bash linuxAIO.sh`
 3. Update the bot (type `2` and press enter)
 4. Run the bot (type `3` and press enter)
 5. 🎉 
 
-## **⚠ IF YOU ARE FOLLOWING THE GUIDE ABOVE, IGNORE THIS SECTION ⚠** 
-
 ## Linux Release
 
-###### 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*
+⚠ IF YOU ARE FOLLOWING THE GUIDE ABOVE, IGNORE THIS SECTION ⚠ 
 
 ##### Installation Instructions
 
@@ -101,7 +72,7 @@ Open Terminal (if you're on an installation with a window manager) and navigate
 9. Run the bot
     - `./NadekoBot`
 
-##### Release Update Instructions
+##### Update Instructions
 
 1. Stop the bot
 2. Download the latest release from <https://gitlab.com/Kwoth/nadekobot/-/releases>
@@ -148,20 +119,14 @@ cd nadekobot && chmod +x NadekoBot
 
 While there are two run modes built into the installer, these options only run Nadeko within the current session. Below are 3 methods of running Nadeko as a background process.
 
-### Tmux Method (Preferred)
+### Tmux (Preferred Method)
 
 Using `tmux` is the simplest method, and is therefore recommended for most users.
 
-**Before proceeding, make sure your bot is not running by either running `.die` in your Discord server or exiting the process with `Ctrl+C`.**
-
-If you are presented with the installer main menu, exit it by choosing Option `8`.
-
-1. Create a new session: `tmux new -s nadeko`
-
-The above command will create a new session named **nadeko** *(you can replace “nadeko” with anything you prefer, it's your session name)*.
-
+1. Start a tmux session:
+    - `tmux`
 2. Navigate to the project's root directory
-    - Project root directory location example: `cd /home/user/nadekobot/`
+    - Project root directory location example: `/home/user/nadekobot/`
 3. Enter the `output` directory:
     - `cd output`
 4. Run the bot using:
@@ -169,10 +134,8 @@ The above command will create a new session named **nadeko** *(you can replace
 5. Detatch the tmux session:
     - Press `Ctrl` + `B`
     - Then press `D`
-Now check your Discord server, the bot should be online. Nadeko should now be running in the background of your system. 
-
-To re-open the tmux session to either update, restart, or whatever, execute `tmux a -t nadeko`. *(Make sure to replace "nadeko" with your session name. If you didn't change it, leave it as it.)*
 
+Nadeko should now be running in the background of your system. To re-open the tmux session to either update, restart, or whatever, execute `tmux a`.
 
 ### Systemd
 
@@ -327,12 +290,3 @@ If you are running your droplet for the first time, it will most likely ask you
 **Save the new password somewhere safe.**
 
 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.
-
-[Linux From Source]: #linux-from-source
-[Source Update Instructions]: #source-update-instructions
-[Linux Release]: #linux-release
-[Release Update Instructions]: #release-update-instructions
-[Tmux (Preferred Method)]: #tmux-preferred-method
-[Systemd]: #systemd
-[Systemd + Script]: #systemd-script
-[Setting up Nadeko on a VPS (Digital Ocean)]: #setting-up-nadeko-on-a-linux-vps-digital-ocean-droplet

docs/guides/migration-guide.md

@@ -0,0 +1,66 @@
+# 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.

docs/guides/osx-guide.md

@@ -12,7 +12,7 @@ Open Terminal (if you don't know how to, click on the magnifying glass on the to
     - `brew install wget`  
     
 ###### Dotnet
-- Download [.net6 SDK](https://dotnet.microsoft.com/download/dotnet/6.0)
+- Download [.net5 SDK](https://dotnet.microsoft.com/download/dotnet/5.0)
 - Open the `.pkg` file you've downloaded and install it.
 - Run this command in Terminal. There might be output. If there is, disregard it. (copy-paste the entire block)
 ```bash
@@ -31,7 +31,7 @@ sudo ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/
 
 ##### Installation Instructions
 
-1. Download and run the **new** installer script `cd ~ && wget -N https://gitlab.com/Kwoth/nadeko-bash-installer/-/raw/v4/linuxAIO.sh && bash linuxAIO.sh`
+1. Download and run the **new** installer script `cd ~ && wget -N https://gitlab.com/Kwoth/nadeko-bash-installer/-/raw/master/linuxAIO.sh && bash linuxAIO.sh`
 2. Install prerequisites (type `1` and press enter)
 3. Download the bot (type `2` and press enter)
 4. Exit the installer in order to set up your `creds.yml` 
@@ -49,7 +49,7 @@ sudo ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/
 ##### Update Instructions
 
 1. ⚠ Stop the bot
-2. Update and run the **new** installer script `cd ~ && wget -N https://gitlab.com/Kwoth/nadeko-bash-installer/-/raw/v4/linuxAIO.sh && bash linuxAIO.sh`
+2. Update and run the **new** installer script `cd ~ && wget -N https://gitlab.com/Kwoth/nadeko-bash-installer/-/raw/master/linuxAIO.sh && bash linuxAIO.sh`
 3. Update the bot (type `2` and press enter)
 4. Run the bot (type `3` and press enter)
 5. 🎉 

docs/guides/windows-guide.md

@@ -1,3 +1,9 @@
+## 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|
@@ -42,8 +48,6 @@
 
 - Either click on **`RUN`** button in the updater or run the bot via its desktop shortcut.
 
-### If you get a "No owner channels created..." message. Please follow the creds guide again [**HERE**](../../creds-guide).
-
 #### Updating Nadeko
 
 - Make sure Nadeko is closed and not running  
@@ -63,14 +67,14 @@ 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
 
-## **⚠ IF YOU ARE FOLLOWING THE GUIDE ABOVE, IGNORE THIS SECTION ⚠**
-
 ### Windows From Source
 
+⚠ IF YOU ARE FOLLOWING THE GUIDE ABOVE, IGNORE THIS SECTION ⚠ 
+
 ##### Prerequisites
 
 **Install these before proceeding or your bot will not work!**
-- [.net 6](https://dotnet.microsoft.com/download/dotnet/6.0)  - needed to compile and run the bot
+- [.net 5](https://dotnet.microsoft.com/download/dotnet/5.0)  - needed to compile and run the bot
 - [git](https://git-scm.com/downloads) - needed to clone the repository (you can also download the zip manually and extract it, but this guide assumes you're using git)
 - [redis](https://github.com/MicrosoftArchive/redis/releases/download/win-3.0.504/Redis-x64-3.0.504.msi) - to cache things needed by some features and persist through restarts
 
@@ -78,7 +82,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 v4 --depth 1`
+1. `git clone https://gitlab.com/kwoth/nadekobot -b v3 --depth 1`
 2. `cd nadekobot`
 3. `dotnet publish -c Release -o output/ src/NadekoBot/`
 4. `cd output`
@@ -122,7 +126,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/
+[Updater]: https://dl.nadeko.bot/v3
 [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

docs/index.md

@@ -17,6 +17,8 @@ To self-host your own Nadeko, use the guides below:
 - [:material-linux: Linux guide][linux-guide]
 - [:material-apple: Mac OS guide][macos-guide]
 
+Alternatively, you may also setup the bot [from source][from-source-guide] if you want to modify the code.
+
 In case you need any help, join our [Discord server][discord-server] where we may provide support.
 
 ---

docs/jsons-explained.md

@@ -24,7 +24,7 @@ This part is completely optional, **however it's necessary for music and a few o
         - Open up `creds.yml` and look for `GoogleAPIKey`, paste your API key after the `:`.
         - It should look like this:
         ```yml
-        GoogleApiKey: 'AIzaSyDSci1sdlWQOWNVj1vlXxxxxxbk0oWMEzM'
+        GoogleApiKey: AIzaSyDSci1sdlWQOWNVj1vlXxxxxxbk0oWMEzM
         ```
 - **MashapeKey**
     - Required for Hearthstone cards.
@@ -40,19 +40,16 @@ This part is completely optional, **however it's necessary for music and a few o
     - For Patreon creators only.
 - **PatreonCampaignId**
     - For Patreon creators only. Id of your campaign.
-- **TwitchClientId and TwitchClientSecret**
+- **TwitchClientId**
     - Mandatory for following twitch streams with `.twitch` (or `.stadd` with twitch link)
-    - Go to [apps page](https://dev.twitch.tv/console) on twitch and register your application.
+    - Go to [apps page](https://dev.twitch.tv/console/apps/create) on twitch and register your application.
     - You need 2FA enabled on twitch in order to create an application
     - You can set `http://localhost` as the OAuth Redirect URL (and press Add button)
     - Select `Chat Bot` from the Category dropdown
-    - Once created, `click Manage`
-    - Click `New Secret` and select `OK` in the popup
-      **Note: You will need to generate a new Client Secret everytime you exit the page**
-    - Copy both to your creds.yml as shown below
+    - Once created, clicking on your application will show a new Client ID field
+    - Copy it to your creds.yml as shown below
     ```yml
-        twitchClientId: 516tr61tr1qweqwe86trg3g
-        twitchClientSecret: 16tr61tr1q86tweqwe
+        TwitchClientId: "516tr61tr1qweqwe86trg3g"
     ```
 - **LocationIqApiKey**
     - Optional. Used only for the `.time` command. https://locationiq.com api key (register and you will receive the token in the email). 
@@ -78,7 +75,6 @@ For Windows (Updater), add this to your `creds.yml`
 ```yml
 RestartCommand:
     Cmd: "NadekoBot.exe"
-    args: "{0}"
 ```
 
 For Windows (Source), Linux or OSX, add this to your `creds.yml`
@@ -97,7 +93,7 @@ RestartCommand:
 
 ```yml
 # DO NOT CHANGE
-version: 4
+version: 1
 # Bot token. Do not share with anyone ever -> https://discordapp.com/developers/applications/
 token: 'MTE5Nzc3MDIxMzE5NTc3NjEw.VlhNCw.BuqJFyzdIUAK1PRf1eK1Cu89Jew'
 # List of Ids of the users who have bot owner permissions
@@ -156,13 +152,6 @@ timezoneDbApiKey:
 coinmarketcapApiKey: 
 # Api key used for Osu related commands. Obtain this key at https://osu.ppy.sh/p/api
 osuApiKey: 4c8c8fdffdsfdsfsdfsfa33f3f3140a7d93320d6
-# Optional Trovo client id.
-# You should use this if Trovo stream notifications stopped working or you're getting ratelimit errors.
-trovoClientId: 
-# Obtain by creating an application at https://dev.twitch.tv/console/apps
-twitchClientId: jf2w6kkyrlzfl6mp1b4k25h4jr6b2o
-# Obtain by creating an application at https://dev.twitch.tv/console/apps
-twitchClientSecret: 16tr61tr1q86tweqwe
 # Command and args which will be used to restart the bot.
 # Only used if bot is executed directly (NOT through the coordinator)
 # placeholders: 
@@ -172,8 +161,8 @@ twitchClientSecret: 16tr61tr1q86tweqwe
 #     cmd: dotnet
 #     args: "NadekoBot.dll -- {0}"
 # Windows default
-#     cmd: "NadekoBot.exe"
-#     args: "{0}"
+#     cmd: NadekoBot.exe
+#     args: {0}
 restartCommand:
   cmd: 
   args: 

docs/medusa/creating-a-medusa.md

@@ -1,251 +0,0 @@
-# Creating A Medusa
-
-## Theory
-
-### Introduction
-
-Medusa system allows you to write independent medusae (known as "modules", "cogs" or "plugins" in other software) which you can then load, unload and update at will without restarting the bot.  
-  
-The system itself borrows some design from the current way Nadeko's Modules are written but mostly from never-released `Ayu.Commands` system which was designed to be used for a full Nadeko v3 rewrite. 
-
-The medusa base classes used for development are open source [here](https://gitlab.com/Kwoth/nadekobot/-/tree/v4/src/Nadeko.Medusa) in case you need reference, as there is no generated documentation at the moment.
-
-### Term list
-
-#### Medusa
-
-- The project itself which compiles to a single `.dll` (and some optional auxiliary files), it can contain multiple [Sneks](#snek), [Services](#service), and [ParamParsers](#param-parser)  
-
-#### Snek
-
-- A class which will be added as a single Module to NadekoBot on load. It also acts as a [lifecycle handler](snek-lifecycle.md) and as a singleton service with the support for initialize and cleanup.
-- It can contain a Snek (called SubSnek) but only 1 level of nesting is supported (you can only have a snek contain a subsnek, but a subsnek can't contain any other sneks)
-- Sneks can have their own prefix
-    - For example if you set this to 'test' then a command called 'cmd' will have to be invoked by using `.test cmd` instead of `.cmd` 
-
-#### Snek Command
-
-- Acts as a normal command
-- Has context injected as a first argument which controls where the command can be executed
-    - `AnyContext` the command can be executed in both DMs and Servers
-    - `GuildContext` the command can only be executed in Servers
-    - `DmContext` the command can only be executed in DMs
-- Support the usual features such as default values, leftover, params, etc.
-- It also supports dependency injection via `[inject]` attribute. These dependencies must come after the context and before any input parameters
-- Supports `ValueTask`, `Task`, `Task<T>` and `void` return types
-
-#### Param Parser
-
-- Allows custom parsing of command arguments into your own types.
-- Overriding existing parsers (for example for IGuildUser, etc...) can cause issues.
-
-#### Service
-
-- Usually not needed.
-- They are marked with a `[svc]` attribute, and offer a way to inject dependencies to different parts of your medusa. 
-- Transient and Singleton lifetimes are supported.
-
-### Localization
-
-Response and command strings can be kept in one of three different places based on whether you plan to allow support for localization
-
-option 1) `res.yml` and `cmds.yml`  
-
-If you don't plan on having your app localized, but you just *may* in the future, you should keep your strings in the `res.yml` and `cmds.yml` file the root folder of your project, and they will be automatically copied to the output whenever you build your medusa.
-
-##### Example project folder structure:
-    - uwu/
-        - uwu.csproj
-        - uwu.cs
-        - res.yml
-        - cmds.yml  
-
-##### Example output folder structure:
-    - medusae/uwu/  
-        - uwu.dll  
-        - res.yml  
-        - cmds.yml
-
-option 2) `strings` folder  
-
-If you plan on having your app localized (or want to allow your consumers to easily add languages themselves), you should keep your response strings in the `strings/res/en-us.yml` and your command strings in `strings/cmds/en-us.yml` file. This will be your base file, and from there you can make support for additional languages, for example `strings/res/ru-ru.yml` and `strings/cmds/ru-ru.yml`
-
-##### Example project folder structure:
-    - uwu/
-        - uwu.csproj
-        - uwu.cs
-        - strings/
-            - res/
-                - en-us.yml
-                - ru-ru.yml
-            - cmds/
-                - en-us.yml
-                - ru-ru.yml
-
-##### Example output folder structure:
-    - medusae/uwu/
-        - uwu.dll
-        - strings/
-            - res/
-                - en-us.yml
-                - ru-ru.yml
-            - cmds/
-                - en-us.yml
-                - ru-ru.yml
-
-option 3) In the code  
-
-If you don't want any auxiliary files, and you don't want to bother making new .yml files to keep your strings in, you can specify the command strings directly in the `[cmd]` attribute itself, and use non-localized methods for message sending in your commands.
-
-If you update your response strings .yml file(s) while the medusa is loaded and running, running `.stringsreload` will reload the responses without the need to reload the medusa or restart the bot.
-
-#### Config
-
-- Medusa config is kept in `medusae/medusa.yml` file
-- At the moment this config only keeps track of which medusae are currently loaded (they will also be always loaded at startup)
-- If a medusa is causing issues and you're unable to unload it, you can remove it from the `loaded:` list in this config file and restart the bot. It won't be loaded next time the bot is started up
-
-#### Unloadability issues  
-
-To make sure your medusa can be properly unloaded/reloaded you must:
-
--  Make sure that none of your types and objects are referenced by the Bot or Bot's services after the DisposeAsync is called on your Snek instances. 
-
-- Make sure that all of your commands execute quickly and don't have any long running tasks, as they will hold a reference to a type from your assembly
-
-- If you are still having issues, you can always run `.meunload` followed by a bot restart, or if you want to find what is causing the medusa unloadability issues, you can check the [microsoft's assembly unloadability debugging guide](https://docs.microsoft.com/en-us/dotnet/standard/assembly/unloadability)
-
-## Practice
-
-This section will guide you through how to create a simple custom medusa. You can find the entirety of this code hosted [here](https://gitlab.com/nadeko/example_medusa)
-
-#### Prerequisite
-- [.net6 sdk](https://dotnet.microsoft.com/en-us/download) installed
-- Optional: use [vscode](https://code.visualstudio.com/download) to write code
-
-#### Guide
-
-
-- Open your favorite terminal and navigate to a folder where you will keep your project .
-
-- Create a new folder 
-    - `mkdir example_medusa`
-- Create a new .net class library
-    - `dotnet new classlib`
-- Open the current folder with your favorite editor/IDE. In this case we'll use VsCode
-    - `code .`
-- Remove the `Class1.cs` file
-- Replace the contents of the `.csproj` file with the following contents
-```xml
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        
-        <!-- Reduces some boilerplate in your .cs files -->
-        <ImplicitUsings>enable</ImplicitUsings>
-        
-        <!-- Use latest .net features -->
-        <LangVersion>preview</LangVersion>
-        <EnablePreviewFeatures>true</EnablePreviewFeatures>
-        
-        <!-- tell .net that this library will be used as a plugin -->
-        <EnableDynamicLoading>true</EnableDynamicLoading>
-    </PropertyGroup>
-    
-    <ItemGroup>
-        <!-- Base medusa package. You MUST reference this in order to have a working medusa -->
-        <!-- Also, this package comes from MyGet, which requires you to have a NuGet.Config file next to your .csproj -->
-        <PackageReference Include="Nadeko.Medusa" Version="1.0.1">
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
-
-        <!-- Note: If you want to use NadekoBot services etc... You will have to manually clone 
-          the gitlab.com/kwoth/nadekobot repo locally and reference the NadekoBot.csproj because there is no NadekoBot package atm.
-          It is strongly recommended that you checkout a specific tag which matches your version of nadeko,
-          as there could be breaking changes even between minor versions of NadekoBot.
-          For example if you're running NadekoBot 4.1.0 locally for which you want to create a medusa for,
-          you should do "git checkout 4.1.0" in your NadekoBot solution and then reference the NadekoBot.csproj
-        -->
-    </ItemGroup>
-    
-    <!-- Copy shortcut and full strings to output (if they exist) -->
-    <ItemGroup>
-        <None Update="res.yml;cmds.yml;strings/**">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
-</Project>
-
-```
-- Create a `MySnek.cs` file and add the following contents
-```cs
-using Nadeko.Snake;
-using NadekoBot;
-using Discord;
-
-public sealed class MySnek : Snek
-{
-    [cmd]
-    public async Task Hello(AnyContext ctx)
-    {
-        await ctx.Channel.SendMessageAsync($"Hello everyone!");
-    }
-
-    [cmd]
-    public async Task Hello(AnyContext ctx, IUser target)
-    {
-        await ctx.ConfirmLocalizedAsync("hello", target);
-    }
-}
-```
-- Create `res.yml` and `cmds.yml` files with the following contents
-`res.yml`
-```yml
-medusa.description: "This is my medusa's description"
-hello: "Hello {0}, from res.yml!"
-```
-
-`cmds.yml`
-```yml
-hello: 
-  desc: "This is a basic hello command"
-  args:
-    - ""
-    - "@Someone"
-```
-
-- Add `NuGet.Config` file which will let you use the base Nadeko.Medusa package. This file should always look like this and you shouldn't change it
-
-```xml
-<configuration>
-    <packageSources>
-        <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-        <add key="nadeko.bot" value="https://www.myget.org/F/nadeko/api/v3/index.json" protocolVersion="3" />
-    </packageSources>
-</configuration>
-```
-
-### Build it
-
-- Build your Medusa into a dll that Nadeko can load. In your terminal, type:
-    - `dotnet publish -o bin/medusae/example_medusa /p:DebugType=embedded`
-
-- Done. You can now try it out in action.
-
-### Try it out
-
-- Copy the `bin/medusae/example_medusa` folder into your NadekoBot's `data/medusae/` folder. (Nadeko version 4.1.0+)
-
-- Load it with `.meload example_medusa`
-
-- In the channel your bot can see, run the following commands to try it out
-    - `.hello` and
-    - `.hello @<someone>`
-
-- Check its information with
-    - `.meinfo example_medusa`
-
-- Unload it
-    - `.meunload example_medusa`
-
-- Congrats! You've just made your first medusa!

docs/medusa/getting-started.md

@@ -1,31 +0,0 @@
-## Getting Started
-
-### What is the Medusa system?
-
-- It is a dynamic module/plugin/cog system for NadekoBot introduced in **NadekoBot 4.1.0**  
-
-- Allows developers to add custom functionality to Nadeko without modifying the original code  
-
-- Allows for those custom features to be updated during bot runtime (if properly written), without the need for bot restart.
-
-- They are added to `data/medusae` folder and are loaded, unloaded and handled through discord commands.  
-    - `.meload` Loads the specified medusa (see `.h .meload`)
-    - `.meunload` Unloads the specified medusa (see `.h .meunload`)
-    - `.meinfo` Checks medusae information (see `.h .meinfo`)
-    - `.melist` Lists the available medusae (see `.h .melist`)
-
-### How to make one?
-
-Medusae are written in [C#](https://docs.microsoft.com/en-us/dotnet/csharp/tour-of-csharp/) programming language, so you will need at least low-intermediate knowledge of it in order to make a useful Medusa.
-
-Follow the [creating a medusa guide](creating-a-medusa.md)
-
-### Where to get medusae other people made?
-
-⚠ *It is EXTREMELY, and I repeat **EXTREMELY** dangerous to run medusae of strangers or people you don't FULLY trust.* ⚠  
-⚠ *It can not only lead to your bot being stolen, but it also puts your entire computer and personal files in jeopardy.* ⚠
-
-**It is strongly recommended to run only the medusae you yourself wrote, and only on a hosted VPS or dedicated server which ONLY hosts your bot, to minimize the potential damage caused by bad actors.**
-
-No easy way at the moment, except asking in the `#dev-and-modding` chat in [#NadekoLog server](https://discord.nadeko.bot)
-

docs/medusa/snek-lifecycle.md

@@ -1,19 +0,0 @@
-# Snek Lifecycle  
-
-*You can override several methods to hook into command handler's lifecycle.  
-These methods start with `Exec*`*
-
-
-- `ExecOnMessageAsync` runs first right after any message was received  
-- `ExecInputTransformAsync` runs after ExecOnMessageAsync and allows you to transform the message content before the bot looks for the matching command  
-- `ExecPreCommandAsync` runs after a command was found but not executed, allowing you to potentially prevent command execution  
-- `ExecPostCommandAsync` runs if the command was successfully executed  
-- `ExecOnNoCommandAsync` runs instead of ExecPostCommandAsync if no command was found for a message  
-
-
-*Besides that, sneks have 2 methods with which you can initialize and cleanup your snek*  
-
-
-- `InitializeAsync` Runs when the medusa which contains this snek is being loaded  
-- `DisposeAsync` Runs when the medusa which contains this snek is being unloaded  
-

docs/permissions-system.md

@@ -73,14 +73,14 @@ Say you want to only enable NSFW commands for a specific role, just do the follo
 2. `.rm NSFW enable Lewd`
     - Enables usage of the NSFW module for the Lewd role
 
-#### How do I disable Expressions from triggering?
+#### How do I disable custom reactions from triggering?
 
-If you don't want server or global Expressions, just block the module that controls their usage:
+If you don't want server or global custom reactions, just block the module that controls their usage:
 
-1. `.sm ActualExpressions disable`
-    - Disables the ActualExpression module from being used
+1. `.sm ActualCustomReactions disable`
+    - Disables the ActualCustomReactions 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).
+**Note**: The `ActualCustomReactions` module controls the usage of custom reactions. The `CustomReactions` module controls commands related to custom reactions (such as `.acr`, `.lcr`, `.crca`, etc).
 
 #### I've broken permissions and am stuck, can I reset permissions?
 

docs/placeholders.md

@@ -1,6 +1,6 @@
 # Placeholders
 
-Placeholders are used in Quotes, Expressions, Greet/Bye messages, playing statuses, and a few other places.
+Placeholders are used in Quotes, Custom Reactions, Greet/Bye messages, playing statuses, and a few other places.
 
 They can be used to make the message more user friendly, generate random numbers or pictures, etc.
 
@@ -28,8 +28,6 @@ Some features have their own specific placeholders which are noted in that featu
 - `%server.id%` - Server ID
 - `%server.name%` - Server name
 - `%server.members%` - Member count
-- `%server.boosters%` - Number of users boosting the server
-- `%server.boost_level%` - Server Boost level
 - `%server.time%` - Server time (requires `.timezone` to be set)
 
 ### Channel placeholders
@@ -81,14 +79,16 @@ Some features have their own specific placeholders which are noted in that featu
 
 ### Music placeholders
 
-- `%music.queued%` - Number of songs currently queued
-- `%music.playing%` - Current song name (random playing song if bot is playing on multiple servers)
-- `%music.servers%` - Number of servers currently listening to music
+!!! Note
+    These placeholders will only work in rotating playing statuses.
+
+- `%music.queued%` - Amount of songs currently queued
+- `%music.playing%` - Current song name
 
 ### Miscellaneous placeholders
 
 - `%rngX-Y%` - Returns a random number between X and Y
-- `%target%` - Returns anything the user has written after the trigger (only works on Expressions)
-- `%img:stuff%` - Returns an `imgur.com` search for "stuff" (only works on Expressions)
+- `%target%` - Returns anything the user has written after the trigger (only works on custom reactions)
+- `%img:stuff%` - Returns an `imgur.com` search for "stuff" (only works on custom reactions)
 
 ![img](https://puu.sh/B7mgI.png)

exe_builder.iss

@@ -1,7 +1,7 @@
 #define sysfolder "system"
 #define version GetEnv("NADEKOBOT_INSTALL_VERSION")
 #define target "win7-x64"
-#define platform "net6.0"
+#define platform "net5.0"
 
 [Setup]
 AppName = {param:botname|NadekoBot}

mkdocs.yml

@@ -72,6 +72,7 @@ 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
@@ -86,9 +87,7 @@ nav:
         - Custom Reactions: custom-reactions.md
         - Placeholders: placeholders.md
         - Config: config-guide.md
-        - Medusa System:
-            - medusa/getting-started.md
-            - medusa/creating-a-medusa.md
-            - medusa/snek-lifecycle.md
+        - Bot Config: bce-guide.md
     - Contribution Guide: contribution-guide.md
     - Donate: donate.md
+    - License: license.md

src/Nadeko.Medusa/Attributes/FilterAttribute.cs

@@ -1,10 +0,0 @@
-namespace Nadeko.Snake;
-
-/// <summary>
-/// Overridden to implement custom checks which commands have to pass in order to be executed.
-/// </summary>
-[AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, AllowMultiple = true)]
-public abstract class FilterAttribute : Attribute
-{
-    public abstract ValueTask<bool> CheckAsync(AnyContext ctx);
-}

src/Nadeko.Medusa/Attributes/cmdAttribute.cs

@@ -1,37 +0,0 @@
-namespace Nadeko.Snake;
-
-/// <summary>
-/// Marks a method as a snek command
-/// </summary>
-[AttributeUsage(AttributeTargets.Method)]
-public class cmdAttribute : Attribute
-{
-    /// <summary>
-    /// Command description. Avoid using, as cmds.yml is preferred
-    /// </summary>
-    public string? desc { get; set; }
-    
-    /// <summary>
-    /// Command args examples. Avoid using, as cmds.yml is preferred
-    /// </summary>
-    public string[]? args { get; set; }
-    
-    /// <summary>
-    /// Command aliases
-    /// </summary>
-    public string[] Aliases { get; }
-
-    public cmdAttribute()
-    {
-        desc = null;
-        args = null;
-        Aliases = Array.Empty<string>();
-    }
-    
-    public cmdAttribute(params string[] aliases)
-    {
-        Aliases = aliases;
-        desc = null;
-        args = null;
-    }
-}

src/Nadeko.Medusa/Attributes/injectAttribute.cs

@@ -1,10 +0,0 @@
-namespace Nadeko.Snake;
-
-/// <summary>
-/// Marks services in command arguments for injection.
-/// The injected services must come after the context and before any input parameters.
-/// </summary>
-public class injectAttribute : Attribute
-{
-    
-}

src/Nadeko.Medusa/Attributes/leftoverAttribute.cs

@@ -1,10 +0,0 @@
-namespace Nadeko.Snake;
-
-/// <summary>
-/// Marks the parameter to take 
-/// </summary>
-[AttributeUsage(AttributeTargets.Parameter)]
-public class leftoverAttribute : Attribute
-{
-    
-}

src/Nadeko.Medusa/Attributes/prioAttribute.cs

@@ -1,20 +0,0 @@
-namespace Nadeko.Snake;
-
-/// <summary>
-/// Sets the priority of a command in case there are multiple commands with the same name but different parameters.
-/// Higher value means higher priority.
-/// </summary>
-[AttributeUsage(AttributeTargets.Method)]
-public class prioAttribute : Attribute
-{
-    public int Priority { get; }
-
-    /// <summary>
-    /// Snek command priority
-    /// </summary>
-    /// <param name="priority">Priority value. The higher the value, the higher the priority</param>
-    public prioAttribute(int priority)
-    {
-        Priority = priority;
-    }
-}

src/Nadeko.Medusa/Attributes/svcAttribute.cs

@@ -1,23 +0,0 @@
-namespace Nadeko.Snake;
-
-/// <summary>
-/// Marks the class as a service which can be used within the same Medusa
-/// </summary>
-[AttributeUsage(AttributeTargets.Class)]
-public class svcAttribute : Attribute
-{
-    public Lifetime Lifetime { get; }
-    public svcAttribute(Lifetime lifetime)
-    {
-        Lifetime = lifetime;
-    }
-}
-
-/// <summary>
-/// Lifetime for <see cref="svcAttribute"/>
-/// </summary>
-public enum Lifetime
-{
-    Singleton,
-    Transient
-}

src/Nadeko.Medusa/Context/AnyContext.cs

@@ -1,47 +0,0 @@
-using Discord;
-using NadekoBot;
-
-namespace Nadeko.Snake;
-
-/// <summary>
-/// Commands which take this class as a first parameter can be executed in both DMs and Servers 
-/// </summary>
-public abstract class AnyContext
-{
-    /// <summary>
-    /// Channel from the which the command is invoked
-    /// </summary>
-    public abstract IMessageChannel Channel { get; }
-    
-    /// <summary>
-    /// Message which triggered the command
-    /// </summary>
-    public abstract IUserMessage Message { get; }
-    
-    /// <summary>
-    /// The user who invoked the command
-    /// </summary>
-    public abstract IUser User { get; }
-
-    /// <summary>
-    /// Provides access to strings used by this medusa
-    /// </summary>
-    public abstract IMedusaStrings Strings { get; } 
-    
-    /// <summary>
-    /// Gets a formatted localized string using a key and arguments which should be formatted in
-    /// </summary>
-    /// <param name="key">The key of the string as specified in localization files</param>
-    /// <param name="args">Arguments (if any) to format in</param>
-    /// <returns>A formatted localized string</returns>
-    public abstract string GetText(string key, object[]? args = null);
-    
-    /// <summary>
-    /// Creates a context-aware <see cref="IEmbedBuilder"/> instance
-    /// (future feature for guild-based embed colors)
-    /// Any code dealing with embeds should use it for future-proofness
-    /// instead of manually creating embedbuilder instances
-    /// </summary>
-    /// <returns>A context-aware <see cref="IEmbedBuilder"/> instance </returns>
-    public abstract IEmbedBuilder Embed();
-}

src/Nadeko.Medusa/Context/DmContext.cs

@@ -1,11 +0,0 @@
-using Discord;
-
-namespace Nadeko.Snake;
-
-/// <summary>
-/// Commands which take this type as the first parameter can only be executed in DMs
-/// </summary>
-public abstract class DmContext : AnyContext
-{
-    public abstract override IDMChannel Channel { get; }
-}

src/Nadeko.Medusa/Context/GuildContext.cs

@@ -1,12 +0,0 @@
-using Discord;
-
-namespace Nadeko.Snake;
-
-/// <summary>
-/// Commands which take this type as a first parameter can only be executed in a server
-/// </summary>
-public abstract class GuildContext : AnyContext
-{
-   public abstract override ITextChannel Channel { get; }
-   public abstract IGuild Guild { get; }
-}

src/Nadeko.Medusa/EmbedColor.cs

@@ -1,8 +0,0 @@
-namespace NadekoBot;
-
-public enum EmbedColor
-{
-    Ok,
-    Pending,
-    Error
-}

src/Nadeko.Medusa/Extensions/EmbedBuilderExtensions.cs

@@ -1,14 +0,0 @@
-namespace NadekoBot;
-
-public static class EmbedBuilderExtensions
-{
-    public static IEmbedBuilder WithOkColor(this IEmbedBuilder eb)
-        => eb.WithColor(EmbedColor.Ok);
-    
-    public static IEmbedBuilder WithPendingColor(this IEmbedBuilder eb)
-        => eb.WithColor(EmbedColor.Pending);
-    
-    public static IEmbedBuilder WithErrorColor(this IEmbedBuilder eb)
-        => eb.WithColor(EmbedColor.Error);
-    
-}

src/Nadeko.Medusa/Extensions/MedusaExtensions.cs

@@ -1,66 +0,0 @@
-using Discord;
-using Nadeko.Snake;
-
-namespace NadekoBot;
-
-public static class MedusaExtensions
-{
-    public static Task<IUserMessage> EmbedAsync(this IMessageChannel ch, IEmbedBuilder embed, string msg = "")
-        => ch.SendMessageAsync(msg,
-            embed: embed.Build(),
-            options: new()
-            {
-                RetryMode = RetryMode.AlwaysRetry
-            });
-
-    // unlocalized
-    public static Task<IUserMessage> SendConfirmAsync(this IMessageChannel ch, AnyContext ctx, string msg)
-        => ch.EmbedAsync(ctx.Embed().WithOkColor().WithDescription(msg));
-
-    public static Task<IUserMessage> SendPendingAsync(this IMessageChannel ch, AnyContext ctx, string msg)
-        => ch.EmbedAsync(ctx.Embed().WithPendingColor().WithDescription(msg));
-
-    public static Task<IUserMessage> SendErrorAsync(this IMessageChannel ch, AnyContext ctx, string msg)
-        => ch.EmbedAsync(ctx.Embed().WithErrorColor().WithDescription(msg));
-
-    // unlocalized
-    public static Task<IUserMessage> SendConfirmAsync(this AnyContext ctx, string msg)
-        => ctx.Channel.SendConfirmAsync(ctx, msg);
-
-    public static Task<IUserMessage> SendPendingAsync(this AnyContext ctx, string msg)
-        => ctx.Channel.SendPendingAsync(ctx, msg);
-
-    public static Task<IUserMessage> SendErrorAsync(this AnyContext ctx, string msg)
-        => ctx.Channel.SendErrorAsync(ctx, msg);
-
-    // localized
-    public static Task ConfirmAsync(this AnyContext ctx)
-        => ctx.Message.AddReactionAsync(new Emoji("✅"));
-
-    public static Task ErrorAsync(this AnyContext ctx)
-        => ctx.Message.AddReactionAsync(new Emoji("❌"));
-
-    public static Task WarningAsync(this AnyContext ctx)
-        => ctx.Message.AddReactionAsync(new Emoji("⚠️"));
-
-    public static Task WaitAsync(this AnyContext ctx)
-        => ctx.Message.AddReactionAsync(new Emoji("🤔"));
-
-    public static Task<IUserMessage> ErrorLocalizedAsync(this AnyContext ctx, string key, params object[]? args)
-        => ctx.SendErrorAsync(ctx.GetText(key));
-
-    public static Task<IUserMessage> PendingLocalizedAsync(this AnyContext ctx, string key, params object[]? args)
-        => ctx.SendPendingAsync(ctx.GetText(key, args));
-
-    public static Task<IUserMessage> ConfirmLocalizedAsync(this AnyContext ctx, string key, params object[]? args)
-        => ctx.SendConfirmAsync(ctx.GetText(key, args));
-
-    public static Task<IUserMessage> ReplyErrorLocalizedAsync(this AnyContext ctx, string key, params object[]? args)
-        => ctx.SendErrorAsync($"{Format.Bold(ctx.User.ToString())} {ctx.GetText(key)}");
-
-    public static Task<IUserMessage> ReplyPendingLocalizedAsync(this AnyContext ctx, string key, params object[]? args)
-        => ctx.SendPendingAsync($"{Format.Bold(ctx.User.ToString())} {ctx.GetText(key)}");
-
-    public static Task<IUserMessage> ReplyConfirmLocalizedAsync(this AnyContext ctx, string key, params object[]? args)
-        => ctx.SendConfirmAsync($"{Format.Bold(ctx.User.ToString())} {ctx.GetText(key)}");
-}

src/Nadeko.Medusa/IEmbedBuilder.cs

@@ -1,17 +0,0 @@
-using Discord;
-
-namespace NadekoBot;
-
-public interface IEmbedBuilder
-{
-    IEmbedBuilder WithDescription(string? desc);
-    IEmbedBuilder WithTitle(string? title);
-    IEmbedBuilder AddField(string title, object value, bool isInline = false);
-    IEmbedBuilder WithFooter(string text, string? iconUrl = null);
-    IEmbedBuilder WithAuthor(string name, string? iconUrl = null, string? url = null);
-    IEmbedBuilder WithColor(EmbedColor color);
-    Embed Build();
-    IEmbedBuilder WithUrl(string url);
-    IEmbedBuilder WithImageUrl(string url);
-    IEmbedBuilder WithThumbnailUrl(string url);
-}

src/Nadeko.Medusa/Nadeko.Medusa.csproj

@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-        <LangVersion>preview</LangVersion>
-        <EnablePreviewFeatures>true</EnablePreviewFeatures>
-        <RootNamespace>Nadeko.Snake</RootNamespace>
-        
-        <Authors>The NadekoBot Team</Authors>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <PackageReference Include="Discord.Net.Core" Version="3.6.1" />
-      <PackageReference Include="Serilog" Version="2.11.0" />
-      <PackageReference Include="YamlDotNet" Version="11.2.1" />
-    </ItemGroup>
-
-</Project>

src/Nadeko.Medusa/ParamParser/ParamParser.cs

@@ -1,16 +0,0 @@
-namespace Nadeko.Snake;
-
-/// <summary>
-/// Overridden to implement parsers for custom types 
-/// </summary>
-/// <typeparam name="T">Type into which to parse the input</typeparam>
-public abstract class ParamParser<T>
-{
-    /// <summary>
-    /// Overridden to implement parsing logic
-    /// </summary>
-    /// <param name="ctx">Context</param>
-    /// <param name="input">Input to parse</param>
-    /// <returns>A <see cref="ParseResult{T}"/> with successful or failed status</returns>
-    public abstract ValueTask<ParseResult<T>> TryParseAsync(AnyContext ctx, string input);
-}

src/Nadeko.Medusa/ParamParser/ParseResult.cs

@@ -1,48 +0,0 @@
-namespace Nadeko.Snake;
-
-public readonly struct ParseResult<T>
-{
-    /// <summary>
-    /// Whether the parsing was successful
-    /// </summary>
-    public bool IsSuccess { get; private init; }
-    
-    /// <summary>
-    /// Parsed value. It should only have value if <see cref="IsSuccess"/> is set to true
-    /// </summary>
-    public T? Data { get; private init;  }
-
-    /// <summary>
-    /// Instantiate a **successful** parse result
-    /// </summary>
-    /// <param name="data">Parsed value</param>
-    public ParseResult(T data)
-    {
-        Data = data;
-        IsSuccess = true;
-    }
-    
-
-    /// <summary>
-    /// Create a new <see cref="ParseResult{T}"/> with IsSuccess = false
-    /// </summary>
-    /// <returns>A new <see cref="ParseResult{T}"/></returns>
-    public static ParseResult<T> Fail()
-        => new ParseResult<T>
-        {
-            IsSuccess = false,
-            Data = default,
-        };
-
-    /// <summary>
-    /// Create a new <see cref="ParseResult{T}"/> with IsSuccess = true
-    /// </summary>
-    /// <param name="obj">Value of the parsed object</param>
-    /// <returns>A new <see cref="ParseResult{T}"/></returns>
-    public static ParseResult<T> Success(T obj)
-        => new ParseResult<T>
-        {
-            IsSuccess = true,
-            Data = obj,
-        };
-}

src/Nadeko.Medusa/README.md

@@ -1 +0,0 @@
-This is the library which is the base of any medusa.

src/Nadeko.Medusa/Snek.cs

@@ -1,143 +0,0 @@
-using Discord;
-
-namespace Nadeko.Snake;
-
-/// <summary>
-/// The base class which will be loaded as a module into NadekoBot
-/// Any user-defined snek has to inherit from this class.
-/// Sneks get instantiated ONLY ONCE during the loading,
-/// and any snek commands will be executed on the same instance.
-/// </summary>
-public abstract class Snek : IAsyncDisposable
-{
-    /// <summary>
-    /// Name of the snek. Defaults to the lowercase class name
-    /// </summary>
-    public virtual string Name
-        => GetType().Name.ToLowerInvariant();
-
-    /// <summary>
-    /// The prefix required before the command name. For example
-    /// if you set this to 'test' then a command called 'cmd' will have to be invoked by using
-    /// '.test cmd' instead of `.cmd` 
-    /// </summary>
-    public virtual string Prefix
-        => string.Empty;
-
-    /// <summary>
-    /// Executed once this snek has been instantiated and before any command is executed.
-    /// </summary>
-    /// <returns>A <see cref="ValueTask"/> representing completion</returns>
-    public virtual ValueTask InitializeAsync()
-        => default;
-
-    /// <summary>
-    /// Override to cleanup any resources or references which might hold this snek in memory
-    /// </summary>
-    /// <returns></returns>
-    public virtual ValueTask DisposeAsync()
-        => default;
-
-    /// <summary>
-    /// This method is called right after the message was received by the bot.
-    /// You can use this method to make the bot conditionally ignore some messages and prevent further processing.
-    /// <para>Execution order:</para>
-    /// <para>
-    /// *<see cref="ExecOnMessageAsync"/>* →
-    /// <see cref="ExecInputTransformAsync"/> →
-    /// <see cref="ExecPreCommandAsync"/> →
-    /// <see cref="ExecPostCommandAsync"/> OR <see cref="ExecOnNoCommandAsync"/>
-    /// </para>
-    /// </summary>
-    /// <param name="guild">Guild in which the message was sent</param>
-    /// <param name="msg">Message received by the bot</param>
-    /// <returns>A <see cref="ValueTask"/> representing whether the message should be ignored and not processed further</returns>
-    public virtual ValueTask<bool> ExecOnMessageAsync(IGuild? guild, IUserMessage msg)
-        => default;
-
-    /// <summary>
-    /// Override this method to modify input before the bot searches for any commands matching the input
-    /// Executed after <see cref="ExecOnMessageAsync"/>
-    /// This is useful if you want to reinterpret the message under some conditions
-    /// <para>Execution order:</para>
-    /// <para>
-    /// <see cref="ExecOnMessageAsync"/> →
-    /// *<see cref="ExecInputTransformAsync"/>* →
-    /// <see cref="ExecPreCommandAsync"/> →
-    /// <see cref="ExecPostCommandAsync"/> OR <see cref="ExecOnNoCommandAsync"/>
-    /// </para> 
-    /// </summary>
-    /// <param name="guild">Guild in which the message was sent</param>
-    /// <param name="channel">Channel in which the message was sent</param>
-    /// <param name="user">User who sent the message</param>
-    /// <param name="input">Content of the message</param>
-    /// <returns>A <see cref="ValueTask"/> representing new, potentially modified content</returns>
-    public virtual ValueTask<string?> ExecInputTransformAsync(
-        IGuild? guild,
-        IMessageChannel channel,
-        IUser user,
-        string input
-    )
-        => default;
-
-    /// <summary>
-    /// This method is called after the command was found but not executed,
-    /// and can be used to prevent the command's execution.
-    /// The command information doesn't have to be from this snek as this method
-    /// will be called when *any* command from any module or snek was found.
-    /// You can choose to prevent the execution of the command by returning "true" value.
-    /// <para>Execution order:</para>
-    /// <para>
-    /// <see cref="ExecOnMessageAsync"/> →
-    /// <see cref="ExecInputTransformAsync"/> →
-    /// *<see cref="ExecPreCommandAsync"/>* →
-    /// <see cref="ExecPostCommandAsync"/> OR <see cref="ExecOnNoCommandAsync"/>
-    /// </para>
-    /// </summary>
-    /// <param name="context">Command context</param>
-    /// <param name="moduleName">Name of the snek or module from which the command originates</param>
-    /// <param name="commandName">Name of the command which is about to be executed</param>
-    /// <returns>A <see cref="ValueTask"/> representing whether the execution should be blocked</returns>
-    public virtual ValueTask<bool> ExecPreCommandAsync(
-        AnyContext context,
-        string moduleName,
-        string commandName
-    )
-        => default;
-
-    /// <summary>
-    /// This method is called after the command was succesfully executed.
-    /// If this method was called, then <see cref="ExecOnNoCommandAsync"/> will not be executed
-    /// <para>Execution order:</para>
-    /// <para>
-    /// <see cref="ExecOnMessageAsync"/> →
-    /// <see cref="ExecInputTransformAsync"/> →
-    /// <see cref="ExecPreCommandAsync"/> →
-    /// *<see cref="ExecPostCommandAsync"/>* OR <see cref="ExecOnNoCommandAsync"/>
-    /// </para>
-    /// </summary>
-    /// <returns>A <see cref="ValueTask"/> representing completion</returns>
-    public virtual ValueTask ExecPostCommandAsync(AnyContext ctx, string moduleName, string commandName)
-        => default;
-
-    /// <summary>
-    /// This method is called if no command was found for the input.
-    /// Useful if you want to have games or features which take arbitrary input
-    /// but ignore any messages which were blocked or caused a command execution
-    /// If this method was called, then <see cref="ExecPostCommandAsync"/> will not be executed
-    /// <para>Execution order:</para>
-    /// <para>
-    /// <see cref="ExecOnMessageAsync"/> →
-    /// <see cref="ExecInputTransformAsync"/> →
-    /// <see cref="ExecPreCommandAsync"/> →
-    /// <see cref="ExecPostCommandAsync"/> OR *<see cref="ExecOnNoCommandAsync"/>*
-    /// </para>
-    /// </summary>
-    /// <returns>A <see cref="ValueTask"/> representing completion</returns>
-    public virtual ValueTask ExecOnNoCommandAsync(IGuild? guild, IUserMessage msg)
-        => default;
-}
-
-public readonly struct ExecResponse
-{
-}

src/Nadeko.Medusa/Strings/CommandStrings.cs

@@ -1,24 +0,0 @@
-using YamlDotNet.Serialization;
-
-namespace Nadeko.Snake;
-
-public readonly struct CommandStrings
-{
-    public CommandStrings(string? desc, string[]? args)
-    {
-        Desc = desc;
-        Args = args;
-    }
-
-    [YamlMember(Alias = "desc")]
-    public string? Desc { get; init; }
-    
-    [YamlMember(Alias = "args")]
-    public string[]? Args { get; init; }
-
-    public void Deconstruct(out string? desc, out string[]? args)
-    {
-        desc = Desc;
-        args = Args;
-    }
-}

src/Nadeko.Medusa/Strings/IMedusaStrings.cs

@@ -1,15 +0,0 @@
-using System.Globalization;
-
-namespace Nadeko.Snake;
-
-/// <summary>
-///     Defines methods to retrieve and reload medusa strings
-/// </summary>
-public interface IMedusaStrings
-{
-    // string GetText(string key, ulong? guildId = null, params object[] data);
-    string? GetText(string key, CultureInfo locale, params object[] data);
-    void Reload();
-    CommandStrings GetCommandStrings(string commandName, CultureInfo cultureInfo);
-    string? GetDescription(CultureInfo? locale);
-}

src/Nadeko.Medusa/Strings/IMedusaStringsProvider.cs

@@ -1,28 +0,0 @@
-namespace Nadeko.Snake;
-
-/// <summary>
-///     Implemented by classes which provide localized strings in their own ways
-/// </summary>
-public interface IMedusaStringsProvider
-{
-    /// <summary>
-    ///     Gets localized string
-    /// </summary>
-    /// <param name="localeName">Language name</param>
-    /// <param name="key">String key</param>
-    /// <returns>Localized string</returns>
-    string? GetText(string localeName, string key);
-
-    /// <summary>
-    ///     Reloads string cache
-    /// </summary>
-    void Reload();
-
-    // /// <summary>
-    // ///     Gets command arg examples and description
-    // /// </summary>
-    // /// <param name="localeName">Language name</param>
-    // /// <param name="commandName">Command name</param>
-    // CommandStrings GetCommandStrings(string localeName, string commandName);
-    CommandStrings? GetCommandStrings(string localeName, string commandName);
-}

src/Nadeko.Medusa/Strings/LocalMedusaStringsProvider.cs

@@ -1,40 +0,0 @@
-namespace Nadeko.Snake;
-
-public class LocalMedusaStringsProvider : IMedusaStringsProvider
-{
-    private readonly StringsLoader _source;
-    private IReadOnlyDictionary<string, IReadOnlyDictionary<string, string>> _responseStrings;
-    private IReadOnlyDictionary<string, IReadOnlyDictionary<string, CommandStrings>> _commandStrings;
-
-    public LocalMedusaStringsProvider(StringsLoader source)
-    {
-        _source = source;
-        _responseStrings = _source.GetResponseStrings();
-        _commandStrings = _source.GetCommandStrings();
-    }
-
-    public void Reload()
-    {
-        _responseStrings = _source.GetResponseStrings();
-        _commandStrings = _source.GetCommandStrings();
-    }
-    
-
-    public string? GetText(string localeName, string key)
-    {
-        if (_responseStrings.TryGetValue(localeName.ToLowerInvariant(), out var langStrings)
-            && langStrings.TryGetValue(key.ToLowerInvariant(), out var text))
-            return text;
-
-        return null;
-    }
-
-    public CommandStrings? GetCommandStrings(string localeName, string commandName)
-    {
-        if (_commandStrings.TryGetValue(localeName.ToLowerInvariant(), out var langStrings)
-            && langStrings.TryGetValue(commandName.ToLowerInvariant(), out var strings))
-            return strings;
-    
-        return null;
-    }
-} 

src/Nadeko.Medusa/Strings/MedusaStrings.cs

@@ -1,79 +0,0 @@
-using System.Globalization;
-using Serilog;
-
-namespace Nadeko.Snake;
-
-public class MedusaStrings : IMedusaStrings
-{
-    /// <summary>
-    ///     Used as failsafe in case response key doesn't exist in the selected or default language.
-    /// </summary>
-    private readonly CultureInfo _usCultureInfo = new("en-US");
-    
-    private readonly IMedusaStringsProvider _stringsProvider;
-
-    public MedusaStrings(IMedusaStringsProvider stringsProvider)
-    {
-        _stringsProvider = stringsProvider;
-    }
-
-    private string? GetString(string key, CultureInfo cultureInfo)
-        => _stringsProvider.GetText(cultureInfo.Name, key);
-
-    public string? GetText(string key, CultureInfo cultureInfo)
-        => GetString(key, cultureInfo)
-           ?? GetString(key, _usCultureInfo);
-
-    public string? GetText(string key, CultureInfo cultureInfo, params object[] data)
-    {
-        var text = GetText(key, cultureInfo);
-
-        if (string.IsNullOrWhiteSpace(text))
-            return null;
-        
-        try
-        {
-            return string.Format(text, data);
-        }
-        catch (FormatException)
-        {
-            Log.Warning(" Key '{Key}' is not properly formatted in '{LanguageName}' response strings",
-                key,
-                cultureInfo.Name);
-            
-            return $"⚠️ Response string key '{key}' is not properly formatted. Please report this.\n\n{text}";
-        }
-    }
-    
-    public CommandStrings GetCommandStrings(string commandName, CultureInfo cultureInfo)
-    {
-        var cmdStrings = _stringsProvider.GetCommandStrings(cultureInfo.Name, commandName);
-        if (cmdStrings is null)
-        {
-            if (cultureInfo.Name == _usCultureInfo.Name)
-            {
-                Log.Warning("'{CommandName}' doesn't exist in 'en-US' command strings for one of the medusae",
-                    commandName);
-
-                return new(null, null);
-            }
-
-            Log.Information("Missing '{CommandName}' command strings for the '{LocaleName}' locale",
-                commandName,
-                cultureInfo.Name);
-            
-            return GetCommandStrings(commandName, _usCultureInfo);
-        }
-
-        return cmdStrings.Value;
-    }
-
-    public string? GetDescription(CultureInfo? locale = null)
-        => GetText("medusa.description", locale ?? _usCultureInfo);
-
-    public static MedusaStrings CreateDefault(string basePath)
-        => new MedusaStrings(new LocalMedusaStringsProvider(new(basePath)));
-    
-    public void Reload()
-        => _stringsProvider.Reload();
-}

src/Nadeko.Medusa/Strings/StringsLoader.cs

@@ -1,137 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using Serilog;
-using YamlDotNet.Serialization;
-
-namespace Nadeko.Snake;
-
-/// <summary>
-///     Loads strings from the shortcut or localizable path
-/// </summary>
-public class StringsLoader
-{
-    private readonly string _localizableResponsesPath;
-    private readonly string _shortcutResponsesFile;
-    
-    private readonly string _localizableCommandsPath;
-    private readonly string _shortcutCommandsFile;
-
-    public StringsLoader(string basePath)
-    {
-        _localizableResponsesPath = Path.Join(basePath, "strings/res");
-        _shortcutResponsesFile = Path.Join(basePath, "res.yml");
-        
-        _localizableCommandsPath = Path.Join(basePath, "strings/cmds");
-        _shortcutCommandsFile = Path.Join(basePath, "cmds.yml");
-    }
-
-    public IReadOnlyDictionary<string, IReadOnlyDictionary<string, CommandStrings>> GetCommandStrings()
-    {
-        var outputDict = new Dictionary<string, IReadOnlyDictionary<string, CommandStrings>>();
-
-        if (File.Exists(_shortcutCommandsFile))
-        {
-            if (TryLoadCommandsFromFile(_shortcutCommandsFile, out var dict, out _))
-            {
-                outputDict["en-us"] = dict;
-            }
-
-            return outputDict;
-        }
-
-        if (Directory.Exists(_localizableCommandsPath))
-        {
-            foreach (var cmdsFile in Directory.EnumerateFiles(_localizableCommandsPath))
-            {
-                if (TryLoadCommandsFromFile(cmdsFile, out var dict, out var locale) && locale is not null)
-                {
-                    outputDict[locale.ToLowerInvariant()] = dict;
-                }
-            }
-        }
-
-        return outputDict;
-    }
-
-    
-    private static readonly IDeserializer _deserializer = new DeserializerBuilder().Build();
-    private static bool TryLoadCommandsFromFile(string file,
-        [NotNullWhen(true)] out IReadOnlyDictionary<string, CommandStrings>? strings,
-        out string? localeName)
-    {
-        try
-        {
-            var text = File.ReadAllText(file);
-            strings = _deserializer.Deserialize<Dictionary<string, CommandStrings>?>(text)
-                      ?? new();
-            localeName = GetLocaleName(file);
-            return true;
-        }
-        catch (Exception ex)
-        {
-            Log.Error(ex, "Error loading {FileName} command strings: {ErrorMessage}", file, ex.Message);
-        }
-
-        strings = null;
-        localeName = null;
-        return false;
-    }
-
-
-    public IReadOnlyDictionary<string, IReadOnlyDictionary<string, string>> GetResponseStrings()
-    {
-        var outputDict = new Dictionary<string, IReadOnlyDictionary<string, string>>();
-
-        // try to load a shortcut file
-        if (File.Exists(_shortcutResponsesFile))
-        {
-            if (TryLoadResponsesFromFile(_shortcutResponsesFile, out var dict, out _))
-            {
-                outputDict["en-us"] = dict;
-            }
-
-            return outputDict;
-        }
-
-        if (!Directory.Exists(_localizableResponsesPath))
-            return outputDict;
-        
-        // if shortcut file doesn't exist, try to load localizable files
-        foreach (var file in Directory.GetFiles(_localizableResponsesPath))
-        {
-            if (TryLoadResponsesFromFile(file, out var strings, out var localeName) && localeName is not null)
-            {
-                outputDict[localeName.ToLowerInvariant()] = strings;
-            }
-        }
-
-        return outputDict;
-    }
-
-    private static bool TryLoadResponsesFromFile(string file,
-        [NotNullWhen(true)] out IReadOnlyDictionary<string, string>? strings,
-        out string? localeName)
-    {
-        try
-        {
-            strings = _deserializer.Deserialize<Dictionary<string, string>?>(File.ReadAllText(file));
-            if (strings is null)
-            {
-                localeName = null;
-                return false;
-            }
-
-            localeName = GetLocaleName(file).ToLowerInvariant();
-            return true;
-        }
-        catch (Exception ex)
-        {
-            Log.Error(ex, "Error loading {FileName} response strings: {ErrorMessage}", file, ex.Message);
-            strings = null;
-            localeName = null;
-            return false;
-        }
-    }
-
-    private static string GetLocaleName(string fileName)
-        => Path.GetFileNameWithoutExtension(fileName);
-}

src/Nadeko.Medusa/pack-and-push.ps1

@@ -1,2 +0,0 @@
-dotnet pack -o bin/Release/packed
-dotnet nuget push bin/Release/packed/ --api-key $env:nadeko_myget_api_key --source https://www.myget.org/F/nadeko/api/v2/package

src/NadekoBot.Coordinator/CoordStartup.cs

@@ -12,7 +12,9 @@ namespace NadekoBot.Coordinator
         public IConfiguration Configuration { get; }
         
         public CoordStartup(IConfiguration config)
-            => Configuration = config;
+        {
+            Configuration = config;
+        }
 
         public void ConfigureServices(IServiceCollection services)
         {

src/NadekoBot.Coordinator/LogSetup.cs

@@ -15,16 +15,13 @@ namespace NadekoBot.Services
                 .MinimumLevel.Override("System", LogEventLevel.Information)
                 .MinimumLevel.Override("Microsoft.AspNetCore", LogEventLevel.Warning)
                 .Enrich.FromLogContext()
-                .WriteTo.File("coord.log", LogEventLevel.Information, 
-                    rollOnFileSizeLimit: true,
-                    fileSizeLimitBytes: 10_000_000)
                 .WriteTo.Console(LogEventLevel.Information,
                     theme: GetTheme(),
                     outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] | #{LogSource} | {Message:lj}{NewLine}{Exception}")
                 .Enrich.WithProperty("LogSource", source)
                 .CreateLogger();
             
-            Console.OutputEncoding = Encoding.UTF8;
+            System.Console.OutputEncoding = Encoding.UTF8;
         }
 
         private static ConsoleTheme GetTheme()

src/NadekoBot.Coordinator/NadekoBot.Coordinator.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -9,10 +9,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.AspNetCore" Version="2.45.0" />
-    <PackageReference Include="Serilog" Version="2.11.0" />
+    <PackageReference Include="Grpc.AspNetCore" Version="2.41.0" />
+    <PackageReference Include="Serilog" Version="2.10.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
     <PackageReference Include="YamlDotNet" Version="11.2.1" />
   </ItemGroup>
   

src/NadekoBot.Coordinator/Services/CoordinatorRunner.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Serilog;
 using YamlDotNet.Serialization;
@@ -29,7 +30,7 @@ namespace NadekoBot.Coordinator
         private readonly Random _rng;
         private bool _gracefulImminent;
         
-        public CoordinatorRunner()
+        public CoordinatorRunner(IConfiguration configuration)
         {
             _serializer = new();
             _deserializer = new();
@@ -90,7 +91,7 @@ namespace NadekoBot.Coordinator
                         var shardIds = Enumerable.Range(0, 1) // shard 0 is always first
                             .Append((int)((117523346618318850 >> 22) % _config.TotalShards)) // then nadeko server shard
                             .Concat(Enumerable.Range(1, _config.TotalShards - 1)
-                                .OrderBy(_ => _rng.Next())) // then all other shards in a random order
+                                .OrderBy(x => _rng.Next())) // then all other shards in a random order
                             .Distinct()
                             .ToList();
                         
@@ -114,6 +115,14 @@ namespace NadekoBot.Coordinator
                                 StartShard(shardId);
                                 break;
                             }
+
+                            if (status.Process is null or {HasExited: true})
+                            {
+                                Log.Warning("Shard {ShardId} is starting (process)...", shardId);
+                                hadAction = true;
+                                StartShard(shardId);
+                                break;
+                            }
                             
                             if (DateTime.UtcNow - status.LastUpdate >
                                 TimeSpan.FromSeconds(_config.UnresponsiveSec))
@@ -131,24 +140,6 @@ namespace NadekoBot.Coordinator
                                 StartShard(shardId);
                                 break;
                             }
-
-                            try
-                            {
-                                if (status.Process is null or { HasExited: true })
-                                {
-                                    Log.Warning("Shard {ShardId} is starting (process)...", shardId);
-                                    hadAction = true;
-                                    StartShard(shardId);
-                                    break;
-                                }
-                            }
-                            catch (InvalidOperationException)
-                            {
-                                Log.Warning("Process for shard {ShardId} is bugged... ", shardId);
-                                hadAction = true;
-                                StartShard(shardId);
-                                break;
-                            }
                         }
                     }
 
@@ -171,13 +162,17 @@ namespace NadekoBot.Coordinator
             var status = _shardStatuses[shardId];
             try
             {
-                status.Process?.Kill(true);
-            }
-            catch
-            {
-            }
-            try
-            {
+                if (status.Process is { HasExited: false } p)
+                {
+                    try
+                    {
+                        p.Kill(true);
+                    }
+                    catch
+                    {
+                    }
+                }
+
                 status.Process?.Dispose();
             }
             catch
@@ -196,7 +191,8 @@ namespace NadekoBot.Coordinator
         }
 
         private Process StartShardProcess(int shardId)
-            => Process.Start(new ProcessStartInfo()
+        {
+            return Process.Start(new ProcessStartInfo()
             {
                 FileName = _config.ShardStartCommand,
                 Arguments = string.Format(_config.ShardStartArgs,
@@ -209,6 +205,7 @@ namespace NadekoBot.Coordinator
                 // CreateNoWindow = true,
                 // UseShellExecute = false,
             });
+        }
 
         public bool Heartbeat(int shardId, int guildCount, ConnState state)
         {
@@ -242,6 +239,7 @@ namespace NadekoBot.Coordinator
         {
             lock (locker)
             {
+                ref var toSave = ref _config;
                 SaveConfig(new Config(
                     totalShards,
                     _config.RecheckIntervalMs,
@@ -288,8 +286,8 @@ namespace NadekoBot.Coordinator
                     var status = _shardStatuses[shardId];
                     if (status.Process is Process p)
                     {
-                        try{p.Kill();} catch {}
-                        try{p.Dispose();} catch {}
+                        p.Kill();
+                        p.Dispose();
                         _shardStatuses[shardId] = status with
                         {
                             Process = null,
@@ -316,7 +314,7 @@ namespace NadekoBot.Coordinator
                     })
                     .ToList()
             };
-            var jsonState = JsonSerializer.Serialize(coordState, new JsonSerializerOptions()
+            var jsonState = JsonSerializer.Serialize(coordState, new ()
             {
                 WriteIndented = true,
             });
@@ -348,7 +346,7 @@ namespace NadekoBot.Coordinator
 
                 if (savedState.StatusObjects.Count != _config.TotalShards)
                 {
-                    Log.Error("Unable to restore old state because shard count doesn't match");
+                    Log.Error("Unable to restore old state because shard count doesn't match.");
                     File.Move(GRACEFUL_STATE_PATH, GRACEFUL_STATE_BACKUP_PATH, overwrite: true);
                     return false;
                 }
@@ -359,7 +357,7 @@ namespace NadekoBot.Coordinator
                 {
                     var statusObj = savedState.StatusObjects[shardId];
                     Process p = null;
-                    if (statusObj.Pid is { } pid)
+                    if (statusObj.Pid is int pid)
                     {
                         try
                         {
@@ -367,7 +365,7 @@ namespace NadekoBot.Coordinator
                         }
                         catch (Exception ex)
                         {
-                            Log.Warning(ex, "Process for shard {ShardId} is not runnning", shardId);
+                            Log.Warning(ex, $"Process for shard {shardId} is not runnning.");
                         }
                     }
 
@@ -443,7 +441,9 @@ namespace NadekoBot.Coordinator
         }
 
         public string GetConfigText()
-            => File.ReadAllText(CONFIG_PATH);
+        {
+            return File.ReadAllText(CONFIG_PATH);
+        }
 
         public void SetConfigText(string text)
         {

src/NadekoBot.Coordinator/Services/CoordinatorService.cs

@@ -5,12 +5,14 @@ using Grpc.Core;
 
 namespace NadekoBot.Coordinator
 {
-    public sealed class CoordinatorService : Coordinator.CoordinatorBase
+    public sealed class CoordinatorService : NadekoBot.Coordinator.Coordinator.CoordinatorBase
     {
         private readonly CoordinatorRunner _runner;
 
         public CoordinatorService(CoordinatorRunner runner)
-            => _runner = runner;
+        {
+            _runner = runner;
+        }
 
         public override Task<HeartbeatReply> Heartbeat(HeartbeatRequest request, ServerCallContext context)
         {
@@ -111,10 +113,11 @@ namespace NadekoBot.Coordinator
             return new DieReply();
         }
 
-        public override Task<SetConfigTextReply> SetConfigText(SetConfigTextRequest request, ServerCallContext context)
+        public override async Task<SetConfigTextReply> SetConfigText(SetConfigTextRequest request, ServerCallContext context)
         {
-            var error = string.Empty;
-            var success = true;
+            await Task.Yield();
+            string error = string.Empty;
+            bool success = true;
             try
             {
                 _runner.SetConfigText(request.ConfigYml);
@@ -125,11 +128,11 @@ namespace NadekoBot.Coordinator
                 success = false;
             }
 
-            return Task.FromResult<SetConfigTextReply>(new(new()
+            return new(new()
             {
                 Success = success,
                 Error = error
-            }));
+            });
         }
 
         public override Task<GetConfigTextReply> GetConfigText(GetConfigTextRequest request, ServerCallContext context)

src/NadekoBot.Coordinator/Shared/JsonStatusObject.cs

@@ -1,4 +1,6 @@
-namespace NadekoBot.Coordinator
+using System;
+
+namespace NadekoBot.Coordinator
 {
     public class JsonStatusObject
     {

src/NadekoBot.Generators/Cloneable/CloneableGenerator.cs

@@ -1,254 +0,0 @@
-// Code temporarily yeeted from
-// https://github.com/mostmand/Cloneable/blob/master/Cloneable/CloneableGenerator.cs
-// because of NRT issue
-#nullable enable
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Text;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Cloneable
-{
-    [Generator]
-    public class CloneableGenerator : ISourceGenerator
-    {
-        private const string PREVENT_DEEP_COPY_KEY_STRING = "PreventDeepCopy";
-        private const string EXPLICIT_DECLARATION_KEY_STRING = "ExplicitDeclaration";
-
-        private const string CLONEABLE_NAMESPACE = "Cloneable";
-        private const string CLONEABLE_ATTRIBUTE_STRING = "CloneableAttribute";
-        private const string CLONE_ATTRIBUTE_STRING = "CloneAttribute";
-        private const string IGNORE_CLONE_ATTRIBUTE_STRING = "IgnoreCloneAttribute";
-
-        private const string CLONEABLE_ATTRIBUTE_TEXT = @"// <AutoGenerated/>
-using System;
-
-namespace " + CLONEABLE_NAMESPACE + @"
-{
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct, Inherited = true, AllowMultiple = false)]
-    public sealed class " + CLONEABLE_ATTRIBUTE_STRING + @" : Attribute
-    {
-        public " + CLONEABLE_ATTRIBUTE_STRING + @"()
-        {
-        }
-
-        public bool " + EXPLICIT_DECLARATION_KEY_STRING + @" { get; set; }
-    }
-}
-";
-
-        private const string CLONE_PROPERTY_ATTRIBUTE_TEXT = @"// <AutoGenerated/>
-using System;
-
-namespace " + CLONEABLE_NAMESPACE + @"
-{
-    [AttributeUsage(AttributeTargets.Property, Inherited = true, AllowMultiple = false)]
-    public sealed class " + CLONE_ATTRIBUTE_STRING + @" : Attribute
-    {
-        public " + CLONE_ATTRIBUTE_STRING + @"()
-        {
-        }
-
-        public bool " + PREVENT_DEEP_COPY_KEY_STRING + @" { get; set; }
-    }
-}
-";
-
-        private const string IGNORE_CLONE_PROPERTY_ATTRIBUTE_TEXT = @"// <AutoGenerated/>
-using System;
-
-namespace " + CLONEABLE_NAMESPACE + @"
-{
-    [AttributeUsage(AttributeTargets.Property, Inherited = true, AllowMultiple = false)]
-    public sealed class " + IGNORE_CLONE_ATTRIBUTE_STRING + @" : Attribute
-    {
-        public " + IGNORE_CLONE_ATTRIBUTE_STRING + @"()
-        {
-        }
-    }
-}
-";
-
-        private INamedTypeSymbol? _cloneableAttribute;
-        private INamedTypeSymbol? _ignoreCloneAttribute;
-        private INamedTypeSymbol? _cloneAttribute;
-
-        public void Initialize(GeneratorInitializationContext context)
-            => context.RegisterForSyntaxNotifications(() => new SyntaxReceiver());
-
-        public void Execute(GeneratorExecutionContext context)
-        {
-            InjectCloneableAttributes(context);
-            GenerateCloneMethods(context);
-        }
-
-        private void GenerateCloneMethods(GeneratorExecutionContext context)
-        {
-            if (context.SyntaxReceiver is not SyntaxReceiver receiver)
-                return;
-
-            Compilation compilation = GetCompilation(context);
-
-            InitAttributes(compilation);
-
-            var classSymbols = GetClassSymbols(compilation, receiver);
-            foreach (var classSymbol in classSymbols)
-            {
-                if (!classSymbol.TryGetAttribute(_cloneableAttribute!, out var attributes))
-                    continue;
-
-                var attribute = attributes.Single();
-                var isExplicit = (bool?)attribute.NamedArguments.FirstOrDefault(e => e.Key.Equals(EXPLICIT_DECLARATION_KEY_STRING)).Value.Value ?? false;
-                context.AddSource($"{classSymbol.Name}_cloneable.g.cs", SourceText.From(CreateCloneableCode(classSymbol, isExplicit), Encoding.UTF8));
-            }
-        }
-
-        private void InitAttributes(Compilation compilation)
-        {
-            _cloneableAttribute = compilation.GetTypeByMetadataName($"{CLONEABLE_NAMESPACE}.{CLONEABLE_ATTRIBUTE_STRING}")!;
-            _cloneAttribute = compilation.GetTypeByMetadataName($"{CLONEABLE_NAMESPACE}.{CLONE_ATTRIBUTE_STRING}")!;
-            _ignoreCloneAttribute = compilation.GetTypeByMetadataName($"{CLONEABLE_NAMESPACE}.{IGNORE_CLONE_ATTRIBUTE_STRING}")!;
-        }
-
-        private static Compilation GetCompilation(GeneratorExecutionContext context)
-        {
-            var options = context.Compilation.SyntaxTrees.First().Options as CSharpParseOptions;
-
-            var compilation = context.Compilation.AddSyntaxTrees(CSharpSyntaxTree.ParseText(SourceText.From(CLONEABLE_ATTRIBUTE_TEXT, Encoding.UTF8), options)).
-                AddSyntaxTrees(CSharpSyntaxTree.ParseText(SourceText.From(CLONE_PROPERTY_ATTRIBUTE_TEXT, Encoding.UTF8), options)).
-                AddSyntaxTrees(CSharpSyntaxTree.ParseText(SourceText.From(IGNORE_CLONE_PROPERTY_ATTRIBUTE_TEXT, Encoding.UTF8), options));
-            return compilation;
-        }
-
-        private string CreateCloneableCode(INamedTypeSymbol classSymbol, bool isExplicit)
-        {
-            string namespaceName = classSymbol.ContainingNamespace.ToDisplayString();
-            var fieldAssignmentsCode = GenerateFieldAssignmentsCode(classSymbol, isExplicit).ToList();
-            var fieldAssignmentsCodeSafe = fieldAssignmentsCode.Select(x =>
-            {
-                if (x.isCloneable)
-                    return x.line + "Safe(referenceChain)";
-                return x.line;
-            });
-            var fieldAssignmentsCodeFast = fieldAssignmentsCode.Select(x =>
-            {
-                if (x.isCloneable)
-                    return x.line + "()";
-                return x.line;
-            });
-
-            return $@"using System.Collections.Generic;
-
-namespace {namespaceName}
-{{
-    {GetAccessModifier(classSymbol)} partial class {classSymbol.Name}
-    {{
-        /// <summary>
-        /// Creates a copy of {classSymbol.Name} with NO circular reference checking. This method should be used if performance matters.
-        /// 
-        /// <exception cref=""StackOverflowException"">Will occur on any object that has circular references in the hierarchy.</exception>
-        /// </summary>
-        public {classSymbol.Name} Clone()
-        {{
-            return new {classSymbol.Name}
-            {{
-{string.Join(",\n", fieldAssignmentsCodeFast)}
-            }};
-        }}
-
-        /// <summary>
-        /// Creates a copy of {classSymbol.Name} with circular reference checking. If a circular reference was detected, only a reference of the leaf object is passed instead of cloning it.
-        /// </summary>
-        /// <param name=""referenceChain"">Should only be provided if specific objects should not be cloned but passed by reference instead.</param>
-        public {classSymbol.Name} CloneSafe(Stack<object> referenceChain = null)
-        {{
-            if(referenceChain?.Contains(this) == true) 
-                return this;
-            referenceChain ??= new Stack<object>();
-            referenceChain.Push(this);
-            var result = new {classSymbol.Name}
-            {{
-{string.Join($",\n", fieldAssignmentsCodeSafe)}
-            }};
-            referenceChain.Pop();
-            return result;
-        }}
-    }}
-}}";
-        }
-
-        private IEnumerable<(string line, bool isCloneable)> GenerateFieldAssignmentsCode(INamedTypeSymbol classSymbol, bool isExplicit )
-        {
-            var fieldNames = GetCloneableProperties(classSymbol, isExplicit);
-
-            var fieldAssignments = fieldNames.Select(field => IsFieldCloneable(field, classSymbol))
-                .OrderBy(x => x.isCloneable)
-                .Select(x => (GenerateAssignmentCode(x.item.Name, x.isCloneable), x.isCloneable));
-            return fieldAssignments;
-        }
-
-        private string GenerateAssignmentCode(string name, bool isCloneable)
-        {
-            if (isCloneable)
-            {
-                return $@"                {name} = this.{name}?.Clone";
-            }
-
-            return $@"                {name} = this.{name}";
-        }
-
-        private (IPropertySymbol item, bool isCloneable) IsFieldCloneable(IPropertySymbol x, INamedTypeSymbol classSymbol)
-        {
-            if (SymbolEqualityComparer.Default.Equals(x.Type, classSymbol))
-            {
-                return (x, false);
-            }
-
-            if (!x.Type.TryGetAttribute(_cloneableAttribute!, out var attributes))
-            {
-                return (x, false);
-            }
-
-            var preventDeepCopy = (bool?)attributes.Single().NamedArguments.FirstOrDefault(e => e.Key.Equals(PREVENT_DEEP_COPY_KEY_STRING)).Value.Value ?? false;
-            return (item: x, !preventDeepCopy);
-        }
-
-        private string GetAccessModifier(INamedTypeSymbol classSymbol)
-            => classSymbol.DeclaredAccessibility.ToString().ToLowerInvariant();
-
-        private IEnumerable<IPropertySymbol> GetCloneableProperties(ITypeSymbol classSymbol, bool isExplicit)
-        {
-            var targetSymbolMembers = classSymbol.GetMembers().OfType<IPropertySymbol>()
-                .Where(x => x.SetMethod is not null &&
-                            x.CanBeReferencedByName);
-            if (isExplicit)
-            {
-                return targetSymbolMembers.Where(x => x.HasAttribute(_cloneAttribute!));
-            }
-            else
-            {
-                return targetSymbolMembers.Where(x => !x.HasAttribute(_ignoreCloneAttribute!));
-            }
-        }
-
-        private static IEnumerable<INamedTypeSymbol> GetClassSymbols(Compilation compilation, SyntaxReceiver receiver)
-            => receiver.CandidateClasses.Select(clazz => GetClassSymbol(compilation, clazz));
-
-        private static INamedTypeSymbol GetClassSymbol(Compilation compilation, ClassDeclarationSyntax clazz)
-        {
-            var model = compilation.GetSemanticModel(clazz.SyntaxTree);
-            var classSymbol = model.GetDeclaredSymbol(clazz)!;
-            return classSymbol;
-        }
-
-        private static void InjectCloneableAttributes(GeneratorExecutionContext context)
-        {
-            context.AddSource(CLONEABLE_ATTRIBUTE_STRING, SourceText.From(CLONEABLE_ATTRIBUTE_TEXT, Encoding.UTF8));
-            context.AddSource(CLONE_ATTRIBUTE_STRING, SourceText.From(CLONE_PROPERTY_ATTRIBUTE_TEXT, Encoding.UTF8));
-            context.AddSource(IGNORE_CLONE_ATTRIBUTE_STRING, SourceText.From(IGNORE_CLONE_PROPERTY_ATTRIBUTE_TEXT, Encoding.UTF8));
-        }
-    }
-}

src/NadekoBot.Generators/Cloneable/SymbolExtensions.cs

@@ -1,24 +0,0 @@
-// Code temporarily yeeted from
-// https://github.com/mostmand/Cloneable/blob/master/Cloneable/CloneableGenerator.cs
-// because of NRT issue
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.CodeAnalysis;
-
-namespace Cloneable
-{
-    internal static class SymbolExtensions
-    {
-        public static bool TryGetAttribute(this ISymbol symbol, INamedTypeSymbol attributeType,
-            out IEnumerable<AttributeData> attributes)
-        {
-            attributes = symbol.GetAttributes()
-                .Where(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, attributeType));
-            return attributes.Any();
-        }
-
-        public static bool HasAttribute(this ISymbol symbol, INamedTypeSymbol attributeType)
-            => symbol.GetAttributes()
-                .Any(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, attributeType));
-    }
-}

src/NadekoBot.Generators/Cloneable/SyntaxReceiver.cs

@@ -1,27 +0,0 @@
-// Code temporarily yeeted from
-// https://github.com/mostmand/Cloneable/blob/master/Cloneable/CloneableGenerator.cs
-// because of NRT issue
-using System.Collections.Generic;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-
-namespace Cloneable
-{
-    internal class SyntaxReceiver : ISyntaxReceiver
-    {
-        public IList<ClassDeclarationSyntax> CandidateClasses { get; } = new List<ClassDeclarationSyntax>();
-
-        /// <summary>
-        /// Called for every syntax node in the compilation, we can inspect the nodes and save any information useful for generation
-        /// </summary>
-        public void OnVisitSyntaxNode(SyntaxNode syntaxNode)
-        {
-            // any field with at least one attribute is a candidate for being cloneable
-            if (syntaxNode is ClassDeclarationSyntax classDeclarationSyntax &&
-                classDeclarationSyntax.AttributeLists.Count > 0)
-            {
-                CandidateClasses.Add(classDeclarationSyntax);
-            }
-        }
-    }
-}

src/NadekoBot.Generators/Command/CommandAttributesGenerator.cs

@@ -1,322 +0,0 @@
-#nullable enable
-using System;
-using System.CodeDom.Compiler;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Text;
-
-namespace NadekoBot.Generators.Command;
-
-[Generator]
-public class CommandAttributesGenerator : IIncrementalGenerator
-{
-    public const string ATTRIBUTE = @"// <AutoGenerated />
-
-namespace NadekoBot.Common;
-
-[System.AttributeUsage(System.AttributeTargets.Method)]
-public class CmdAttribute : System.Attribute
-{
-    
-}";
-
-    public class MethodModel
-    {
-        public string? Namespace { get; }
-        public IReadOnlyCollection<string> Classes { get; }
-        public string ReturnType { get; }
-        public string MethodName { get; }
-        public IEnumerable<string> Params { get; }
-
-        public MethodModel(string? ns, IReadOnlyCollection<string> classes, string returnType, string methodName, IEnumerable<string> @params)
-        {
-            Namespace = ns;
-            Classes = classes;
-            ReturnType = returnType;
-            MethodName = methodName;
-            Params = @params;
-        }
-    }
-
-    public class FileModel
-    {
-        public string? Namespace { get; }
-        public IReadOnlyCollection<string> ClassHierarchy { get; }
-        public IReadOnlyCollection<MethodModel> Methods { get; }
-
-        public FileModel(string? ns, IReadOnlyCollection<string> classHierarchy, IReadOnlyCollection<MethodModel> methods)
-        {
-            Namespace = ns;
-            ClassHierarchy = classHierarchy;
-            Methods = methods;
-        }
-    }
-
-    public void Initialize(IncrementalGeneratorInitializationContext context)
-    {
-// #if DEBUG
-//         SpinWait.SpinUntil(() => Debugger.IsAttached);
-// #endif
-        context.RegisterPostInitializationOutput(static ctx => ctx.AddSource(
-            "CmdAttribute.g.cs",
-            SourceText.From(ATTRIBUTE, Encoding.UTF8)));
-
-        var methods = context.SyntaxProvider
-            .CreateSyntaxProvider(
-                static (node, _) => node is MethodDeclarationSyntax { AttributeLists.Count: > 0 },
-                static (ctx, cancel) => Transform(ctx, cancel))
-            .Where(static m => m is not null)
-            .Where(static m => m?.ChildTokens().Any(static x => x.IsKind(SyntaxKind.PublicKeyword)) ?? false);
-
-        var compilationMethods = context.CompilationProvider.Combine(methods.Collect());
-
-        context.RegisterSourceOutput(compilationMethods,
-            static (ctx, tuple) => RegisterAction(in ctx, tuple.Left, in tuple.Right));
-    }
-
-    private static void RegisterAction(in SourceProductionContext ctx,
-        Compilation comp,
-        in ImmutableArray<MethodDeclarationSyntax?> methods)
-    {
-        if (methods is { IsDefaultOrEmpty: true })
-            return;
-
-        var models = GetModels(comp, methods, ctx.CancellationToken);
-
-        foreach (var model in models)
-        {
-            var name = $"{model.Namespace}.{string.Join(".", model.ClassHierarchy)}.g.cs";
-            try
-            {
-                var source = GetSourceText(model);
-                ctx.AddSource(name, SourceText.From(source, Encoding.UTF8));
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine($"Error writing source file {name}\n" + ex);
-            }
-        }
-    }
-
-    private static string GetSourceText(FileModel model)
-    {
-        using var sw = new StringWriter();
-        using var tw = new IndentedTextWriter(sw);
-        
-        tw.WriteLine("// <AutoGenerated />");
-        tw.WriteLine("#pragma warning disable CS1066");
-
-        if (model.Namespace is not null)
-        {
-            tw.WriteLine($"namespace {model.Namespace};");
-            tw.WriteLine();
-        }
-
-        foreach (var className in model.ClassHierarchy)
-        {
-            tw.WriteLine($"public partial class {className}");
-            tw.WriteLine("{");
-            tw.Indent ++;
-        }
-        
-        foreach (var method in model.Methods)
-        {
-            tw.WriteLine("[NadekoCommand]");
-            tw.WriteLine("[NadekoDescription]");
-            tw.WriteLine("[Aliases]");
-            tw.WriteLine($"public partial {method.ReturnType} {method.MethodName}({string.Join(", ", method.Params)});");
-        }
-        
-        foreach (var _ in model.ClassHierarchy)
-        {
-            tw.Indent --;
-            tw.WriteLine("}");
-        }
-        
-        tw.Flush();
-        return sw.ToString();
-    }
-
-    private static IReadOnlyCollection<FileModel> GetModels(Compilation compilation,
-        in ImmutableArray<MethodDeclarationSyntax?> inputMethods,
-        CancellationToken cancel)
-    {
-        var models = new List<FileModel>();
-
-        var methods = inputMethods
-            .Where(static x => x is not null)
-            .Distinct();
-        
-        var methodModels = methods
-            .Select(x => MethodDeclarationToMethodModel(compilation, x!));
-
-        var groups = methodModels
-            .GroupBy(static x => $"{x.Namespace}.{string.Join(".", x.Classes)}");
-        
-        foreach (var group in groups)
-        {
-            if (cancel.IsCancellationRequested)
-                return new Collection<FileModel>();
-
-            if (group is null)
-                continue;
-            
-            var elems = group.ToList();
-            if (elems.Count is 0)
-                continue;
-
-            var model = new FileModel(
-                methods: elems,
-                ns: elems[0].Namespace,
-                classHierarchy: elems[0].Classes
-            );
-            
-            models.Add(model);
-        }
-
-
-        return models;
-    }
-
-    private static MethodModel MethodDeclarationToMethodModel(Compilation comp, MethodDeclarationSyntax decl)
-    {
-        // SpinWait.SpinUntil(static () => Debugger.IsAttached);
-
-        var semanticModel = comp.GetSemanticModel(decl.SyntaxTree);
-        var methodModel = new MethodModel(
-            @params: decl.ParameterList.Parameters
-                .Where(p => p.Type is not null)
-                .Select(p =>
-                {
-                    var prefix = p.Modifiers.Any(static x => x.IsKind(SyntaxKind.ParamsKeyword))
-                        ? "params "
-                        : string.Empty;
-
-                    var type = semanticModel
-                        .GetTypeInfo(p.Type!)
-                        .Type
-                        ?.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
-
-
-                    var name = p.Identifier.Text;
-
-                    var suffix = string.Empty;
-                    if (p.Default is not null)
-                    {
-                        if (p.Default.Value is LiteralExpressionSyntax)
-                        {
-                            suffix = " = " + p.Default.Value;
-                        }
-                        else if (p.Default.Value is MemberAccessExpressionSyntax maes)
-                        {
-                            var maesSemModel = comp.GetSemanticModel(maes.SyntaxTree);
-                            var sym = maesSemModel.GetSymbolInfo(maes.Name);
-                            if (sym.Symbol is null)
-                            {
-                                suffix = " = " + p.Default.Value;
-                            }
-                            else
-                            {
-                                suffix = " = " + sym.Symbol.ToDisplayString();
-                            }
-                        }
-                    }
-
-                    return $"{prefix}{type} {name}{suffix}";
-                })
-                .ToList(),
-            methodName: decl.Identifier.Text,
-            returnType: decl.ReturnType.ToString(),
-            ns: GetNamespace(decl),
-            classes: GetClasses(decl)
-        );
-
-        return methodModel;
-    }
-
-    //https://github.com/andrewlock/NetEscapades.EnumGenerators/blob/main/src/NetEscapades.EnumGenerators/EnumGenerator.cs
-    static string? GetNamespace(MethodDeclarationSyntax declarationSyntax)
-    {
-        // determine the namespace the class is declared in, if any
-        string? nameSpace = null;
-        var parentOfInterest = declarationSyntax.Parent;
-        while (parentOfInterest is not null)
-        {
-            parentOfInterest = parentOfInterest.Parent;
-            
-            if (parentOfInterest is BaseNamespaceDeclarationSyntax ns)
-            {
-                nameSpace = ns.Name.ToString();
-                while (true)
-                {
-                    if (ns.Parent is not NamespaceDeclarationSyntax parent)
-                    {
-                        break;
-                    }
-
-                    ns = parent;
-                    nameSpace = $"{ns.Name}.{nameSpace}";
-                }
-
-                return nameSpace;
-            }
-            
-        }
-        
-        return nameSpace;
-    }
-    
-    static IReadOnlyCollection<string> GetClasses(MethodDeclarationSyntax declarationSyntax)
-    {
-        // determine the namespace the class is declared in, if any
-        var classes = new LinkedList<string>();
-        var parentOfInterest = declarationSyntax.Parent;
-        while (parentOfInterest is not null)
-        {
-            if (parentOfInterest is ClassDeclarationSyntax cds)
-            {
-                classes.AddFirst(cds.Identifier.ToString());
-            }
-
-            parentOfInterest = parentOfInterest.Parent;
-        }
-
-        Debug.WriteLine($"Method {declarationSyntax.Identifier.Text} has {classes.Count} classes");
-        
-        return classes;
-    }
-
-    private static MethodDeclarationSyntax? Transform(GeneratorSyntaxContext ctx, CancellationToken cancel)
-    {
-        var methodDecl = ctx.Node as MethodDeclarationSyntax;
-        if (methodDecl is null)
-            return default;
-
-        foreach (var attListSyntax in methodDecl.AttributeLists)
-        {
-            foreach (var attSyntax in attListSyntax.Attributes)
-            {
-                if (cancel.IsCancellationRequested)
-                    return default;
-
-                var symbol = ctx.SemanticModel.GetSymbolInfo(attSyntax).Symbol;
-                if (symbol is not IMethodSymbol attSymbol)
-                    continue;
-
-                if (attSymbol.ContainingType.ToDisplayString() == "NadekoBot.Common.CmdAttribute")
-                    return methodDecl;
-            }
-        }
-
-        return default;
-    }
-}

src/NadekoBot.Generators/LocalizedStringsGenerator.cs

@@ -1,32 +1,26 @@
-#nullable enable
-using System;
+using System;
 using System.CodeDom.Compiler;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Text;
 using System.Text.RegularExpressions;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
 using Newtonsoft.Json;
 
 namespace NadekoBot.Generators
 {
-    internal readonly struct TranslationPair
+    internal class TranslationPair
     {
-        public string Name { get; }
-        public string Value { get; }
-
-        public TranslationPair(string name, string value)
-        {
-            Name = name;
-            Value = value;
-        }
+        public string Name { get; set; }
+        public string Value { get; set; }
     }
 
     [Generator]
     public class LocalizedStringsGenerator : ISourceGenerator
     {
-        private const string LOC_STR_SOURCE = @"namespace NadekoBot
+        private const string LocStrSource = @"namespace NadekoBot
 {
     public readonly struct LocStr
     {
@@ -55,14 +49,14 @@ namespace NadekoBot.Generators
             using (var stringWriter = new StringWriter())
             using (var sw = new IndentedTextWriter(stringWriter))
             {
-                sw.WriteLine("namespace NadekoBot;");
-                sw.WriteLine();
+                sw.WriteLine("namespace NadekoBot");
+                sw.WriteLine("{");
+                sw.Indent++;
 
                 sw.WriteLine("public static class strs");
                 sw.WriteLine("{");
                 sw.Indent++;
 
-                var typedParamStrings = new List<string>(10);
                 foreach (var field in fields)
                 {
                     var matches = Regex.Matches(field.Value, @"{(?<num>\d)[}:]");
@@ -72,70 +66,50 @@ namespace NadekoBot.Generators
                         max = Math.Max(max, int.Parse(match.Groups["num"].Value) + 1);
                     }
 
-                    typedParamStrings.Clear();
-                    var typeParams = new string[max];
-                    var passedParamString = string.Empty;
+                    List<string> typedParamStrings = new List<string>();
+                    var paramStrings = string.Empty;
                     for (var i = 0; i < max; i++)
                     {
-                        typedParamStrings.Add($"in T{i} p{i}");
-                        passedParamString += $", p{i}";
-                        typeParams[i] = $"T{i}";
+                        typedParamStrings.Add($"object p{i}");
+                        paramStrings += $", p{i}";
                     }
 
+
                     var sig = string.Empty;
-                    var typeParamStr = string.Empty;
-                    if (max > 0)
-                    {
+                    if(max > 0)
                         sig = $"({string.Join(", ", typedParamStrings)})";
-                        typeParamStr = $"<{string.Join(", ", typeParams)}>";
-                    }
-
-                    sw.WriteLine("public static LocStr {0}{1}{2} => new LocStr(\"{3}\"{4});",
-                        field.Name,
-                        typeParamStr,
-                        sig,
-                        field.Name,
-                        passedParamString);
+                    
+                    sw.WriteLine($"public static LocStr {field.Name}{sig} => new LocStr(\"{field.Name}\"{paramStrings});");
                 }
 
                 sw.Indent--;
                 sw.WriteLine("}");
+                sw.Indent--;
+                sw.WriteLine("}");
 
 
                 sw.Flush();
-                context.AddSource("strs.g.cs", stringWriter.ToString());
+                context.AddSource("strs.cs", stringWriter.ToString());
             }
 
-            context.AddSource("LocStr.g.cs", LOC_STR_SOURCE);
+            context.AddSource("LocStr.cs", LocStrSource);
         }
 
-        private List<TranslationPair> GetFields(string? dataText)
+        private List<TranslationPair> GetFields(string dataText)
         {
             if (string.IsNullOrWhiteSpace(dataText))
-                return new();
+                throw new ArgumentNullException(nameof(dataText));
 
-            Dictionary<string, string> data;
-            try
-            {
-                var output = JsonConvert.DeserializeObject<Dictionary<string, string>>(dataText!);
-                if (output is null)
-                    return new();
-
-                data = output;
-            }
-            catch
-            {
-                Debug.WriteLine("Failed parsing responses file.");
-                return new();
-            }
+            var data = JsonConvert.DeserializeObject<Dictionary<string, string>>(dataText);
 
             var list = new List<TranslationPair>();
             foreach (var entry in data)
             {
-                list.Add(new(
-                    entry.Key,
-                    entry.Value
-                ));
+                list.Add(new TranslationPair()
+                {
+                    Name = entry.Key,
+                    Value = entry.Value
+                });
             }
 
             return list;

src/NadekoBot.Generators/NadekoBot.Generators.csproj

@@ -1,15 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <LangVersion>latest</LangVersion>
         <IncludeBuildOutput>false</IncludeBuildOutput>
-        <IsRoslynComponent>true</IsRoslynComponent>
     </PropertyGroup>
     
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
-        <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" PrivateAssets="all" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" PrivateAssets="all" GeneratePathProperty="true" />
     </ItemGroup>
     

src/NadekoBot.Tests/BotStringsTests.cs

@@ -14,7 +14,6 @@ namespace NadekoBot.Tests
         private const string responsesPath = "../../../../NadekoBot/data/strings/responses";
         private const string commandsPath = "../../../../NadekoBot/data/strings/commands";
         private const string aliasesPath = "../../../../NadekoBot/data/aliases.yml";
-        
         [Test]
         public void AllCommandNamesHaveStrings()
         {
@@ -26,13 +25,15 @@ namespace NadekoBot.Tests
             var culture = new CultureInfo("en-US");
 
             var isSuccess = true;
-            foreach (var (methodName, _) in CommandNameLoadHelper.LoadAliases(aliasesPath))
+            foreach (var entry in CommandNameLoadHelper.LoadCommandNames(aliasesPath))
             {
-                var cmdStrings = strings.GetCommandStrings(culture.Name, methodName);
+                var commandName = entry.Value[0];
+
+                var cmdStrings = strings.GetCommandStrings(culture.Name, commandName);
                 if (cmdStrings is null)
                 {
                     isSuccess = false;
-                    TestContext.Out.WriteLine($"{methodName} doesn't exist in commands.en-US.yml");
+                    TestContext.Out.WriteLine($"{commandName} doesn't exist in commands.en-US.yml");
                 }
             }
 
@@ -40,7 +41,7 @@ namespace NadekoBot.Tests
         }
 
         private static string[] GetCommandMethodNames()
-            => typeof(Bot).Assembly
+            => typeof(NadekoBot.Bot).Assembly
                 .GetExportedTypes()
                 .Where(type => type.IsClass && !type.IsAbstract)
                 .Where(type => typeof(NadekoModule).IsAssignableFrom(type) // if its a top level module
@@ -54,7 +55,7 @@ namespace NadekoBot.Tests
         [Test]
         public void AllCommandMethodsHaveNames()
         {
-            var allAliases = CommandNameLoadHelper.LoadAliases(
+            var allAliases = CommandNameLoadHelper.LoadCommandNames(
                 aliasesPath);
 
             var methodNames = GetCommandMethodNames();
@@ -62,7 +63,7 @@ namespace NadekoBot.Tests
             var isSuccess = true;
             foreach (var methodName in methodNames)
             {
-                if (!allAliases.TryGetValue(methodName, out _))
+                if (!allAliases.TryGetValue(methodName, out var _))
                 {
                     TestContext.Error.WriteLine($"{methodName} is missing an alias.");
                     isSuccess = false;
@@ -75,7 +76,7 @@ namespace NadekoBot.Tests
         [Test]
         public void NoObsoleteAliases()
         {
-            var allAliases = CommandNameLoadHelper.LoadAliases(aliasesPath);
+            var allAliases = CommandNameLoadHelper.LoadCommandNames(aliasesPath);
 
             var methodNames = GetCommandMethodNames()
                 .ToHashSet();
@@ -93,10 +94,7 @@ namespace NadekoBot.Tests
                 }
             }
             
-            if(isSuccess)
-                Assert.Pass();
-            else
-                Assert.Warn("There are some unused entries in data/aliases.yml");
+            Assert.IsTrue(isSuccess);
         }
         
         // [Test]

src/NadekoBot.Tests/GroupGreetTests.cs

@@ -1,6 +1,7 @@
+using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using NadekoBot.Extensions;
 using NadekoBot.Services;
 using NUnit.Framework;
 
@@ -12,7 +13,9 @@ namespace NadekoBot.Tests
 
         [SetUp]
         public void Setup()
-            => _grouper = new GreetGrouper<int>();
+        {
+            _grouper = new GreetGrouper<int>();
+        }
 
         [Test]
         public void CreateTest()
@@ -59,8 +62,8 @@ namespace NadekoBot.Tests
             _grouper.CreateOrAdd(0, 5);
             
             // add 15 items
-            await Enumerable.Range(10, 15)
-                .Select(x => Task.Run(() => _grouper.CreateOrAdd(0, x))).WhenAll();
+            await Task.WhenAll(Enumerable.Range(10, 15)
+                .Select(x => Task.Run(() => _grouper.CreateOrAdd(0, x))));
             
             // get 5 at most
             _grouper.ClearGroup(0, 5, out var items);

src/NadekoBot.Tests/IndexedCollectionTests.cs

@@ -62,10 +62,7 @@ namespace NadekoBot.Tests
             collection.Clear();
 
             Assert.IsTrue(collection.Count == 0, "Collection has not been cleared.");
-            Assert.Throws<ArgumentOutOfRangeException>(() =>
-            {
-                _ = collection[0];
-            }, "Collection has not been cleared.");
+            Assert.Throws<ArgumentOutOfRangeException>(() => collection.Contains(collection[0]), "Collection has not been cleared.");
         }
 
         [Test]
@@ -118,7 +115,7 @@ namespace NadekoBot.Tests
         [Test]
         public void ContainsTest()
         {
-            var subCol = new[]
+            var subCol = new ShopEntry[]
             {
                 new ShopEntry() { Id = 111 },
                 new ShopEntry() { Id = 222 },

src/NadekoBot.Tests/KwumTests.cs

@@ -1,4 +1,5 @@
-using NadekoBot.Common;
+using System.Linq;
+using NadekoBot.Common;
 using NUnit.Framework;
 
 namespace NadekoBot.Tests

src/NadekoBot.Tests/NadekoBot.Tests.csproj

@@ -1,16 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <LangVersion>10.0</LangVersion>
-        <EnablePreviewFeatures>True</EnablePreviewFeatures>
+        <TargetFramework>net5.0</TargetFramework>
+        <LangVersion>9.0</LangVersion>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="NUnit" Version="3.13.3" />
-        <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+        <PackageReference Include="NUnit" Version="3.13.2" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     </ItemGroup>
 
     <ItemGroup>

src/NadekoBot.Tests/Random.cs

@@ -9,8 +9,10 @@ namespace NadekoBot.Tests
     {
         [SetUp]
         public void Setup()
-            => Console.OutputEncoding = Encoding.UTF8;
-
+        {
+            Console.OutputEncoding = Encoding.UTF8;
+        }
+        
         [Test]
         public void Utf8CodepointsToEmoji()
         {

src/NadekoBot.VotesApi/Common/AuthHandler.cs

@@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using NadekoBot.VotesApi.Controllers;
 
 namespace NadekoBot.VotesApi
 {
@@ -23,7 +24,9 @@ namespace NadekoBot.VotesApi
             ISystemClock clock,
             IConfiguration conf)
             : base(options, logger, encoder, clock)
-            => _conf = conf;
+        {
+            _conf = conf;
+        }
 
         protected override Task<AuthenticateResult> HandleAuthenticateAsync()
         {

src/NadekoBot.VotesApi/Common/TopggVoteWebhookModel.cs

@@ -23,7 +23,7 @@
         public bool Weekend { get; set; }
         
         /// <summary>
-        /// Query string params found on the /bot/:ID/vote page. Example: ?a=1&amp;b=2.
+        /// Query string params found on the /bot/:ID/vote page. Example: ?a=1&b=2.
         /// </summary>
         public string Query { get; set; }
     }

src/NadekoBot.VotesApi/Controllers/DiscordsController.cs

@@ -11,10 +11,10 @@ namespace NadekoBot.VotesApi.Controllers
     [Route("[controller]")]
     public class DiscordsController : ControllerBase
     {
-        private readonly ILogger<DiscordsController> _logger;
+        private readonly ILogger<TopGgController> _logger;
         private readonly IVotesCache _cache;
 
-        public DiscordsController(ILogger<DiscordsController> logger, IVotesCache cache)
+        public DiscordsController(ILogger<TopGgController> logger, IVotesCache cache)
         {
             _logger = logger;
             _cache = cache;
@@ -26,7 +26,7 @@ namespace NadekoBot.VotesApi.Controllers
         {
             var votes = await _cache.GetNewDiscordsVotesAsync();
             if(votes.Count > 0)
-                _logger.LogInformation("Sending {NewDiscordsVotes} new discords votes", votes.Count);
+                _logger.LogInformation("Sending {NewDiscordsVotes} new discords votes.", votes.Count);
             return votes;
         }
     }

src/NadekoBot.VotesApi/Controllers/TopGgController.cs

@@ -26,7 +26,7 @@ namespace NadekoBot.VotesApi.Controllers
         {
             var votes = await _cache.GetNewTopGgVotesAsync();
             if(votes.Count > 0)
-                _logger.LogInformation("Sending {NewTopggVotes} new topgg votes", votes.Count);
+                _logger.LogInformation("Sending {NewTopggVotes} new topgg votes.", votes.Count);
             
             return votes;
         }

src/NadekoBot.VotesApi/Controllers/WebhookController.cs

@@ -1,6 +1,8 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using NadekoBot.VotesApi.Services;
 
@@ -11,11 +13,13 @@ namespace NadekoBot.VotesApi.Controllers
     {
         private readonly ILogger<WebhookController> _logger;
         private readonly IVotesCache _votesCache;
+        private readonly IConfiguration _conf;
 
-        public WebhookController(ILogger<WebhookController> logger, IVotesCache votesCache)
+        public WebhookController(ILogger<WebhookController> logger, IVotesCache votesCache, IConfiguration conf)
         {
             _logger = logger;
             _votesCache = votesCache;
+            _conf = conf;
         }
         
         [HttpPost("/discordswebhook")]

src/NadekoBot.VotesApi/NadekoBot.VotesApi.csproj

@@ -1,13 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="MorseCode.ITask" Version="2.0.3" />
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.1" />
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
     </ItemGroup>
 
 </Project>

src/NadekoBot.VotesApi/Program.cs

@@ -1,9 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
-using NadekoBot.VotesApi;
+using Microsoft.Extensions.Logging;
 
-CreateHostBuilder(args).Build().Run();
+namespace NadekoBot.VotesApi
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            CreateHostBuilder(args).Build().Run();
+        }
 
-static IHostBuilder CreateHostBuilder(string[] args) =>
-    Host.CreateDefaultBuilder(args)
-        .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); });
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); });
+    }
+}

src/NadekoBot.VotesApi/Services/FileVotesCache.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.Json;
@@ -9,33 +10,37 @@ namespace NadekoBot.VotesApi.Services
 {
     public class FileVotesCache : IVotesCache
     {
-        // private const string STATS_FILE = "store/stats.json";
-        private const string TOPGG_FILE = "store/topgg.json";
-        private const string DISCORDS_FILE = "store/discords.json";
+        private const string statsFile = "store/stats.json";
+        private const string topggFile = "store/topgg.json";
+        private const string discordsFile = "store/discords.json";
 
-        private readonly SemaphoreSlim _locker = new SemaphoreSlim(1, 1);
+        private readonly SemaphoreSlim locker = new SemaphoreSlim(1, 1);
 
         public FileVotesCache()
         {
             if (!Directory.Exists("store"))
                 Directory.CreateDirectory("store");
             
-            if(!File.Exists(TOPGG_FILE))
-                File.WriteAllText(TOPGG_FILE, "[]");
+            if(!File.Exists(topggFile))
+                File.WriteAllText(topggFile, "[]");
             
-            if(!File.Exists(DISCORDS_FILE))
-                File.WriteAllText(DISCORDS_FILE, "[]");
+            if(!File.Exists(discordsFile))
+                File.WriteAllText(discordsFile, "[]");
         }
 
         public ITask AddNewTopggVote(string userId)
-            => AddNewVote(TOPGG_FILE, userId);
-
+        {
+            return AddNewVote(topggFile, userId);
+        }
+        
         public ITask AddNewDiscordsVote(string userId)
-            => AddNewVote(DISCORDS_FILE, userId);
+        {
+            return AddNewVote(discordsFile, userId);
+        }
 
         private async ITask AddNewVote(string file, string userId)
         {
-            await _locker.WaitAsync();
+            await locker.WaitAsync();
             try
             {
                 var votes = await GetVotesAsync(file);
@@ -44,7 +49,7 @@ namespace NadekoBot.VotesApi.Services
             }
             finally
             {
-                _locker.Release();
+                locker.Release();
             }
         }
 
@@ -61,14 +66,14 @@ namespace NadekoBot.VotesApi.Services
         }
 
         private ITask<List<Vote>> EvictTopggVotes()
-            => EvictVotes(TOPGG_FILE);
+            => EvictVotes(topggFile);
 
         private ITask<List<Vote>> EvictDiscordsVotes()
-            => EvictVotes(DISCORDS_FILE);
+            => EvictVotes(discordsFile);
 
         private async ITask<List<Vote>> EvictVotes(string file)
         {
-            await _locker.WaitAsync();
+            await locker.WaitAsync();
             try
             {
 
@@ -86,7 +91,7 @@ namespace NadekoBot.VotesApi.Services
             }
             finally
             {
-                _locker.Release();
+                locker.Release();
             }
         }
 

src/NadekoBot.VotesApi/Startup.cs

@@ -11,18 +11,19 @@ namespace NadekoBot.VotesApi
 {
     public class Startup
     {
-        public IConfiguration Configuration { get; }
-        
         public Startup(IConfiguration configuration)
-            => Configuration = configuration;
+        {
+            Configuration = configuration;
+        }
 
+        public IConfiguration Configuration { get; }
 
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddControllers();
             services.AddSingleton<IVotesCache, FileVotesCache>();
-            services.AddSwaggerGen(static c =>
+            services.AddSwaggerGen(c =>
             {
                 c.SwaggerDoc("v1", new OpenApiInfo { Title = "NadekoBot.VotesApi", Version = "v1" });
             });
@@ -35,13 +36,13 @@ namespace NadekoBot.VotesApi
                 });
             
             services
-                .AddAuthorization(static opts =>
+                .AddAuthorization(opts =>
                 {
                     opts.DefaultPolicy = new AuthorizationPolicyBuilder(AuthHandler.SchemeName)
-                        .RequireAssertion(static _ => false)
+                        .RequireAssertion(x => false)
                         .Build();
-                    opts.AddPolicy(Policies.DiscordsAuth, static policy => policy.RequireClaim(AuthHandler.DiscordsClaim));
-                    opts.AddPolicy(Policies.TopggAuth, static policy => policy.RequireClaim(AuthHandler.TopggClaim));
+                    opts.AddPolicy(Policies.DiscordsAuth, policy => policy.RequireClaim(AuthHandler.DiscordsClaim));
+                    opts.AddPolicy(Policies.TopggAuth, policy => policy.RequireClaim(AuthHandler.TopggClaim));
                 });
         }
 
@@ -52,7 +53,7 @@ namespace NadekoBot.VotesApi
             {
                 app.UseDeveloperExceptionPage();
                 app.UseSwagger();
-                app.UseSwaggerUI(static c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "NadekoBot.VotesApi v1"));
+                app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "NadekoBot.VotesApi v1"));
             }
 
             app.UseHttpsRedirection();
@@ -62,7 +63,7 @@ namespace NadekoBot.VotesApi
             app.UseAuthentication();
             app.UseAuthorization();
 
-            app.UseEndpoints(static endpoints => { endpoints.MapControllers(); });
+            app.UseEndpoints(endpoints => { endpoints.MapControllers(); });
         }
     }
 }

src/NadekoBot.VotesApi/WeatherForecast.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace NadekoBot.VotesApi
 {
     public class Vote

src/NadekoBot/.editorconfig

@@ -1,359 +0,0 @@
-root = true
-# Remove the line below if you want to inherit .editorconfig settings from higher directories
-
-[obj/**]
-generated_code = true
-
-# C# files
-[*.cs]
-
-
-#### Core EditorConfig Options ####
-
-# Indentation and spacing
-indent_size = 4
-indent_style = space
-tab_width = 4
-
-# New line preferences
-end_of_line = crlf
-insert_final_newline = false
-
-#### .NET Coding Conventions ####
-
-# Organize usings
-dotnet_separate_import_directive_groups = false
-dotnet_sort_system_directives_first = false
-
-# this. and Me. preferences
-dotnet_style_qualification_for_event = false
-dotnet_style_qualification_for_field = false
-dotnet_style_qualification_for_method = false
-dotnet_style_qualification_for_property = false
-
-# Language keywords vs BCL types preferences
-dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
-dotnet_style_predefined_type_for_member_access = true:suggestion
-
-# Parentheses preferences
-dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:warning
-dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:warning
-dotnet_style_parentheses_in_other_operators = never_if_unnecessary
-dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:warning
-
-# Modifier preferences
-dotnet_style_require_accessibility_modifiers = always:error
-
-# Expression-level preferences
-dotnet_style_coalesce_expression = true
-dotnet_style_collection_initializer = true
-dotnet_style_explicit_tuple_names = true
-dotnet_style_namespace_match_folder = true
-dotnet_style_null_propagation = true
-dotnet_style_object_initializer = true
-dotnet_style_operator_placement_when_wrapping = beginning_of_line
-dotnet_style_prefer_auto_properties = true:warning
-dotnet_style_prefer_compound_assignment = true
-dotnet_style_prefer_conditional_expression_over_assignment = false:suggestion
-dotnet_style_prefer_conditional_expression_over_return = false:suggestion
-dotnet_style_prefer_inferred_anonymous_type_member_names = true
-dotnet_style_prefer_inferred_tuple_names = true
-dotnet_style_prefer_is_null_check_over_reference_equality_method = true:error
-dotnet_style_prefer_simplified_boolean_expressions = true
-dotnet_style_prefer_simplified_interpolation = true
-
-# Field preferences
-dotnet_style_readonly_field = true:suggestion
-
-# Parameter preferences
-dotnet_code_quality_unused_parameters = all:warning
-
-#### C# Coding Conventions ####
-
-# var preferences
-csharp_style_var_elsewhere = true
-csharp_style_var_for_built_in_types = true:suggestion
-csharp_style_var_when_type_is_apparent = true:suggestion
-
-# Expression-bodied members
-csharp_style_expression_bodied_accessors = true:suggestion
-csharp_style_expression_bodied_constructors = when_on_single_line:suggestion
-csharp_style_expression_bodied_indexers = true:suggestion
-csharp_style_expression_bodied_lambdas = true:suggestion
-csharp_style_expression_bodied_local_functions = true:suggestion
-csharp_style_expression_bodied_methods = when_on_single_line:suggestion
-csharp_style_expression_bodied_operators = when_on_single_line:suggestion
-csharp_style_expression_bodied_properties = true:suggestion
-
-# Pattern matching preferences
-csharp_style_pattern_matching_over_as_with_null_check = true:error
-csharp_style_pattern_matching_over_is_with_cast_check = true:error
-csharp_style_prefer_not_pattern = true:error
-csharp_style_prefer_pattern_matching = true:suggestion
-csharp_style_prefer_switch_expression = true
-
-# Null-checking preferences
-csharp_style_conditional_delegate_call = true:error
-
-# Modifier preferences
-csharp_prefer_static_local_function = true
-csharp_preferred_modifier_order = public, private, protected, internal, static, extern, new, virtual, abstract, sealed, override, readonly, unsafe, volatile, async
-
-# Code-block preferences
-csharp_prefer_braces = when_multiline:warning
-csharp_prefer_simple_using_statement = true
-
-# Expression-level preferences
-csharp_prefer_simple_default_expression = true
-csharp_style_deconstructed_variable_declaration = true
-csharp_style_implicit_object_creation_when_type_is_apparent = true:error
-csharp_style_inlined_variable_declaration = true:warning
-csharp_style_pattern_local_over_anonymous_function = true
-csharp_style_prefer_index_operator = true
-csharp_style_prefer_range_operator = true
-csharp_style_throw_expression = true:error
-csharp_style_unused_value_assignment_preference = discard_variable:warning
-csharp_style_unused_value_expression_statement_preference = discard_variable
-
-# 'using' directive preferences
-csharp_using_directive_placement = outside_namespace:error
-
-# Enforce file-scoped namespaces
-csharp_style_namespace_declarations = file_scoped:error
-
-# New line preferences
-csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
-csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false
-csharp_style_allow_embedded_statements_on_same_line_experimental = false
-
-#### C# Formatting Rules ####
-
-# New line preferences
-csharp_new_line_before_catch = true
-csharp_new_line_before_else = true
-csharp_new_line_before_finally = true
-csharp_new_line_before_members_in_anonymous_types = true
-csharp_new_line_before_members_in_object_initializers = true
-csharp_new_line_before_open_brace = all
-csharp_new_line_between_query_expression_clauses = true
-
-# Indentation preferences
-csharp_indent_block_contents = true
-csharp_indent_braces = false
-csharp_indent_case_contents = true
-csharp_indent_case_contents_when_block = true
-csharp_indent_labels = one_less_than_current
-csharp_indent_switch_labels = true
-
-# Space preferences
-csharp_space_after_cast = false
-csharp_space_after_colon_in_inheritance_clause = true
-csharp_space_after_comma = true
-csharp_space_after_dot = false
-csharp_space_after_keywords_in_control_flow_statements = true
-csharp_space_after_semicolon_in_for_statement = true
-csharp_space_around_binary_operators = before_and_after
-csharp_space_around_declaration_statements = false
-csharp_space_before_colon_in_inheritance_clause = true
-csharp_space_before_comma = false
-csharp_space_before_dot = false
-csharp_space_before_open_square_brackets = false
-csharp_space_before_semicolon_in_for_statement = false
-csharp_space_between_empty_square_brackets = false
-csharp_space_between_method_call_empty_parameter_list_parentheses = false
-csharp_space_between_method_call_name_and_opening_parenthesis = false
-csharp_space_between_method_call_parameter_list_parentheses = false
-csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
-csharp_space_between_method_declaration_name_and_open_parenthesis = false
-csharp_space_between_method_declaration_parameter_list_parentheses = false
-csharp_space_between_parentheses = false
-csharp_space_between_square_brackets = false
-
-# Wrapping preferences
-csharp_preserve_single_line_blocks = true
-csharp_preserve_single_line_statements = false
-
-#### Naming styles ####
-
-# Naming rules
-
-dotnet_naming_rule.private_readonly_field.symbols = private_readonly_field
-dotnet_naming_rule.private_readonly_field.style = begins_with_underscore
-dotnet_naming_rule.private_readonly_field.severity = warning
-
-dotnet_naming_rule.private_field.symbols = private_field
-dotnet_naming_rule.private_field.style = camel_case
-dotnet_naming_rule.private_field.severity = warning
-
-dotnet_naming_rule.const_fields.symbols = const_fields
-dotnet_naming_rule.const_fields.style = all_upper
-dotnet_naming_rule.const_fields.severity = warning
-
-# dotnet_naming_rule.class_should_be_pascal_case.severity = error
-# dotnet_naming_rule.class_should_be_pascal_case.symbols = class
-# dotnet_naming_rule.class_should_be_pascal_case.style = pascal_case
-
-dotnet_naming_rule.struct_should_be_pascal_case.severity = error
-dotnet_naming_rule.struct_should_be_pascal_case.symbols = struct
-dotnet_naming_rule.struct_should_be_pascal_case.style = pascal_case
-
-dotnet_naming_rule.interface_should_be_begins_with_i.severity = error
-dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
-dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
-
-# dotnet_naming_rule.types_should_be_pascal_case.severity = error
-# dotnet_naming_rule.types_should_be_pascal_case.symbols = types
-# dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
-
-# dotnet_naming_rule.enum_should_be_pascal_case.severity = error
-# dotnet_naming_rule.enum_should_be_pascal_case.symbols = enum
-# dotnet_naming_rule.enum_should_be_pascal_case.style = pascal_case
-
-# dotnet_naming_rule.property_should_be_pascal_case.severity = error
-# dotnet_naming_rule.property_should_be_pascal_case.symbols = property
-# dotnet_naming_rule.property_should_be_pascal_case.style = pascal_case
-
-dotnet_naming_rule.method_should_be_pascal_case.severity = error
-dotnet_naming_rule.method_should_be_pascal_case.symbols = method
-dotnet_naming_rule.method_should_be_pascal_case.style = pascal_case
-
-dotnet_naming_rule.async_method_should_be_ends_with_async.severity = error
-dotnet_naming_rule.async_method_should_be_ends_with_async.symbols = async_method
-dotnet_naming_rule.async_method_should_be_ends_with_async.style = ends_with_async
-
-# dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = error
-# dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
-# dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
-
-dotnet_naming_rule.local_variable_should_be_camel_case.severity = error
-dotnet_naming_rule.local_variable_should_be_camel_case.symbols = local_variable
-dotnet_naming_rule.local_variable_should_be_camel_case.style = camel_case
-
-# Symbol specifications
-
-dotnet_naming_symbols.const_fields.required_modifiers = const
-dotnet_naming_symbols.const_fields.applicable_kinds = field
-
-dotnet_naming_symbols.class.applicable_kinds = class
-dotnet_naming_symbols.class.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.class.required_modifiers =
-
-dotnet_naming_symbols.interface.applicable_kinds = interface
-dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.interface.required_modifiers =
-
-dotnet_naming_symbols.struct.applicable_kinds = struct
-dotnet_naming_symbols.struct.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.struct.required_modifiers =
-
-dotnet_naming_symbols.enum.applicable_kinds = enum
-dotnet_naming_symbols.enum.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.enum.required_modifiers =
-
-dotnet_naming_symbols.method.applicable_kinds = method
-dotnet_naming_symbols.method.applicable_accessibilities = public
-dotnet_naming_symbols.method.required_modifiers =
-
-dotnet_naming_symbols.property.applicable_kinds = property
-dotnet_naming_symbols.property.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.property.required_modifiers =
-
-dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
-dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.types.required_modifiers =
-
-dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
-dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.non_field_members.required_modifiers =
-
-dotnet_naming_symbols.private_readonly_field.applicable_kinds = field
-dotnet_naming_symbols.private_readonly_field.applicable_accessibilities = private, protected
-dotnet_naming_symbols.private_readonly_field.required_modifiers = readonly
-
-dotnet_naming_symbols.private_field.applicable_kinds = field
-dotnet_naming_symbols.private_field.applicable_accessibilities = private, protected
-dotnet_naming_symbols.private_field.required_modifiers =
-
-dotnet_naming_symbols.async_method.applicable_kinds = method, local_function
-dotnet_naming_symbols.async_method.applicable_accessibilities = *
-dotnet_naming_symbols.async_method.required_modifiers = async
-
-dotnet_naming_symbols.local_variable.applicable_kinds = parameter, local
-dotnet_naming_symbols.local_variable.applicable_accessibilities = local
-dotnet_naming_symbols.local_variable.required_modifiers =
-
-# Naming styles
-
-
-dotnet_naming_style.all_upper.capitalization = all_upper
-
-dotnet_naming_style.pascal_case.required_prefix =
-dotnet_naming_style.pascal_case.required_suffix =
-dotnet_naming_style.pascal_case.word_separator =
-dotnet_naming_style.pascal_case.capitalization = pascal_case
-
-dotnet_naming_style.begins_with_i.required_prefix = I
-dotnet_naming_style.begins_with_i.required_suffix =
-dotnet_naming_style.begins_with_i.word_separator =
-dotnet_naming_style.begins_with_i.capitalization = pascal_case
-
-dotnet_naming_style.begins_with_underscore.required_prefix = _
-dotnet_naming_style.begins_with_underscore.required_suffix =
-dotnet_naming_style.begins_with_underscore.word_separator =
-dotnet_naming_style.begins_with_underscore.capitalization = camel_case
-
-dotnet_naming_style.ends_with_async.required_prefix =
-# dotnet_naming_style.ends_with_async.required_suffix = Async
-dotnet_naming_style.ends_with_async.word_separator =
-dotnet_naming_style.ends_with_async.capitalization = pascal_case
-
-dotnet_naming_style.camel_case.required_prefix =
-dotnet_naming_style.camel_case.required_suffix =
-dotnet_naming_style.camel_case.word_separator =
-dotnet_naming_style.camel_case.capitalization = camel_case
-
-# CA1822: Mark members as static
-dotnet_diagnostic.ca1822.severity = suggestion
-
-# IDE0004: Cast is redundant
-dotnet_diagnostic.ide0004.severity = warning
-
-# IDE0058: Expression value is never used
-dotnet_diagnostic.ide0058.severity = none
-
-# # IDE0011: Add braces to 'if'/'else' statement
-# dotnet_diagnostic.ide0011.severity = none
-
-resharper_wrap_after_invocation_lpar = false
-resharper_wrap_before_invocation_rpar = false
-
-# ReSharper properties
-resharper_align_multiline_calls_chain = true
-resharper_csharp_wrap_after_declaration_lpar = true
-resharper_csharp_wrap_after_invocation_lpar = false
-resharper_csharp_wrap_before_binary_opsign = true
-resharper_csharp_wrap_before_invocation_rpar = false
-resharper_csharp_wrap_parameters_style = chop_if_long
-resharper_force_chop_compound_if_expression = false
-resharper_keep_existing_linebreaks = true
-resharper_keep_user_linebreaks = true
-resharper_max_formal_parameters_on_line = 3
-resharper_place_simple_embedded_statement_on_same_line = false
-resharper_wrap_chained_binary_expressions = chop_if_long
-resharper_wrap_chained_binary_patterns = chop_if_long
-resharper_wrap_chained_method_calls = chop_if_long
-resharper_wrap_object_and_collection_initializer_style = chop_always
-
-resharper_csharp_wrap_before_first_type_parameter_constraint = true
-resharper_csharp_place_type_constraints_on_same_line = false
-resharper_csharp_wrap_before_extends_colon = true
-resharper_csharp_place_constructor_initializer_on_same_line = false
-resharper_force_attribute_style = separate
-resharper_csharp_braces_for_ifelse = required_for_multiline_statement
-resharper_csharp_braces_for_foreach = required_for_multiline
-resharper_csharp_braces_for_while = required_for_multiline
-resharper_csharp_braces_for_for = required_for_multiline
-resharper_arrange_redundant_parentheses_highlighting = hint
-
-# IDE0011: Add braces
-dotnet_diagnostic.IDE0011.severity = warning

src/NadekoBot/Bot.cs

@@ -1,395 +1,365 @@
-#nullable disable
+using Discord;
+using Discord.Commands;
+using Discord.WebSocket;
 using Microsoft.Extensions.DependencyInjection;
-using NadekoBot.Common.Configs;
-using NadekoBot.Common.ModuleBehaviors;
-using NadekoBot.Db;
-using NadekoBot.Modules.Administration;
-using NadekoBot.Modules.Utility;
+using NadekoBot.Common;
+using NadekoBot.Services;
 using NadekoBot.Services.Database.Models;
+using NadekoBot.Extensions;
+using System;
+using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics;
-using System.Net;
+using System.Linq;
+using System.Net.Http;
 using System.Reflection;
-using RunMode = Discord.Commands.RunMode;
+using System.Threading.Tasks;
+using Discord.Net;
+using NadekoBot.Common.ModuleBehaviors;
+using NadekoBot.Common.Configs;
+using NadekoBot.Db;
+using NadekoBot.Modules.Administration.Services;
+using NadekoBot.Modules.Searches;
+using Serilog;
 
-namespace NadekoBot;
-
-public sealed class Bot
+namespace NadekoBot
 {
-    public event Func<GuildConfig, Task> JoinedGuild = delegate { return Task.CompletedTask; };
-
-    public DiscordSocketClient Client { get; }
-    public ImmutableArray<GuildConfig> AllGuildConfigs { get; private set; }
-
-    private IServiceProvider Services { get; set; }
-
-    public string Mention { get; private set; }
-    public bool IsReady { get; private set; }
-    public int ShardId { get; set; }
-
-    private readonly IBotCredentials _creds;
-    private readonly CommandService _commandService;
-    private readonly DbService _db;
-
-    private readonly IBotCredsProvider _credsProvider;
-    // private readonly InteractionService _interactionService;
-
-    public Bot(int shardId, int? totalShards)
+    public sealed class Bot
     {
-        if (shardId < 0)
-            throw new ArgumentOutOfRangeException(nameof(shardId));
-
-        ShardId = shardId;
-        _credsProvider = new BotCredsProvider(totalShards);
-        _creds = _credsProvider.GetCreds();
-
-        _db = new(_credsProvider);
-
-        var messageCacheSize =
-#if GLOBAL_NADEKO
-            0;
-#else
-            50;
-#endif
-
-        if(!_creds.UsePrivilegedIntents)
-            Log.Warning("You are not using privileged intents. Some features will not work properly");
+        private readonly IBotCredentials _creds;
+        private readonly CommandService _commandService;
+        private readonly DbService _db;
+        private readonly IBotCredsProvider _credsProvider;
         
-        Client = new(new()
+        public event Func<GuildConfig, Task> JoinedGuild = delegate { return Task.CompletedTask; };
+        
+        public DiscordSocketClient Client { get; }
+        public ImmutableArray<GuildConfig> AllGuildConfigs { get; private set; }
+
+        private IServiceProvider Services { get; set; }
+        
+        public string Mention { get; private set; }
+        public bool IsReady { get; private set; }
+
+        public Bot(int shardId, int? totalShards)
         {
-            MessageCacheSize = messageCacheSize,
-            LogLevel = LogSeverity.Warning,
-            ConnectionTimeout = int.MaxValue,
-            TotalShards = _creds.TotalShards,
-            ShardId = shardId,
-            AlwaysDownloadUsers = false,
-            AlwaysResolveStickers = false,
-            AlwaysDownloadDefaultStickers = false,
-            GatewayIntents = _creds.UsePrivilegedIntents
-                ? GatewayIntents.All
-                : GatewayIntents.AllUnprivileged,
-            LogGatewayIntentWarnings = false,
-            FormatUsersInBidirectionalUnicode = false,
-        });
+            if (shardId < 0)
+                throw new ArgumentOutOfRangeException(nameof(shardId));
 
-        _commandService = new(new()
-        {
-            CaseSensitiveCommands = false,
-            DefaultRunMode = RunMode.Sync,
-        });
+            _credsProvider = new BotCredsProvider(totalShards);
+            _creds = _credsProvider.GetCreds();
+            
+            _db = new DbService(_creds);
 
-        // _interactionService = new(Client.Rest);
+            if (shardId == 0)
+            {
+                _db.Setup();
+            }
 
-        Client.Log += Client_Log;
-    }
+            Client = new DiscordSocketClient(new DiscordSocketConfig
+            {
+                MessageCacheSize = 50,
+                LogLevel = LogSeverity.Warning,
+                ConnectionTimeout = int.MaxValue,
+                TotalShards = _creds.TotalShards,
+                ShardId = shardId,
+                AlwaysDownloadUsers = false,
+                ExclusiveBulkDelete = true,
+            });
 
+            _commandService = new CommandService(new CommandServiceConfig()
+            {
+                CaseSensitiveCommands = false,
+                DefaultRunMode = RunMode.Sync,
+            });
 
-    public List<ulong> GetCurrentGuildIds()
-        => Client.Guilds.Select(x => x.Id).ToList();
-
-    private void AddServices()
-    {
-        var startingGuildIdList = GetCurrentGuildIds();
-        var sw = Stopwatch.StartNew();
-        var bot = Client.CurrentUser;
-
-        using (var uow = _db.GetDbContext())
-        {
-            uow.EnsureUserCreated(bot.Id, bot.Username, bot.Discriminator, bot.AvatarId);
-            AllGuildConfigs = uow.GuildConfigs.GetAllGuildConfigs(startingGuildIdList).ToImmutableArray();
+#if GLOBAL_NADEKO || DEBUG
+            Client.Log += Client_Log;
+#endif
         }
 
-        var svcs = new ServiceCollection().AddTransient(_ => _credsProvider.GetCreds()) // bot creds
-                                          .AddSingleton(_credsProvider)
-                                          .AddSingleton(_db) // database
-                                          .AddRedis(_creds.RedisOptions) // redis
-                                          .AddSingleton(Client) // discord socket client
-                                          .AddSingleton(_commandService)
-                                          // .AddSingleton(_interactionService)
-                                          .AddSingleton(this)
-                                          .AddSingleton<ISeria, JsonSeria>()
-                                          .AddSingleton<IPubSub, RedisPubSub>()
-                                          .AddSingleton<IConfigSeria, YamlSeria>()
-                                          .AddBotStringsServices(_creds.TotalShards)
-                                          .AddConfigServices()
-                                          .AddConfigMigrators()
-                                          .AddMemoryCache()
-                                          // music
-                                          .AddMusic();
-        // admin
-#if GLOBAL_NADEKO
-        svcs.AddSingleton<ILogCommandService, DummyLogCommandService>();
-#endif
+        public List<ulong> GetCurrentGuildIds()
+        {
+            return Client.Guilds.Select(x => x.Id).ToList();
+        }
 
-        svcs.AddHttpClient();
-        svcs.AddHttpClient("memelist")
-            .ConfigurePrimaryHttpMessageHandler(() => new HttpClientHandler
+        private void AddServices()
+        {
+            var startingGuildIdList = GetCurrentGuildIds();
+            var sw = Stopwatch.StartNew();
+            var _bot = Client.CurrentUser;
+
+            using (var uow = _db.GetDbContext())
+            {
+                uow.EnsureUserCreated(_bot.Id, _bot.Username, _bot.Discriminator, _bot.AvatarId);
+                AllGuildConfigs = uow.GuildConfigs.GetAllGuildConfigs(startingGuildIdList).ToImmutableArray();
+            }
+            
+            var svcs = new ServiceCollection()
+                .AddTransient<IBotCredentials>(_ => _credsProvider.GetCreds()) // bot creds
+                .AddSingleton<IBotCredsProvider>(_credsProvider)
+                .AddSingleton(_db) // database
+                .AddRedis(_creds.RedisOptions) // redis
+                .AddSingleton(Client) // discord socket client
+                .AddSingleton(_commandService)
+                .AddSingleton(this)
+                .AddSingleton<ISeria, JsonSeria>()
+                .AddSingleton<IPubSub, RedisPubSub>()
+                .AddSingleton<IConfigSeria, YamlSeria>()
+                .AddBotStringsServices(_creds.TotalShards)
+                .AddConfigServices()
+                .AddConfigMigrators()
+                .AddMemoryCache()
+                // music
+                .AddMusic()
+                // admin
+#if GLOBAL_NADEKO
+                .AddSingleton<ILogCommandService, DummyLogCommandService>()
+#else
+                .AddSingleton<ILogCommandService, LogCommandService>()
+#endif
+                ;
+
+            svcs.AddHttpClient();
+            svcs.AddHttpClient("memelist").ConfigurePrimaryHttpMessageHandler(() => new HttpClientHandler
             {
                 AllowAutoRedirect = false
             });
-        
-        svcs.AddHttpClient("google:search")
-            .ConfigurePrimaryHttpMessageHandler(() => new HttpClientHandler()
+
+            if (Environment.GetEnvironmentVariable("NADEKOBOT_IS_COORDINATED") != "1")
             {
-                AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
-            });
+                svcs.AddSingleton<ICoordinator, SingleProcessCoordinator>();
+            }
+            else
+            {
+                svcs.AddSingleton<RemoteGrpcCoordinator>()
+                    .AddSingleton<ICoordinator>(x => x.GetRequiredService<RemoteGrpcCoordinator>())
+                    .AddSingleton<IReadyExecutor>(x => x.GetRequiredService<RemoteGrpcCoordinator>());
+            }
 
-        if (Environment.GetEnvironmentVariable("NADEKOBOT_IS_COORDINATED") != "1")
-            svcs.AddSingleton<ICoordinator, SingleProcessCoordinator>();
-        else
-        {
-            svcs.AddSingleton<RemoteGrpcCoordinator>()
-                .AddSingleton<ICoordinator>(x => x.GetRequiredService<RemoteGrpcCoordinator>())
-                .AddSingleton<IReadyExecutor>(x => x.GetRequiredService<RemoteGrpcCoordinator>());
-        }
-
-        svcs.AddSingleton<RedisLocalDataCache>()
-            .AddSingleton<ILocalDataCache>(x => x.GetRequiredService<RedisLocalDataCache>())
-            .AddSingleton<RedisImagesCache>()
-            .AddSingleton<IImageCache>(x => x.GetRequiredService<RedisImagesCache>())
-            .AddSingleton<IReadyExecutor>(x => x.GetRequiredService<RedisImagesCache>())
-            .AddSingleton<IDataCache, RedisCache>();
-
-        svcs.Scan(scan => scan.FromAssemblyOf<IReadyExecutor>()
-                              .AddClasses(classes => classes.AssignableToAny(
-                                      // services
-                                      typeof(INService),
-
-                                      // behaviours
-                                      typeof(IExecOnMessage),
-                                      typeof(IInputTransformer),
-                                      typeof(IExecPreCommand),
-                                      typeof(IExecPostCommand),
-                                      typeof(IExecNoCommand))
-                                                .WithoutAttribute<DontAddToIocContainerAttribute>()
+            svcs.AddSingleton<RedisLocalDataCache>()
+                .AddSingleton<ILocalDataCache>(x => x.GetRequiredService<RedisLocalDataCache>())
+                .AddSingleton<RedisImagesCache>()
+                .AddSingleton<IImageCache>(x => x.GetRequiredService<RedisImagesCache>())
+                .AddSingleton<IReadyExecutor>(x => x.GetRequiredService<RedisImagesCache>())
+                .AddSingleton<IDataCache, RedisCache>();
+            
+            svcs.Scan(scan => scan
+                .FromAssemblyOf<IReadyExecutor>()
+                .AddClasses(classes => classes
+                        .AssignableToAny(
+                    // services
+                    typeof(INService),
+                    
+                    // behaviours
+                    typeof(IEarlyBehavior),
+                    typeof(ILateBlocker),
+                    typeof(IInputTransformer),
+                    typeof(ILateExecutor))
 #if GLOBAL_NADEKO
-                                                .WithoutAttribute<NoPublicBotAttribute>()
+                    .WithoutAttribute<NoPublicBotAttribute>()
 #endif
-                              )
-                              .AsSelfWithInterfaces()
-                              .WithSingletonLifetime());
+                )
+                .AsSelfWithInterfaces()
+                .WithSingletonLifetime()
+            );
 
-        //initialize Services
-        Services = svcs.BuildServiceProvider();
-        Services.GetRequiredService<IBehaviorHandler>().Initialize();
-        Services.GetRequiredService<CurrencyRewardService>();
+            //initialize Services
+            Services = svcs.BuildServiceProvider();
+            var exec = Services.GetRequiredService<IBehaviourExecutor>();
+            exec.Initialize();
 
-        if (Client.ShardId == 0)
-            ApplyConfigMigrations();
+            if (Client.ShardId == 0)
+            {
+                ApplyConfigMigrations();
+            }
+            
+            _ = LoadTypeReaders(typeof(Bot).Assembly);
 
-        _ = LoadTypeReaders(typeof(Bot).Assembly);
-
-        sw.Stop();
-        Log.Information( "All services loaded in {ServiceLoadTime:F2}s", sw.Elapsed.TotalSeconds);
-    }
-
-    private void ApplyConfigMigrations()
-    {
-        // execute all migrators
-        var migrators = Services.GetServices<IConfigMigrator>();
-        foreach (var migrator in migrators)
-            migrator.EnsureMigrated();
-    }
-
-    private IEnumerable<object> LoadTypeReaders(Assembly assembly)
-    {
-        Type[] allTypes;
-        try
-        {
-            allTypes = assembly.GetTypes();
-        }
-        catch (ReflectionTypeLoadException ex)
-        {
-            Log.Warning(ex.LoaderExceptions[0], "Error getting types");
-            return Enumerable.Empty<object>();
+            sw.Stop();
+            Log.Information($"All services loaded in {sw.Elapsed.TotalSeconds:F2}s");
         }
 
-        var filteredTypes = allTypes.Where(x => x.IsSubclassOf(typeof(TypeReader))
-                                                && x.BaseType?.GetGenericArguments().Length > 0
-                                                && !x.IsAbstract);
-
-        var toReturn = new List<object>();
-        foreach (var ft in filteredTypes)
+        private void ApplyConfigMigrations()
         {
-            var x = (TypeReader)ActivatorUtilities.CreateInstance(Services, ft);
-            var baseType = ft.BaseType;
-            if (baseType is null)
-                continue;
-            var typeArgs = baseType.GetGenericArguments();
-            _commandService.AddTypeReader(typeArgs[0], x);
-            toReturn.Add(x);
+            // execute all migrators
+            var migrators = Services.GetServices<IConfigMigrator>();
+            foreach (var migrator in migrators)
+            {
+                migrator.EnsureMigrated();
+            }
         }
 
-        return toReturn;
-    }
-
-    private async Task LoginAsync(string token)
-    {
-        var clientReady = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-
-        async Task SetClientReady()
+        private IEnumerable<object> LoadTypeReaders(Assembly assembly)
         {
-            clientReady.TrySetResult(true);
+            Type[] allTypes;
             try
             {
-                foreach (var chan in await Client.GetDMChannelsAsync())
-                    await chan.CloseAsync();
+                allTypes = assembly.GetTypes();
             }
-            catch
+            catch (ReflectionTypeLoadException ex)
             {
-                // ignored
+                Log.Warning(ex.LoaderExceptions[0], "Error getting types");
+                return Enumerable.Empty<object>();
             }
-        }
+            var filteredTypes = allTypes
+                .Where(x => x.IsSubclassOf(typeof(TypeReader))
+                    && x.BaseType.GetGenericArguments().Length > 0
+                    && !x.IsAbstract);
 
-        //connect
-        Log.Information("Shard {ShardId} logging in ...", Client.ShardId);
-        try
-        {
-            Client.Ready += SetClientReady;
-
-            await Client.LoginAsync(TokenType.Bot, token);
-            await Client.StartAsync();
-        }
-        catch (HttpException ex)
-        {
-            LoginErrorHandler.Handle(ex);
-            Helpers.ReadErrorAndExit(3);
-        }
-        catch (Exception ex)
-        {
-            LoginErrorHandler.Handle(ex);
-            Helpers.ReadErrorAndExit(4);
-        }
-        
-        await clientReady.Task.ConfigureAwait(false);
-        Client.Ready -= SetClientReady;
-        
-        Client.JoinedGuild += Client_JoinedGuild;
-        Client.LeftGuild += Client_LeftGuild;
-
-        Log.Information("Shard {ShardId} logged in", Client.ShardId);
-    }
-
-    private Task Client_LeftGuild(SocketGuild arg)
-    {
-        Log.Information("Left server: {GuildName} [{GuildId}]", arg?.Name, arg?.Id);
-        return Task.CompletedTask;
-    }
-
-    private Task Client_JoinedGuild(SocketGuild arg)
-    {
-        Log.Information("Joined server: {GuildName} [{GuildId}]", arg.Name, arg.Id);
-        _ = Task.Run(async () =>
-        {
-            GuildConfig gc;
-            await using (var uow = _db.GetDbContext())
+            var toReturn = new List<object>();
+            foreach (var ft in filteredTypes)
             {
-                gc = uow.GuildConfigsForId(arg.Id, null);
+                var x = (TypeReader)ActivatorUtilities.CreateInstance(Services, ft);
+                var baseType = ft.BaseType;
+                var typeArgs = baseType.GetGenericArguments();
+                _commandService.AddTypeReader(typeArgs[0], x);
+                toReturn.Add(x);
             }
 
-            await JoinedGuild.Invoke(gc);
-        });
-        return Task.CompletedTask;
-    }
-
-    public async Task RunAsync()
-    {
-        if (ShardId == 0)
-            await _db.SetupAsync();
-        
-        var sw = Stopwatch.StartNew();
-
-        await LoginAsync(_creds.Token);
-
-        Mention = Client.CurrentUser.Mention;
-        Log.Information("Shard {ShardId} loading services...", Client.ShardId);
-        try
-        {
-            AddServices();
-        }
-        catch (Exception ex)
-        {
-            Log.Error(ex, "Error adding services");
-            Helpers.ReadErrorAndExit(9);
+            return toReturn;
         }
 
-        sw.Stop();
-        Log.Information("Shard {ShardId} connected in {Elapsed:F2}s", Client.ShardId, sw.Elapsed.TotalSeconds);
-        var commandHandler = Services.GetRequiredService<CommandHandler>();
-
-        // start handling messages received in commandhandler
-        await commandHandler.StartHandling();
-
-        await _commandService.AddModulesAsync(typeof(Bot).Assembly, Services);
-        // await _interactionService.AddModulesAsync(typeof(Bot).Assembly, Services);
-        IsReady = true;
-        _ = Task.Run(ExecuteReadySubscriptions);
-        Log.Information("Shard {ShardId} ready", Client.ShardId);
-    }
-
-    private Task ExecuteReadySubscriptions()
-    {
-        var readyExecutors = Services.GetServices<IReadyExecutor>();
-        var tasks = readyExecutors.Select(async toExec =>
+        private async Task LoginAsync(string token)
         {
+            var clientReady = new TaskCompletionSource<bool>();
+
+            Task SetClientReady()
+            {
+                var _ = Task.Run(async () =>
+                {
+                    clientReady.TrySetResult(true);
+                    try
+                    {
+                        foreach (var chan in (await Client.GetDMChannelsAsync().ConfigureAwait(false)))
+                        {
+                            await chan.CloseAsync().ConfigureAwait(false);
+                        }
+                    }
+                    catch
+                    {
+                        // ignored
+                    }
+                });
+                return Task.CompletedTask;
+            }
+
+            //connect
+            Log.Information("Shard {ShardId} logging in ...", Client.ShardId);
             try
             {
-                await toExec.OnReadyAsync();
+                await Client.LoginAsync(TokenType.Bot, token).ConfigureAwait(false);
+                await Client.StartAsync().ConfigureAwait(false);
+            }
+            catch (HttpException ex)
+            {
+                LoginErrorHandler.Handle(ex);
+                Helpers.ReadErrorAndExit(3);
             }
             catch (Exception ex)
             {
-                Log.Error(ex,
-                    "Failed running OnReadyAsync method on {Type} type: {Message}",
-                    toExec.GetType().Name,
-                    ex.Message);
+                LoginErrorHandler.Handle(ex);
+                Helpers.ReadErrorAndExit(4);
             }
-        });
 
-        return tasks.WhenAll();
-    }
+            Client.Ready += SetClientReady;
+            await clientReady.Task.ConfigureAwait(false);
+            Client.Ready -= SetClientReady;
+            
+            Client.JoinedGuild += Client_JoinedGuild;
+            Client.LeftGuild += Client_LeftGuild;
+            
+            Log.Information("Shard {0} logged in.", Client.ShardId);
+        }
 
-    private Task Client_Log(LogMessage arg)
-    {
-        if (arg.Message?.Contains("unknown dispatch", StringComparison.InvariantCultureIgnoreCase) ?? false)
-            return Task.CompletedTask;
-
-        if (arg.Exception is { InnerException: WebSocketClosedException { CloseCode: 4014 } })
+        private Task Client_LeftGuild(SocketGuild arg)
         {
-            Log.Error(@"
-Login failed.
-
-*** Please enable privileged intents ***
-
-Certain Nadeko features require Discord's privileged gateway intents.
-These include greeting and goodbye messages, as well as creating the Owner message channels for DM forwarding.
-
-How to enable privileged intents:
-1. Head over to the Discord Developer Portal https://discord.com/developers/applications/
-2. Select your Application.
-3. Click on `Bot` in the left side navigation panel, and scroll down to the intents section.
-4. Enable all intents.
-5. Restart your bot.
-
-Read this only if your bot is in 100 or more servers:
-
-You'll need to apply to use the intents with Discord, but for small selfhosts, all that is required is enabling the intents in the developer portal.
-Yes, this is a new thing from Discord, as of October 2020. No, there's nothing we can do about it. Yes, we're aware it worked before.
-While waiting for your bot to be accepted, you can change the 'usePrivilegedIntents' inside your creds.yml to 'false', although this will break many of the nadeko's features");
+            Log.Information("Left server: {0} [{1}]", arg?.Name, arg?.Id);
             return Task.CompletedTask;
         }
-        
-#if GLOBAL_NADEKO || DEBUG
-        if (arg.Exception is not null)
-            Log.Warning(arg.Exception, "{ErrorSource} | {ErrorMessage}", arg.Source, arg.Message);
-        else
-            Log.Warning("{ErrorSource} | {ErrorMessage}", arg.Source, arg.Message);
-#endif
-        return Task.CompletedTask;
-    }
 
-    public async Task RunAndBlockAsync()
-    {
-        await RunAsync();
-        await Task.Delay(-1);
+        private Task Client_JoinedGuild(SocketGuild arg)
+        {
+            Log.Information($"Joined server: {0} [{1}]", arg.Name, arg.Id);
+            var _ = Task.Run(async () =>
+            {
+                GuildConfig gc;
+                using (var uow = _db.GetDbContext())
+                {
+                    gc = uow.GuildConfigsForId(arg.Id);
+                }
+                await JoinedGuild.Invoke(gc).ConfigureAwait(false);
+            });
+            return Task.CompletedTask;
+        }
+
+        public async Task RunAsync()
+        {
+            var sw = Stopwatch.StartNew();
+
+            await LoginAsync(_creds.Token).ConfigureAwait(false);
+
+            Mention = Client.CurrentUser.Mention;
+            Log.Information("Shard {ShardId} loading services...", Client.ShardId);
+            try
+            {
+                AddServices();
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "Error adding services");
+                Helpers.ReadErrorAndExit(9);
+            }
+
+            sw.Stop();
+            Log.Information("Shard {ShardId} connected in {Elapsed:F2}s", Client.ShardId, sw.Elapsed.TotalSeconds);
+            var commandHandler = Services.GetRequiredService<CommandHandler>();
+
+            // start handling messages received in commandhandler
+            await commandHandler.StartHandling().ConfigureAwait(false);
+
+            await _commandService.AddModulesAsync(typeof(Bot).Assembly, Services);
+            
+            IsReady = true;
+            _ = Task.Run(ExecuteReadySubscriptions);
+            Log.Information("Shard {ShardId} ready", Client.ShardId);
+        }
+
+        private Task ExecuteReadySubscriptions()
+        {
+            var readyExecutors = Services.GetServices<IReadyExecutor>();
+            var tasks = readyExecutors.Select(async toExec => 
+            {
+                try
+                {
+                    await toExec.OnReadyAsync();
+                }
+                catch (Exception ex)
+                {
+                    Log.Error(ex,
+                        "Failed running OnReadyAsync method on {Type} type: {Message}",
+                        toExec.GetType().Name,
+                        ex.Message);
+                }
+            });
+
+            return Task.WhenAll(tasks);
+        }
+
+        private Task Client_Log(LogMessage arg)
+        {
+            if (arg.Exception != null)
+                Log.Warning(arg.Exception, arg.Source + " | " + arg.Message);
+            else
+                Log.Warning(arg.Source + " | " + arg.Message);
+
+            return Task.CompletedTask;
+        }
+
+        public async Task RunAndBlockAsync()
+        {
+            await RunAsync().ConfigureAwait(false);
+            await Task.Delay(-1).ConfigureAwait(false);
+        }
     }
-}
+}

src/NadekoBot/Common/AddRemove.cs

@@ -1,10 +0,0 @@
-#nullable disable
-namespace NadekoBot.Common;
-
-public enum AddRemove
-{
-    Add = int.MinValue,
-    Remove = int.MinValue + 1,
-    Rem = int.MinValue + 1,
-    Rm = int.MinValue + 1
-}

src/NadekoBot/Common/AsyncLazy.cs

@@ -1,20 +1,20 @@
-#nullable disable
+using System;
 using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
 
-namespace NadekoBot.Common;
-
-public class AsyncLazy<T> : Lazy<Task<T>>
+namespace NadekoBot.Common
 {
-    public AsyncLazy(Func<T> valueFactory)
-        : base(() => Task.Run(valueFactory))
+    public class AsyncLazy<T> : Lazy<Task<T>>
     {
+        public AsyncLazy(Func<T> valueFactory) :
+            base(() => Task.Run(valueFactory))
+        { }
+
+        public AsyncLazy(Func<Task<T>> taskFactory) :
+            base(() => Task.Run(taskFactory))
+        { }
+
+        public TaskAwaiter<T> GetAwaiter() { return Value.GetAwaiter(); }
     }
 
-    public AsyncLazy(Func<Task<T>> taskFactory)
-        : base(() => Task.Run(taskFactory))
-    {
-    }
-
-    public TaskAwaiter<T> GetAwaiter()
-        => Value.GetAwaiter();
-}
+}

src/NadekoBot/Common/Attributes/Aliases.cs

@@ -1,12 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Runtime.CompilerServices;
-
-namespace NadekoBot.Common.Attributes;
-
-[AttributeUsage(AttributeTargets.Method)]
-public sealed class AliasesAttribute : AliasAttribute
+using Discord.Commands;
+using NadekoBot.Services;
+namespace NadekoBot.Common.Attributes
 {
-    public AliasesAttribute([CallerMemberName] string memberName = "")
-        : base(CommandNameLoadHelper.GetAliasesFor(memberName))
+    [AttributeUsage(AttributeTargets.Method)]
+    public sealed class AliasesAttribute : AliasAttribute
     {
+        public AliasesAttribute([CallerMemberName] string memberName = "")
+            : base(CommandNameLoadHelper.GetAliasesFor(memberName))
+        {
+        }
     }
-}
+}

src/NadekoBot/Common/Attributes/BotPerm.cs

@@ -0,0 +1,15 @@
+using Discord.Commands;
+
+namespace Discord
+{
+    public class BotPermAttribute : RequireBotPermissionAttribute
+    {
+        public BotPermAttribute(GuildPerm permission) : base((GuildPermission)permission)
+        {
+        }
+
+        public BotPermAttribute(ChannelPerm permission) : base((ChannelPermission)permission)
+        {
+        }
+    }
+}

src/NadekoBot/Common/Attributes/CommandNameLoadHelper.cs

@@ -1,31 +1,36 @@
-using YamlDotNet.Serialization;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 
-namespace NadekoBot.Common.Attributes;
-
-public static class CommandNameLoadHelper
+namespace NadekoBot.Common.Attributes
 {
-    private static readonly IDeserializer _deserializer = new Deserializer();
-
-    private static readonly Lazy<Dictionary<string, string[]>> _lazyCommandAliases
-        = new(() => LoadAliases());
-
-    public static Dictionary<string, string[]> LoadAliases(string aliasesFilePath = "data/aliases.yml")
+    public static class CommandNameLoadHelper
     {
-        var text = File.ReadAllText(aliasesFilePath);
-        return _deserializer.Deserialize<Dictionary<string, string[]>>(text);
-    }
+        
+        private static YamlDotNet.Serialization.IDeserializer _deserializer
+            = new YamlDotNet.Serialization.Deserializer();
+        
+        public static Lazy<Dictionary<string, string[]>> LazyCommandAliases
+            = new Lazy<Dictionary<string, string[]>>(() => LoadCommandNames()); 
+        public static Dictionary<string, string[]> LoadCommandNames(string aliasesFilePath = "data/aliases.yml")
+        {
+            var text = File.ReadAllText(aliasesFilePath);
+            return _deserializer.Deserialize<Dictionary<string, string[]>>(text);
+        }
 
-    public static string[] GetAliasesFor(string methodName)
-        => _lazyCommandAliases.Value.TryGetValue(methodName.ToLowerInvariant(), out var aliases) && aliases.Length > 1
-            ? aliases.Skip(1).ToArray()
-            : Array.Empty<string>();
+        public static string[] GetAliasesFor(string methodName)
+            => LazyCommandAliases.Value.TryGetValue(methodName.ToLowerInvariant(), out var aliases) && aliases.Length > 1
+                ? aliases.Skip(1).ToArray()
+                : Array.Empty<string>();
 
-    public static string GetCommandNameFor(string methodName)
-    {
-        methodName = methodName.ToLowerInvariant();
-        var toReturn = _lazyCommandAliases.Value.TryGetValue(methodName, out var aliases) && aliases.Length > 0
-            ? aliases[0]
-            : methodName;
-        return toReturn;
+        public static string GetCommandNameFor(string methodName)
+        {
+            methodName = methodName.ToLowerInvariant();
+            var toReturn = LazyCommandAliases.Value.TryGetValue(methodName, out var aliases) && aliases.Length > 0
+                ? aliases[0]
+                : methodName;
+            return toReturn;
+        }
     }
 }

src/NadekoBot/Common/Attributes/Description.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Runtime.CompilerServices;
+using Discord.Commands;
+using NadekoBot.Services;
+
+namespace NadekoBot.Common.Attributes
+{
+    [AttributeUsage(AttributeTargets.Method)]
+    public sealed class DescriptionAttribute : SummaryAttribute
+    {
+        // Localization.LoadCommand(memberName.ToLowerInvariant()).Desc
+        public DescriptionAttribute(string text = "") : base(text)
+        {
+        }
+    }
+}

src/NadekoBot/Common/Attributes/DontAddToIocContainerAttribute.cs

@@ -1,11 +0,0 @@
-#nullable disable
-namespace NadekoBot.Common;
-
-/// <summary>
-/// Classed marked with this attribute will not be added to the service provider 
-/// </summary>
-[AttributeUsage(AttributeTargets.Class)]
-public class DontAddToIocContainerAttribute : Attribute
-{
-    
-}

src/NadekoBot/Common/Attributes/LeftoverAttribute.cs

@@ -0,0 +1,9 @@
+namespace Discord.Commands
+{
+    public class LeftoverAttribute : RemainderAttribute
+    {
+        public LeftoverAttribute()
+        {
+        }
+    }
+}

src/NadekoBot/Common/Attributes/NadekoCommand.cs

@@ -1,13 +1,19 @@
+using System;
 using System.Runtime.CompilerServices;
+using Discord.Commands;
+using NadekoBot.Services;
 
-namespace NadekoBot.Common.Attributes;
-
-[AttributeUsage(AttributeTargets.Method)]
-public sealed class NadekoCommandAttribute : CommandAttribute
+namespace NadekoBot.Common.Attributes
 {
-    public string MethodName { get; }
+    [AttributeUsage(AttributeTargets.Method)]
+    public sealed class NadekoCommandAttribute : CommandAttribute
+    {
+        public NadekoCommandAttribute([CallerMemberName] string memberName="") 
+            : base(CommandNameLoadHelper.GetCommandNameFor(memberName))
+        {
+            this.MethodName = memberName.ToLowerInvariant();
+        }
 
-    public NadekoCommandAttribute([CallerMemberName] string memberName = "")
-        : base(CommandNameLoadHelper.GetCommandNameFor(memberName))
-        => MethodName = memberName.ToLowerInvariant();
-}
+        public string MethodName { get; }
+    }
+}

src/NadekoBot/Common/Attributes/NadekoModuleAttribute.cs

@@ -1,30 +1,14 @@
-using System.Runtime.CompilerServices;
+using System;
+using Discord.Commands;
 
-namespace NadekoBot.Common.Attributes;
-
-[AttributeUsage(AttributeTargets.Class)]
-internal sealed class NadekoModuleAttribute : GroupAttribute
+namespace NadekoBot.Common.Attributes
 {
-    public NadekoModuleAttribute(string moduleName)
-        : base(moduleName)
+    [AttributeUsage(AttributeTargets.Class)]
+    sealed class NadekoModuleAttribute : GroupAttribute
     {
+        public NadekoModuleAttribute(string moduleName) : base(moduleName)
+        {
+        }
     }
 }
 
-[AttributeUsage(AttributeTargets.Method)]
-internal sealed class NadekoDescriptionAttribute : SummaryAttribute
-{
-    public NadekoDescriptionAttribute([CallerMemberName] string name = "")
-        : base(name.ToLowerInvariant())
-    {
-    }
-}
-
-[AttributeUsage(AttributeTargets.Method)]
-internal sealed class NadekoUsageAttribute : RemarksAttribute
-{
-    public NadekoUsageAttribute([CallerMemberName] string name = "")
-        : base(name.ToLowerInvariant())
-    {
-    }
-}

src/NadekoBot/Common/Attributes/NadekoOptions.cs

@@ -1,10 +1,15 @@
-namespace NadekoBot.Common.Attributes;
+using System;
 
-[AttributeUsage(AttributeTargets.Method)]
-public sealed class NadekoOptionsAttribute : Attribute
+namespace NadekoBot.Common.Attributes
 {
-    public Type OptionType { get; set; }
+    [AttributeUsage(AttributeTargets.Method)]
+    public sealed class NadekoOptionsAttribute : Attribute
+    {
+        public Type OptionType { get; set; }
 
-    public NadekoOptionsAttribute(Type t)
-        => OptionType = t;
-}
+        public NadekoOptionsAttribute(Type t)
+        {
+            this.OptionType = t;
+        }
+    }
+}

src/NadekoBot/Common/Attributes/NoPublicBotPrecondition.cs

@@ -1,38 +0,0 @@
-#nullable disable
-using System.Diagnostics.CodeAnalysis;
-
-namespace NadekoBot.Common;
-
-[AttributeUsage(AttributeTargets.Method | AttributeTargets.Class)]
-[SuppressMessage("Style", "IDE0022:Use expression body for methods")]
-public sealed class NoPublicBotAttribute : PreconditionAttribute
-{
-    public override Task<PreconditionResult> CheckPermissionsAsync(
-        ICommandContext context,
-        CommandInfo command,
-        IServiceProvider services)
-    {
-#if GLOBAL_NADEKO
-        return Task.FromResult(PreconditionResult.FromError("Not available on the public bot. To learn how to selfhost a private bot, click [here](https://nadekobot.readthedocs.io/en/latest/)."));
-#else
-        return Task.FromResult(PreconditionResult.FromSuccess());
-#endif
-    }
-}
-
-[AttributeUsage(AttributeTargets.Method | AttributeTargets.Class)]
-[SuppressMessage("Style", "IDE0022:Use expression body for methods")]
-public sealed class OnlyPublicBotAttribute : PreconditionAttribute
-{
-    public override Task<PreconditionResult> CheckPermissionsAsync(
-        ICommandContext context,
-        CommandInfo command,
-        IServiceProvider services)
-    {
-#if GLOBAL_NADEKO || DEBUG
-        return Task.FromResult(PreconditionResult.FromSuccess());
-#else
-        return Task.FromResult(PreconditionResult.FromError("Only available on the public bot."));
-#endif
-    }
-}

src/NadekoBot/Common/Attributes/OwnerOnlyAttribute.cs

@@ -1,19 +1,20 @@
+using System;
+using System.Threading.Tasks;
+using Discord.Commands;
 using Microsoft.Extensions.DependencyInjection;
+using NadekoBot.Extensions;
+using NadekoBot.Services;
 
-namespace NadekoBot.Common.Attributes;
-
-[AttributeUsage(AttributeTargets.Method | AttributeTargets.Class)]
-public sealed class OwnerOnlyAttribute : PreconditionAttribute
+namespace NadekoBot.Common.Attributes
 {
-    public override Task<PreconditionResult> CheckPermissionsAsync(
-        ICommandContext context,
-        CommandInfo command,
-        IServiceProvider services)
+    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class)]
+    public sealed class OwnerOnlyAttribute : PreconditionAttribute
     {
-        var creds = services.GetRequiredService<IBotCredsProvider>().GetCreds();
+        public override Task<PreconditionResult> CheckPermissionsAsync(ICommandContext context, CommandInfo executingCommand, IServiceProvider services)
+        {
+            var creds = services.GetRequiredService<IBotCredsProvider>().GetCreds();
 
-        return Task.FromResult(creds.IsOwner(context.User) || context.Client.CurrentUser.Id == context.User.Id
-            ? PreconditionResult.FromSuccess()
-            : PreconditionResult.FromError("Not owner"));
+            return Task.FromResult((creds.IsOwner(context.User) || context.Client.CurrentUser.Id == context.User.Id ? PreconditionResult.FromSuccess() : PreconditionResult.FromError("Not owner")));
+        }
     }
 }

src/NadekoBot/Common/Attributes/Ratelimit.cs

@@ -1,36 +1,38 @@
+using Discord.Commands;
+using NadekoBot.Services;
+using System;
+using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace NadekoBot.Common.Attributes;
-
-[AttributeUsage(AttributeTargets.Method)]
-public sealed class RatelimitAttribute : PreconditionAttribute
+namespace NadekoBot.Common.Attributes
 {
-    public int Seconds { get; }
-
-    public RatelimitAttribute(int seconds)
+    [AttributeUsage(AttributeTargets.Method)]
+    public sealed class RatelimitAttribute : PreconditionAttribute
     {
-        if (seconds <= 0)
-            throw new ArgumentOutOfRangeException(nameof(seconds));
+        public int Seconds { get; }
 
-        Seconds = seconds;
+        public RatelimitAttribute(int seconds)
+        {
+            if (seconds <= 0)
+                throw new ArgumentOutOfRangeException(nameof(seconds));
+
+            Seconds = seconds;
+        }
+
+        public override Task<PreconditionResult> CheckPermissionsAsync(ICommandContext context, CommandInfo command, IServiceProvider services)
+        {
+            if (Seconds == 0)
+                return Task.FromResult(PreconditionResult.FromSuccess());
+
+            var cache = services.GetRequiredService<IDataCache>();
+            var rem = cache.TryAddRatelimit(context.User.Id, command.Name, Seconds);
+
+            if(rem is null)
+                return Task.FromResult(PreconditionResult.FromSuccess());
+
+            var msgContent = $"You can use this command again in {rem.Value.TotalSeconds:F1}s.";
+
+            return Task.FromResult(PreconditionResult.FromError(msgContent));
+        }
     }
-
-    public override Task<PreconditionResult> CheckPermissionsAsync(
-        ICommandContext context,
-        CommandInfo command,
-        IServiceProvider services)
-    {
-        if (Seconds == 0)
-            return Task.FromResult(PreconditionResult.FromSuccess());
-
-        var cache = services.GetRequiredService<IDataCache>();
-        var rem = cache.TryAddRatelimit(context.User.Id, command.Name, Seconds);
-
-        if (rem is null)
-            return Task.FromResult(PreconditionResult.FromSuccess());
-
-        var msgContent = $"You can use this command again in {rem.Value.TotalSeconds:F1}s.";
-
-        return Task.FromResult(PreconditionResult.FromError(msgContent));
-    }
-}
+}

src/NadekoBot/Common/Attributes/Usage.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Runtime.CompilerServices;
+using Discord.Commands;
+using NadekoBot.Services;
+using Newtonsoft.Json;
+
+namespace NadekoBot.Common.Attributes
+{
+    [AttributeUsage(AttributeTargets.Method)]
+    public sealed class UsageAttribute : RemarksAttribute
+    {
+        // public static string GetUsage(string memberName)
+        // {
+        //     var usage = Localization.LoadCommand(memberName.ToLowerInvariant()).Usage;
+        //     return JsonConvert.SerializeObject(usage);
+        // }
+        public UsageAttribute(string text = "") : base(text)
+        {
+        }
+    }
+}

src/NadekoBot/Common/Attributes/UserPerm.cs

@@ -1,30 +1,33 @@
+using System;
+using System.Threading.Tasks;
+using Discord.Commands;
 using Microsoft.Extensions.DependencyInjection;
 using NadekoBot.Modules.Administration.Services;
 
-namespace Discord;
-
-[AttributeUsage(AttributeTargets.Method)]
-public class UserPermAttribute : RequireUserPermissionAttribute
+namespace Discord
 {
-    public UserPermAttribute(GuildPerm permission)
-        : base(permission)
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
+    public class UserPermAttribute : PreconditionAttribute
     {
-    }
+        public RequireUserPermissionAttribute UserPermissionAttribute { get; }
 
-    public UserPermAttribute(ChannelPerm permission)
-        : base(permission)
-    {
-    }
+        public UserPermAttribute(GuildPerm permission)
+        {
+            UserPermissionAttribute = new RequireUserPermissionAttribute((GuildPermission)permission);
+        }
 
-    public override Task<PreconditionResult> CheckPermissionsAsync(
-        ICommandContext context,
-        CommandInfo command,
-        IServiceProvider services)
-    {
-        var permService = services.GetRequiredService<DiscordPermOverrideService>();
-        if (permService.TryGetOverrides(context.Guild?.Id ?? 0, command.Name.ToUpperInvariant(), out _))
-            return Task.FromResult(PreconditionResult.FromSuccess());
+        public UserPermAttribute(ChannelPerm permission)
+        {
+            UserPermissionAttribute = new RequireUserPermissionAttribute((ChannelPermission)permission);
+        }
 
-        return base.CheckPermissionsAsync(context, command, services);
+        public override Task<PreconditionResult> CheckPermissionsAsync(ICommandContext context, CommandInfo command, IServiceProvider services)
+        {
+            var permService = services.GetRequiredService<DiscordPermOverrideService>();
+            if (permService.TryGetOverrides(context.Guild?.Id ?? 0, command.Name.ToUpperInvariant(), out var _))
+                return Task.FromResult(PreconditionResult.FromSuccess());
+            
+            return UserPermissionAttribute.CheckPermissionsAsync(context, command, services);
+        }
     }
-}
+}

src/NadekoBot/Common/CmdStrings.cs

@@ -1,17 +1,20 @@
-#nullable disable
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
-namespace NadekoBot.Common;
-
-public class CmdStrings
+namespace NadekoBot.Common
 {
-    public string[] Usages { get; }
-    public string Description { get; }
-
-    [JsonConstructor]
-    public CmdStrings([JsonProperty("args")] string[] usages, [JsonProperty("desc")] string description)
+    public class CmdStrings
     {
-        Usages = usages;
-        Description = description;
+        public string[] Usages { get; }
+        public string Description { get; }
+
+        [JsonConstructor]
+        public CmdStrings(
+            [JsonProperty("args")]string[] usages,
+            [JsonProperty("desc")]string description
+        )
+        {
+            Usages = usages;
+            Description = description;
+        }
     }
 }

src/NadekoBot/Common/Collections/DisposableImutableList.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace NadekoBot.Common.Collections
+{
+    public static class DisposableReadOnlyListExtensions
+    {
+        public static IDisposableReadOnlyList<T> AsDisposable<T>(this IReadOnlyList<T> arr) where T : IDisposable
+            => new DisposableReadOnlyList<T>(arr);
+
+        public static IDisposableReadOnlyList<KeyValuePair<TKey, TValue>> AsDisposable<TKey, TValue>(this IReadOnlyList<KeyValuePair<TKey, TValue>> arr) where TValue : IDisposable
+            => new DisposableReadOnlyList<TKey, TValue>(arr);
+    }
+
+    public interface IDisposableReadOnlyList<T> : IReadOnlyList<T>, IDisposable
+    {
+    }
+
+    public sealed class DisposableReadOnlyList<T> : IDisposableReadOnlyList<T>
+        where T : IDisposable
+    {
+        private readonly IReadOnlyList<T> _arr;
+
+        public int Count => _arr.Count;
+
+        public T this[int index] => _arr[index];
+
+        public DisposableReadOnlyList(IReadOnlyList<T> arr)
+        {
+            this._arr = arr;
+        }
+
+        public IEnumerator<T> GetEnumerator()
+            => _arr.GetEnumerator();
+
+        IEnumerator IEnumerable.GetEnumerator()
+            => _arr.GetEnumerator();
+
+        public void Dispose()
+        {
+            foreach (var item in _arr)
+            {
+                item.Dispose();
+            }
+        }
+    }
+
+    public sealed class DisposableReadOnlyList<T, U> : IDisposableReadOnlyList<KeyValuePair<T, U>>
+        where U : IDisposable
+    {
+        private readonly IReadOnlyList<KeyValuePair<T, U>> _arr;
+
+        public int Count => _arr.Count;
+
+        KeyValuePair<T, U> IReadOnlyList<KeyValuePair<T, U>>.this[int index] => _arr[index];
+
+        public DisposableReadOnlyList(IReadOnlyList<KeyValuePair<T, U>> arr)
+        {
+            this._arr = arr;
+        }
+
+        public IEnumerator<KeyValuePair<T, U>> GetEnumerator() =>
+            _arr.GetEnumerator();
+
+        IEnumerator IEnumerable.GetEnumerator() =>
+            _arr.GetEnumerator();
+
+        public void Dispose()
+        {
+            foreach (var item in _arr)
+            {
+                item.Value.Dispose();
+            }
+        }
+    }
+}