Fixed VoiceXP bug, closes #374. Upped version to 4.3.4, Updated changelog

.dockerignore

@@ -3,9 +3,19 @@
 
 # Don't ignore nugetconfig
 !./NuGet.Config
-
 # Don't ignore src projects
-!src/**
+!src/Nadeko.Econ/**
+!src/Nadeko.Common/**
+# Use Nadeko.Medusa project
+!src/Nadeko.Medusa/**
+# Use NadekoBot project
+!src/NadekoBot/**
+# Use NadekoBot.Coordinator project
+!src/NadekoBot.Coordinator/**
+# Use Generators project
+!src/NadekoBot.Generators/**
+# Use Ayu stuff
+!src/ayu/**
 !docker-entrypoint.sh
 
 # ignore bin and obj folders in projects

.gitignore

@@ -3,7 +3,8 @@
 src/NadekoBot/data/last_known_version.txt
 
 # medusa stuff
-src/NadekoBot/data/medusae/
+!src/NadekoBot/data/medusae/medusa.yml
+src/NadekoBot/data/medusae/**
 
 # other
 

.gitlab-ci.yml

@@ -1,11 +1,12 @@
-image: mcr.microsoft.com/dotnet/sdk:8.0
+image: mcr.microsoft.com/dotnet/sdk:6.0
 
 stages:
   - build
   - test
-  - build-installer
   - upload-builds
   - release
+  - publish-windows
+  - upload-windows-updater-release
   - publish-medusa-package
 
 variables:
@@ -13,16 +14,8 @@ variables:
   tests: "NadekoBot.Tests"
   LINUX_X64_OUTPUT_DIR: "nadekobot-linux-x64"
   LINUX_X64_RELEASE: "$CI_COMMIT_TAG-linux-x64-build.tar"
-  LINUX_ARM64_OUTPUT_DIR: "nadekobot-linux-arm64"
-  LINUX_ARM64_RELEASE: "$CI_COMMIT_TAG-linux-arm64-build.tar"
-  MACOS_X64_OUTPUT_DIR: "nadekobot-osx-x64"
-  MACOS_X64_RELEASE: "$CI_COMMIT_TAG-osx-x64-build.tar"
-  MACOS_ARM64_OUTPUT_DIR: "nadekobot-osx-arm64"
-  MACOS_ARM64_RELEASE: "$CI_COMMIT_TAG-osx-arm64-build.tar"
   WIN_X64_OUTPUT_DIR: "nadekobot-windows-x64"
   WIN_X64_RELEASE: "$CI_COMMIT_TAG-windows-x64-build.zip"
-  WIN_ARM64_OUTPUT_DIR: "nadekobot-windows-arm64"
-  WIN_ARM64_RELEASE: "$CI_COMMIT_TAG-windows-arm64-build.zip"
   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"
@@ -31,19 +24,11 @@ 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 linux-arm64 --self-contained -o $LINUX_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
-    - "dotnet publish -c Release -r win-x64 --self-contained -o $WIN_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
-    - "dotnet publish -c Release -r win-arm64 --self-contained -o $WIN_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
-    - "dotnet publish -c Release -r osx-x64 --self-contained -o $MACOS_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
-    - "dotnet publish -c Release -r osx-arm64 --self-contained -o $MACOS_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
+    - "dotnet publish -c Release -r win7-x64 --self-contained -o $WIN_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
   artifacts:
     paths:
       - "$LINUX_X64_OUTPUT_DIR/"
-      - "$LINUX_ARM64_OUTPUT_DIR/"
       - "$WIN_X64_OUTPUT_DIR/"
-      - "$WIN_ARM64_OUTPUT_DIR/"
-      - "$MACOS_X64_OUTPUT_DIR/"
-      - "$MACOS_ARM64_OUTPUT_DIR/"
 
 upload-builds:
   stage: upload-builds
@@ -53,26 +38,11 @@ upload-builds:
   script:
     - apk add --no-cache curl tar zip
     - "tar cvf $LINUX_X64_RELEASE $LINUX_X64_OUTPUT_DIR/*"
-   - "tar cvf $LINUX_ARM64_RELEASE $LINUX_ARM64_OUTPUT_DIR/*"
-   - "tar cvf $MACOS_X64_RELEASE $MACOS_X64_OUTPUT_DIR/*"
-   - "tar cvf $MACOS_ARM64_RELEASE $MACOS_ARM64_OUTPUT_DIR/*"
     - "zip -r $WIN_X64_RELEASE $WIN_X64_OUTPUT_DIR/*"
-   - "zip -r $WIN_ARM64_RELEASE $WIN_ARM64_OUTPUT_DIR/*"
-   - "mv $INSTALLER_OUTPUT_DIR/$INSTALLER_FILE_NAME $INSTALLER_FILE_NAME"
     - |
       curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $LINUX_X64_RELEASE $PACKAGE_REGISTRY_URL/$LINUX_X64_RELEASE
-   - |
-     curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $LINUX_ARM64_RELEASE $PACKAGE_REGISTRY_URL/$LINUX_ARM64_RELEASE
     - |
       curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $WIN_X64_RELEASE $PACKAGE_REGISTRY_URL/$WIN_X64_RELEASE
-   - |
-     curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $WIN_ARM64_RELEASE $PACKAGE_REGISTRY_URL/$WIN_ARM64_RELEASE
-   - |
-     curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $MACOS_X64_RELEASE $PACKAGE_REGISTRY_URL/$MACOS_X64_RELEASE
-   - |
-     curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $MACOS_ARM64_RELEASE $PACKAGE_REGISTRY_URL/$MACOS_ARM64_RELEASE
-   - |
-     curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $INSTALLER_FILE_NAME $PACKAGE_REGISTRY_URL/$INSTALLER_FILE_NAME
 
 release:
   stage: release
@@ -81,14 +51,9 @@ release:
     - if: $CI_COMMIT_TAG
   script:
     - |
-     release-cli create --name "NadekoBot v$CI_COMMIT_TAG" --description "## [Changelog](https://gitlab.com/nadeko/nadekobot/-/blob/v5/CHANGELOG.md#$(echo "$CI_COMMIT_TAG" | sed "s/\.//g")-$(date +%d%m%Y))" --tag-name $CI_COMMIT_TAG \
+      release-cli create --name "NadekoBot v$CI_COMMIT_TAG" --description "## [Changelog](https://gitlab.com/Kwoth/nadekobot/-/blob/v4/CHANGELOG.md#$(echo "$CI_COMMIT_TAG" | sed "s/\.//g")-$(date +%d%m%Y))" --tag-name $CI_COMMIT_TAG \
         --assets-link "{\"name\":\"${LINUX_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${LINUX_X64_RELEASE}\"}" \
-       --assets-link "{\"name\":\"${LINUX_ARM64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${LINUX_ARM64_RELEASE}\"}" \
-       --assets-link "{\"name\":\"${WIN_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${WIN_X64_RELEASE}\"}" \
-       --assets-link "{\"name\":\"${WIN_ARM64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${WIN_ARM64_RELEASE}\"}" \
-       --assets-link "{\"name\":\"${MACOS_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${MACOS_X64_RELEASE}\"}" \
-       --assets-link "{\"name\":\"${MACOS_ARM64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${MACOS_ARM64_RELEASE}\"}" \
-       --assets-link "{\"name\":\"${INSTALLER_FILE_NAME}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${INSTALLER_FILE_NAME}\"}"
+        --assets-link "{\"name\":\"${WIN_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${WIN_X64_RELEASE}\"}"
 
 test:
   stage: test
@@ -98,14 +63,14 @@ test:
     - "cd $tests_path"
     - "dotnet test"
 
-build-installer:
- stage: build-installer
+publish-windows:
+  stage: publish-windows
   rules:
     - if: "$CI_COMMIT_TAG"
   image: scottyhardy/docker-wine
   before_script:
-   - choco install dotnet-runtime --version=8.0.4 -y
-   - choco install dotnet-sdk --version=8.0.204 -y
+    - choco install dotnet-6.0-runtime --version=6.0.4 -y
+    - choco install dotnet-6.0-sdk --version=6.0.202 -y
     - choco install innosetup -y
   artifacts:
     paths:
@@ -113,20 +78,33 @@ build-installer:
   script:
     - dotnet clean
     - dotnet restore -f --no-cache -v n
-   - dotnet publish -c Release --self-contained --runtime win-x64 /p:Version=$CI_COMMIT_TAG src/NadekoBot
+    - 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"
   tags:
-   - saas-windows-medium-amd64
+    - windows
+
+upload-windows-updater-release:
+  stage: upload-windows-updater-release
+  rules:
+    - if: "$CI_COMMIT_TAG"
+  image:
+    name: amazon/aws-cli
+    entrypoint: [""]
+  script:
+    - sed -i "s/_INSTALLER_FILE_NAME_/$INSTALLER_FILE_NAME/g" releases-v3.json
+    - sed -i "s/_VERSION_/$CI_COMMIT_TAG/g" releases-v3.json
+    - 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
- allow_failure: true
   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-alpha$CI_COMMIT_SHORT_SHA"; fi
+    - 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"

.readthedocs.yaml

@@ -1,19 +0,0 @@
-# Read the Docs configuration file for MkDocs projects
-# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-
-# Required
-version: 2
-
-# Set the version of Python and other tools you might need
-build:
-  os: ubuntu-22.04
-  tools:
-    python: "3.12"
-
-mkdocs:
-  configuration: mkdocs.yml
-
-# Optionally declare the Python requirements required to build your docs
-python:
-  install:
-  - requirements: mkdocs-requirements.txt

CHANGELOG.md

@@ -1,345 +1,8 @@
 # Changelog
 
-Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
+Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
 
-## [5.0.1] - 09.05.2024
-
-### Added
-
-- Added `.shopadd command` You can now sell commands in the shop. The command will execute as if you were the one running it when someone buys it
-  - type `.h .shopadd` for more info
-- Added `.stickyroles` Users leaving the server will have their roles saved to the database and reapplied if they rejoin within 30 days.
-- Giveaway commands
-  - `.ga start <duration> <text>` starts the giveway with the specified duration and message (prize). You may have up to 5 giveaways on the server at once
-  - `.ga end <id>` prematurely ends the giveaway and selects a winner
-  - `.ga cancel <id>` cancels the giveaway and doesn't select a winner
-  - `.ga list` lists active giveaways on the current server
-  - `.ga reroll <id>` rerolls the winner on the completed giveaway. This only works for 24 hours after the giveaway has ended, or until the bot restarts.
-  - Users can join the giveaway by adding a :tada: reaction
-- Added Todo Commands
-  - `.todo add <name>` - adds a new todo
-  - `.todo delete <id>` - deletes a todo item
-  - `.todo done <id>` - completes a todo (marks it with a checkmark)
-  - `.todo list` - lists all todos
-  - `.todo edit <id> <new message>` - edits a todo item message
-  - `.todo show <id>` - Shows the text of the specified todo item
-  - In addition to that, there are also Todo archive commands
-    - `.todo archive add <name>` - adds all current todos (completed and not completed) to the archived list, your current todo list will become cleared
-    - `.todo archive list` - lists all your archived todo lists
-    - `.todo archive show <id>` - shows the todo items from one of your archived lists
-    - `.todo archive delete <id>` - deletes and archived todo list
-- Added `.queufairplay` / `.qfp` (music feature) re-added but it works differently
-  - Once you run it, it will reorganize currently queued songs so that they're in a fair order.
-- Added `.clubrename` command to uh rename your club
-- For self-hosters:
-  - Added `.sqlselectcsv` which will return results in a csv file instead of an embed.
-  - You can set whether nadeko ignores other bots in `bot.yml`
-  - You can set shop sale cut in `gambling.yml`
-- Added a page parameter to `.feedlist`
-- Added seconds/sec/s to `.convert` command
-- Added `.prunecancel` to cancel an active prune
-- Added progress reporting when using `.prune`. 
-- Added audit log reason for `.setrole` and some other features
-
-### Changed
-
-- Users who have manage messages perm in the channel will now be excluded from link and invite filtering (`.sfi` and `.sfl`)
-- `.send` command should work consistently and correctly now. You can have targets from other shards too. The usage has been changed. refer to `.h .send` for more info
-- `.serverinfo` no longer takes a server name. It only takes an id or no arguments
-- You can now target a different channel with .repeat
-- `.cmds <module name>`, `.cmds <group name` and `.mdls` looks better
-- The bot will now send a discord Reply to every command
-- `.queuesearch` / `.qs` will now show the results with respective video thumbnails
-- A lot of code cleanup (still a lot to be done) and Quality of Life improvements
-- `.inrole` will now show mentions primarily, and use a spoiler to show usernames
-
-### Fixed
-
-- `.feed` should now correctly accept (and show) the message which can be passed as the third parameter
-- `.say` will now correctly report errors if the user or the bot don't have sufficent perms to send a message in the targeted channel
-- Fixed `.invitelist` not paginating correctly
-- `.serverinfo` will now correctly work for other shards
-- `.send` will now correctly work for other shards
-- `.translate` command will no longer fail if the user capitalizes the language name 
-- Fixed xp card user avatar not showing for some users
-
-### Removed
-
-- `.poll` commands removed as discord added polls
-- `.scpl` and other music soundcloud commands have been removed as soundcloud isn't issuing new api tokens for years now
-- Removed a lot of useless and nsfw commands
-- Removed log voice presence TTS
-- Cleanup: Removed a lot of obsolete aliases from aliases.yml
-
-## [4.3.22] - 23.04.2024
-
-### Added
-- Added `.setbanner` command (thx cata)
-
-### Fixed
-- Fixed pagination error due to a missing emoji
-
-
-## [4.3.21] - 19.04.2024
-
-### Fixed
-- Possible fix for a duplicate in `.h bank`
-- Fixed `.stock` command
-- Fixed `.clubapply` and `.clubaccept`
-- Removed some redundant discriminators
-
-## [4.3.20] - 20.01.2024
-
-### Fixed
-- Fixed `.config searches followedStreams.maxCount` not working
-
-## [4.3.19] - 20.01.2024
-
-### Added
-- Added `followedStreams.maxCount` to `searches.yml` which lets bot owners change the default of 10 per server
-
-### Changed
-- Improvements to GPT ChatterBot (thx alexandra) 
-- Add a personality prompt to tweak the way chatgpt bot behaves 
-- Added Chat history support to chatgpt ChatterBot
-- Chatgpt token usage now correctly calculated
-- More chatgpt configs in `games.yml`
-
-## [4.3.18] - 26.12.2023
-
-### Added
-
-- Added `.cacheusers` command (thx Kotz) 
-- Added `.clubreject` which lets you reject club applications
-
-### Changed
-
-- Updated discord lib, there should be less console errors now
-
-### Fixed
-
-- Fixed `icon_url` when using `.showembed`
-- Fixed `.quoteshow` not showing sometimes (thx Cata)
-- Notifications will no longer be sent if dms are off when using `.give`
-- Users should no longer be able to apply to clubs while in a club already (especially not to the same club they're already in)
-
-### Removed
-
-- `.revimg` and `.revav` as google removed reverse image search
-
-## [4.3.17] - 06.09.2023
-
-### Fixed 
-
-- Fix to waifu gifts being character limited
-- Fixes UserUpdated and UserPresence not correctly ignoring users that are logignored
-- Added Trim() to activity names since apparently some activities have trailing spaces.
-
-## [4.3.16] - 24.05.2023
-
-### Fixed
-
-- Fixed missing events from `.logevents`
-- Fixed `.log` thread deleted and thread created events not working properly
-
-## [4.3.15] - 21.05.2023
-
-### Fixed
-
-- Fixed -w 0 in trivia
-- Fixed `.rps` amount field in the response
-- Fixed `.showembed` output
-- Fixed bank award's incorrect output message
-
-## [4.3.14] - 02.04.2023
-
-### Fixed
-
-- Fixed voice hearbeat issue
-- `.banktake` had ok/error responses flipped. No functional change
-- PermRole should deny messages in threads todo
-- Fixed chucknorris jokes
-- `.logserver` will now
-
-## [4.3.13] - 20.02.2023
-
-### Fixed
-
-- Fixed `.log userpresence`
-- `.q` will now use `yt-dlp` if anything other than `ytProvider: Ytdl` is set in `data/searches.yml`
-- Fixed Title links on some embeds
-
-## [4.3.12] - 12.02.2023
-
-### Fixed
-
-- Fixed `.betstats` not working on european locales
-- Timed `.ban` will work on users who are not in the server
-- Fixed some bugs in the medusa system
-
-## [4.3.11] - 21.01.2023
-
-### Added
-
-- Added `.doas` Bot owner only command
-- Added `.stickeradd` command
-
-### Changed
-
-- `.waifuinfo` optimized
-- You can now specify an optional custom message in `.feed` and `.yun` which will be posted along with an update
-- Greet/bye messages will now get disabled if they're set to a deleted/unknown channel
-- Updated response strings
-- `.translate` now supports many more languages
-- `.translangs` prettier output
-
-### Fixed
-
-- Added logging for thread events
-- Fixed a bug for `.quotedeleteauthor` causing the executing user to delete own messages
-- Fixed TimeOut punishment not alklowing duration
-- Fixed a nullref in streamrole service
-- Fixed some potential causes for ratelimit due to default message retry settings
-- Fixed a patron rewards bug caused by monthly donation checking not accounting for year increase
-- Fixed a patron rewards bug for users who connected the same discord account with multiple patreon accounts
-- `.deletecurrency` will now also reset banked currency
-- Fixed DMHelpText reply
-- `.h` command show now properly show both channel and server user permission requirements
-- Many fixes and improvements to medusa system
-- Fixed trivia --nohint
-- `.joinrace` will no longer fail if the user isn't in the database yet
-
-## [4.3.10] - 10.11.2022
-
-### Added
-
-- `.filterlist` / `.fl` command which lists link and invite filtering channels and status
-- Added support for `%target%` placeholder in `.alias` command
-- Added .forwardtochannel which will forward messages to the current channel. It has lower priority than fwtoall
-- Added .exprtoggleglobal / .extg  which can be used to toggle usage of global expressions on the server
-
-### Changed
-
-- .meload and .meunload are now case sensitive. Previously loaded medusae may need to be reloaded or data/medusae/medusa.yml may need to be edited manually
-- Several club related command have their error messages improved
-- Updated help text for .antispam and .antiraid
-- You can now specify time and date (time is optional) in `.remind` command instead of relative time, in the format `HH:mm dd.MM.YYYY`
-- OwnerId will be automatically added to `creds.yml` at bot startup if it's missing
-
-### Fixed
-
-- Fixed `.cmdcd` console error
-- Fixed an error when currency is add per xp
-- Fixed an issue preventing execution of expressions starting with @Bot when cleverbot is enabled on the server
-- Fixed `.feedadd`
-- Fixed `.prune @target` not working
-- Medusa modules (sneks) should now inherit medusa description when listed in .mdls command
-- Fixed command cooldown calculation
-
-## [4.3.9] - 12.10.2022
-
-### Added
-
-- `.betstats` shows sum of all bets, payouts and the payout rate in %. Updates once an hour
-
-### Changed
-
-- `.betstats` looks way better (except on Mac)
-- `.feedadd` errors clarified and separated in individual error messages for each issue.
-- `.clubban` and `.clubunban` errors clarified and separated in individual error messages for each issue.
-- `.clubapply` better error messages
-
-### Fixed
-
-- `.timely` 'Remind' button fixed in DMs
-- `.cmdcd` database bugs fixed
-- Fixed bugged mysql and postgresql migrations
-- Fixed issues with lodaing medusae due to strict versioning
-
-### Removed
-
-- `.slotstats` Superseded by `.betstats`
-
-## [4.3.8] - 02.10.2022
-
-### Added
-
-- Added `.autopublish` command which will automatically publish messages posted in the channel.
-- Added `--after <messageid>` option to prune which will make prune only delete messages after the specified message id.
-
-### Changed
-
-- `.prune` options `--after` and `--safe` are now proper command options, and will show in .h help
-- `.cmdcd` code mostly rewritten, slight QoL improvements.
-- Clarified `.remind` permission requirements in help text
-- `.cmdcds` looks a little better, and is paginated
-
-### Fixed
-
-- Fixed trivia bugs
-- Fixed `.yun` not working with channels with underscore in the name
-
-## [4.3.7] - 14.09.2022
-
-### Added
-
-- Added `.exprdelserv` (.exds) to completement .exas. Deletes an expression on the current server and is susceptible to .dpo, unlike .exd
-- Added `.shopreq` which lets you set role requirement for specific shop items
-- Added `.shopbuy` alias to `.buy`
-
-### Fixed
-
-- Fixed `.convertlist` showing currencies twice (this may not apply to existing users and it may require you to manually remove all currencies from units.json)
-
-### Removed
-
-- Removed `Viewer` field from stream online notification as it is (almost?) always 0.
-
-## [4.3.6] - 08.09.2022
-
-### Added
-
-- Added `.expraddserver` (.exas) which will server as a server-only alternative to '.exa' in case users want to override default Admin permissions with .dpo
-- Added .banprune command which sets how many days worth of messages will be pruned when bot (soft)bans a person either through a command or another punishment feature.
-- Added .qdelauth - Delete all quotes by the specified author on this server. If you target yourself - no permission required
-- Added `.timeout` command
-- Added an option to award currency based on received xp
-
-### Changed
-
-- Reminders now have embed support, but plaintext field is not supported.
-- User friendlier errors when parsing a number in a command fails
-
-### Fixed
-
-- Awarded xp is now correctly used in level up calculations
-
-## [4.3.5] - 17.08.2022
-
-### Added
-
-- Added a 'Use' button when a user already owns an item
-- Added a 'Pull Again' button to slots
-- Added `.roleinfo` command
-- Added `.emojiremove` command
-- Added `.threadcreate` and `.threaddelete` commands
-- Added `.bank seize` / `.bank award` owner only commands
-
-### Changed
-
-- Running a .timely command early now shows a pending color
-- .xp system is once again no longer opt in for servers
-  - It's still opt-in for global and requires users to run .xp at least once in order to start gaining global xp
-
-### Fixed
-
-- Fixed users not getting club xp
-
-## [4.3.4] - 07.08.2022
-
-### Fixed
-
-- Fixed users getting XP out of nowhere while voice xp is enabled
+## Unreleased
 
 ## [4.3.3] - 06.08.2022
 

Dockerfile

@@ -1,11 +1,13 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 WORKDIR /source
 
 COPY src/Nadeko.Medusa/*.csproj src/Nadeko.Medusa/
+COPY src/Nadeko.Econ/*.csproj src/Nadeko.Econ/
+COPY src/Nadeko.Common/*.csproj src/Nadeko.Common/
 COPY src/NadekoBot/*.csproj src/NadekoBot/
 COPY src/NadekoBot.Coordinator/*.csproj src/NadekoBot.Coordinator/
 COPY src/NadekoBot.Generators/*.csproj src/NadekoBot.Generators/
-COPY src/NadekoBot.Voice/*.csproj src/NadekoBot.Voice/
+COPY src/ayu/Ayu.Discord.Voice/*.csproj src/ayu/Ayu.Discord.Voice/
 COPY NuGet.Config ./
 RUN dotnet restore src/NadekoBot/
 
@@ -20,17 +22,18 @@ RUN set -xe; \
     chmod +x /app/NadekoBot
 
 # final stage/image
-FROM mcr.microsoft.com/dotnet/runtime:8.0
+FROM mcr.microsoft.com/dotnet/runtime:6.0
 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 sudo; \
-    update-alternatives --install /usr/local/bin/python python /usr/bin/python3.9 1; \
+    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; \
     echo 'Defaults>nadeko env_keep+="ASPNETCORE_* DOTNET_* NadekoBot_* shard_id total_shards TZ"' > /etc/sudoers.d/nadeko; \
-    curl -Lo /usr/local/bin/yt-dlp https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp; \
-    chmod a+rx /usr/local/bin/yt-dlp; \
+    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
 

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright 2023 Kwoth
+Copyright 2021 Kwoth
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

NadekoBot.sln

@@ -13,23 +13,27 @@ ProjectSection(SolutionItems) = preProject
 	.gitlab-ci.yml = .gitlab-ci.yml
 	Dockerfile = Dockerfile
 	NuGet.Config = NuGet.Config
-	migrate.ps1 = migrate.ps1
-	remove-migration.ps1 = remove-migration.ps1
 EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NadekoBot", "src\NadekoBot\NadekoBot.csproj", "{45EC1473-C678-4857-A544-07DFE0D0B478}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.Voice", "src\NadekoBot.Voice\NadekoBot.Voice.csproj", "{2F4CF6D6-0C2F-4944-B204-9508CDA53195}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ayu", "ayu", "{6058FEDF-A318-4CD4-8F04-A7E8E7EC8874}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ayu.Discord.Voice", "src\ayu\Ayu.Discord.Voice\Ayu.Discord.Voice.csproj", "{2F4CF6D6-0C2F-4944-B204-9508CDA53195}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.Tests", "src\NadekoBot.Tests\NadekoBot.Tests.csproj", "{DB448DD4-C97F-40E9-8BD3-F605FF1FF833}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.Coordinator", "src\NadekoBot.Coordinator\NadekoBot.Coordinator.csproj", "{AE9B7F8C-81D7-4401-83A3-643B38258374}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.Generators", "src\NadekoBot.Generators\NadekoBot.Generators.csproj", "{3BC3BDF8-1A0B-45EB-AB2B-C0891D4D37B8}"
+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
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.Generators", "src\NadekoBot.Generators\NadekoBot.Generators.csproj", "{92770AF3-83EE-49F1-A0BB-79124D19A13D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nadeko.Common", "src\Nadeko.Common\Nadeko.Common.csproj", "{A6022F5F-A764-4D3F-847B-36F0391FF659}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nadeko.Econ", "src\Nadeko.Econ\Nadeko.Econ.csproj", "{4F4FBF7C-74F0-4AE4-B451-9E60BDCA9C37}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -62,6 +66,12 @@ Global
 		{AE9B7F8C-81D7-4401-83A3-643B38258374}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU
 		{AE9B7F8C-81D7-4401-83A3-643B38258374}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AE9B7F8C-81D7-4401-83A3-643B38258374}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3BC3BDF8-1A0B-45EB-AB2B-C0891D4D37B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3BC3BDF8-1A0B-45EB-AB2B-C0891D4D37B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3BC3BDF8-1A0B-45EB-AB2B-C0891D4D37B8}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU
+		{3BC3BDF8-1A0B-45EB-AB2B-C0891D4D37B8}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU
+		{3BC3BDF8-1A0B-45EB-AB2B-C0891D4D37B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3BC3BDF8-1A0B-45EB-AB2B-C0891D4D37B8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3BC82CFE-BEE7-451F-986B-17EDD1570C4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3BC82CFE-BEE7-451F-986B-17EDD1570C4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3BC82CFE-BEE7-451F-986B-17EDD1570C4F}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU
@@ -74,24 +84,33 @@ Global
 		{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
-		{92770AF3-83EE-49F1-A0BB-79124D19A13D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{92770AF3-83EE-49F1-A0BB-79124D19A13D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{92770AF3-83EE-49F1-A0BB-79124D19A13D}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU
-		{92770AF3-83EE-49F1-A0BB-79124D19A13D}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU
-		{92770AF3-83EE-49F1-A0BB-79124D19A13D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{92770AF3-83EE-49F1-A0BB-79124D19A13D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A6022F5F-A764-4D3F-847B-36F0391FF659}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6022F5F-A764-4D3F-847B-36F0391FF659}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6022F5F-A764-4D3F-847B-36F0391FF659}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6022F5F-A764-4D3F-847B-36F0391FF659}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU
+		{A6022F5F-A764-4D3F-847B-36F0391FF659}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A6022F5F-A764-4D3F-847B-36F0391FF659}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F4FBF7C-74F0-4AE4-B451-9E60BDCA9C37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F4FBF7C-74F0-4AE4-B451-9E60BDCA9C37}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F4FBF7C-74F0-4AE4-B451-9E60BDCA9C37}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F4FBF7C-74F0-4AE4-B451-9E60BDCA9C37}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU
+		{4F4FBF7C-74F0-4AE4-B451-9E60BDCA9C37}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F4FBF7C-74F0-4AE4-B451-9E60BDCA9C37}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{45EC1473-C678-4857-A544-07DFE0D0B478} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
+		{6058FEDF-A318-4CD4-8F04-A7E8E7EC8874} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
+		{2F4CF6D6-0C2F-4944-B204-9508CDA53195} = {6058FEDF-A318-4CD4-8F04-A7E8E7EC8874}
 		{DB448DD4-C97F-40E9-8BD3-F605FF1FF833} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
 		{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}
-		{92770AF3-83EE-49F1-A0BB-79124D19A13D} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
-		{2F4CF6D6-0C2F-4944-B204-9508CDA53195} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
+		{A6022F5F-A764-4D3F-847B-36F0391FF659} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
+		{4F4FBF7C-74F0-4AE4-B451-9E60BDCA9C37} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5F3F555C-855F-4BE8-B526-D062D3E8ACA4}

README.md

@@ -1,3 +1,8 @@
+[![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)
+[![Discord Bots](https://discordbots.org/api/widget/status/116275390695079945.svg)](https://top.gg/bot/116275390695079945)  
+
+  
 [![nadeko0](https://cdn.nadeko.bot/tutorial/docs-top.png)](https://nadeko.bot/)  
   
 [![nadeko1](https://cdn.nadeko.bot/tutorial/docs-mid.png)](https://invite.nadeko.bot/)  
@@ -5,5 +10,5 @@
 [![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/latest)
+- [Self hosting Guides and Docs](https://nadekobot.readthedocs.io/en/v4)
 - [Discord support server](https://discord.nadeko.bot)

docker-compose.yml

@@ -1,23 +0,0 @@
-version: "3.7"
-
-services:
-  nadeko:
-    image: insert-image-name-here:latest
-    depends_on:
-      - redis
-    environment:
-      TZ: Europe/Paris
-      NadekoBot_RedisOptions: redis,name=nadeko
-      #NadekoBot_ShardRunCommand: dotnet
-      #NadekoBot_ShardRunArguments: /app/NadekoBot.dll {0} {1}
-    volumes:
-      - /srv/nadeko/conf:/app/conf:ro
-      - /srv/nadeko/data:/app/data
-
-  redis:
-    image: redis:4-alpine
-    sysctls:
-      - net.core.somaxconn=511
-    command: redis-server --maxmemory 32M --maxmemory-policy volatile-lru
-    volumes:
-      - /srv/nadeko/redis-data:/data

docs/config-guide.md

@@ -24,10 +24,6 @@ The list below is not complete. Use commands above to see up-to-date list for yo
 
 `trivia.min_win_req` - Restricts a user's ability to make a trivia game with a win requirement less than the set value.   
 `trivia.currency_reward` - Sets the amount of currency a user will win if they place first in a completed trivia game.  
-`hangman.currency_reward` - Sets the amount of currency a user will win if they win a game of hangman.  
-`chatbot` - Sets which chatbot API the bot should use, values: `gpt3`, `cleverbot`.  
-`gpt.model` - Sets which GPT-3 model the bot should use, values: `ada001`, `babbage001`, `curie001`, `davinci003`.  
-`gpt.max_tokens` - Sets the limit of tokens GPT-3 can use per call. Find out more about tokens [here](https://help.openai.com/en/articles/4936856-what-are-tokens-and-how-to-count-them).
 
 *more settings may be available in `data/games.yml` file*
 

docs/contribution-guide.md

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

docs/donate.md

@@ -30,7 +30,7 @@ You can also donate to us through [PayPal][paypal] for one-time donations using
 
 [![img][paypal-button]][paypal]
 
-[gitlab]: https://gitlab.com/nadeko/nadekobot
+[gitlab]: https://gitlab.com/Kwoth/nadekobot
 [discord-server]: https://discord.nadeko.bot/
 [patreon]: https://www.patreon.com/nadekobot
 [patreon-button]: ./assets/patreon.png

docs/guides/docker-guide.md

@@ -14,7 +14,7 @@
 version: "3.7"
 services:
   nadeko:
-    image: registry.gitlab.com/nadeko/nadekobot:latest
+    image: registry.gitlab.com/kwoth/nadekobot:latest
     depends_on:
       - redis
     environment:

docs/guides/linux-guide.md

@@ -13,22 +13,24 @@
 
 #### Operating System Compatibility
 
+It is recommended that you use **Ubuntu 20.04**, as there have been nearly no problems with it. Also, **32-bit systems are incompatible**.
+
 ##### Compatible operating systems:
 
-- Ubuntu: 18.04, 20.04, 22.04, 22.10
-- Mint: 19, 20, 21
-- Debian: 10, 11
+- Ubuntu: 16.04, 18.04, 20.04, 21.04, 21.10 22.04
+- Mint: 19, 20
+- Debian: 9, 10
 - CentOS: 7
-- openSUSE 15
-- ~~Fedora: 33, 34, 35~~ (Fedora is Pending Support)
+- openSUSE
+- Fedora: 33, 34, 35
 
 ## Linux From Source 
 
-##### Migration from v3 -> v5
+##### 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/nadeko/nadeko-bash-installer/-/raw/v5/linuxAIO.sh && bash linuxAIO.sh`
+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`)
@@ -38,7 +40,7 @@ Use the new installer script:  `cd ~ && wget -N https://gitlab.com/nadeko/nadeko
 
 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/nadeko/nadeko-bash-installer/-/raw/v5/linuxAIO.sh && bash linuxAIO.sh`
+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`
 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)
@@ -50,13 +52,13 @@ 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/nadeko/nadeko-bash-installer/-/raw/v5/linuxAIO.sh && bash linuxAIO.sh`
+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)
 
 ##### Source Update Instructions
 
 1. ⚠ Stop the bot ⚠
-2. Update and run the **new** installer script `cd ~ && wget -N https://gitlab.com/nadeko/nadeko-bash-installer/-/raw/v5/linuxAIO.sh && bash linuxAIO.sh`
+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`
 3. Update the bot (type `2` and press enter)
 4. Run the bot (type `3` and press enter)
 5. 🎉 
@@ -74,11 +76,11 @@ Open Terminal (if you're on an installation with a window manager) and navigate
 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/nadeko/nadeko-bash-installer/-/blob/v5/n-prereq.sh) as a reference*
+*You can use nadeko bash script [prerequisites installer](https://gitlab.com/Kwoth/nadeko-bash-installer/-/blob/v4/n-prereq.sh) as a reference*
 
 ##### Installation Instructions
 
-1. Download the latest release from <https://gitlab.com/nadeko/nadekobot/-/releases>
+1. Download the latest release from <https://gitlab.com/Kwoth/nadekobot/-/releases>
     - Look for the file called "X.XX.X-linux-x64-build.tar" (where X.XX.X is a series of numbers) and download it
 2. Untar it 
     - ⚠ Make sure that you change X.XX.X to the same series of numbers as in step 1!
@@ -102,7 +104,7 @@ Open Terminal (if you're on an installation with a window manager) and navigate
 ##### Release Update Instructions
 
 1. Stop the bot
-2. Download the latest release from <https://gitlab.com/nadeko/nadekobot/-/releases>
+2. Download the latest release from <https://gitlab.com/Kwoth/nadekobot/-/releases>
     - Look for the file called "x.x.x-linux-x64-build.tar" (where `X.X.X` is a version, for example 3.0.4) and download it
 3. Untar it 
     - ⚠ Make sure that you change `X.X.X` to the same series of numbers as in step 2!
@@ -158,30 +160,15 @@ If you are presented with the installer main menu, exit it by choosing Option `8
 
 The above command will create a new session named **nadeko** *(you can replace “nadeko” with anything you prefer, it's your session name)*.
 
-2. Run the installer: `bash linuxAIO.sh`
-
-3. There are a few options when it comes to running Nadeko.
-
-    - Run `3` to *Run the bot normally*
-    - Run `4` to *Run the bot with Auto Restart* (This is may or may not work)
-
-4. If option `4` was selected, you have the following options
-```
-1. Run Auto Restart normally without updating NadekoBot.
-2. Run Auto Restart and update NadekoBot.
-3. Exit
-
-Choose:
-[1] to Run NadekoBot with Auto Restart on "die" command without updating.
-[2] to Run with Auto Updating on restart after using "die" command.
-```
-- Run `1` to restart the bot without updating. (This is done using the `.die` command)
-- Run `2` to update the bot upon restart. (This is also done using the `.die` command)
-
-5. That's it! to detatch the tmux session:
+2. Navigate to the project's root directory
+    - Project root directory location example: `cd /home/user/nadekobot/`
+3. Enter the `output` directory:
+    - `cd output`
+4. Run the bot using:
+    - `dotnet NadekoBot.dll`
+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.)*
@@ -314,26 +301,6 @@ This method is similar to the one above, but requires one extra step, with the a
 
 If you want Nadeko to play music for you 24/7 without having to hosting it on your PC and want to keep it cheap, reliable and convenient as possible, you can try Nadeko on Linux Digital Ocean Droplet using the link [DigitalOcean](http://m.do.co/c/46b4d3d44795/) (by using this link, you will get **$10 credit** and also support Nadeko)
 
-To set up the VPS, please select the options below
-```
-These are the min requirements you must follow:
-
-OS: Any between Ubuntu, Fedora, and Debian
-
-Plan: Basic
-
-CPU options: regular with SSD
-1 GB / 1 CPU
-25 GB SSD Disk
-1000 GB transfer
-
-Note: You can select the cheapest option with 512 MB /1 CPU but this has been a hit or miss.
-
-Datacenter region: Choose one depending on where you are located.
-
-Authentication: Password or SSH 
-(Select SSH if you know what you are doing, otherwise choose password)
-```
 **Setting up NadekoBot**
 Assuming you have followed the link above to setup an account and a Droplet with a 64-bit operational system on Digital Ocean and got the `IP address and root password (in your e-mail)` to login, it's time to get started.
 

docs/guides/osx-guide.md

@@ -7,7 +7,7 @@ Open Terminal (if you don't know how to, click on the magnifying glass on the to
 ###### Homebrew/wget  
 *Skip this step if you already have homebrew installed*
 - Copy and paste this command, then press Enter:  
-    - `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"`  
+    - `/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"`  
 - Install wget  
     - `brew install wget`  
     
@@ -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/nadeko/nadeko-bash-installer/-/raw/v5/linuxAIO.sh && bash linuxAIO.sh`
+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`
 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/nadeko/nadeko-bash-installer/-/raw/v5/linuxAIO.sh && bash linuxAIO.sh`
+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`
 3. Update the bot (type `2` and press enter)
 4. Run the bot (type `3` and press enter)
 5. 🎉 
@@ -60,7 +60,7 @@ sudo ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/
 
 ##### Installation Instructions
 
-1. Download the latest release from <https://gitlab.com/nadeko/nadekobot/-/releases>
+1. Download the latest release from <https://gitlab.com/Kwoth/nadekobot/-/releases>
    - Look for the file called "X.XX.X-linux-x64-build.tar" (where X.XX.X is a series of numbers) and download it
 2. Untar it 
    ⚠ Make sure that you change X.XX.X to the same series of numbers as in step 1!
@@ -84,7 +84,7 @@ sudo ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/
 ##### Update Instructions
 
 1. Stop the bot
-2. Download the latest release from <https://gitlab.com/nadeko/nadekobot/-/releases>
+2. Download the latest release from <https://gitlab.com/Kwoth/nadekobot/-/releases>
     - Look for the file called "X.XX.X-linux-x64-build.tar" (where X.XX.X is a series of numbers) and download it
 3. Untar it 
    ⚠ Make sure that you change X.XX.X to the same series of numbers as in step 2!

docs/guides/windows-guide.md

@@ -10,9 +10,11 @@
 
 *Note: If you want to make changes to Nadeko's source code, please follow the [From Source](#windows-from-source) guide instead.*
 
+*If you have Windows 7 or a 32-bit system, please refer to the [From Source](#windows-from-source)) guide.*
+
 #### Prerequisites
 
-- Windows 10 or later (64-bit)
+- Windows 8 or later (64-bit)
 - [Create a Discord Bot application and invite the bot to your server](../creds-guide.md)
 
 **Optional**
@@ -29,8 +31,10 @@
  ![Create a new bot](https://i.imgur.com/JxtRk9e.png "Create a new bot")
 - Click on **`DOWNLOAD`** at the lower right
  ![Bot Setup](https://i.imgur.com/HqAl36p.png "Bot Setup")
-- **Note: Redis is optional. install Redis manually here: [Redis] Download and run the **`.msi`** file.**
-- If you will use the music module, click on **`Install`** next to **`FFMPEG`** and **`Youtube-DLP`**.
+- Click on **`Install`** next to **`Redis`**. 
+- **(Note: Redis is optional unless you are are using the bot on 2000+ servers)**
+- Note: If Redis fails to install, install Redis manually here: [Redis Installer](https://github.com/MicrosoftArchive/redis/releases/tag/win-3.0.504) Download and run the **`.msi`** file.
+- If you will use the music module, click on **`Install`** next to **`FFMPEG`** and **`Youtube-DL`**.
 - If any dependencies fail to install, you can temporarily disable your Windows Defender/AV until you install them. If you don't want to, then read [the last section of this guide](#Manual-Prerequisite-Installation).
 - When installation is finished, click on **`CREDS`** to the left of **`RUN`** at the lower right.
 - Follow the guide on how to [Set up the creds.yml](../../creds-guide) file.
@@ -56,9 +60,9 @@
 
 You can still install them manually:
 
-- [Redis] (OPTIONAL) - Download and run the **`.msi`** file
+- [Redis Installer](https://github.com/MicrosoftArchive/redis/releases/tag/win-3.0.504) - Download and run the **`.msi`** file
 - [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-dlp] - Click to download the `yt-dlp.exe` file then put `yt-dlp.exe` in a path that's in your PATH environment variable. If you don't know what that is, then just move the `yt-dlp.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 ⚠**
 
@@ -67,15 +71,15 @@ You can still install them manually:
 ##### Prerequisites
 
 **Install these before proceeding or your bot will not work!**
-- [.net 8](https://dotnet.microsoft.com/en-us/download)  - needed to compile and run the bot
+- [.net 6](https://dotnet.microsoft.com/download/dotnet/6.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] (OPTIONAL)- to cache things needed by some features and persist through restarts
+- [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
 
 ##### Installation Instructions
 
 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/nadeko/nadekobot -b v5 --depth 1`
+1. `git clone https://gitlab.com/kwoth/nadekobot -b v4 --depth 1`
 2. `cd nadekobot`
 3. `dotnet publish -c Release -o output/ src/NadekoBot/`
 4. `cd output`
@@ -115,11 +119,11 @@ Open PowerShell as described above and run the following commands:
 🎉 Enjoy
 
 #### Music prerequisites  
-In order to use music commands, you need ffmpeg and yt-dlp installed.
+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-dlp] - Click to download the `yt-dlp.exe` file, then move `yt-dlp.exe` to a path that's in your PATH environment variable. If you don't know what that is, just move the `yt-dlp.exe` file to `NadekoBot/system`.
+- [youtube-dl] - Click to download the file, then move `youtube-dl.exe` to a path that's in your PATH environment variable. If you don't know what that is, just move the `youtube-dl.exe` file to `NadekoBot/system`.
 
-[Updater]: https://dl.nadeko.bot/v3/
+[Updater]: https://dl.nadeko.bot/
 [Notepad++]: https://notepad-plus-plus.org/
 [.net]: https://dotnet.microsoft.com/download/dotnet/5.0
 [Redis]: https://github.com/MicrosoftArchive/redis/releases/download/win-3.0.504/Redis-x64-3.0.504.msi
@@ -127,4 +131,4 @@ In order to use music commands, you need ffmpeg and yt-dlp installed.
 [Visual C++ 2017 (x64)]: https://aka.ms/vs/15/release/vc_redist.x64.exe
 [ffmpeg-32bit]: https://cdn.nadeko.bot/dl/ffmpeg-32.zip
 [ffmpeg-64bit]: https://cdn.nadeko.bot/dl/ffmpeg-64.zip
-[youtube-dlp]: https://github.com/yt-dlp/yt-dlp/releases
+[youtube-dl]: https://yt-dl.org/downloads/latest/youtube-dl.exe

docs/index.md

@@ -36,6 +36,6 @@ If you're unsure whether something is an issue, ask in our support server first.
 [macos-guide]: ./guides/osx-guide.md
 [from-source-guide]: ./guides/from-source.md
 [discord-server]: https://discord.nadeko.bot/
-[gitlab]: https://gitlab.com/nadeko/nadekobot
-[issues]: https://gitlab.com/nadeko/nadekobot/issues
+[gitlab]: https://gitlab.com/Kwoth/nadekobot
+[issues]: https://gitlab.com/Kwoth/nadekobot/issues
 [donate]: ./donate.md

docs/medusa/creating-a-medusa.md

@@ -8,7 +8,7 @@ Medusa system allows you to write independent medusae (known as "modules", "cogs
   
 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/nadeko/nadekobot/-/tree/v5/src/Nadeko.Medusa) in case you need reference, as there is no generated documentation at the moment.
+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
 
@@ -147,7 +147,6 @@ This section will guide you through how to create a simple custom medusa. You ca
         <!-- Use latest .net features -->
         <LangVersion>preview</LangVersion>
         <EnablePreviewFeatures>true</EnablePreviewFeatures>
-        <GenerateRequiresPreviewFeaturesAttribute>true</GenerateRequiresPreviewFeaturesAttribute>
         
         <!-- tell .net that this library will be used as a plugin -->
         <EnableDynamicLoading>true</EnableDynamicLoading>
@@ -156,12 +155,12 @@ This section will guide you through how to create a simple custom medusa. You ca
     <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="4.3.9">
+        <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 https://gitlab.com/nadeko/nadekobot repo locally and reference the NadekoBot.csproj because there is no NadekoBot package atm.
+          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,

docs/permissions-system.md

@@ -8,7 +8,7 @@ Permissions are very handy at setting who can use what commands in a server. All
 
 Several commands still require that you have the correct permissions on Discord to be able to use them, so for users to be able to use commands like `.kick` and `.voicemute`, they need **Kick** and **Mute Members** server permissions, respectively.
 
-With the permissions system it possible to restrict who can skip the current song.
+With the permissions system it possible to restrict who can skip the current song, pick NadekoFlowers or use the NSFW module.
 
 ## First Time Setup
 
@@ -64,6 +64,15 @@ To allow users to only see the current song and have a DJ role for queuing follo
 4. `.rm Music enable DJ`
     - Enables all music commands only for the DJ role
 
+#### How do I create a NSFW role?
+
+Say you want to only enable NSFW commands for a specific role, just do the following two steps.
+
+1. `.sm NSFW disable`
+    - Disables the NSFW module from being used
+2. `.rm NSFW enable Lewd`
+    - Enables usage of the NSFW module for the Lewd role
+
 #### How do I disable Expressions from triggering?
 
 If you don't want server or global Expressions, just block the module that controls their usage:

docs/placeholders.md

@@ -38,7 +38,7 @@ Some features have their own specific placeholders which are noted in that featu
 - `%channel.name%` - Channel name
 - `%channel.id%` - Channel ID
 - `%channel.created%` - Channel creation date
-- `%channel.nsfw%` - Returns either `True` or `False`, depending on if the channel is designated as age-restricted in discord
+- `%channel.nsfw%` - Returns either `True` or `False`, depending on if the channel is designated as NSFW using discord
 - `%channel.topic%` - Channel topic
 
 ### User placeholders
@@ -68,6 +68,11 @@ Some features have their own specific placeholders which are noted in that featu
 - `%ban.reason%` - Reason for the ban, if provided  
 - `%ban.duration%` - Duration of the ban in the form Days.Hours:Minutes (6.05:04)  
 
+### Bot stats placeholders
+
+- `%servers%` - Server count bot has joined
+- `%users%` - Combined user count on servers the bot has joined
+
 ### Shard stats placeholders
 
 - `%shard.servercount%` - Server count on current shard
@@ -84,5 +89,6 @@ Some features have their own specific placeholders which are noted in that featu
 
 - `%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)
 
 ![img](https://puu.sh/B7mgI.png)

exe_builder.iss

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

migrate.ps1

@@ -1,10 +0,0 @@
-if ($args.Length -eq 0) {
-    Write-Host "Please provide a migration name." -ForegroundColor Red
-}
-else {
-    $migrationName = $args[0]
-    dotnet ef migrations add $migrationName -c SqliteContext -p src/NadekoBot/NadekoBot.csproj
-    dotnet ef migrations add $migrationName -c PostgreSqlContext -p src/NadekoBot/NadekoBot.csproj
-    dotnet ef migrations add $migrationName -c MysqlContext -p src/NadekoBot/NadekoBot.csproj
-}
-

mkdocs.yml

@@ -1,6 +1,6 @@
 site_name: 'NadekoBot'
 site_url: 'https://nadeko.bot'
-repo_url: 'https://gitlab.com/nadeko/nadekobot'
+repo_url: 'https://gitlab.com/kwoth/nadekobot'
 site_author: 'Kwoth'
 
 theme:

release.ps1

@@ -0,0 +1,63 @@
+function Get-Changelog($lastTag)
+{
+    if(!$lastTag)
+    {
+        $lastTag = git describe --tags --abbrev=0
+    }
+
+    $tag = "$lastTag..HEAD"
+
+    $clArr = (git log $tag --oneline)
+    [array]::Reverse($clArr)
+    $changelog = $clArr | where { "$_" -notlike "*(POEditor.com)*" -and "$_" -notlike "*Merge branch*" -and "$_" -notlike "*Merge pull request*" -and "$_" -notlike "^-*" -and "$_" -notlike "*Merge remote tracking*" }
+    $changelog = [string]::join([Environment]::NewLine, $changelog)
+
+    $cl2 = $clArr | where { "$_" -like "*Merge pull request*" }
+    $changelog = "## Changes$nl$changelog"
+    if ($null -ne $cl2) {
+        $cl2 = [string]::join([Environment]::NewLine, $cl2)
+        $changelog = $changelog + "$nl ## Pull Requests Merged$nl$cl2"
+    }
+
+    return $changelog
+}
+
+function Build-Installer($versionNumber)
+{
+    $env:NADEKOBOT_INSTALL_VERSION = $versionNumber
+
+	dotnet clean
+    # rm -r -fo "src\NadekoBot\bin"
+    dotnet publish -c Release --runtime win7-x64 /p:Version=$versionNumber src/NadekoBot
+    # .\rcedit-x64.exe "src\NadekoBot\bin\Release\netcoreapp2.1\win7-x64\nadekobot.exe" --set-icon "src\NadekoBot\bin\Release\netcoreapp2.1\win7-x64\nadeko_icon.ico"
+
+    & "iscc.exe" "/O+" ".\exe_builder.iss"
+
+    Write-ReleaseFile($versionNumber)
+    # $path = [Environment]::GetFolderPath('MyDocuments') + "\_projekti\new_installer\$versionNumber\";
+    # $binPath = $path + "nadeko-setup-$versionNumber.exe";
+    # Copy-Item -Path $path -Destination $dest -Force -ErrorAction Stop
+
+	# return $path
+}
+
+function Write-ReleaseFile($versionNumber) {	
+    $changelog = ""
+	# pull the changes if they exist
+	# git pull
+	# attempt to build teh installer
+	# $path = Build-Installer $versionNumber
+
+	# get changelog before tagging
+    $changelog = Get-Changelog
+	# tag the release
+	# & (git tag, $tag)
+
+	# print out the changelog to the console
+    # Write-Host $changelog
+
+	$jsonReleaseFile = "[{""VersionName"": ""$versionNumber"", ""DownloadLink"": ""https://cdn.nadeko.bot/dl/bot/nadeko-setup-$versionNumber.exe"", ""Changelog"": """"}]"
+
+	$releaseJsonOutPath = [Environment]::GetFolderPath('MyDocuments') + "\_projekti\nadeko-installers\$versionNumber\"
+	New-Item -Path $releaseJsonOutPath -Value $jsonReleaseFile -Name "releases.json" -Force
+}

releases-v3.json

@@ -0,0 +1 @@
+[{ "VersionName":"_VERSION_", "DownloadLink":"https://cdn.nadeko.bot/dl/bot/_INSTALLER_FILE_NAME_" }]

remove-migration.ps1

@@ -1,4 +0,0 @@
-dotnet ef migrations remove -c SqliteContext -f
-dotnet ef migrations remove -c PostgreSqlContext -f
-dotnet ef migrations remove -c MysqlContext -f
-

src/Nadeko.Common/Extensions/ArrayExtensions.cs

@@ -1,6 +1,4 @@
-using System.Security.Cryptography;
-
-namespace Nadeko.Common;
+namespace Nadeko.Common;
 
 // made for expressions because they almost never get added
 // and they get looped through constantly
@@ -50,13 +48,4 @@ public static class ArrayExtensions
 
         return toReturn;
     }
-
-    public static T? RandomOrDefault<T>(this T[] data)
-    {
-        if (data.Length == 0)
-            return default;
-
-        var index = RandomNumberGenerator.GetInt32(0, data.Length);
-        return data[index];
-    }
 }

src/Nadeko.Common/Extensions/EnumerableExtensions.cs

@@ -45,11 +45,21 @@ public static class EnumerableExtensions
     /// <param name="items">Items to shuffle</param>
     public static IReadOnlyList<T> Shuffle<T>(this IEnumerable<T> items)
     {
-        var list = items.ToArray();
-        var n = list.Length;
-        while (n-- > 1)
+        using var provider = RandomNumberGenerator.Create();
+        var list = items.ToList();
+        var n = list.Count;
+        while (n > 1)
         {
-            var k = RandomNumberGenerator.GetInt32(n);
+            var box = new byte[(n / byte.MaxValue) + 1];
+            int boxSum;
+            do
+            {
+                provider.GetBytes(box);
+                boxSum = box.Sum(b => b);
+            } while (!(boxSum < n * (byte.MaxValue * box.Length / n)));
+
+            var k = boxSum % n;
+            n--;
             (list[k], list[n]) = (list[n], list[k]);
         }
 

src/Nadeko.Common/GlobalUsings.cs

@@ -0,0 +1 @@
+global using NonBlocking;

src/Nadeko.Common/Helpers/LogSetup.cs

@@ -1,6 +1,7 @@
 using Serilog.Events;
 using Serilog.Sinks.SystemConsole.Themes;
 using System.Text;
+using Serilog;
 
 namespace Nadeko.Common;
 

src/Nadeko.Common/Kwum.cs

@@ -5,9 +5,9 @@ namespace Nadeko.Common;
 // needs proper invalid input check (character array input out of range)
 // needs negative number support
 // ReSharper disable once InconsistentNaming
-#pragma warning disable CS8981
+#pragma warning disable IDE1006
 public readonly struct kwum : IEquatable<kwum>
-#pragma warning restore CS8981
+#pragma warning restore IDE1006
 {
     private const string VALID_CHARACTERS = "23456789abcdefghijkmnpqrstuvwxyz";
     private readonly int _value;

src/Nadeko.Common/Nadeko.Common.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="NonBlocking" Version="2.1.0" />
+
+        <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    </ItemGroup>
+</Project>

src/Nadeko.Common/NadekoRandom.cs

@@ -3,7 +3,7 @@ using System.Security.Cryptography;
 
 namespace Nadeko.Common;
 
-public sealed class NadekoRandom : Random
+public class NadekoRandom : Random
 {
     private readonly RandomNumberGenerator _rng;
 
@@ -17,24 +17,26 @@ public sealed class NadekoRandom : Random
         return Math.Abs(BitConverter.ToInt32(bytes, 0));
     }
 
-    /// <summary>
-    /// Generates a random integer between 0 (inclusive) and
-    /// a specified exclusive upper bound using a cryptographically strong random number generator.
-    /// </summary>
-    /// <param name="maxValue">Exclusive max value</param>
-    /// <returns>A random number</returns>
     public override int Next(int maxValue)
-        => RandomNumberGenerator.GetInt32(maxValue);
+    {
+        if (maxValue <= 0)
+            throw new ArgumentOutOfRangeException(nameof(maxValue));
+        var bytes = new byte[sizeof(int)];
+        _rng.GetBytes(bytes);
+        return Math.Abs(BitConverter.ToInt32(bytes, 0)) % maxValue;
+    }
 
-    /// <summary>
-    /// Generates a random integer between a specified inclusive lower bound and a
-    /// specified exclusive upper bound using a cryptographically strong random number generator.
-    /// </summary>
-    /// <param name="minValue">Inclusive min value</param>
-    /// <param name="maxValue">Exclusive max value</param>
-    /// <returns>A random number</returns>
     public override int Next(int minValue, int maxValue)
-        => RandomNumberGenerator.GetInt32(minValue, maxValue);
+    {
+        if (minValue > maxValue)
+            throw new ArgumentOutOfRangeException(nameof(maxValue));
+        if (minValue == maxValue)
+            return minValue;
+        var bytes = new byte[sizeof(int)];
+        _rng.GetBytes(bytes);
+        var sign = Math.Sign(BitConverter.ToInt32(bytes, 0));
+        return (sign * BitConverter.ToInt32(bytes, 0) % (maxValue - minValue)) + minValue;
+    }
 
     public long NextLong(long minValue, long maxValue)
     {

src/Nadeko.Common/QueueRunner.cs

@@ -1,4 +1,5 @@
 using System.Threading.Channels;
+using Serilog;
 
 namespace Nadeko.Common;
 

src/Nadeko.Common/ShmartBankAmount.cs

@@ -0,0 +1,19 @@
+namespace Nadeko.Common;
+
+public readonly struct ShmartBankAmount
+{
+    public long Amount { get; }
+    public ShmartBankAmount(long amount)
+    {
+        Amount = amount;
+    }
+    
+    public static implicit operator ShmartBankAmount(long num)
+        => new(num);
+
+    public static implicit operator long(ShmartBankAmount num)
+        => num.Amount;
+
+    public static implicit operator ShmartBankAmount(int num)
+        => new(num);
+}

src/Nadeko.Common/ShmartNumber.cs

@@ -0,0 +1,38 @@
+namespace Nadeko.Common;
+
+public readonly struct ShmartNumber : IEquatable<ShmartNumber>
+{
+    public long Value { get; }
+
+    public ShmartNumber(long val)
+    {
+        Value = val;
+    }
+
+    public static implicit operator ShmartNumber(long num)
+        => new(num);
+
+    public static implicit operator long(ShmartNumber num)
+        => num.Value;
+
+    public static implicit operator ShmartNumber(int num)
+        => new(num);
+
+    public override string ToString()
+        => Value.ToString();
+
+    public override bool Equals(object? obj)
+        => obj is ShmartNumber sn && Equals(sn);
+
+    public bool Equals(ShmartNumber other)
+        => other.Value == Value;
+
+    public override int GetHashCode()
+        => Value.GetHashCode();
+
+    public static bool operator ==(ShmartNumber left, ShmartNumber right)
+        => left.Equals(right);
+
+    public static bool operator !=(ShmartNumber left, ShmartNumber right)
+        => !(left == right);
+}

src/Nadeko.Econ/Gambling/Betdraw/BetdrawGame.cs

@@ -1,4 +1,6 @@
-namespace Nadeko.Econ.Gambling.Betdraw;
+using Serilog;
+
+namespace Nadeko.Econ.Gambling.Betdraw;
 
 public sealed class BetdrawGame
 {

src/Nadeko.Econ/Gambling/Rps/RpsGame.cs

@@ -4,9 +4,9 @@ public sealed class RpsGame
 {
     private static readonly NadekoRandom _rng = new NadekoRandom();
     
-    private const decimal WIN_MULTI = 1.95m;
-    private const decimal DRAW_MULTI = 1m;
-    private const decimal LOSE_MULTI = 0m;
+    const decimal WIN_MULTI = 1.95m;
+    const decimal DRAW_MULTI = 1m;
+    const decimal LOSE_MULTI = 0m;
     
     public RpsGame()
     {

src/Nadeko.Econ/Gambling/Slot/SlotGame.cs

@@ -1,8 +1,5 @@
 namespace Nadeko.Econ.Gambling;
 
-//here is a payout chart
-//https://lh6.googleusercontent.com/-i1hjAJy_kN4/UswKxmhrbPI/AAAAAAAAB1U/82wq_4ZZc-Y/DE6B0895-6FC1-48BE-AC4F-14D1B91AB75B.jpg
-//thanks to judge for helping me with this
 public class SlotGame
 {
     private static readonly NadekoRandom _rng = new NadekoRandom();

src/Nadeko.Econ/GlobalUsings.cs

@@ -0,0 +1 @@
+global using Nadeko.Common;

src/Nadeko.Econ/Nadeko.Econ.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Nadeko.Common\Nadeko.Common.csproj" />
+    </ItemGroup>
+
+</Project>

src/Nadeko.Medusa/Attributes/FilterAttribute.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Medusa;
+namespace Nadeko.Snake;
 
 /// <summary>
 /// Overridden to implement custom checks which commands have to pass in order to be executed.

src/Nadeko.Medusa/Attributes/MedusaPermAttribute.cs

@@ -1,10 +0,0 @@
-namespace NadekoBot.Medusa;
-
-/// <summary>
-/// Used as a marker class for bot_perm and user_perm Attributes
-/// Has no functionality.
-/// </summary>
-public abstract class MedusaPermAttribute : Attribute
-{
-    
-}

src/Nadeko.Medusa/Attributes/bot_owner_onlyAttribute.cs

@@ -1,7 +0,0 @@
-namespace NadekoBot.Medusa;
-
-[AttributeUsage(AttributeTargets.Method)]
-public sealed class bot_owner_onlyAttribute : MedusaPermAttribute
-{
-    
-}

src/Nadeko.Medusa/Attributes/bot_permAttribute.cs

@@ -1,23 +0,0 @@
-using Discord;
-
-namespace NadekoBot.Medusa;
-
-[AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
-public sealed class bot_permAttribute : MedusaPermAttribute
-{
-    public GuildPermission? GuildPerm { get; }
-    public ChannelPermission? ChannelPerm { get; }
-
-
-    public bot_permAttribute(GuildPermission perm)
-    {
-        GuildPerm = perm;
-        ChannelPerm = null;
-    }
-
-    public bot_permAttribute(ChannelPermission perm)
-    {
-        ChannelPerm = perm;
-        GuildPerm = null;
-    }
-}

src/Nadeko.Medusa/Attributes/cmdAttribute.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Medusa;
+namespace Nadeko.Snake;
 
 /// <summary>
 /// Marks a method as a snek command

src/Nadeko.Medusa/Attributes/injectAttribute.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Medusa;
+namespace Nadeko.Snake;
 
 /// <summary>
 /// Marks services in command arguments for injection.

src/Nadeko.Medusa/Attributes/leftoverAttribute.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Medusa;
+namespace Nadeko.Snake;
 
 /// <summary>
 /// Marks the parameter to take 

src/Nadeko.Medusa/Attributes/prioAttribute.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Medusa;
+namespace Nadeko.Snake;
 
 /// <summary>
 /// Sets the priority of a command in case there are multiple commands with the same name but different parameters.

src/Nadeko.Medusa/Attributes/svcAttribute.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Medusa;
+namespace Nadeko.Snake;
 
 /// <summary>
 /// Marks the class as a service which can be used within the same Medusa

src/Nadeko.Medusa/Attributes/user_permAttribute.cs

@@ -1,22 +0,0 @@
-using Discord;
-
-namespace NadekoBot.Medusa;
-
-[AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
-public sealed class user_permAttribute : MedusaPermAttribute
-{
-    public GuildPermission? GuildPerm { get; }
-    public ChannelPermission? ChannelPerm { get; }
-    
-    public user_permAttribute(GuildPermission perm)
-    {
-        GuildPerm = perm;
-        ChannelPerm = null;
-    }
-
-    public user_permAttribute(ChannelPermission perm)
-    {
-        ChannelPerm = perm;
-        GuildPerm = null;
-    }
-}

src/Nadeko.Medusa/Context/AnyContext.cs

@@ -1,7 +1,7 @@
 using Discord;
 using NadekoBot;
 
-namespace NadekoBot.Medusa;
+namespace Nadeko.Snake;
 
 /// <summary>
 /// Commands which take this class as a first parameter can be executed in both DMs and Servers 
@@ -23,11 +23,6 @@ public abstract class AnyContext
     /// </summary>
     public abstract IUser User { get; }
 
-    /// <summary>
-    /// Bot user
-    /// </summary>
-    public abstract ISelfUser Bot { get; }
-
     /// <summary>
     /// Provides access to strings used by this medusa
     /// </summary>
@@ -40,4 +35,13 @@ public abstract class AnyContext
     /// <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,6 +1,6 @@
 using Discord;
 
-namespace NadekoBot.Medusa;
+namespace Nadeko.Snake;
 
 /// <summary>
 /// Commands which take this type as the first parameter can only be executed in DMs

src/Nadeko.Medusa/Context/GuildContext.cs

@@ -1,6 +1,6 @@
 using Discord;
 
-namespace NadekoBot.Medusa;
+namespace Nadeko.Snake;
 
 /// <summary>
 /// Commands which take this type as a first parameter can only be executed in a server

src/Nadeko.Medusa/Extensions/EmbedBuilderExtensions.cs

@@ -0,0 +1,14 @@
+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,32 +1,37 @@
 using Discord;
+using Nadeko.Snake;
 
-namespace NadekoBot.Medusa;
+namespace NadekoBot;
 
 public static class MedusaExtensions
 {
-    public static Task<IUserMessage> EmbedAsync(this IMessageChannel ch, EmbedBuilder embed, string msg = "")
+    public static Task<IUserMessage> EmbedAsync(this IMessageChannel ch, IEmbedBuilder embed, string msg = "")
         => ch.SendMessageAsync(msg,
             embed: embed.Build(),
             options: new()
             {
-                RetryMode = RetryMode.Retry502
+                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.EmbedAsync(new EmbedBuilder()
-                           .WithColor(0, 200, 0)
-                           .WithDescription(msg));
+        => ctx.Channel.SendConfirmAsync(ctx, msg);
 
     public static Task<IUserMessage> SendPendingAsync(this AnyContext ctx, string msg)
-        => ctx.Channel.EmbedAsync(new EmbedBuilder()
-                           .WithColor(200, 200, 0)
-                           .WithDescription(msg));
+        => ctx.Channel.SendPendingAsync(ctx, msg);
 
     public static Task<IUserMessage> SendErrorAsync(this AnyContext ctx, string msg)
-        => ctx.Channel.EmbedAsync(new EmbedBuilder()
-                           .WithColor(200, 0, 0)
-                           .WithDescription(msg));
+        => ctx.Channel.SendErrorAsync(ctx, msg);
 
     // localized
     public static Task ConfirmAsync(this AnyContext ctx)

src/Nadeko.Medusa/IEmbedBuilder.cs

@@ -0,0 +1,17 @@
+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 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <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.204.0" />
-      <PackageReference Include="Serilog" Version="3.1.1" />
-      <PackageReference Include="YamlDotNet" Version="15.1.2" />
+      <PackageReference Include="Discord.Net.Core" Version="3.103.0" />
+      <PackageReference Include="Serilog" Version="2.11.0" />
+      <PackageReference Include="YamlDotNet" Version="11.2.1" />
     </ItemGroup>
 
-    <PropertyGroup Condition=" '$(Version)' == '' ">
-        <Version>9.0.0</Version>
-    </PropertyGroup>
 </Project>

src/Nadeko.Medusa/ParamParser/ParamParser.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Medusa;
+namespace Nadeko.Snake;
 
 /// <summary>
 /// Overridden to implement parsers for custom types 

src/Nadeko.Medusa/ParamParser/ParseResult.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Medusa;
+namespace Nadeko.Snake;
 
 public readonly struct ParseResult<T>
 {

src/Nadeko.Medusa/Snek.cs

@@ -1,6 +1,6 @@
 using Discord;
 
-namespace NadekoBot.Medusa;
+namespace Nadeko.Snake;
 
 /// <summary>
 /// The base class which will be loaded as a module into NadekoBot

src/Nadeko.Medusa/Strings/CommandStrings.cs

@@ -1,6 +1,6 @@
 using YamlDotNet.Serialization;
 
-namespace NadekoBot.Medusa;
+namespace Nadeko.Snake;
 
 public readonly struct CommandStrings
 {

src/Nadeko.Medusa/Strings/IMedusaStrings.cs

@@ -1,6 +1,6 @@
 using System.Globalization;
 
-namespace NadekoBot.Medusa;
+namespace Nadeko.Snake;
 
 /// <summary>
 ///     Defines methods to retrieve and reload medusa strings

src/Nadeko.Medusa/Strings/IMedusaStringsProvider.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Medusa;
+namespace Nadeko.Snake;
 
 /// <summary>
 ///     Implemented by classes which provide localized strings in their own ways

src/Nadeko.Medusa/Strings/LocalMedusaStringsProvider.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Medusa;
+namespace Nadeko.Snake;
 
 public class LocalMedusaStringsProvider : IMedusaStringsProvider
 {

src/Nadeko.Medusa/Strings/MedusaStrings.cs

@@ -1,7 +1,7 @@
 using System.Globalization;
 using Serilog;
 
-namespace NadekoBot.Medusa;
+namespace Nadeko.Snake;
 
 public class MedusaStrings : IMedusaStrings
 {

src/Nadeko.Medusa/Strings/StringsLoader.cs

@@ -2,7 +2,7 @@
 using Serilog;
 using YamlDotNet.Serialization;
 
-namespace NadekoBot.Medusa;
+namespace Nadeko.Snake;
 
 /// <summary>
 ///     Loads strings from the shortcut or localizable path

src/NadekoBot.Coordinator/NadekoBot.Coordinator.csproj

@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <NoWarn>CS8981</NoWarn>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,11 +9,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.AspNetCore" Version="2.62.0" />
-    <PackageReference Include="Serilog" Version="3.1.1" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
+    <PackageReference Include="Grpc.AspNetCore" Version="2.47.0" />
+    <PackageReference Include="Serilog" Version="2.11.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Include="YamlDotNet" Version="15.1.2" />
+    <PackageReference Include="YamlDotNet" Version="11.2.1" />
   </ItemGroup>
   
 </Project>

src/NadekoBot.Generators/Cloneable/CloneableGenerator.cs

@@ -6,6 +6,8 @@ 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
@@ -21,60 +23,54 @@ namespace Cloneable
         private const string CLONE_ATTRIBUTE_STRING = "CloneAttribute";
         private const string IGNORE_CLONE_ATTRIBUTE_STRING = "IgnoreCloneAttribute";
 
-        private const string CLONEABLE_ATTRIBUTE_TEXT = $$"""
-            // <AutoGenerated/>
+        private const string CLONEABLE_ATTRIBUTE_TEXT = @"// <AutoGenerated/>
 using System;
 
-            namespace {{CLONEABLE_NAMESPACE}}
+namespace " + CLONEABLE_NAMESPACE + @"
 {
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct, Inherited = true, AllowMultiple = false)]
-                internal sealed class {{CLONEABLE_ATTRIBUTE_STRING}} : Attribute
+    public sealed class " + CLONEABLE_ATTRIBUTE_STRING + @" : Attribute
     {
-                    public {{CLONEABLE_ATTRIBUTE_STRING}}()
+        public " + CLONEABLE_ATTRIBUTE_STRING + @"()
         {
         }
 
-                    public bool {{EXPLICIT_DECLARATION_KEY_STRING}} { get; set; }
+        public bool " + EXPLICIT_DECLARATION_KEY_STRING + @" { get; set; }
     }
 }
+";
 
-            """;
-
-        private const string CLONE_PROPERTY_ATTRIBUTE_TEXT = $$"""
-            // <AutoGenerated/>
+        private const string CLONE_PROPERTY_ATTRIBUTE_TEXT = @"// <AutoGenerated/>
 using System;
 
-            namespace {{CLONEABLE_NAMESPACE}}
+namespace " + CLONEABLE_NAMESPACE + @"
 {
     [AttributeUsage(AttributeTargets.Property, Inherited = true, AllowMultiple = false)]
-                internal sealed class {{CLONE_ATTRIBUTE_STRING}} : Attribute
+    public sealed class " + CLONE_ATTRIBUTE_STRING + @" : Attribute
     {
-                    public {{CLONE_ATTRIBUTE_STRING}}()
+        public " + CLONE_ATTRIBUTE_STRING + @"()
         {
         }
 
-                    public bool {{PREVENT_DEEP_COPY_KEY_STRING}} { get; set; }
+        public bool " + PREVENT_DEEP_COPY_KEY_STRING + @" { get; set; }
     }
 }
+";
 
-            """;
-
-        private const string IGNORE_CLONE_PROPERTY_ATTRIBUTE_TEXT = $$"""
-            // <AutoGenerated/>
+        private const string IGNORE_CLONE_PROPERTY_ATTRIBUTE_TEXT = @"// <AutoGenerated/>
 using System;
 
-            namespace {{CLONEABLE_NAMESPACE}}
+namespace " + CLONEABLE_NAMESPACE + @"
 {
     [AttributeUsage(AttributeTargets.Property, Inherited = true, AllowMultiple = false)]
-                internal sealed class {{IGNORE_CLONE_ATTRIBUTE_STRING}} : Attribute
+    public sealed class " + IGNORE_CLONE_ATTRIBUTE_STRING + @" : Attribute
     {
-                    public {{IGNORE_CLONE_ATTRIBUTE_STRING}}()
+        public " + IGNORE_CLONE_ATTRIBUTE_STRING + @"()
         {
         }
     }
 }
-
-            """;
+";
 
         private INamedTypeSymbol? _cloneableAttribute;
         private INamedTypeSymbol? _ignoreCloneAttribute;

src/NadekoBot.Generators/Cloneable/SymbolExtensions.cs

@@ -1,7 +1,8 @@
 // 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

src/NadekoBot.Generators/Cloneable/SyntaxReceiver.cs

@@ -1,7 +1,7 @@
 // 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;
 

src/NadekoBot.Generators/Command/CommandAttributesGenerator.cs

@@ -0,0 +1,336 @@
+// #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
+// //         if (!Debugger.IsAttached)
+// //             Debugger.Launch();
+// //         // 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!))
+//             .Where(static x => x is not null)
+//             .Cast<MethodModel>();
+//
+//         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);
+//
+//         SemanticModel semanticModel;
+//         try
+//         {
+//             semanticModel = comp.GetSemanticModel(decl.SyntaxTree);
+//         }
+//         catch
+//         {
+//             // for some reason this method can throw "Not part of this compilation" argument exception
+//             return null;
+//         }
+//
+//         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,6 +1,10 @@
 #nullable enable
+using System;
 using System.CodeDom.Compiler;
+using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
+using System.Linq;
 using System.Text.RegularExpressions;
 using Microsoft.CodeAnalysis;
 using Newtonsoft.Json;
@@ -22,23 +26,24 @@ namespace NadekoBot.Generators
     [Generator]
     public class LocalizedStringsGenerator : ISourceGenerator
     {
-//         private const string LOC_STR_SOURCE = @"namespace NadekoBot
-// {
-//     public readonly struct LocStr
-//     {
-//         public readonly string Key;
-//         public readonly object[] Params;
-//         
-//         public LocStr(string key, params object[] data)
-//         {
-//             Key = key;
-//             Params = data;
-//         }
-//     }
-// }";
+        private const string LOC_STR_SOURCE = @"namespace NadekoBot
+{
+    public readonly struct LocStr
+    {
+        public readonly string Key;
+        public readonly object[] Params;
+        
+        public LocStr(string key, params object[] data)
+        {
+            Key = key;
+            Params = data;
+        }
+    }
+}";
 
         public void Initialize(GeneratorInitializationContext context)
         {
+
         }
 
         public void Execute(GeneratorExecutionContext context)
@@ -50,7 +55,6 @@ namespace NadekoBot.Generators
             using (var stringWriter = new StringWriter())
             using (var sw = new IndentedTextWriter(stringWriter))
             {
-                sw.WriteLine("#pragma warning disable CS8981");
                 sw.WriteLine("namespace NadekoBot;");
                 sw.WriteLine();
 
@@ -102,7 +106,7 @@ namespace NadekoBot.Generators
                 context.AddSource("strs.g.cs", stringWriter.ToString());
             }
 
-            // context.AddSource("LocStr.g.cs", LOC_STR_SOURCE);
+            context.AddSource("LocStr.g.cs", LOC_STR_SOURCE);
         }
 
         private List<TranslationPair> GetFields(string? dataText)