Updated CHANGELOG.md

.dockerignore

@@ -1,11 +1,16 @@
 # Ignore all files
 *
 
-# Don't ignore nugetconfig
-!./NuGet.Config
-
-# Don't ignore src projects
-!src/**
+# 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

@@ -1,9 +1,8 @@
 #Manually added files
 
-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,83 +1,47 @@
-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-medusa-package
+  - publish-windows
+  - upload-windows-updater-release
 
 variables:
   project: "NadekoBot"
   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"
-
+  
 build:
   stage: build
   script:
-    - |
-      VERSION_STRING=""
-      if [ -n "$CI_COMMIT_TAG" ]; then
-        VERSION_STRING="-p:Version=$CI_COMMIT_TAG"
-      fi
-    - "dotnet publish -c Release -r linux-x64 --self-contained $VERSION_STRING -o $LINUX_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
-    - "dotnet publish -c Release -r linux-arm64 --self-contained $VERSION_STRING -o $LINUX_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
-    - "dotnet publish -c Release -r win-x64 --self-contained $VERSION_STRING -o $WIN_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
-    - "dotnet publish -c Release -r win-arm64 --self-contained $VERSION_STRING -o $WIN_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
-    - "dotnet publish -c Release -r osx-x64 --self-contained $VERSION_STRING -o $MACOS_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
-    - "dotnet publish -c Release -r osx-arm64 --self-contained $VERSION_STRING -o $MACOS_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
+    - "dotnet publish -c Release -r linux-x64 -o $LINUX_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
+    - "dotnet publish -c Release -r win7-x64 -o $WIN_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
   artifacts:
     paths:
       - "$LINUX_X64_OUTPUT_DIR/"
-      - "$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
  image: alpine:latest
  rules:
    - if: $CI_COMMIT_TAG
- script:
+ script:    
    - apk add --no-cache curl tar zip
    - "tar cvf $LINUX_X64_RELEASE $LINUX_X64_OUTPUT_DIR/*"
-   - "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
@@ -86,14 +50,9 @@ release:
    - if: $CI_COMMIT_TAG
  script:
    - |
-     release-cli create --name "NadekoBot v$CI_COMMIT_TAG" --description "## [Changelog](https://gitlab.com/kwoth/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
@@ -103,46 +62,45 @@ test:
     - "cd $tests_path"
     - "dotnet test"
 
-build-installer:
- stage: build-installer
+publish-windows:
+ stage: publish-windows 
  rules:
-   - if: "$CI_COMMIT_TAG"
+   - 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 -y
+   - choco install dotnet-6.0-sdk -y
    - choco install innosetup -y
  artifacts:
    paths:
      - "$INSTALLER_OUTPUT_DIR/$INSTALLER_FILE_NAME"
  script:
    - dotnet clean
-   - dotnet restore -f --no-cache -v n
-   - dotnet publish -c Release --self-contained --runtime win-x64 /p:Version=$CI_COMMIT_TAG src/NadekoBot
+   - dotnet restore
+   - dotnet publish -c Release --runtime win7-x64 /p:Version=$CI_COMMIT_TAG src/NadekoBot
    - $env:NADEKOBOT_INSTALL_VERSION = $CI_COMMIT_TAG
    - iscc.exe "/O+" ".\exe_builder.iss"
  tags:
-   - saas-windows-medium-amd64
+   - windows
 
-publish-medusa-package:
- stage: publish-medusa-package
- allow_failure: true
+upload-windows-updater-release:
+ stage: upload-windows-updater-release
  rules:
-   - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-     when: never
-   - 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
-   - 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"
+   - 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"
 
 docker-build:
  # Use the official docker image.
  image: docker:latest
  stage: build
- allow_failure: true
  services:
    - docker:dind
  before_script:
@@ -155,13 +113,13 @@ docker-build:
        tag=""
        echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'"
      else
-       tag=":$CI_COMMIT_SHA"
+       tag=":$CI_COMMIT_REF_SLUG"
        echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
      fi
    - docker build --pull -t "$CI_REGISTRY_IMAGE${tag}" .
    - docker push "$CI_REGISTRY_IMAGE${tag}"
  # Run this job in a branch where a Dockerfile exists
  rules:
-   - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_TAG
+   - if: $CI_COMMIT_BRANCH
      exists:
        - Dockerfile

.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

Dockerfile

@@ -1,24 +1,15 @@
-# Use the .NET 8.0 SDK as the base image for the build stage
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 WORKDIR /source
 
-# Copy the .csproj files for each project
 COPY src/Nadeko.Medusa/*.csproj src/Nadeko.Medusa/
 COPY src/NadekoBot/*.csproj src/NadekoBot/
 COPY src/NadekoBot.Coordinator/*.csproj src/NadekoBot.Coordinator/
 COPY src/NadekoBot.Generators/*.csproj src/NadekoBot.Generators/
-COPY src/NadekoBot.Voice/*.csproj src/NadekoBot.Voice/
-
-# Restore the dependencies for the NadekoBot project
+COPY src/ayu/Ayu.Discord.Voice/*.csproj src/ayu/Ayu.Discord.Voice/
 RUN dotnet restore src/NadekoBot/
 
-# Copy the rest of the source code
 COPY . .
-
-# Set the working directory to the NadekoBot project
 WORKDIR /source/src/NadekoBot
-
-# Build and publish the NadekoBot project, then clean up unnecessary files
 RUN set -xe; \
     dotnet --version; \
     dotnet publish -c Release -o /app --no-restore; \
@@ -27,33 +18,26 @@ RUN set -xe; \
     find /app -type f -exec chmod -x {} \; ;\
     chmod +x /app/NadekoBot
 
-# Use the .NET 8.0 runtime as the base image for the final stage
-FROM mcr.microsoft.com/dotnet/runtime:8.0
+# final stage/image
+FROM mcr.microsoft.com/dotnet/runtime:6.0
 WORKDIR /app
 
-# Create a new user, install dependencies, and set up sudoers file
 RUN set -xe; \
     useradd -m nadeko; \
     apt-get update; \
-    apt-get install -y --no-install-recommends libsqlite3-0 curl ffmpeg sudo python3; \
+    apt-get install -y 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; \
-    apt-get autoremove -y; \
-    apt-get autoclean -y
+    pip3 install --upgrade youtube-dl; \
+    apt-get remove -y python3-pip; \
+    chmod +x /usr/local/bin/youtube-dl
 
-# Copy the built application and the entrypoint script from the build stage
 COPY --from=build /app ./
 COPY docker-entrypoint.sh /usr/local/sbin
 
-# Set environment variables
 ENV shard_id=0
 ENV total_shards=1
-ENV NadekoBot__creds=/app/data/creds.yml
 
-# Define the data directory as a volume
 VOLUME [ "/app/data" ]
-
-# Set the entrypoint and default command
 ENTRYPOINT [ "/usr/local/sbin/docker-entrypoint.sh" ]
-CMD dotnet NadekoBot.dll "$shard_id" "$total_shards"
+CMD dotnet NadekoBot.dll "$shard_id" "$total_shards"

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

@@ -12,26 +12,24 @@ ProjectSection(SolutionItems) = preProject
 	README.md = README.md
 	.gitlab-ci.yml = .gitlab-ci.yml
 	Dockerfile = Dockerfile
-	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}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.GrpcApiBase", "src\NadekoBot.GrpcApiBase\NadekoBot.GrpcApiBase.csproj", "{FB74B9EA-10B9-4542-ACB1-35523A95A587}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -63,6 +61,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
@@ -75,31 +79,19 @@ 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
-		{FB74B9EA-10B9-4542-ACB1-35523A95A587}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FB74B9EA-10B9-4542-ACB1-35523A95A587}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FB74B9EA-10B9-4542-ACB1-35523A95A587}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU
-		{FB74B9EA-10B9-4542-ACB1-35523A95A587}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU
-		{FB74B9EA-10B9-4542-ACB1-35523A95A587}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FB74B9EA-10B9-4542-ACB1-35523A95A587}.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}
-		{FB74B9EA-10B9-4542-ACB1-35523A95A587} = {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-entrypoint.sh

@@ -13,15 +13,7 @@ do
     fi
 done
 
-# creds.yml migration
-if [ -f /app/creds.yml ]; then
-    echo "Default location for creds.yml is now /app/data/creds.yml."
-    echo "Please move your creds.yml and update your docker-compose.yml accordingly."
-
-    export Nadeko_creds=/app/creds.yml
-fi
-
-# ensure nadeko can write on /app/data
+# fix folder permissions
 chown -R nadeko:nadeko "$data"
 
 # drop to regular user and launch command

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/kwoth/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/creds-guide.md

@@ -33,17 +33,17 @@ These are required for a number of features to function properly, and all should
 For a single owner, it should look like this:
 
 ```yml
-OwnerIds:
-  - 105635576866156544
+    OwnerIds:
+        - 105635576866156544
 ```
 
 For multiple owners, it should look like this:
 
 ```yml
-OwnerIds:
-  - 105635123466156544
-  - 145521851676884992
-  - 341420590009417729
+    OwnerIds:
+        - 105635123466156544
+        - 145521851676884992
+        - 341420590009417729
 ```
 
 

docs/custom-reactions.md

@@ -1,23 +1,23 @@
-## Expressions
+## Custom Reactions / Expressions
 
 ### Important
 
-- For modifying **global** expressions, the ones which will work across all the servers your bot is connected to, you **must** be a Bot Owner.  
-  You must also use the commands for adding, deleting and listing these expressions in a direct message with the bot.
-- For modifying **local** expressions, the ones which will only work on the server that they are added on, it is required to have the **Administrator** permission.  
-  You must also use the commands for adding, deleting and listing these expressions in the server you want the expressions to work on.
+- For modifying **global** custom reactions, the ones which will work across all the servers your bot is connected to, you **must** be a Bot Owner.  
+  You must also use the commands for adding, deleting and listing these reactions in a direct message with the bot.
+- For modifying **local** custom reactions, the ones which will only work on the server that they are added on, it is required to have the **Administrator** permission.  
+  You must also use the commands for adding, deleting and listing these reactions in the server you want the custom reactions to work on.
 
 ### Commands and Their Use
 
 | Command Name | Description                                                                                                                                                                                                                                                                                | Example                          |
 | :----------: | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------------------------------- |
-| `.exa`  | Add an expression with a trigger and a response. Running this command in a server requries the Administrator permission. Running this command in DM is Bot Owner only, and adds a new global expression.             | `.exadd "hello" Hi there, %user%!` |
-|   `exl`   | Lists a page of global or server expression(15 expressions per page). Running this command in a DM will list the global expression, while running it in a server will list that server's expression.   | `.exl 1`                           |
-|   `.exd`  | Deletes an expression based on the provided index. Running this command in a server requires the Administrator permission. Running this command in DM is Bot Owner only, and will delete a global expression.     | `.exd 5`                           |
+|    `.acr`    | Add a custom reaction with a trigger and a response. Running this command in a server requries the Administrator permission. Running this command in DM is Bot Owner only, and adds a new global custom reaction. | `.acr "hello" Hi there, %user%!` |
+|    `.lcr`    | Lists a page of global or server custom reactions (15 reactions per page). Running this command in a DM will list the global custom reactions, while running it in a server will list that server's custom reactions.                                                                      | `.lcr 1`                         |
+|    `.dcr`    | Deletes a custom reaction based on the provided index. Running this command in a server requires the Administrator permission. Running this command in DM is Bot Owner only, and will delete a global custom reaction.                                                                     | `.dcr 5`                         |
 
-#### Now that we know the commands let's take a look at an example of adding a command with `.exa`,
+#### Now that we know the commands let's take a look at an example of adding a command with `.acr`,
 
-`.exadd "Nice Weather" It sure is, %user%!`
+`.acr "Nice Weather" It sure is, %user%!`
 
 This command can be split into two different arguments:
 
@@ -28,16 +28,16 @@ An important thing to note about the triger is that, to be more than one word, w
 
 There's no special requirement for the formatting of the response, so we could just write it in exactly the same way we want it to respond, albeit with a placeholder - which will be explained in this next section.
 
-Now, if that command was ran in a server, anyone on that server can make the bot mention them, saying `It sure is, @Username` anytime they say "Nice Weather". If the command is ran in a direct message with the bot, then the expression can be used on every server the bot is connected to.
+Now, if that command was ran in a server, anyone on that server can make the bot mention them, saying `It sure is, @Username` anytime they say "Nice Weather". If the command is ran in a direct message with the bot, then the custom reaction can be used on every server the bot is connected to.
 
-### Block global Expressions
+### Block global Custom Reactions
 
-If you want to disable a global expression which you do not like, and you do not want to remove it, or you are not the bot owner, you can do so by adding a new expression with the same trigger on your server, and set the response to `-`.
+If you want to disable a global custom reaction which you do not like, and you do not want to remove it, or you are not the bot owner, you can do so by adding a new Custom Reaction with the same trigger on your server, and set the response to `-`.
 
 For example:
-`.exa /o/ -`
+`.acr /o/ -`
 
-Now if you try to trigger `/o/`, it won't print anything even if there is a global expression with the same name.
+Now if you try to trigger `/o/`, it won't print anything even if there is a global custom reaction with the same name.
 
 ### Placeholders!
 

docs/donate.md

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

@@ -1,76 +1,46 @@
-# Deploying NadekoBot with Docker: A Comprehensive Guide
+# Setting up NadekoBot with Docker
 
-## Getting Started
+# WORK IN PROGRESS
 
-Ensure Docker and Docker Compose are installed on your system. If not, follow the official Docker guides for your specific operating system:
-
-- [Docker Installation Guide](https://docs.docker.com/engine/install/)
-- [Docker Compose Installation Guide](https://docs.docker.com/compose/install/)
-
-## Step-by-Step Installation
-
-1. **Choose Your Workspace:** Select a directory where you'll set up your NadekoBot stack. Use your terminal to navigate to this directory. For the purpose of this guide, we'll use `/opt/stacks/nadekobot/` as an example, but you can choose any directory that suits your needs.
-
-2. **Create a Docker Compose File:** In this directory, create a Docker Compose file named `docker-compose.yml`. You can use any text editor for this task. For instance, to use the `nano` editor, type `nano docker-compose.yml`.
-
-3. **Configure Your Docker Compose File:** Populate your Docker Compose file with the following configuration:
+### Installation
 
+1. Create a `/srv/nadeko` folder 
+  - `mkdir -p /srv/nadeko`
+2. Create a `docker-compose.yml`
+  - nano `docker-compose.yml`
+  - copy the following contents into it:
+##### docker-compose.yml 
 ```yml
+version: "3.7"
 services:
   nadeko:
     image: registry.gitlab.com/kwoth/nadekobot:latest
-    container_name: nadeko
-    restart: unless-stopped
+    depends_on:
+      - redis
     environment:
-      TZ: Europe/Rome
+      TZ: Europe/Paris
+      NadekoBot_RedisOptions: redis,name=nadeko
+      #NadekoBot_ShardRunCommand: dotnet
+      #NadekoBot_ShardRunArguments: /app/NadekoBot.dll {0} {1}
     volumes:
-      - /opt/stacks/nadekobot/conf/creds.yml:/app/data/creds.yml
-      - /opt/stacks/nadekobot/data:/app/data
-networks: {}
-```
+      - /srv/nadeko/conf/creds.yml:/app/creds.yml:ro
+      - /srv/nadeko/data:/app/data
 
-4. **Prepare Your Credentials File:** Before running Docker Compose, ensure the `creds.yml` file exists in the `/opt/stacks/nadekobot/conf/` directory. If it's missing, create it using `touch /opt/stacks/nadekobot/conf/creds.yml`. You may need to use `sudo`. Remember to replace `/opt/stacks/nadekobot/` with your chosen directory.
-
-5. **Edit Your Credentials File:** Populate the `creds.yml` file in `/opt/stacks/nadekobot/conf/creds.yml` with your bot's credentials. You can use any text editor for this task. For instance, to use the `nano` editor, type `nano /opt/stacks/nadekobot/conf/creds.yml`. You may need to use `sudo`. Again, replace `/opt/stacks/nadekobot/` with your chosen directory.
-
-6. **Launch Your Bot:** Now, you're ready to run Docker Compose. Use the following command: `docker-compose up -d`.
-
-## Keeping Your Bot Up-to-Date
-
-There are two methods to update your NadekoBot:
-
-### Manual Update
-
-1. **Navigate to Your Directory:** Use `cd /path/to/your/directory` to go to the directory containing your Docker Compose file.
-
-2. **Pull the Latest Images:** Use `docker-compose pull` to fetch the latest images.
-
-3. **Restart Your Containers:** Use `docker-compose up -d` to restart the containers.
-
-### Automatic Update with Watchtower
-
-If you prefer an automated update process, consider using Watchtower. Watchtower automatically updates your Docker containers to the latest versions. 
-
-To use Watchtower with NadekoBot, you need to add a specific label to the service in your Docker Compose file. Here's how your Docker Compose file should look:
-
-```yml
-services:
-  nadeko:
-    image: registry.gitlab.com/kwoth/nadekobot:latest
-    container_name: nadeko
-    restart: unless-stopped
-    labels:
-      - com.centurylinklabs.watchtower.enable=true
-    environment:
-      TZ: Europe/Rome
+  redis:
+    image: redis:4-alpine
+    sysctls:
+      - net.core.somaxconn=511
+    command: redis-server --maxmemory 32M --maxmemory-policy volatile-lru
     volumes:
-      - /opt/stacks/nadekobot/conf/creds.yml:/app/data/creds.yml
-      - /opt/stacks/nadekobot/data:/app/data
-networks: {}
+      - /srv/nadeko/redis-data:/data
 ```
+3. Save your file and run docker compose
+  - `docker-compose up`  
+4. Edit creds in `/srv/nadeko/conf/creds.yml`
+5. Run it again with
+  - `docker-compose up`
 
-Remember to replace `/opt/stacks/nadekobot/` with your chosen directory in the Docker Compose file.
-
-To install and run Watchtower, follow the guide provided by Containrrr:
-
-- [Watchtower Installation and Usage Guide](https://containrrr.dev/watchtower/)
+### Updating
+- `cd /srv/nadeko`
+- `docker-compose pull`
+- `docker-compose up -d`

docs/guides/linux-guide.md

@@ -13,23 +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: 20.04, 22.04, 24.04
-- Mint: 19, 20, 21
-- Debian: 10, 11, 12
-- RockyLinux: 8, 9
-- AlmaLinux: 8, 9
-- openSUSE Leap: 15.5, 15.6 & Tumbleweed
-- Fedora: 38, 39, 40, 41, 42
+- Ubuntu: 16.04, 18.04, 20.04, 21.04, 21.10
+- Mint: 19, 20
+- Debian: 9, 10
+- CentOS: 7
+- 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/kwoth/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`)
@@ -39,7 +40,7 @@ Use the new installer script:  `cd ~ && wget -N https://gitlab.com/kwoth/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/kwoth/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)
@@ -51,35 +52,24 @@ Open Terminal (if you're on an installation with a window manager) and navigate
        - `CTRL` + `X`
        - `Y`
        - `Enter`
-8. Run the installer script again `cd ~ && wget -N https://gitlab.com/kwoth/nadeko-bash-installer/-/raw/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/kwoth/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. 🎉 
 
-## **⚠ IF YOU ARE FOLLOWING THE GUIDE ABOVE, IGNORE THIS SECTION ⚠** 
-
 ## Linux Release
 
-###### Prerequisites
-
-1. (Optional) Installing Redis
-    - ubuntu installation command: `sudo apt-get install redis-server`
-2. Playing music requires `ffmpeg`, `libopus`, `libsodium` and `yt-dlp` (which in turn requires python3)
-    - Ubuntu installation command: `sudo apt-get install ffmpeg libopus0 opus-tools libopus-dev libsodium-dev -y`
-    - yt-dlp installation command: `sudo wget https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -O /usr/local/bin/yt-dlp && sudo chmod a+rx /usr/local/bin/yt-dlp` 
-3. Make sure your python is version 3+ with `python --version`
-    - if it's not, you can install python 3 and make it the default with: `sudo apt-get install python3.8 python-is-python3`
-*You can use nadeko bash script [prerequisites installer](https://gitlab.com/kwoth/nadeko-bash-installer/-/blob/v5/n-prereq.sh) as a reference*
+**⚠ IF YOU ARE FOLLOWING THE GUIDE ABOVE, IGNORE THIS SECTION ⚠** 
 
 ##### Installation Instructions
 
-1. Download the latest release from <https://gitlab.com/kwoth/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!
@@ -103,7 +93,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/kwoth/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!
@@ -159,30 +149,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.)*
@@ -268,7 +243,7 @@ This method is similar to the one above, but requires one extra step, with the a
     echo '#!/bin/bash'
     echo ""
     echo "echo \"Running NadekoBot in the background with auto restart\"
-    yt-dlp -U
+    youtube-dl -U
     
     # If you want Nadeko to be compiled prior to every startup, uncomment the lines
     # below. Note  that it's not necessary unless you are personally modifying the
@@ -300,7 +275,7 @@ This method is similar to the one above, but requires one extra step, with the a
         
         echo \"Waiting for 5 seconds...\"
         sleep 5
-        yt-dlp -U
+        youtube-dl -U
         echo \"Restarting NadekoBot...\"
     done
     
@@ -315,26 +290,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/kwoth/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/kwoth/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/kwoth/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/kwoth/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,14 +10,16 @@
 
 *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**
 
-- [Visual Studio Code](https://code.visualstudio.com/Download) (Highly suggested if you plan on editing files)
+- [Notepad++] (makes it easier to edit your credentials)
 - [Visual C++ 2010 (x86)] and [Visual C++ 2017 (x64)] (both are required if you want Nadeko to play music - restart Windows after installation)
 
 #### Setup
@@ -29,8 +31,9 @@
  ![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: 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.
@@ -43,7 +46,7 @@
 
 #### Updating Nadeko
 
-- Make sure Nadeko is closed and not running
+- Make sure Nadeko is closed and not running  
   (Run `.die` in a connected server to ensure it's not running).
 - Open NadekoBot Updater
 - Click on your bot at the upper left (looks like a spy).
@@ -56,33 +59,33 @@
 
 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
-
-## **⚠ IF YOU ARE FOLLOWING THE GUIDE ABOVE, IGNORE THIS SECTION ⚠**
+- [youtube-dl] - Click to download the file. Then put `youtube-dl.exe` in a path that's in your PATH environment variable. If you don't know what that is, then just move the `youtube-dl.exe` file to NadekoBot/system
 
 ### Windows From Source
 
+⚠ IF YOU ARE FOLLOWING THE GUIDE ABOVE, IGNORE THIS SECTION ⚠ 
+
 ##### 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/`)
+Open PowerShell (press windows button on your keyboard and type powershell, it should show up; alternatively, right click the start menu and select Windows PowerShell), and navigate to the location where you want to install the bot (for example `cd ~/Desktop/`)  
 
-1. `git clone https://gitlab.com/kwoth/nadekobot -b 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`
 5. `cp creds_example.yml creds.yml`
 6. Open `creds.yml` with your favorite text editor (Please don't use Notepad or WordPad. You can use Notepad++, VSCode, Atom, Sublime, or something similar)
 7. [Enter your bot's token](#creds-guide)
-8. Run the bot `dotnet NadekoBot.dll`
+8. Run the bot `dotnet NadekoBot.dll` 
 9. 🎉
 
 ##### Update Instructions
@@ -93,18 +96,14 @@ Open PowerShell as described above and run the following commands:
   - ⚠️ Make sure you don't have your database, credentials or any other nadekobot folder open in some application, this might prevent some of the steps from executing succesfully
 2. Navigate to your bot's folder, example:
     - `cd ~/Desktop/nadekobot`
-3. Pull the new version, and make sure you're on the v5 branch
-    - *⚠️ the first 3 lines can be omitted if you're already on v5. If you're updating from v4, you must run them*
-        - `git remote set-branches origin '*'`
-        - `git fetch -v --depth=1`
-        - `git checkout v5`
-    - `git pull` 
+3. Pull the new version
+    - `git pull`
     - ⚠️ If this fails, you may want to stash or remove your code changes if you don't know how to resolve merge conflicts
 4. **Backup** old output in case your data is overwritten
     - `cp -r -fo output/ output-old`
 5. Build the bot again
     - `dotnet publish -c Release -o output/ src/NadekoBot/`
-6. Remove old strings and aliases to avoid overwriting the updated versions of those files
+6. Remove old strings and aliases to avoid overwriting the updated versions of those files  
     - ⚠ If you've modified said files, back them up instead
     - `rm output-old/data/aliases.yml`
     - `rm -r output-old/data/strings`
@@ -112,18 +111,18 @@ Open PowerShell as described above and run the following commands:
     - `cp -Recurse .\output-old\data\ .\output\ -Force`
 8. Copy creds.yml
     - `cp output-old/creds.yml output/`
-9. Run the bot
+9. Run the bot 
     - `cd output`
     - `dotnet NadekoBot.dll`
 
 🎉 Enjoy
 
-#### Music prerequisites
-In order to use music commands, you need ffmpeg and yt-dlp installed.
+#### Music prerequisites  
+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
@@ -131,4 +130,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

@@ -17,6 +17,8 @@ To self-host your own Nadeko, use the guides below:
 - [:material-linux: Linux guide][linux-guide]
 - [:material-apple: Mac OS guide][macos-guide]
 
+Alternatively, you may also setup the bot [from source][from-source-guide] if you want to modify the code.
+
 In case you need any help, join our [Discord server][discord-server] where we may provide support.
 
 ---
@@ -36,6 +38,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/kwoth/nadekobot
-[issues]: https://gitlab.com/kwoth/nadekobot/issues
+[gitlab]: https://gitlab.com/Kwoth/nadekobot
+[issues]: https://gitlab.com/Kwoth/nadekobot/issues
 [donate]: ./donate.md

docs/medusa/creating-a-medusa.md

@@ -1,61 +1,14 @@
 # Creating A Medusa
 
-## Getting started
-
-This section will guide you through how to create a simple custom medusa. You can find the entirety of this code hosted [here](https://gitlab.com/nadeko/example_medusa)
-
-#### Prerequisite
-- [.net8 sdk](https://dotnet.microsoft.com/en-us/download) installed
-- Optional: use [vscode](https://code.visualstudio.com/download) to write code
-
-#### Guide
-
-- Open your favorite terminal and navigate to a folder where you will keep your project .
-
-- Create a new folder and move into it
-    - `mkdir example_medusa `
-    - `cd example_medusa`
-
-- Install nadeko-medusa template
-    - `dotnet new install nadeko-medusa`
-
-- Make a new Nadeko Medusa project
-    - `dotnet new nadeko-medusa`
-
-### Build it
-
-- Build your Medusa into a dll that Nadeko can load. In your terminal, type:
-    - `dotnet publish -o bin/medusae/example_medusa /p:DebugType=embedded`
-
-- Done. You can now try it out in action.
-
-### Try it out
-
-- Copy the `bin/medusae/example_medusa` folder into your NadekoBot's `data/medusae/` folder. (Nadeko version 4.1.0+)
-
-- Load it with `.meload example_medusa`
-
-- In the channel your bot can see, run the following commands to try it out
-    - `.hello` and
-    - `.hello @<someone>`
-
-- Check its information with
-    - `.meinfo example_medusa`
-
-- Unload it
-    - `.meunload example_medusa`
-
-- :tada: Congrats! You've just made your first medusa! :tada:
-
-
-
 ## Theory
 
+### Introduction
+
 Medusa system allows you to write independent medusae (known as "modules", "cogs" or "plugins" in other software) which you can then load, unload and update at will without restarting the bot.  
   
 The system itself borrows some design from the current way Nadeko's Modules are written but mostly from never-released `Ayu.Commands` system which was designed to be used for a full Nadeko v3 rewrite. 
 
-The medusa base classes used for development are open source [here](https://gitlab.com/kwoth/nadekobot/-/tree/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
 
@@ -146,9 +99,9 @@ If you don't want any auxiliary files, and you don't want to bother making new .
 
 If you update your response strings .yml file(s) while the medusa is loaded and running, running `.stringsreload` will reload the responses without the need to reload the medusa or restart the bot.
 
-#### Bot medusa config file
+#### Config
 
-- Medusa config is kept in `data/medusae/medusa.yml` file in NadekoBot installation folder
+- Medusa config is kept in `medusae/medusa.yml` file
 - At the moment this config only keeps track of which medusae are currently loaded (they will also be always loaded at startup)
 - If a medusa is causing issues and you're unable to unload it, you can remove it from the `loaded:` list in this config file and restart the bot. It won't be loaded next time the bot is started up
 
@@ -162,4 +115,137 @@ To make sure your medusa can be properly unloaded/reloaded you must:
 
 - If you are still having issues, you can always run `.meunload` followed by a bot restart, or if you want to find what is causing the medusa unloadability issues, you can check the [microsoft's assembly unloadability debugging guide](https://docs.microsoft.com/en-us/dotnet/standard/assembly/unloadability)
 
+## Practice
 
+This section will guide you through how to create a simple custom medusa. You can find the entirety of this code hosted [here](https://gitlab.com/nadeko/example_medusa)
+
+#### Prerequisite
+- [.net6 sdk](https://dotnet.microsoft.com/en-us/download) installed
+- Optional: use [vscode](https://code.visualstudio.com/download) to write code
+
+#### Guide
+
+
+- Open your favorite terminal and navigate to a folder where you will keep your project .
+
+- Create a new folder 
+    - `mkdir example_medusa`
+- Create a new .net class library
+    - `dotnet new classlib`
+- Open the current folder with your favorite editor/IDE. In this case we'll use VsCode
+    - `code .`
+- Remove the `Class1.cs` file
+- Replace the contents of the `.csproj` file with the following contents
+```xml
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        
+        <!-- Reduces some boilerplate in your .cs files -->
+        <ImplicitUsings>enable</ImplicitUsings>
+        
+        <!-- Use latest .net features -->
+        <LangVersion>preview</LangVersion>
+        <EnablePreviewFeatures>true</EnablePreviewFeatures>
+        
+        <!-- tell .net that this library will be used as a plugin -->
+        <EnableDynamicLoading>true</EnableDynamicLoading>
+    </PropertyGroup>
+    
+    <ItemGroup>
+        <!-- Base medusa package. You MUST reference this in order to have a working medusa -->
+        <!-- Also, this package comes from MyGet, which requires you to have a NuGet.Config file next to your .csproj -->
+        <PackageReference Include="Nadeko.Medusa" Version="1.0.1">
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+
+        <!-- Note: If you want to use NadekoBot services etc... You will have to manually clone 
+          the gitlab.com/kwoth/nadekobot repo locally and reference the NadekoBot.csproj because there is no NadekoBot package atm.
+          It is strongly recommended that you checkout a specific tag which matches your version of nadeko,
+          as there could be breaking changes even between minor versions of NadekoBot.
+          For example if you're running NadekoBot 4.1.0 locally for which you want to create a medusa for,
+          you should do "git checkout 4.1.0" in your NadekoBot solution and then reference the NadekoBot.csproj
+        -->
+    </ItemGroup>
+    
+    <!-- Copy shortcut and full strings to output (if they exist) -->
+    <ItemGroup>
+        <None Update="res.yml;cmds.yml;strings/**">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
+</Project>
+
+```
+- Create a `MySnek.cs` file and add the following contents
+```cs
+using Nadeko.Snake;
+using NadekoBot;
+using Discord;
+
+public sealed class MySnek : Snek
+{
+    [cmd]
+    public async Task Hello(AnyContext ctx)
+    {
+        await ctx.Channel.SendMessageAsync($"Hello everyone!");
+    }
+
+    [cmd]
+    public async Task Hello(AnyContext ctx, IUser target)
+    {
+        await ctx.ConfirmLocalizedAsync("hello", target);
+    }
+}
+```
+- Create `res.yml` and `cmds.yml` files with the following contents
+`res.yml`
+```yml
+medusa.description: "This is my medusa's description"
+hello: "Hello {0}, from res.yml!"
+```
+
+`cmds.yml`
+```yml
+hello: 
+  desc: "This is a basic hello command"
+  args:
+    - ""
+    - "@Someone"
+```
+
+- Add `NuGet.Config` file which will let you use the base Nadeko.Medusa package. This file should always look like this and you shouldn't change it
+
+```xml
+<configuration>
+    <packageSources>
+        <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+        <add key="nadeko.bot" value="https://www.myget.org/F/nadeko/api/v3/index.json" protocolVersion="3" />
+    </packageSources>
+</configuration>
+```
+
+### Build it
+
+- Build your Medusa into a dll that Nadeko can load. In your terminal, type:
+    - `dotnet publish -o bin/medusae/example_medusa /p:DebugType=embedded`
+
+- Done. You can now try it out in action.
+
+### Try it out
+
+- Copy the `bin/medusae/example_medusa` folder into your NadekoBot's `data/medusae/` folder. (Nadeko version 4.1.0+)
+
+- Load it with `.meload example_medusa`
+
+- In the channel your bot can see, run the following commands to try it out
+    - `.hello` and
+    - `.hello @<someone>`
+
+- Check its information with
+    - `.meinfo example_medusa`
+
+- Unload it
+    - `.meunload example_medusa`
+
+- Congrats! You've just made your first medusa!

docs/medusa/getting-started.md

@@ -27,5 +27,5 @@ Follow the [creating a medusa guide](creating-a-medusa.md)
 
 **It is strongly recommended to run only the medusae you yourself wrote, and only on a hosted VPS or dedicated server which ONLY hosts your bot, to minimize the potential damage caused by bad actors.**
 
-No easy way at the moment, except asking in the `#dev-and-modding` chat in [#NadekoLog server](https://discord.nadeko.bot)
+No easy way at the moment, except asking in the `#dev-and-modding` chat in [#NadekoLog server][https://discord.nadeko.bot]
 

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

docs/placeholders.md

@@ -1,6 +1,6 @@
 # Placeholders
 
-Placeholders are used in Quotes, Expressions, Greet/Bye messages, playing statuses, and a few other places.
+Placeholders are used in Quotes, Custom Reactions, Greet/Bye messages, playing statuses, and a few other places.
 
 They can be used to make the message more user friendly, generate random numbers or pictures, etc.
 
@@ -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,7 +68,12 @@ 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)  
 
-### Shard stats placeholders 
+### 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
 - `%shard.usercount%` - Combined user count on current shard
@@ -83,6 +88,7 @@ Some features have their own specific placeholders which are noted in that featu
 ### Miscellaneous placeholders
 
 - `%rngX-Y%` - Returns a random number between X and Y
-- `%target%` - Returns anything the user has written after the trigger (only works on Expressions)
+- `%target%` - Returns anything the user has written after the trigger (only works on custom reactions)
+- `%img:stuff%` - Returns an `imgur.com` search for "stuff" (only works on custom reactions)
 
 ![img](https://puu.sh/B7mgI.png)

exe_builder.iss

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

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:
@@ -92,3 +92,4 @@ nav:
             - medusa/snek-lifecycle.md
     - Contribution Guide: contribution-guide.md
     - Donate: donate.md
+    - License: license.md

privacy-policy.md

@@ -1,11 +0,0 @@
-# Privacy Policy
-
-## Profile Information
-Nadeko stores userids, avatars, usernames, discriminators and nicknames of users who were targeted by or have used commands which require Xp, Clubs or Waifu features (not limited to these, as other features may be added over time).
-
-## Other
-Nadeko doesn't do analytics, doesn't store messages, doesn't track users, doesn't store their emails etc.  
-Nadeko only stores user settings and states as the result of executed commands or as the effect of administration tools (for example warnings or protection commands).
-
-## Sensitive Information
-Nadeko doesn't store sensitive information, and users are strongly discouraged from adding their passwords, keys, or other important information as quotes or expressions.

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_" }]

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,6 +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 
@@ -21,11 +22,6 @@ public abstract class AnyContext
     /// The user who invoked the command
     /// </summary>
     public abstract IUser User { get; }
-    
-    /// <summary>
-    /// Bot user
-    /// </summary>
-    public abstract ISelfUser Bot { get; }
 
     /// <summary>
     /// Provides access to strings used by this medusa
@@ -39,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)
@@ -42,7 +47,7 @@ public static class MedusaExtensions
         => ctx.Message.AddReactionAsync(new Emoji("🤔"));
 
     public static Task<IUserMessage> ErrorLocalizedAsync(this AnyContext ctx, string key, params object[]? args)
-        => ctx.SendErrorAsync(ctx.GetText(key, args));
+        => ctx.SendErrorAsync(ctx.GetText(key));
 
     public static Task<IUserMessage> PendingLocalizedAsync(this AnyContext ctx, string key, params object[]? args)
         => ctx.SendPendingAsync(ctx.GetText(key, args));
@@ -51,11 +56,11 @@ public static class MedusaExtensions
         => ctx.SendConfirmAsync(ctx.GetText(key, args));
 
     public static Task<IUserMessage> ReplyErrorLocalizedAsync(this AnyContext ctx, string key, params object[]? args)
-        => ctx.SendErrorAsync($"{Format.Bold(ctx.User.ToString())} {ctx.GetText(key, args)}");
+        => ctx.SendErrorAsync($"{Format.Bold(ctx.User.ToString())} {ctx.GetText(key)}");
 
     public static Task<IUserMessage> ReplyPendingLocalizedAsync(this AnyContext ctx, string key, params object[]? args)
-        => ctx.SendPendingAsync($"{Format.Bold(ctx.User.ToString())} {ctx.GetText(key, args)}");
+        => ctx.SendPendingAsync($"{Format.Bold(ctx.User.ToString())} {ctx.GetText(key)}");
 
     public static Task<IUserMessage> ReplyConfirmLocalizedAsync(this AnyContext ctx, string key, params object[]? args)
-        => ctx.SendConfirmAsync($"{Format.Bold(ctx.User.ToString())} {ctx.GetText(key, args)}");
+        => ctx.SendConfirmAsync($"{Format.Bold(ctx.User.ToString())} {ctx.GetText(key)}");
 }

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,21 @@
 <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>
+        <Version>1.0.2</Version>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Discord.Net.Core" Version="3.15.3" />
-      <PackageReference Include="Serilog" Version="3.1.1" />
-      <PackageReference Include="YamlDotNet" Version="15.1.4" />
+      <PackageReference Include="Discord.Net.Core" Version="3.5.0" />
+      <PackageReference Include="Serilog" Version="2.10.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="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Include="YamlDotNet" Version="15.1.4" />
+    <PackageReference Include="Grpc.AspNetCore" Version="2.44.0" />
+    <PackageReference Include="Serilog" Version="2.10.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="YamlDotNet" Version="11.2.1" />
   </ItemGroup>
   
 </Project>

src/NadekoBot.Coordinator/Services/CoordinatorRunner.cs

@@ -417,7 +417,8 @@ namespace NadekoBot.Coordinator
         {
             lock (locker)
             {
-                ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual(shardId, _shardStatuses.Length);
+                if (shardId >= _shardStatuses.Length)
+                    throw new ArgumentOutOfRangeException(nameof(shardId));
 
                 return _shardStatuses[shardId];
             }

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

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

src/NadekoBot.Generators/GrpcApiPermGenerator.cs

@@ -1,184 +0,0 @@
-#nullable enable
-using System.CodeDom.Compiler;
-using System.Collections.Immutable;
-using System.Diagnostics;
-using System.Text;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Text;
-using Newtonsoft.Json;
-
-namespace NadekoBot.Generators
-{
-    public readonly record struct MethodPermData
-    {
-        public readonly ImmutableArray<(string Name, string Value)> MethodPerms;
-        public readonly ImmutableArray<string> NoAuthRequired;
-
-        public MethodPermData(ImmutableArray<(string Name, string Value)> methodPerms,
-            ImmutableArray<string> noAuthRequired)
-        {
-            MethodPerms = methodPerms;
-            NoAuthRequired = noAuthRequired;
-        }
-    }
-
-
-    [Generator]
-    public class GrpcApiPermGenerator : IIncrementalGenerator
-    {
-        public const string GRPC_API_PERM_ATTRIBUTE =
-            """
-            namespace NadekoBot.GrpcApi;
-
-            [System.AttributeUsage(System.AttributeTargets.Method)]
-            public class GrpcApiPermAttribute : System.Attribute
-            {
-                public GuildPerm Value { get; }
-                public GrpcApiPermAttribute(GuildPerm value) => Value = value;
-            }
-            """;
-        
-        public const string GRPC_NO_AUTH_REQUIRED_ATTRIBUTE =
-            """
-            namespace NadekoBot.GrpcApi;
-
-            [System.AttributeUsage(System.AttributeTargets.Method)]
-            public class GrpcNoAuthRequiredAttribute : System.Attribute
-            {
-            }
-            """;
-
-        public void Initialize(IncrementalGeneratorInitializationContext context)
-        {
-            context.RegisterPostInitializationOutput(ctx => ctx.AddSource("GrpcApiPermAttribute.cs",
-                SourceText.From(GRPC_API_PERM_ATTRIBUTE, Encoding.UTF8)));
-            
-            context.RegisterPostInitializationOutput(ctx => ctx.AddSource("GrpcNoAuthRequiredAttribute.cs",
-                SourceText.From(GRPC_NO_AUTH_REQUIRED_ATTRIBUTE, Encoding.UTF8)));
-
-            var perms = context.SyntaxProvider
-                .ForAttributeWithMetadataName(
-                    "NadekoBot.GrpcApi.GrpcApiPermAttribute",
-                    predicate: static (s, _) => s is MethodDeclarationSyntax,
-                    transform: static (ctx, _) => GetMethodSemanticTargets(ctx.SemanticModel, ctx.TargetNode))
-                .Where(static m => m is not null)
-                .Select(static (x, _) => x!.Value)
-                .Collect();
-
-
-            var all = context.SyntaxProvider
-                .ForAttributeWithMetadataName(
-                    "NadekoBot.GrpcApi.GrpcNoAuthRequiredAttribute",
-                    predicate: static (s, _) => s is MethodDeclarationSyntax,
-                    transform: static (ctx, _) => GetNoAuthMethodName(ctx.SemanticModel, ctx.TargetNode))
-                .Collect()
-                .Combine(perms)
-                .Select((x, _) => new MethodPermData(x.Right, x.Left));
-                
-            context.RegisterSourceOutput(all,
-                static (spc, source) => Execute(source, spc));
-        }
-
-        private static string GetNoAuthMethodName(SemanticModel model, SyntaxNode node)
-            => ((MethodDeclarationSyntax)node).Identifier.Text;
-
-        private static (string Name, string Value)? GetMethodSemanticTargets(SemanticModel model, SyntaxNode node)
-        {
-            var method = (MethodDeclarationSyntax)node;
-
-            var name = method.Identifier.Text;
-            var attr = method.AttributeLists
-                .SelectMany(x => x.Attributes)
-                .FirstOrDefault();
-
-            if (attr is null)
-                return null;
-
-            return (name, attr.ArgumentList?.Arguments[0].ToString() ?? "__missing_perm__");
-        }
-
-        private static void Execute(MethodPermData data, SourceProductionContext ctx)
-        {
-            using (var stringWriter = new StringWriter())
-            using (var sw = new IndentedTextWriter(stringWriter))
-            {
-                sw.WriteLine("using System.Collections.Frozen;");
-                sw.WriteLine();
-                sw.WriteLine("namespace NadekoBot.GrpcApi;");
-                sw.WriteLine();
-
-                sw.WriteLine("public partial class GrpcApiPermsInterceptor");
-                sw.WriteLine("{");
-
-                sw.Indent++;
-
-                sw.WriteLine(
-                    "private static FrozenDictionary<string, GuildPerm> _perms = new Dictionary<string, GuildPerm>()");
-                sw.WriteLine("{");
-
-                sw.Indent++;
-                foreach (var field in data.MethodPerms)
-                {
-                    sw.WriteLine("{{ \"{0}\", {1} }},", field.Name, field.Value);
-                }
-
-                sw.Indent--;
-                sw.WriteLine("}.ToFrozenDictionary();");
-
-                sw.WriteLine();
-                sw.WriteLine("private static FrozenSet<string> _noAuthRequired = new HashSet<string>()");
-                sw.WriteLine("{");
-
-                sw.Indent++;
-                foreach (var noauth in data.NoAuthRequired)
-                {
-                    sw.WriteLine("{{ \"{0}\" }},", noauth);
-                }
-
-                sw.WriteLine("");
-
-                sw.Indent--;
-                sw.WriteLine("}.ToFrozenSet();");
-
-                sw.Indent--;
-                sw.WriteLine("}");
-
-                sw.Flush();
-                ctx.AddSource("GrpcApiInterceptor.g.cs", stringWriter.ToString());
-            }
-        }
-
-        private List<TranslationPair> GetFields(string? dataText)
-        {
-            if (string.IsNullOrWhiteSpace(dataText))
-                return new();
-
-            Dictionary<string, string> data;
-            try
-            {
-                var output = JsonConvert.DeserializeObject<Dictionary<string, string>>(dataText!);
-                if (output is null)
-                    return new();
-
-                data = output;
-            }
-            catch
-            {
-                Debug.WriteLine("Failed parsing responses file.");
-                return new();
-            }
-
-            var list = new List<TranslationPair>();
-            foreach (var entry in data)
-            {
-                list.Add(new(
-                    entry.Key,
-                    entry.Value
-                ));
-            }
-
-            return list;
-        }
-    }
-}

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();
 
@@ -58,7 +62,6 @@ namespace NadekoBot.Generators
                 sw.WriteLine("{");
                 sw.Indent++;
 
-                var typedParamStrings = new List<string>(10);
                 foreach (var field in fields)
                 {
                     var matches = Regex.Matches(field.Value, @"{(?<num>\d)[}:]");
@@ -68,30 +71,20 @@ namespace NadekoBot.Generators
                         max = Math.Max(max, int.Parse(match.Groups["num"].Value) + 1);
                     }
 
-                    typedParamStrings.Clear();
-                    var typeParams = new string[max];
-                    var passedParamString = string.Empty;
+                    List<string> typedParamStrings = new List<string>();
+                    var paramStrings = string.Empty;
                     for (var i = 0; i < max; i++)
                     {
-                        typedParamStrings.Add($"in T{i} p{i}");
-                        passedParamString += $", p{i}";
-                        typeParams[i] = $"T{i}";
+                        typedParamStrings.Add($"object p{i}");
+                        paramStrings += $", p{i}";
                     }
 
+
                     var sig = string.Empty;
-                    var typeParamStr = string.Empty;
-                    if (max > 0)
-                    {
+                    if(max > 0)
                         sig = $"({string.Join(", ", typedParamStrings)})";
-                        typeParamStr = $"<{string.Join(", ", typeParams)}>";
-                    }
-
-                    sw.WriteLine("public static LocStr {0}{1}{2} => new LocStr(\"{3}\"{4});",
-                        field.Name,
-                        typeParamStr,
-                        sig,
-                        field.Name,
-                        passedParamString);
+                    
+                    sw.WriteLine($"public static LocStr {field.Name}{sig} => new LocStr(\"{field.Name}\"{paramStrings});");
                 }
 
                 sw.Indent--;
@@ -102,7 +95,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)

src/NadekoBot.Generators/NadekoBot.Generators.csproj

@@ -5,15 +5,14 @@
         <LangVersion>latest</LangVersion>
         <IncludeBuildOutput>false</IncludeBuildOutput>
         <IsRoslynComponent>true</IsRoslynComponent>
-        <ImplicitUsings>true</ImplicitUsings>
     </PropertyGroup>
-
+    
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
         <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" PrivateAssets="all" GeneratePathProperty="true" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" PrivateAssets="all" GeneratePathProperty="true" />
     </ItemGroup>
-
+    
     <PropertyGroup>
         <GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPaths</GetTargetPathDependsOn>
     </PropertyGroup>
@@ -24,4 +23,3 @@
         </ItemGroup>
     </Target>
 </Project>
-

src/NadekoBot.GrpcApiBase/NadekoBot.GrpcApiBase.csproj

@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-    
-    <ItemGroup>
-        <PackageReference Include="Google.Protobuf" Version="3.28.2" />
-        <PackageReference Include="Grpc" Version="2.46.6" />
-        <PackageReference Include="Grpc.Tools" Version="2.66.0" PrivateAssets="All" />
-    </ItemGroup>
-    
-    <ItemGroup>
-        <Protobuf Include="protos/*.proto">
-            <GrpcServices>Server</GrpcServices>
-        </Protobuf>
-    </ItemGroup>
-
-</Project>

src/NadekoBot.GrpcApiBase/protos/canvas.proto

@@ -1,47 +0,0 @@
-syntax = "proto3";
-
-option csharp_namespace = "NadekoBot.GrpcApi";
-
-import "google/protobuf/empty.proto";
-
-package ncanvas;
-
-service GrpcNCanvas {
-  rpc GetCanvas(google.protobuf.Empty) returns (CanvasReply);
-  rpc GetPixel(GetPixelRequest) returns (GetPixelReply);
-  rpc SetPixel(SetPixelRequest) returns (SetPixelReply);
-}
-
-message CanvasReply {
-  repeated uint32 pixels = 1;
-  int32 width = 2;
-  int32 height = 3;
-}
-
-message GetPixelRequest {
-  int32 x = 1;
-  int32 y = 2;
-}
-
-message GetPixelReply {
-  string color = 1;
-  uint32 packedColor = 2;
-  int32 positionX = 3;
-  int32 positionY = 4;
-  int64 price = 5;
-  string text = 6;
-  string position = 7;
-}
-
-message SetPixelRequest {
-  string position = 1;
-  string color = 2;
-  string text = 3;
-  int64 price = 4;
-}
-
-message SetPixelReply {
-  string error = 1;
-  bool success = 2;
-  optional GetPixelReply pixel = 3;
-}

src/NadekoBot.GrpcApiBase/protos/exprs.proto

@@ -1,89 +0,0 @@
-syntax = "proto3";
-
-option csharp_namespace = "NadekoBot.GrpcApi";
-
-import "google/protobuf/empty.proto";
-
-package exprs;
-
-service GrpcExprs {
-  rpc GetExprs(GetExprsRequest) returns (GetExprsReply);
-  rpc AddExpr(AddExprRequest) returns (AddExprReply);
-  rpc DeleteExpr(DeleteExprRequest) returns (google.protobuf.Empty);
-
-  rpc GetQuotes(GetQuotesRequest) returns (GetQuotesReply);
-  rpc AddQuote(AddQuoteRequest) returns (AddQuoteReply);
-  rpc DeleteQuote(DeleteQuoteRequest) returns (google.protobuf.Empty);
-}
-
-message DeleteExprRequest {
-  string id = 1;
-  uint64 guildId = 2;
-}
-
-message GetExprsRequest {
-  uint64 guildId = 1;
-  string query = 2;
-  int32 page = 3;
-}
-
-message GetExprsReply {
-  repeated ExprDto expressions = 1;
-  int32 totalCount = 2;
-}
-
-message ExprDto {
-  string id = 1;
-  string trigger = 2;
-  string response = 3;
-
-  bool ca = 4;
-  bool ad = 5;
-  bool dm = 6;
-  bool at = 7;
-}
-
-message AddExprRequest {
-  uint64 guildId = 1;
-  ExprDto expr = 2;
-}
-
-message AddExprReply {
-  string id = 1;
-  bool success = 2;
-}
-
-message GetQuotesRequest {
-  uint64 guildId = 1;
-  string query = 2;
-  int32 page = 3;
-}
-
-message GetQuotesReply {
-  repeated QuoteDto quotes = 1;
-  int32 totalCount = 2;
-}
-
-message QuoteDto {
-  string id = 1;
-  string trigger = 2;
-  string response = 3;
-
-  uint64 authorId = 4;
-  string authorName = 5;
-}
-
-message AddQuoteRequest {
-  uint64 guildId = 1;
-  QuoteDto quote = 2;
-}
-
-message AddQuoteReply {
-  string id = 1;
-  bool success = 2;
-}
-
-message DeleteQuoteRequest {
-  string id = 1;
-  uint64 guildId = 2;
-}

src/NadekoBot.GrpcApiBase/protos/fin.proto

@@ -1,60 +0,0 @@
-syntax = "proto3";
-
-option csharp_namespace = "NadekoBot.GrpcApi";
-
-import "google/protobuf/timestamp.proto";
-
-package fin;
-
-service GrpcFin {
-  rpc GetTransactions(GetTransactionsRequest) returns (GetTransactionsReply);
-  rpc GetHoldings(GetHoldingsRequest) returns (GetHoldingsReply);
-  rpc Withdraw(WithdrawRequest) returns (WithdrawReply);
-  rpc Deposit(DepositRequest) returns (DepositReply);
-}
-
-message GetTransactionsRequest {
-  int32 page = 1;
-  uint64 userId = 2;
-}
-
-message GetTransactionsReply {
-  repeated TransactionReply transactions = 1;
-  int32 total = 2;
-}
-
-message TransactionReply {
-  int64 amount = 1;
-  string note = 2;
-  string type = 3;
-  string extra = 4;
-  google.protobuf.Timestamp timestamp = 5;
-  string id = 6;
-}
-
-message GetHoldingsRequest {
-  uint64 userId = 1;
-}
-
-message GetHoldingsReply {
-  int64 cash = 1;
-  int64 bank = 2;
-}
-
-message WithdrawRequest {
-  uint64 userId = 1;
-  int64 amount = 2;
-}
-
-message WithdrawReply {
-  bool success = 1;
-}
-
-message DepositRequest {
-  uint64 userId = 1;
-  int64 amount = 2;
-}
-
-message DepositReply {
-  bool success = 1;
-}

src/NadekoBot.GrpcApiBase/protos/greet.proto

@@ -1,51 +0,0 @@
-syntax = "proto3";
-
-option csharp_namespace = "NadekoBot.GrpcApi";
-
-package greet;
-
-service GrpcGreet {
-  rpc GetGreetSettings (GetGreetRequest) returns (GrpcGreetSettings);
-  rpc UpdateGreet (UpdateGreetRequest) returns (UpdateGreetReply);
-  rpc TestGreet (TestGreetRequest) returns (TestGreetReply);
-}
-
-message GrpcGreetSettings {
-  string channelId = 1;
-  string message = 2;
-  bool isEnabled = 3;
-  GrpcGreetType type = 4;
-}
-
-message GetGreetRequest {
-  uint64 guildId = 1;
-  GrpcGreetType type = 2;
-}
-
-message UpdateGreetRequest {
-  uint64 guildId = 1;
-  GrpcGreetSettings settings = 2;
-}
-
-enum GrpcGreetType {
-  Greet = 0;
-  GreetDm = 1;
-  Bye = 2;
-  Boost = 3;
-}
-
-message UpdateGreetReply {
-  bool Success = 1;
-}
-
-message TestGreetRequest {
-  uint64 guildId = 1;
-  uint64 channelId = 2;
-  uint64 userId = 3;
-  GrpcGreetType type = 4;
-}
-
-message TestGreetReply {
-  bool success = 1;
-  string error = 2;
-}

src/NadekoBot.GrpcApiBase/protos/other.proto

@@ -1,144 +0,0 @@
-syntax = "proto3";
-
-option csharp_namespace = "NadekoBot.GrpcApi";
-
-import "google/protobuf/empty.proto";
-
-package other;
-
-service GrpcOther {
-  rpc BotOnGuild(BotOnGuildRequest) returns (BotOnGuildReply);
-  rpc GetTextChannels(GetTextChannelsRequest) returns (GetTextChannelsReply);
-  rpc GetRoles(GetRolesRequest) returns (GetRolesReply);
-
-  rpc GetCurrencyLb(GetLbRequest) returns (CurrencyLbReply);
-  rpc GetXpLb(GetLbRequest) returns (XpLbReply);
-  rpc GetWaifuLb(GetLbRequest) returns (WaifuLbReply);
-
-  rpc GetShardStats(google.protobuf.Empty) returns (stream ShardStatsReply);
-  rpc GetCommandFeed(google.protobuf.Empty) returns (stream CommandFeedEntry);
-  rpc GetServerInfo(ServerInfoRequest) returns (GetServerInfoReply);
-}
-
-message CommandFeedEntry {
-  string command = 1;
-}
-
-message GetRolesRequest {
-  uint64 guildId = 1;
-}
-
-message GetRolesReply {
-  repeated RoleReply roles = 1;
-}
-
-message BotOnGuildRequest {
-  uint64 guildId = 1;
-}
-
-message BotOnGuildReply {
-  bool success = 1;
-}
-
-message ShardStatsReply {
-  int32 id = 1;
-  string status = 2;
-
-  int32 guildCount = 3;
-  string uptime = 4;
-  int64 commands = 5;
-}
-
-message GetTextChannelsRequest{
-  uint64 guildId = 1;
-}
-
-message GetTextChannelsReply {
-  repeated TextChannelReply textChannels = 1;
-}
-
-message TextChannelReply {
-  uint64 id = 1;
-  string name = 2;
-}
-
-message CurrencyLbReply {
-  repeated CurrencyLbEntryReply entries = 1;
-}
-
-message CurrencyLbEntryReply {
-  string user = 1;
-  uint64 userId = 2;
-  int64 amount = 3;
-  string avatar = 4;
-}
-
-message GetLbRequest {
-  int32 page = 1;
-  int32 perPage = 2;
-}
-
-message XpLbReply {
-  repeated XpLbEntryReply entries = 1;
-}
-
-message XpLbEntryReply {
-  string user = 1;
-  uint64 userId = 2;
-  int64 totalXp = 3;
-  int64 level = 4;
-}
-
-message WaifuLbReply {
-  repeated WaifuLbEntry entries = 1;
-}
-
-message WaifuLbEntry {
-  string user = 1;
-  string claimedBy = 2;
-  int64 value = 3;
-  bool isMutual = 4;
-}
-
-message ServerInfoRequest {
-  uint64 guildId = 1;
-}
-
-message GetServerInfoReply {
-  uint64 id = 1;
-  string name = 2;
-  string iconUrl = 3;
-  uint64 ownerId = 4;
-  string ownerName = 5;
-  repeated RoleReply roles = 6;
-  repeated EmojiReply emojis = 7;
-  repeated string features = 8;
-  int32 textChannels = 9;
-  int32 voiceChannels = 10;
-  int32 memberCount = 11;
-  int64 createdAt = 12;
-}
-
-message RoleReply {
-  uint64 id = 1;
-  string name = 2;
-  string iconUrl = 3;
-  string color = 4;
-}
-
-message EmojiReply {
-  string name = 1;
-  string url = 2;
-  string code = 3;
-}
-
-message ChannelReply {
-  uint64 id = 1;
-  string name = 2;
-  ChannelType type = 3;
-}
-
-enum ChannelType {
-  Text = 0;
-  Voice = 1;
-}

src/NadekoBot.GrpcApiBase/protos/warn.proto

@@ -1,107 +0,0 @@
-syntax = "proto3";
-
-option csharp_namespace = "NadekoBot.GrpcApi";
-
-package warn;
-
-service GrpcWarn {
-  rpc GetWarnSettings (WarnSettingsRequest) returns (WarnSettingsReply);
-
-  rpc SetWarnExpiry(SetWarnExpiryRequest) returns (SetWarnExpiryReply);
-  rpc AddWarnp (AddWarnpRequest) returns (AddWarnpReply);
-  rpc DeleteWarnp (DeleteWarnpRequest) returns (DeleteWarnpReply);
-
-  rpc GetLatestWarnings(GetLatestWarningsRequest) returns (GetLatestWarningsReply);
-  rpc GetUserWarnings(GetUserWarningsRequest) returns (GetUserWarningsReply);
-
-  rpc ForgiveWarning(ForgiveWarningRequest) returns (ForgiveWarningReply);
-  rpc DeleteWarning(ForgiveWarningRequest) returns (ForgiveWarningReply);
-
-}
-message WarnSettingsRequest {
-  uint64 guildId = 1;
-}
-
-message WarnPunishment {
-  int32 threshold = 1;
-  string action = 2;
-  int32 duration = 3;
-  string role = 4;
-}
-
-message WarnSettingsReply {
-  repeated WarnPunishment punishments = 1;
-  int32 expiryDays = 2;
-  bool deleteOnExpire = 3;
-}
-
-message AddWarnpRequest {
-  uint64 guildId = 1;
-  WarnPunishment punishment = 2;
-}
-
-message AddWarnpReply {
-  bool success = 1;
-}
-
-message DeleteWarnpRequest {
-  uint64 guildId = 1;
-  int32 threshold = 2;
-}
-
-message DeleteWarnpReply {
-  bool success = 1;
-}
-
-message GetUserWarningsRequest {
-  uint64 guildId = 1;
-  string user = 2;
-  int32 page = 3;
-}
-
-message GetUserWarningsReply {
-  repeated Warning warnings = 1;
-  int32 totalCount = 2;
-}
-
-message Warning {
-  string id = 1;
-  string reason = 2;
-  int64 timestamp = 3;
-  int64 weight = 4;
-  bool forgiven = 5;
-  string forgivenBy = 6;
-  string user = 7;
-  uint64 userId = 8;
-  string moderator = 9;
-}
-
-message ForgiveWarningRequest {
-  uint64 guildId = 1;
-  string warnId = 2;
-  string modName = 3;
-}
-
-message ForgiveWarningReply {
-  bool success = 1;
-}
-
-message SetWarnExpiryRequest {
-  uint64 guildId = 1;
-  int32 expiryDays = 2;
-  bool deleteOnExpire = 3;
-}
-
-message SetWarnExpiryReply {
-  bool success = 1;
-}
-
-message GetLatestWarningsRequest {
-  uint64 guildId = 1;
-  int32 page = 2;
-}
-
-message GetLatestWarningsReply {
-  repeated Warning warnings = 1;
-  int32 totalCount = 2;
-}

src/NadekoBot.GrpcApiBase/protos/xp.proto

@@ -1,120 +0,0 @@
-syntax = "proto3";
-
-option csharp_namespace = "NadekoBot.GrpcApi";
-
-package xp;
-
-service GrpcXp {
-  rpc GetXpLb(GetXpLbRequest) returns (GetXpLbReply);
-  rpc ResetUserXp(ResetUserXpRequest) returns (ResetUserXpReply);
-
-  rpc GetXpSettings(GetXpSettingsRequest) returns (GetXpSettingsReply);
-
-  rpc AddExclusion(AddExclusionRequest) returns (AddExclusionReply);
-  rpc DeleteExclusion(DeleteExclusionRequest) returns (DeleteExclusionReply);
-
-  rpc AddReward(AddRewardRequest) returns (AddRewardReply);
-  rpc DeleteReward(DeleteRewardRequest) returns (DeleteRewardReply);
-
-  rpc SetServerExclusion(SetServerExclusionRequest) returns (SetServerExclusionReply);
-}
-
-message SetServerExclusionRequest {
-  uint64 guildId = 1;
-  bool serverExcluded = 2;
-}
-
-message SetServerExclusionReply {
-  bool success = 1;
-}
-
-message GetXpLbRequest {
-  uint64 guildId = 1;
-  int32 page = 2;
-}
-
-message GetXpLbReply {
-  repeated XpLbUserReply users = 1;
-  int32 total = 2;
-}
-
-message XpLbUserReply {
-  uint64 userId = 1;
-  string username = 2;
-  int64 xp = 3;
-  int64 level = 4;
-  int64 levelPercent = 5;
-  string avatar = 6;
-}
-
-message ResetUserXpRequest {
-  uint64 guildId = 1;
-  uint64 userId = 2;
-}
-
-message ResetUserXpReply {
-  bool success = 1;
-}
-
-message GetXpSettingsReply {
-  repeated ExclItemReply exclusions = 1;
-  repeated RewItemReply rewards = 2;
-  bool serverExcluded = 3;
-}
-
-message GetXpSettingsRequest {
-  uint64 guildId = 1;
-}
-
-message ExclItemReply {
-  string type = 1;
-  uint64 id = 2;
-  string name = 3;
-}
-
-message RewItemReply {
-  int32 level = 1;
-  string type = 2;
-  string value = 3;
-}
-
-message AddExclusionRequest {
-  uint64 guildId = 1;
-  string type = 2;
-  uint64 id = 3;
-}
-
-message AddExclusionReply {
-  bool success = 1;
-}
-
-message DeleteExclusionRequest {
-  uint64 guildId = 1;
-  string type = 2;
-  uint64 id = 3;
-}
-
-message DeleteExclusionReply {
-  bool success = 1;
-}
-
-message AddRewardRequest {
-  uint64 guildId = 1;
-  int32 level = 2;
-  string type = 3;
-  string value = 4;
-}
-
-message AddRewardReply {
-  bool success = 1;
-}
-
-message DeleteRewardRequest {
-  uint64 guildId = 1;
-  int32 level = 2;
-  string type = 3;
-}
-
-message DeleteRewardReply {
-  bool success = 1;
-}

src/NadekoBot.Tests/BotStringsTests.cs

@@ -3,9 +3,9 @@ using System.Globalization;
 using System.Linq;
 using System.Reflection;
 using Discord.Commands;
-using NadekoBot.Common;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Services;
+using NadekoBot.Modules;
 
 namespace NadekoBot.Tests
 {
@@ -21,7 +21,7 @@ namespace NadekoBot.Tests
             var stringsSource = new LocalFileStringsSource(
                 responsesPath,
                 commandsPath);
-            var strings = new MemoryBotStringsProvider(stringsSource);
+            var strings = new LocalBotStringsProvider(stringsSource);
 
             var culture = new CultureInfo("en-US");
 
@@ -47,7 +47,7 @@ namespace NadekoBot.Tests
                                || !(type.GetCustomAttribute<GroupAttribute>(true) is null)) // or a submodule
                 .SelectMany(x => x.GetMethods()
                         .Where(mi => mi.CustomAttributes
-                            .Any(ca => ca.AttributeType == typeof(CmdAttribute))))
+                            .Any(ca => ca.AttributeType == typeof(NadekoCommandAttribute))))
                 .Select(x => x.Name.ToLowerInvariant())
                 .ToArray();
 
@@ -58,7 +58,7 @@ namespace NadekoBot.Tests
                 aliasesPath);
 
             var methodNames = GetCommandMethodNames();
-            
+
             var isSuccess = true;
             foreach (var methodName in methodNames)
             {
@@ -99,33 +99,31 @@ namespace NadekoBot.Tests
                 Assert.Warn("There are some unused entries in data/aliases.yml");
         }
         
-        [Test]
-        public void NoObsoleteCommandStrings()
-        {
-            var stringsSource = new LocalFileStringsSource(responsesPath, commandsPath);
-        
-            var culture = new CultureInfo("en-US");
-            
-            var methodNames = GetCommandMethodNames()
-                            .ToHashSet();
-        
-            var isSuccess = true;
-            // var allCommandNames = CommandNameLoadHelper.LoadCommandStrings(commandsPath));
-            foreach (var entry in stringsSource.GetCommandStrings()[culture.Name])
-            {
-                var cmdName = entry.Key;
-        
-                if (!methodNames.Contains(cmdName))
-                {
-                    TestContext.Out.WriteLine($"'{cmdName}' from commands.en-US.yml doesn't have a matching command method.");
-                    isSuccess = false;
-                }
-            }
-        
-            if(isSuccess)
-                Assert.IsTrue(isSuccess);
-            else
-                Assert.Warn("There are some unused command strings in data/strings/commands.en-US.yml");
-        }
+        // [Test]
+        // public void NoObsoleteCommandStrings()
+        // {
+        //     var stringsSource = new LocalFileStringsSource(responsesPath, commandsPath);
+        //
+        //     var culture = new CultureInfo("en-US");
+        //
+        //     var isSuccess = true;
+        //     var allCommandNames = CommandNameLoadHelper.LoadCommandNames(aliasesPath);
+        //     var enUsCommandNames = allCommandNames
+        //         .Select(x => x.Value[0]) // first alias is command name
+        //         .ToHashSet();
+        //     foreach (var entry in stringsSource.GetCommandStrings()[culture.Name])
+        //     {
+        //         // key is command name which should be specified in aliases[0] of any method name
+        //         var cmdName = entry.Key;
+        //
+        //         if (!enUsCommandNames.Contains(cmdName))
+        //         {
+        //             TestContext.Out.WriteLine($"'{cmdName}' It's either obsolete or missing an alias entry.");
+        //             isSuccess = false;
+        //         }
+        //     }
+        //
+        //     Assert.IsTrue(isSuccess);
+        // }
     }
 }

src/NadekoBot.Tests/ConcurrentHashSetTests.cs

@@ -1,93 +0,0 @@
-using System.Collections.Generic;
-using NUnit.Framework;
-
-namespace NadekoBot.Tests;
-
-public class ConcurrentHashSetTests
-{
-    private ConcurrentHashSet<(int?, int?)> _set;
-
-    [SetUp]
-    public void SetUp()
-    {
-        _set = new();
-    }
-
-    [Test]
-    public void AddTest()
-    {
-        var result = _set.Add((1, 2));
-        
-        Assert.AreEqual(true, result);
-        
-        result = _set.Add((1, 2));
-        
-        Assert.AreEqual(false, result);
-    }
-
-    [Test]
-    public void TryRemoveTest()
-    {
-        _set.Add((1, 2));
-        var result = _set.TryRemove((1, 2));
-        
-        Assert.AreEqual(true, result);
-        
-        result = _set.TryRemove((1, 2));
-        Assert.AreEqual(false, result);
-    }
-
-    [Test]
-    public void CountTest()
-    {
-        _set.Add((1, 2)); // 1
-        _set.Add((1, 2)); // 1
-        
-        _set.Add((2, 2)); // 2
-        
-        _set.Add((3, 2)); // 3
-        _set.Add((3, 2)); // 3
-        
-        Assert.AreEqual(3, _set.Count);
-    }
-
-    [Test]
-    public void ClearTest()
-    {
-        _set.Add((1, 2));
-        _set.Add((1, 3));
-        _set.Add((1, 4));
-        
-        _set.Clear();
-        
-        Assert.AreEqual(0, _set.Count);
-    }
-
-    [Test]
-    public void ContainsTest()
-    {
-        _set.Add((1, 2));
-        _set.Add((3, 2));
-        
-        Assert.AreEqual(true, _set.Contains((1, 2)));
-        Assert.AreEqual(true, _set.Contains((3, 2)));
-        Assert.AreEqual(false, _set.Contains((2, 1)));
-        Assert.AreEqual(false, _set.Contains((2, 3)));
-    }
-
-    [Test]
-    public void RemoveWhereTest()
-    {
-        _set.Add((1, 2));
-        _set.Add((1, 3));
-        _set.Add((1, 4));
-        _set.Add((2, 5));
-        
-        // remove tuples which have even second item
-        _set.RemoveWhere(static x => x.Item2 % 2 == 0);
-        
-        Assert.AreEqual(2, _set.Count);
-        Assert.AreEqual(true, _set.Contains((1, 3)));
-        Assert.AreEqual(true, _set.Contains((2, 5)));
-    }
-}

src/NadekoBot.Tests/GroupGreetTests.cs

@@ -0,0 +1,76 @@
+using System.Linq;
+using System.Threading.Tasks;
+using NadekoBot.Extensions;
+using NadekoBot.Services;
+using NUnit.Framework;
+
+namespace NadekoBot.Tests
+{
+    public class GroupGreetTests
+    {
+        private GreetGrouper<int> _grouper;
+
+        [SetUp]
+        public void Setup()
+            => _grouper = new GreetGrouper<int>();
+
+        [Test]
+        public void CreateTest()
+        {
+            var created = _grouper.CreateOrAdd(0, 5);
+            
+            Assert.True(created);
+        }
+        
+        [Test]
+        public void CreateClearTest()
+        {
+            _grouper.CreateOrAdd(0, 5);
+            _grouper.ClearGroup(0, 5, out var items);
+
+            Assert.AreEqual(0, items.Count());
+        }
+        
+        [Test]
+        public void NotCreatedTest()
+        {
+            _grouper.CreateOrAdd(0, 5);
+            var created = _grouper.CreateOrAdd(0, 4);
+            
+            Assert.False(created);
+        }
+        
+        [Test]
+        public void ClearAddedTest()
+        {
+            _grouper.CreateOrAdd(0, 5);
+            _grouper.CreateOrAdd(0, 4);
+            _grouper.ClearGroup(0, 5, out var items);
+
+            var list = items.ToList();
+            
+            Assert.AreEqual(1, list.Count, $"Count was {list.Count}");
+            Assert.AreEqual(4, list[0]);
+        }
+
+        [Test]
+        public async Task ClearManyTest()
+        {
+            _grouper.CreateOrAdd(0, 5);
+            
+            // add 15 items
+            await Enumerable.Range(10, 15)
+                .Select(x => Task.Run(() => _grouper.CreateOrAdd(0, x))).WhenAll();
+            
+            // get 5 at most
+            _grouper.ClearGroup(0, 5, out var items);
+            var list = items.ToList();
+            Assert.AreEqual(5, list.Count, $"Count was {list.Count}");
+
+            // try to get 15, but there should be 10 left
+            _grouper.ClearGroup(0, 15, out items);
+            list = items.ToList();
+            Assert.AreEqual(10, list.Count, $"Count was {list.Count}");
+        }
+    }
+}

src/NadekoBot.Tests/IndexedCollectionTests.cs

@@ -1,5 +1,5 @@
-using Nadeko.Common;
-using NadekoBot.Db.Models;
+using NadekoBot.Common.Collections;
+using NadekoBot.Services.Database.Models;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;

src/NadekoBot.Tests/KwumTests.cs

@@ -1,4 +1,4 @@
-using Nadeko.Common;
+using NadekoBot.Common;
 using NUnit.Framework;
 
 namespace NadekoBot.Tests

src/NadekoBot.Tests/NadekoBot.Tests.csproj

@@ -1,17 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
+        <LangVersion>10.0</LangVersion>
+        <EnablePreviewFeatures>True</EnablePreviewFeatures>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="NUnit" Version="3.13.3" />
+        <PackageReference Include="NUnit" Version="3.13.2" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     </ItemGroup>
 
-
     <ItemGroup>
       <ProjectReference Include="..\NadekoBot\NadekoBot.csproj" />
     </ItemGroup>

src/NadekoBot.Tests/NewDeckTests.cs

@@ -1,83 +0,0 @@
-using Nadeko.Econ;
-using NUnit.Framework;
-
-namespace NadekoBot.Tests;
-
-public class NewDeckTests
-{
-    private RegularDeck _deck;
-
-    [SetUp]
-    public void Setup()
-    {
-        _deck = new RegularDeck();
-    }
-
-    [Test]
-    public void TestCount()
-    {
-        Assert.AreEqual(52, _deck.TotalCount);
-        Assert.AreEqual(52, _deck.CurrentCount);
-    }
-    
-    [Test]
-    public void TestDeckDraw()
-    {
-        var card = _deck.Draw();
-        
-        Assert.IsNotNull(card);
-        Assert.AreEqual(card.Suit, RegularSuit.Hearts);
-        Assert.AreEqual(card.Value, RegularValue.Ace);
-        Assert.AreEqual(_deck.CurrentCount, _deck.TotalCount - 1);
-    }
-
-    [Test]
-    public void TestDeckSpent()
-    {
-        for (var i = 0; i < _deck.TotalCount - 1; ++i)
-        {
-            _deck.Draw();
-        }
-
-        var lastCard = _deck.Draw();
-        
-        Assert.IsNotNull(lastCard);
-        Assert.AreEqual(new RegularCard(RegularSuit.Spades, RegularValue.King), lastCard);
-
-        var noCard = _deck.Draw();
-        
-        Assert.IsNull(noCard);
-    }
-
-    [Test]
-    public void TestCardGetName()
-    {
-        var ace = _deck.Draw()!;
-        var two = _deck.Draw()!;
-        
-        Assert.AreEqual("Ace of Hearts", ace.GetName());
-        Assert.AreEqual("Two of Hearts", two.GetName());
-    }
-
-    [Test]
-    public void TestPeek()
-    {
-        var ace = _deck.Peek()!;
-
-        var tenOfSpades = _deck.Peek(48);
-        Assert.AreEqual(new RegularCard(RegularSuit.Hearts, RegularValue.Ace), ace);
-        Assert.AreEqual(new RegularCard(RegularSuit.Spades, RegularValue.Ten), tenOfSpades);
-    }
-
-    [Test]
-    public void TestMultipleDeck()
-    {
-        var quadDeck = new MultipleRegularDeck(4);
-        var count = quadDeck.TotalCount;
-        
-        Assert.AreEqual(52 * 4, count);
-
-        var card = quadDeck.Peek(54);
-        Assert.AreEqual(new RegularCard(RegularSuit.Hearts, RegularValue.Three), card);
-    }
-}

src/NadekoBot.Tests/PubSubTests.cs

@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using Nadeko.Common;
+using NadekoBot.Common;
 using NUnit.Framework;
 using NUnit.Framework.Internal;
 

src/NadekoBot.VotesApi/Common/AuthHandler.cs

@@ -20,8 +20,9 @@ namespace NadekoBot.VotesApi
         public AuthHandler(IOptionsMonitor<AuthenticationSchemeOptions> options,
             ILoggerFactory logger,
             UrlEncoder encoder,
+            ISystemClock clock,
             IConfiguration conf)
-            : base(options, logger, encoder)
+            : base(options, logger, encoder, clock)
             => _conf = conf;
 
         protected override Task<AuthenticateResult> HandleAuthenticateAsync()

src/NadekoBot.VotesApi/NadekoBot.VotesApi.csproj

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

src/NadekoBot/.editorconfig

@@ -77,6 +77,7 @@ csharp_style_var_when_type_is_apparent = true:suggestion
 
 # Expression-bodied members
 csharp_style_expression_bodied_accessors = true:suggestion
+csharp_style_expression_bodied_constructors = when_on_single_line:suggestion
 csharp_style_expression_bodied_indexers = true:suggestion
 csharp_style_expression_bodied_lambdas = true:suggestion
 csharp_style_expression_bodied_local_functions = true:suggestion
@@ -180,9 +181,9 @@ dotnet_naming_rule.private_readonly_field.symbols = private_readonly_field
 dotnet_naming_rule.private_readonly_field.style = begins_with_underscore
 dotnet_naming_rule.private_readonly_field.severity = warning
 
-# dotnet_naming_rule.private_field.symbols = private_field
-# dotnet_naming_rule.private_field.style = camel_case
-# dotnet_naming_rule.private_field.severity = warning
+dotnet_naming_rule.private_field.symbols = private_field
+dotnet_naming_rule.private_field.style = camel_case
+dotnet_naming_rule.private_field.severity = warning
 
 dotnet_naming_rule.const_fields.symbols = const_fields
 dotnet_naming_rule.const_fields.style = all_upper
@@ -356,4 +357,3 @@ resharper_arrange_redundant_parentheses_highlighting = hint
 
 # IDE0011: Add braces
 dotnet_diagnostic.IDE0011.severity = warning
-

src/NadekoBot/Bot.cs

@@ -1,11 +1,10 @@
 #nullable disable
-using DryIoc;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.DependencyInjection;
 using NadekoBot.Common.Configs;
 using NadekoBot.Common.ModuleBehaviors;
-using NadekoBot.Db.Models;
+using NadekoBot.Db;
+using NadekoBot.Modules.Administration;
+using NadekoBot.Services.Database.Models;
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Reflection;
@@ -13,39 +12,36 @@ using RunMode = Discord.Commands.RunMode;
 
 namespace NadekoBot;
 
-public sealed class Bot : IBot
+public sealed class Bot
 {
     public event Func<GuildConfig, Task> JoinedGuild = delegate { return Task.CompletedTask; };
 
     public DiscordSocketClient Client { get; }
-    public IReadOnlyCollection<GuildConfig> AllGuildConfigs { get; private set; }
+    public ImmutableArray<GuildConfig> AllGuildConfigs { get; private set; }
 
-    private IContainer Services { get; set; }
+    private IServiceProvider Services { get; set; }
 
+    public string Mention { get; private set; }
     public bool IsReady { get; private set; }
     public int ShardId { get; set; }
 
-    private readonly IBotCreds _creds;
+    private readonly IBotCredentials _creds;
     private readonly CommandService _commandService;
     private readonly DbService _db;
 
     private readonly IBotCredsProvider _credsProvider;
-
-    private readonly Assembly[] _loadedAssemblies;
     // private readonly InteractionService _interactionService;
 
-    public Bot(int shardId, int? totalShards, string credPath = null)
+    public Bot(int shardId, int? totalShards)
     {
-        ArgumentOutOfRangeException.ThrowIfLessThan(shardId, 0);
+        if (shardId < 0)
+            throw new ArgumentOutOfRangeException(nameof(shardId));
 
         ShardId = shardId;
-        _credsProvider = new BotCredsProvider(totalShards, credPath);
+        _credsProvider = new BotCredsProvider(totalShards);
         _creds = _credsProvider.GetCreds();
 
-        LogSetup.SetupLogger(shardId, _creds);
-        Log.Information("Pid: {ProcessId}", Environment.ProcessId);
-
-        _db = new NadekoDbService(_credsProvider);
+        _db = new(_credsProvider);
 
         var messageCacheSize =
 #if GLOBAL_NADEKO
@@ -54,9 +50,9 @@ public sealed class Bot : IBot
             50;
 #endif
 
-        if (!_creds.UsePrivilegedIntents)
+        if(!_creds.UsePrivilegedIntents)
             Log.Warning("You are not using privileged intents. Some features will not work properly");
-
+        
         Client = new(new()
         {
             MessageCacheSize = messageCacheSize,
@@ -71,121 +67,150 @@ public sealed class Bot : IBot
                 ? GatewayIntents.All
                 : GatewayIntents.AllUnprivileged,
             LogGatewayIntentWarnings = false,
-            FormatUsersInBidirectionalUnicode = false,
-            DefaultRetryMode = RetryMode.Retry502
         });
 
         _commandService = new(new()
         {
             CaseSensitiveCommands = false,
-            DefaultRunMode = RunMode.Sync,
+            DefaultRunMode = RunMode.Sync
         });
 
         // _interactionService = new(Client.Rest);
 
         Client.Log += Client_Log;
-        _loadedAssemblies =
-        [
-            typeof(Bot).Assembly // bot
-        ];
     }
 
 
-    public IReadOnlyList<ulong> GetCurrentGuildIds()
-        => Client.Guilds.Select(x => x.Id).ToList().AsReadOnly();
+    public List<ulong> GetCurrentGuildIds()
+        => Client.Guilds.Select(x => x.Id).ToList();
 
-    private async Task AddServices()
+    private void AddServices()
     {
-        var startingGuildIdList = GetCurrentGuildIds().ToList();
-        var startTime = Stopwatch.GetTimestamp();
+        var startingGuildIdList = GetCurrentGuildIds();
+        var sw = Stopwatch.StartNew();
         var bot = Client.CurrentUser;
 
-        await using (var uow = _db.GetDbContext())
+        using (var uow = _db.GetDbContext())
         {
-            AllGuildConfigs = await uow.GuildConfigs.GetAllGuildConfigs(startingGuildIdList);
             uow.EnsureUserCreated(bot.Id, bot.Username, bot.Discriminator, bot.AvatarId);
+            AllGuildConfigs = uow.GuildConfigs.GetAllGuildConfigs(startingGuildIdList).ToImmutableArray();
         }
 
-        // var svcs = new StandardKernel(new NinjectSettings()
-        // {
-        //     // ThrowOnGetServiceNotFound = true,
-        //     ActivationCacheDisabled = true,
-        // });
+        var svcs = new ServiceCollection().AddTransient(_ => _credsProvider.GetCreds()) // bot creds
+                                          .AddSingleton(_credsProvider)
+                                          .AddSingleton(_db) // database
+                                          .AddRedis(_creds.RedisOptions) // redis
+                                          .AddSingleton(Client) // discord socket client
+                                          .AddSingleton(_commandService)
+                                          // .AddSingleton(_interactionService)
+                                          .AddSingleton(this)
+                                          .AddSingleton<ISeria, JsonSeria>()
+                                          .AddSingleton<IPubSub, RedisPubSub>()
+                                          .AddSingleton<IConfigSeria, YamlSeria>()
+                                          .AddBotStringsServices(_creds.TotalShards)
+                                          .AddConfigServices()
+                                          .AddConfigMigrators()
+                                          .AddMemoryCache()
+                                          // music
+                                          .AddMusic();
+        // admin
+#if GLOBAL_NADEKO
+        svcs.AddSingleton<ILogCommandService, DummyLogCommandService>();
+#endif
 
-        var svcs = new Container();
-
-        // this is required in order for medusa unloading to work
-        // svcs.Components.Remove<IPlanner, Planner>();
-        // svcs.Components.Add<IPlanner, RemovablePlanner>();
-
-        svcs.AddSingleton<IBotCreds>(_ => _credsProvider.GetCreds());
-        svcs.AddSingleton<DbService, DbService>(_db);
-        svcs.AddSingleton<IBotCredsProvider>(_credsProvider);
-        svcs.AddSingleton<DiscordSocketClient>(Client);
-        svcs.AddSingleton<CommandService>(_commandService);
-        svcs.AddSingleton<Bot>(this);
-        svcs.AddSingleton<IBot>(this);
-
-        svcs.AddSingleton<ISeria, JsonSeria>();
-        svcs.AddSingleton<IConfigSeria, YamlSeria>();
-        svcs.AddSingleton<IMemoryCache, MemoryCache>(new MemoryCache(new MemoryCacheOptions()));
-        svcs.AddSingleton<IBehaviorHandler, BehaviorHandler>();
-        svcs.AddSingleton<ILocalization, Localization>();
-
-
-        foreach (var a in _loadedAssemblies)
-        {
-            svcs.AddConfigServices(a)
-                .AddLifetimeServices(a);
-        }
-
-        svcs.AddMusic()
-            .AddCache(_creds)
-            .AddHttpClients();
+        svcs.AddHttpClient();
+        svcs.AddHttpClient("memelist")
+            .ConfigurePrimaryHttpMessageHandler(() => new HttpClientHandler
+            {
+                AllowAutoRedirect = false
+            });
 
         if (Environment.GetEnvironmentVariable("NADEKOBOT_IS_COORDINATED") != "1")
-        {
             svcs.AddSingleton<ICoordinator, SingleProcessCoordinator>();
-        }
         else
         {
-            svcs.AddSingleton<RemoteGrpcCoordinator>();
-            svcs.AddSingleton<ICoordinator>(_ => svcs.GetRequiredService<RemoteGrpcCoordinator>());
-            svcs.AddSingleton<IReadyExecutor>(_ => svcs.GetRequiredService<RemoteGrpcCoordinator>());
+            svcs.AddSingleton<RemoteGrpcCoordinator>()
+                .AddSingleton<ICoordinator>(x => x.GetRequiredService<RemoteGrpcCoordinator>())
+                .AddSingleton<IReadyExecutor>(x => x.GetRequiredService<RemoteGrpcCoordinator>());
         }
 
-        svcs.AddSingleton<IServiceProvider>(svcs);
+        svcs.AddSingleton<RedisLocalDataCache>()
+            .AddSingleton<ILocalDataCache>(x => x.GetRequiredService<RedisLocalDataCache>())
+            .AddSingleton<RedisImagesCache>()
+            .AddSingleton<IImageCache>(x => x.GetRequiredService<RedisImagesCache>())
+            .AddSingleton<IReadyExecutor>(x => x.GetRequiredService<RedisImagesCache>())
+            .AddSingleton<IDataCache, RedisCache>();
+
+        svcs.Scan(scan => scan.FromAssemblyOf<IReadyExecutor>()
+                              .AddClasses(classes => classes.AssignableToAny(
+                                      // services
+                                      typeof(INService),
+
+                                      // behaviours
+                                      typeof(IExecOnMessage),
+                                      typeof(IInputTransformer),
+                                      typeof(IExecPreCommand),
+                                      typeof(IExecPostCommand),
+                                      typeof(IExecNoCommand))
+                                                .WithoutAttribute<DontAddToIocContainerAttribute>()
+#if GLOBAL_NADEKO
+                                                .WithoutAttribute<NoPublicBotAttribute>()
+#endif
+                              )
+                              .AsSelfWithInterfaces()
+                              .WithSingletonLifetime());
 
         //initialize Services
-        Services = svcs;
+        Services = svcs.BuildServiceProvider();
         Services.GetRequiredService<IBehaviorHandler>().Initialize();
 
-        foreach (var a in _loadedAssemblies)
-        {
-            LoadTypeReaders(a);
-        }
+        if (Client.ShardId == 0)
+            ApplyConfigMigrations();
 
-        Log.Information("All services loaded in {ServiceLoadTime:F2}s",
-            Stopwatch.GetElapsedTime(startTime).TotalSeconds);
+        _ = LoadTypeReaders(typeof(Bot).Assembly);
+
+        sw.Stop();
+        Log.Information( "All services loaded in {ServiceLoadTime:F2}s", sw.Elapsed.TotalSeconds);
     }
 
-    private void LoadTypeReaders(Assembly assembly)
+    private void ApplyConfigMigrations()
     {
-        var filteredTypes = assembly.GetExportedTypes()
-                                    .Where(x => x.IsSubclassOf(typeof(TypeReader))
+        // execute all migrators
+        var migrators = Services.GetServices<IConfigMigrator>();
+        foreach (var migrator in migrators)
+            migrator.EnsureMigrated();
+    }
+
+    private IEnumerable<object> LoadTypeReaders(Assembly assembly)
+    {
+        Type[] allTypes;
+        try
+        {
+            allTypes = assembly.GetTypes();
+        }
+        catch (ReflectionTypeLoadException ex)
+        {
+            Log.Warning(ex.LoaderExceptions[0], "Error getting types");
+            return Enumerable.Empty<object>();
+        }
+
+        var filteredTypes = allTypes.Where(x => x.IsSubclassOf(typeof(TypeReader))
                                                 && x.BaseType?.GetGenericArguments().Length > 0
                                                 && !x.IsAbstract);
 
+        var toReturn = new List<object>();
         foreach (var ft in filteredTypes)
         {
+            var x = (TypeReader)ActivatorUtilities.CreateInstance(Services, ft);
             var baseType = ft.BaseType;
             if (baseType is null)
                 continue;
-
-            var typeReader = (TypeReader)ActivatorUtilities.CreateInstance(Services, ft);
             var typeArgs = baseType.GetGenericArguments();
-            _commandService.AddTypeReader(typeArgs[0], typeReader);
+            _commandService.AddTypeReader(typeArgs[0], x);
+            toReturn.Add(x);
         }
+
+        return toReturn;
     }
 
     private async Task LoginAsync(string token)
@@ -225,14 +250,13 @@ public sealed class Bot : IBot
             LoginErrorHandler.Handle(ex);
             Helpers.ReadErrorAndExit(4);
         }
-
+        
         await clientReady.Task.ConfigureAwait(false);
         Client.Ready -= SetClientReady;
-
+        
         Client.JoinedGuild += Client_JoinedGuild;
         Client.LeftGuild += Client_LeftGuild;
 
-        // _ = Client.SetStatusAsync(UserStatus.Online);
         Log.Information("Shard {ShardId} logged in", Client.ShardId);
     }
 
@@ -262,15 +286,16 @@ public sealed class Bot : IBot
     {
         if (ShardId == 0)
             await _db.SetupAsync();
-
-        var startTime = Stopwatch.GetTimestamp();
+        
+        var sw = Stopwatch.StartNew();
 
         await LoginAsync(_creds.Token);
 
+        Mention = Client.CurrentUser.Mention;
         Log.Information("Shard {ShardId} loading services...", Client.ShardId);
         try
         {
-            await AddServices();
+            AddServices();
         }
         catch (Exception ex)
         {
@@ -278,44 +303,20 @@ public sealed class Bot : IBot
             Helpers.ReadErrorAndExit(9);
         }
 
-        Log.Information("Shard {ShardId} connected in {Elapsed:F2}s",
-            Client.ShardId,
-            Stopwatch.GetElapsedTime(startTime).TotalSeconds);
+        sw.Stop();
+        Log.Information("Shard {ShardId} connected in {Elapsed:F2}s", Client.ShardId, sw.Elapsed.TotalSeconds);
         var commandHandler = Services.GetRequiredService<CommandHandler>();
 
         // start handling messages received in commandhandler
         await commandHandler.StartHandling();
 
-        foreach (var a in _loadedAssemblies)
-        {
-            await _commandService.AddModulesAsync(a, Services);
-        }
-
+        await _commandService.AddModulesAsync(typeof(Bot).Assembly, Services);
         // await _interactionService.AddModulesAsync(typeof(Bot).Assembly, Services);
         IsReady = true;
-
-        await EnsureBotOwnershipAsync();
         _ = Task.Run(ExecuteReadySubscriptions);
         Log.Information("Shard {ShardId} ready", Client.ShardId);
     }
 
-    private async ValueTask EnsureBotOwnershipAsync()
-    {
-        try
-        {
-            if (_creds.OwnerIds.Count != 0)
-                return;
-
-            Log.Information("Initializing Owner Id...");
-            var info = await Client.GetApplicationInfoAsync();
-            _credsProvider.ModifyCredsFile(x => x.OwnerIds = new[] { info.Owner.Id });
-        }
-        catch (Exception ex)
-        {
-            Log.Warning("Getting application info failed: {ErrorMessage}", ex.Message);
-        }
-    }
-
     private Task ExecuteReadySubscriptions()
     {
         var readyExecutors = Services.GetServices<IReadyExecutor>();
@@ -344,30 +345,29 @@ public sealed class Bot : IBot
 
         if (arg.Exception is { InnerException: WebSocketClosedException { CloseCode: 4014 } })
         {
-            Log.Error("""
-                      Login failed.
+            Log.Error(@"
+Login failed.
 
-                      *** Please enable privileged intents ***
+*** Please enable privileged intents ***
 
-                      Certain Nadeko features require Discord's privileged gateway intents.
-                      These include greeting and goodbye messages, as well as creating the Owner message channels for DM forwarding.
+Certain Nadeko features require Discord's privileged gateway intents.
+These include greeting and goodbye messages, as well as creating the Owner message channels for DM forwarding.
 
-                      How to enable privileged intents:
-                      1. Head over to the Discord Developer Portal https://discord.com/developers/applications/
-                      2. Select your Application.
-                      3. Click on `Bot` in the left side navigation panel, and scroll down to the intents section.
-                      4. Enable all intents.
-                      5. Restart your bot.
+How to enable privileged intents:
+1. Head over to the Discord Developer Portal https://discord.com/developers/applications/
+2. Select your Application.
+3. Click on `Bot` in the left side navigation panel, and scroll down to the intents section.
+4. Enable all intents.
+5. Restart your bot.
 
-                      Read this only if your bot is in 100 or more servers:
+Read this only if your bot is in 100 or more servers:
 
-                      You'll need to apply to use the intents with Discord, but for small selfhosts, all that is required is enabling the intents in the developer portal.
-                      Yes, this is a new thing from Discord, as of October 2020. No, there's nothing we can do about it. Yes, we're aware it worked before.
-                      While waiting for your bot to be accepted, you can change the 'usePrivilegedIntents' inside your creds.yml to 'false', although this will break many of the nadeko's features
-                      """);
+You'll need to apply to use the intents with Discord, but for small selfhosts, all that is required is enabling the intents in the developer portal.
+Yes, this is a new thing from Discord, as of October 2020. No, there's nothing we can do about it. Yes, we're aware it worked before.
+While waiting for your bot to be accepted, you can change the 'usePrivilegedIntents' inside your creds.yml to 'false', although this will break many of the nadeko's features");
             return Task.CompletedTask;
         }
-
+        
 #if GLOBAL_NADEKO || DEBUG
         if (arg.Exception is not null)
             Log.Warning(arg.Exception, "{ErrorSource} | {ErrorMessage}", arg.Source, arg.Message);

src/NadekoBot/Common/AsyncLazy.cs

@@ -1,6 +1,7 @@
-using System.Runtime.CompilerServices;
+#nullable disable
+using System.Runtime.CompilerServices;
 
-namespace Nadeko.Common;
+namespace NadekoBot.Common;
 
 public class AsyncLazy<T> : Lazy<Task<T>>
 {

src/NadekoBot/Common/Attributes/CommandNameLoadHelper.cs

@@ -1,4 +1,3 @@
-using NadekoBot.Common.Yml;
 using YamlDotNet.Serialization;
 
 namespace NadekoBot.Common.Attributes;
@@ -16,17 +15,9 @@ public static class CommandNameLoadHelper
         return _deserializer.Deserialize<Dictionary<string, string[]>>(text);
     }
 
-    public static Dictionary<string, CommandStrings> LoadCommandStrings(
-        string commandsFilePath = "data/strings/commands.yml")
-    {
-        var text = File.ReadAllText(commandsFilePath);
-
-        return Yaml.Deserializer.Deserialize<Dictionary<string, CommandStrings>>(text);
-    }
-
     public static string[] GetAliasesFor(string methodName)
         => _lazyCommandAliases.Value.TryGetValue(methodName.ToLowerInvariant(), out var aliases) && aliases.Length > 1
-            ? aliases.ToArray()
+            ? aliases.Skip(1).ToArray()
             : Array.Empty<string>();
 
     public static string GetCommandNameFor(string methodName)

src/NadekoBot/Common/Attributes/NadekoCommand.cs

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

src/NadekoBot/Common/Attributes/NadekoModuleAttribute.cs

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

src/NadekoBot/Common/Attributes/NadekoOptions.cs

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

src/NadekoBot/Common/Attributes/Ratelimit.cs

@@ -9,29 +9,28 @@ public sealed class RatelimitAttribute : PreconditionAttribute
 
     public RatelimitAttribute(int seconds)
     {
-        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(seconds);
+        if (seconds <= 0)
+            throw new ArgumentOutOfRangeException(nameof(seconds));
 
         Seconds = seconds;
     }
 
-    public override async Task<PreconditionResult> CheckPermissionsAsync(
+    public override Task<PreconditionResult> CheckPermissionsAsync(
         ICommandContext context,
         CommandInfo command,
         IServiceProvider services)
     {
         if (Seconds == 0)
-            return PreconditionResult.FromSuccess();
+            return Task.FromResult(PreconditionResult.FromSuccess());
 
-        var cache = services.GetRequiredService<IBotCache>();
-        var rem = await cache.GetRatelimitAsync(
-            new($"precondition:{context.User.Id}:{command.Name}"),
-            Seconds.Seconds());
+        var cache = services.GetRequiredService<IDataCache>();
+        var rem = cache.TryAddRatelimit(context.User.Id, command.Name, Seconds);
 
         if (rem is null)
-            return PreconditionResult.FromSuccess();
+            return Task.FromResult(PreconditionResult.FromSuccess());
 
         var msgContent = $"You can use this command again in {rem.Value.TotalSeconds:F1}s.";
 
-        return PreconditionResult.FromError(msgContent);
+        return Task.FromResult(PreconditionResult.FromError(msgContent));
     }
 }

src/NadekoBot/Common/Attributes/UserPerm.cs

@@ -1,8 +1,9 @@
 using Microsoft.Extensions.DependencyInjection;
+using NadekoBot.Modules.Administration.Services;
 
 namespace Discord;
 
-[AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+[AttributeUsage(AttributeTargets.Method)]
 public class UserPermAttribute : RequireUserPermissionAttribute
 {
     public UserPermAttribute(GuildPerm permission)
@@ -20,7 +21,7 @@ public class UserPermAttribute : RequireUserPermissionAttribute
         CommandInfo command,
         IServiceProvider services)
     {
-        var permService = services.GetRequiredService<IDiscordPermOverrideService>();
+        var permService = services.GetRequiredService<DiscordPermOverrideService>();
         if (permService.TryGetOverrides(context.Guild?.Id ?? 0, command.Name.ToUpperInvariant(), out _))
             return Task.FromResult(PreconditionResult.FromSuccess());
 

src/NadekoBot/Common/Collections/ConcurrentHashSet.cs

@@ -0,0 +1,821 @@
+#nullable disable
+#pragma warning disable
+// License MIT
+// Source: https://github.com/i3arnon/ConcurrentHashSet
+
+using System.Diagnostics;
+
+namespace System.Collections.Generic;
+
+/// <summary>
+///     Represents a thread-safe hash-based unique collection.
+/// </summary>
+/// <typeparam name="T">The type of the items in the collection.</typeparam>
+/// <remarks>
+///     All public members of <see cref="ConcurrentHashSet{T}" /> are thread-safe and may be used
+///     concurrently from multiple threads.
+/// </remarks>
+[DebuggerDisplay("Count = {Count}")]
+public sealed class ConcurrentHashSet<T> : IReadOnlyCollection<T>, ICollection<T>
+{
+    private const int DEFAULT_CAPACITY = 31;
+    private const int MAX_LOCK_NUMBER = 1024;
+
+    private static int DefaultConcurrencyLevel
+        => PlatformHelper.ProcessorCount;
+
+    /// <summary>
+    ///     Gets a value that indicates whether the <see cref="ConcurrentHashSet{T}" /> is empty.
+    /// </summary>
+    /// <value>
+    ///     true if the <see cref="ConcurrentHashSet{T}" /> is empty; otherwise,
+    ///     false.
+    /// </value>
+    public bool IsEmpty
+    {
+        get
+        {
+            var acquiredLocks = 0;
+            try
+            {
+                AcquireAllLocks(ref acquiredLocks);
+
+                for (var i = 0; i < tables.CountPerLock.Length; i++)
+                {
+                    if (tables.CountPerLock[i] != 0)
+                        return false;
+                }
+            }
+            finally
+            {
+                ReleaseLocks(0, acquiredLocks);
+            }
+
+            return true;
+        }
+    }
+
+    bool ICollection<T>.IsReadOnly
+        => false;
+
+    /// <summary>
+    ///     Gets the number of items contained in the
+    ///     <see
+    ///         cref="ConcurrentHashSet{T}" />
+    ///     .
+    /// </summary>
+    /// <value>
+    ///     The number of items contained in the
+    ///     <see
+    ///         cref="ConcurrentHashSet{T}" />
+    ///     .
+    /// </value>
+    /// <remarks>
+    ///     Count has snapshot semantics and represents the number of items in the
+    ///     <see
+    ///         cref="ConcurrentHashSet{T}" />
+    ///     at the moment when Count was accessed.
+    /// </remarks>
+    public int Count
+    {
+        get
+        {
+            var count = 0;
+            var acquiredLocks = 0;
+            try
+            {
+                AcquireAllLocks(ref acquiredLocks);
+
+                for (var i = 0; i < tables.CountPerLock.Length; i++)
+                    count += tables.CountPerLock[i];
+            }
+            finally
+            {
+                ReleaseLocks(0, acquiredLocks);
+            }
+
+            return count;
+        }
+    }
+
+    private readonly IEqualityComparer<T> _comparer;
+    private readonly bool _growLockArray;
+
+    private int budget;
+    private volatile Tables tables;
+
+    /// <summary>
+    ///     Initializes a new instance of the
+    ///     <see
+    ///         cref="ConcurrentHashSet{T}" />
+    ///     class that is empty, has the default concurrency level, has the default initial capacity, and
+    ///     uses the default comparer for the item type.
+    /// </summary>
+    public ConcurrentHashSet()
+        : this(DefaultConcurrencyLevel, DEFAULT_CAPACITY, true, EqualityComparer<T>.Default)
+    {
+    }
+
+    /// <summary>
+    ///     Initializes a new instance of the
+    ///     <see
+    ///         cref="ConcurrentHashSet{T}" />
+    ///     class that is empty, has the specified concurrency level and capacity, and uses the default
+    ///     comparer for the item type.
+    /// </summary>
+    /// <param name="concurrencyLevel">
+    ///     The estimated number of threads that will update the
+    ///     <see cref="ConcurrentHashSet{T}" /> concurrently.
+    /// </param>
+    /// <param name="capacity">
+    ///     The initial number of elements that the
+    ///     <see
+    ///         cref="ConcurrentHashSet{T}" />
+    ///     can contain.
+    /// </param>
+    /// <exception cref="T:System.ArgumentOutOfRangeException">
+    ///     <paramref name="concurrencyLevel" /> is
+    ///     less than 1.
+    /// </exception>
+    /// <exception cref="T:System.ArgumentOutOfRangeException">
+    ///     <paramref name="capacity" /> is less than
+    ///     0.
+    /// </exception>
+    public ConcurrentHashSet(int concurrencyLevel, int capacity)
+        : this(concurrencyLevel, capacity, false, EqualityComparer<T>.Default)
+    {
+    }
+
+    /// <summary>
+    ///     Initializes a new instance of the <see cref="ConcurrentHashSet{T}" />
+    ///     class that contains elements copied from the specified
+    ///     <see
+    ///         cref="T:System.Collections.IEnumerable{T}" />
+    ///     , has the default concurrency
+    ///     level, has the default initial capacity, and uses the default comparer for the item type.
+    /// </summary>
+    /// <param name="collection">
+    ///     The
+    ///     <see
+    ///         cref="T:System.Collections.IEnumerable{T}" />
+    ///     whose elements are copied to
+    ///     the new
+    ///     <see cref="ConcurrentHashSet{T}" />.
+    /// </param>
+    /// <exception cref="T:System.ArgumentNullException"><paramref name="collection" /> is a null reference.</exception>
+    public ConcurrentHashSet(IEnumerable<T> collection)
+        : this(collection, EqualityComparer<T>.Default)
+    {
+    }
+
+    /// <summary>
+    ///     Initializes a new instance of the <see cref="ConcurrentHashSet{T}" />
+    ///     class that is empty, has the specified concurrency level and capacity, and uses the specified
+    ///     <see cref="T:System.Collections.Generic.IEqualityComparer{T}" />.
+    /// </summary>
+    /// <param name="comparer">
+    ///     The <see cref="T:System.Collections.Generic.IEqualityComparer{T}" />
+    ///     implementation to use when comparing items.
+    /// </param>
+    /// <exception cref="T:System.ArgumentNullException"><paramref name="comparer" /> is a null reference.</exception>
+    public ConcurrentHashSet(IEqualityComparer<T> comparer)
+        : this(DefaultConcurrencyLevel, DEFAULT_CAPACITY, true, comparer)
+    {
+    }
+
+    /// <summary>
+    ///     Initializes a new instance of the <see cref="ConcurrentHashSet{T}" />
+    ///     class that contains elements copied from the specified
+    ///     <see
+    ///         cref="T:System.Collections.IEnumerable" />
+    ///     , has the default concurrency level, has the default
+    ///     initial capacity, and uses the specified
+    ///     <see cref="T:System.Collections.Generic.IEqualityComparer{T}" />.
+    /// </summary>
+    /// <param name="collection">
+    ///     The
+    ///     <see
+    ///         cref="T:System.Collections.IEnumerable{T}" />
+    ///     whose elements are copied to
+    ///     the new
+    ///     <see cref="ConcurrentHashSet{T}" />.
+    /// </param>
+    /// <param name="comparer">
+    ///     The <see cref="T:System.Collections.Generic.IEqualityComparer{T}" />
+    ///     implementation to use when comparing items.
+    /// </param>
+    /// <exception cref="T:System.ArgumentNullException">
+    ///     <paramref name="collection" /> is a null reference
+    ///     (Nothing in Visual Basic). -or-
+    ///     <paramref name="comparer" /> is a null reference (Nothing in Visual Basic).
+    /// </exception>
+    public ConcurrentHashSet(IEnumerable<T> collection, IEqualityComparer<T> comparer)
+        : this(comparer)
+    {
+        if (collection is null)
+            throw new ArgumentNullException(nameof(collection));
+
+        InitializeFromCollection(collection);
+    }
+
+
+    /// <summary>
+    ///     Initializes a new instance of the <see cref="ConcurrentHashSet{T}" />
+    ///     class that contains elements copied from the specified <see cref="T:System.Collections.IEnumerable" />,
+    ///     has the specified concurrency level, has the specified initial capacity, and uses the specified
+    ///     <see cref="T:System.Collections.Generic.IEqualityComparer{T}" />.
+    /// </summary>
+    /// <param name="concurrencyLevel">
+    ///     The estimated number of threads that will update the
+    ///     <see cref="ConcurrentHashSet{T}" /> concurrently.
+    /// </param>
+    /// <param name="collection">
+    ///     The <see cref="T:System.Collections.IEnumerable{T}" /> whose elements are copied to the new
+    ///     <see cref="ConcurrentHashSet{T}" />.
+    /// </param>
+    /// <param name="comparer">
+    ///     The <see cref="T:System.Collections.Generic.IEqualityComparer{T}" /> implementation to use
+    ///     when comparing items.
+    /// </param>
+    /// <exception cref="T:System.ArgumentNullException">
+    ///     <paramref name="collection" /> is a null reference.
+    ///     -or-
+    ///     <paramref name="comparer" /> is a null reference.
+    /// </exception>
+    /// <exception cref="T:System.ArgumentOutOfRangeException">
+    ///     <paramref name="concurrencyLevel" /> is less than 1.
+    /// </exception>
+    public ConcurrentHashSet(int concurrencyLevel, IEnumerable<T> collection, IEqualityComparer<T> comparer)
+        : this(concurrencyLevel, DEFAULT_CAPACITY, false, comparer)
+    {
+        if (collection is null)
+            throw new ArgumentNullException(nameof(collection));
+        if (comparer is null)
+            throw new ArgumentNullException(nameof(comparer));
+
+        InitializeFromCollection(collection);
+    }
+
+    /// <summary>
+    ///     Initializes a new instance of the <see cref="ConcurrentHashSet{T}" />
+    ///     class that is empty, has the specified concurrency level, has the specified initial capacity, and
+    ///     uses the specified <see cref="T:System.Collections.Generic.IEqualityComparer{T}" />.
+    /// </summary>
+    /// <param name="concurrencyLevel">
+    ///     The estimated number of threads that will update the
+    ///     <see cref="ConcurrentHashSet{T}" /> concurrently.
+    /// </param>
+    /// <param name="capacity">
+    ///     The initial number of elements that the
+    ///     <see
+    ///         cref="ConcurrentHashSet{T}" />
+    ///     can contain.
+    /// </param>
+    /// <param name="comparer">
+    ///     The <see cref="T:System.Collections.Generic.IEqualityComparer{T}" />
+    ///     implementation to use when comparing items.
+    /// </param>
+    /// <exception cref="T:System.ArgumentOutOfRangeException">
+    ///     <paramref name="concurrencyLevel" /> is less than 1. -or-
+    ///     <paramref name="capacity" /> is less than 0.
+    /// </exception>
+    /// <exception cref="T:System.ArgumentNullException"><paramref name="comparer" /> is a null reference.</exception>
+    public ConcurrentHashSet(int concurrencyLevel, int capacity, IEqualityComparer<T> comparer)
+        : this(concurrencyLevel, capacity, false, comparer)
+    {
+    }
+
+    private ConcurrentHashSet(
+        int concurrencyLevel,
+        int capacity,
+        bool growLockArray,
+        IEqualityComparer<T> comparer)
+    {
+        if (concurrencyLevel < 1)
+            throw new ArgumentOutOfRangeException(nameof(concurrencyLevel));
+        if (capacity < 0)
+            throw new ArgumentOutOfRangeException(nameof(capacity));
+
+        // The capacity should be at least as large as the concurrency level. Otherwise, we would have locks that don't guard
+        // any buckets.
+        if (capacity < concurrencyLevel)
+            capacity = concurrencyLevel;
+
+        var locks = new object[concurrencyLevel];
+        for (var i = 0; i < locks.Length; i++)
+            locks[i] = new();
+
+        var countPerLock = new int[locks.Length];
+        var buckets = new Node[capacity];
+        tables = new(buckets, locks, countPerLock);
+
+        _growLockArray = growLockArray;
+        budget = buckets.Length / locks.Length;
+        _comparer = comparer ?? throw new ArgumentNullException(nameof(comparer));
+    }
+
+    /// <summary>
+    ///     Removes all items from the <see cref="ConcurrentHashSet{T}" />.
+    /// </summary>
+    public void Clear()
+    {
+        var locksAcquired = 0;
+        try
+        {
+            AcquireAllLocks(ref locksAcquired);
+
+            var newTables = new Tables(new Node[DEFAULT_CAPACITY], tables.Locks, new int[tables.CountPerLock.Length]);
+            tables = newTables;
+            budget = Math.Max(1, newTables.Buckets.Length / newTables.Locks.Length);
+        }
+        finally
+        {
+            ReleaseLocks(0, locksAcquired);
+        }
+    }
+
+    /// <summary>
+    ///     Determines whether the <see cref="ConcurrentHashSet{T}" /> contains the specified
+    ///     item.
+    /// </summary>
+    /// <param name="item">The item to locate in the <see cref="ConcurrentHashSet{T}" />.</param>
+    /// <returns>true if the <see cref="ConcurrentHashSet{T}" /> contains the item; otherwise, false.</returns>
+    public bool Contains(T item)
+    {
+        var hashcode = _comparer.GetHashCode(item!);
+
+        // We must capture the _buckets field in a local variable. It is set to a new table on each table resize.
+        var localTables = tables;
+
+        var bucketNo = GetBucket(hashcode, localTables.Buckets.Length);
+
+        // We can get away w/out a lock here.
+        // The Volatile.Read ensures that the load of the fields of 'n' doesn't move before the load from buckets[i].
+        var current = Volatile.Read(ref localTables.Buckets[bucketNo]);
+
+        while (current is not null)
+        {
+            if (hashcode == current.Hashcode && _comparer.Equals(current.Item, item))
+                return true;
+
+            current = current.Next;
+        }
+
+        return false;
+    }
+
+    void ICollection<T>.Add(T item)
+        => Add(item);
+
+    void ICollection<T>.CopyTo(T[] array, int arrayIndex)
+    {
+        if (array is null)
+            throw new ArgumentNullException(nameof(array));
+        if (arrayIndex < 0)
+            throw new ArgumentOutOfRangeException(nameof(arrayIndex));
+
+        var locksAcquired = 0;
+        try
+        {
+            AcquireAllLocks(ref locksAcquired);
+
+            var count = 0;
+
+            for (var i = 0; i < tables.Locks.Length && count >= 0; i++)
+                count += tables.CountPerLock[i];
+
+            if (array.Length - count < arrayIndex || count < 0) //"count" itself or "count + arrayIndex" can overflow
+            {
+                throw new ArgumentException(
+                    "The index is equal to or greater than the length of the array, or the number of elements in the set is greater than the available space from index to the end of the destination array.");
+            }
+
+            CopyToItems(array, arrayIndex);
+        }
+        finally
+        {
+            ReleaseLocks(0, locksAcquired);
+        }
+    }
+
+    bool ICollection<T>.Remove(T item)
+        => TryRemove(item);
+
+    IEnumerator IEnumerable.GetEnumerator()
+        => GetEnumerator();
+
+    /// <summary>
+    ///     Returns an enumerator that iterates through the
+    ///     <see
+    ///         cref="ConcurrentHashSet{T}" />
+    ///     .
+    /// </summary>
+    /// <returns>An enumerator for the <see cref="ConcurrentHashSet{T}" />.</returns>
+    /// <remarks>
+    ///     The enumerator returned from the collection is safe to use concurrently with
+    ///     reads and writes to the collection, however it does not represent a moment-in-time snapshot
+    ///     of the collection.  The contents exposed through the enumerator may contain modifications
+    ///     made to the collection after <see cref="GetEnumerator" /> was called.
+    /// </remarks>
+    public IEnumerator<T> GetEnumerator()
+    {
+        var buckets = tables.Buckets;
+
+        for (var i = 0; i < buckets.Length; i++)
+        {
+            // The Volatile.Read ensures that the load of the fields of 'current' doesn't move before the load from buckets[i].
+            var current = Volatile.Read(ref buckets[i]);
+
+            while (current is not null)
+            {
+                yield return current.Item;
+                current = current.Next;
+            }
+        }
+    }
+
+    /// <summary>
+    ///     Adds the specified item to the <see cref="ConcurrentHashSet{T}" />.
+    /// </summary>
+    /// <param name="item">The item to add.</param>
+    /// <returns>
+    ///     true if the items was added to the <see cref="ConcurrentHashSet{T}" />
+    ///     successfully; false if it already exists.
+    /// </returns>
+    /// <exception cref="T:System.OverflowException">
+    ///     The <see cref="ConcurrentHashSet{T}" />
+    ///     contains too many items.
+    /// </exception>
+    public bool Add(T item)
+        => AddInternal(item, _comparer.GetHashCode(item), true);
+
+    /// <summary>
+    ///     Attempts to remove the item from the <see cref="ConcurrentHashSet{T}" />.
+    /// </summary>
+    /// <param name="item">The item to remove.</param>
+    /// <returns>true if an item was removed successfully; otherwise, false.</returns>
+    public bool TryRemove(T item)
+    {
+        var hashcode = _comparer.GetHashCode(item);
+        while (true)
+        {
+            var localTables = tables;
+
+            GetBucketAndLockNo(hashcode,
+                out var bucketNo,
+                out var lockNo,
+                localTables.Buckets.Length,
+                localTables.Locks.Length);
+
+            lock (localTables.Locks[lockNo])
+            {
+                // If the table just got resized, we may not be holding the right lock, and must retry.
+                // This should be a rare occurrence.
+                if (localTables != tables)
+                    continue;
+
+                Node previous = null;
+                for (var current = localTables.Buckets[bucketNo]; current is not null; current = current.Next)
+                {
+                    Debug.Assert((previous is null && current == localTables.Buckets[bucketNo])
+                                 || previous!.Next == current);
+
+                    if (hashcode == current.Hashcode && _comparer.Equals(current.Item, item))
+                    {
+                        if (previous is null)
+                            Volatile.Write(ref localTables.Buckets[bucketNo], current.Next);
+                        else
+                            previous.Next = current.Next;
+
+                        localTables.CountPerLock[lockNo]--;
+                        return true;
+                    }
+
+                    previous = current;
+                }
+            }
+
+            return false;
+        }
+    }
+
+    private void InitializeFromCollection(IEnumerable<T> collection)
+    {
+        foreach (var item in collection)
+            AddInternal(item, _comparer.GetHashCode(item), false);
+
+        if (budget == 0)
+            budget = tables.Buckets.Length / tables.Locks.Length;
+    }
+
+    private bool AddInternal(T item, int hashcode, bool acquireLock)
+    {
+        while (true)
+        {
+            var localTables = tables;
+            GetBucketAndLockNo(hashcode,
+                out var bucketNo,
+                out var lockNo,
+                localTables.Buckets.Length,
+                localTables.Locks.Length);
+
+            var resizeDesired = false;
+            var lockTaken = false;
+            try
+            {
+                if (acquireLock)
+                    Monitor.Enter(localTables.Locks[lockNo], ref lockTaken);
+
+                // If the table just got resized, we may not be holding the right lock, and must retry.
+                // This should be a rare occurrence.
+                if (localTables != tables)
+                    continue;
+
+                // Try to find this item in the bucket
+                Node previous = null;
+                for (var current = localTables.Buckets[bucketNo]; current is not null; current = current.Next)
+                {
+                    Debug.Assert((previous is null && current == localTables.Buckets[bucketNo])
+                                 || previous!.Next == current);
+                    if (hashcode == current.Hashcode && _comparer.Equals(current.Item, item))
+                        return false;
+
+                    previous = current;
+                }
+
+                // The item was not found in the bucket. Insert the new item.
+                Volatile.Write(ref localTables.Buckets[bucketNo], new(item, hashcode, localTables.Buckets[bucketNo]));
+                checked
+                {
+                    localTables.CountPerLock[lockNo]++;
+                }
+
+                //
+                // If the number of elements guarded by this lock has exceeded the budget, resize the bucket table.
+                // It is also possible that GrowTable will increase the budget but won't resize the bucket table.
+                // That happens if the bucket table is found to be poorly utilized due to a bad hash function.
+                //
+                if (localTables.CountPerLock[lockNo] > budget)
+                    resizeDesired = true;
+            }
+            finally
+            {
+                if (lockTaken)
+                    Monitor.Exit(localTables.Locks[lockNo]);
+            }
+
+            //
+            // The fact that we got here means that we just performed an insertion. If necessary, we will grow the table.
+            //
+            // Concurrency notes:
+            // - Notice that we are not holding any locks at when calling GrowTable. This is necessary to prevent deadlocks.
+            // - As a result, it is possible that GrowTable will be called unnecessarily. But, GrowTable will obtain lock 0
+            //   and then verify that the table we passed to it as the argument is still the current table.
+            //
+            if (resizeDesired)
+                GrowTable(localTables);
+
+            return true;
+        }
+    }
+
+    private static int GetBucket(int hashcode, int bucketCount)
+    {
+        var bucketNo = (hashcode & 0x7fffffff) % bucketCount;
+        Debug.Assert(bucketNo >= 0 && bucketNo < bucketCount);
+        return bucketNo;
+    }
+
+    private static void GetBucketAndLockNo(
+        int hashcode,
+        out int bucketNo,
+        out int lockNo,
+        int bucketCount,
+        int lockCount)
+    {
+        bucketNo = (hashcode & 0x7fffffff) % bucketCount;
+        lockNo = bucketNo % lockCount;
+
+        Debug.Assert(bucketNo >= 0 && bucketNo < bucketCount);
+        Debug.Assert(lockNo >= 0 && lockNo < lockCount);
+    }
+
+    private void GrowTable(Tables localTables)
+    {
+        const int maxArrayLength = 0X7FEFFFFF;
+        var locksAcquired = 0;
+        try
+        {
+            // The thread that first obtains _locks[0] will be the one doing the resize operation
+            AcquireLocks(0, 1, ref locksAcquired);
+
+            // Make sure nobody resized the table while we were waiting for lock 0:
+            if (localTables != tables)
+                // We assume that since the table reference is different, it was already resized (or the budget
+                // was adjusted). If we ever decide to do table shrinking, or replace the table for other reasons,
+                // we will have to revisit this logic.
+                return;
+
+            // Compute the (approx.) total size. Use an Int64 accumulation variable to avoid an overflow.
+            long approxCount = 0;
+            for (var i = 0; i < localTables.CountPerLock.Length; i++)
+                approxCount += localTables.CountPerLock[i];
+
+            //
+            // If the bucket array is too empty, double the budget instead of resizing the table
+            //
+            if (approxCount < localTables.Buckets.Length / 4)
+            {
+                budget = 2 * budget;
+                if (budget < 0)
+                    budget = int.MaxValue;
+
+                return;
+            }
+
+            // Compute the new table size. We find the smallest integer larger than twice the previous table size, and not divisible by
+            // 2,3,5 or 7. We can consider a different table-sizing policy in the future.
+            var newLength = 0;
+            var maximizeTableSize = false;
+            try
+            {
+                checked
+                {
+                    // Double the size of the buckets table and add one, so that we have an odd integer.
+                    newLength = (localTables.Buckets.Length * 2) + 1;
+
+                    // Now, we only need to check odd integers, and find the first that is not divisible
+                    // by 3, 5 or 7.
+                    while (newLength % 3 == 0 || newLength % 5 == 0 || newLength % 7 == 0)
+                        newLength += 2;
+
+                    Debug.Assert(newLength % 2 != 0);
+
+                    if (newLength > maxArrayLength)
+                        maximizeTableSize = true;
+                }
+            }
+            catch (OverflowException)
+            {
+                maximizeTableSize = true;
+            }
+
+            if (maximizeTableSize)
+            {
+                newLength = maxArrayLength;
+
+                // We want to make sure that GrowTable will not be called again, since table is at the maximum size.
+                // To achieve that, we set the budget to int.MaxValue.
+                //
+                // (There is one special case that would allow GrowTable() to be called in the future: 
+                // calling Clear() on the ConcurrentHashSet will shrink the table and lower the budget.)
+                budget = int.MaxValue;
+            }
+
+            // Now acquire all other locks for the table
+            AcquireLocks(1, localTables.Locks.Length, ref locksAcquired);
+
+            var newLocks = localTables.Locks;
+
+            // Add more locks
+            if (_growLockArray && localTables.Locks.Length < MAX_LOCK_NUMBER)
+            {
+                newLocks = new object[localTables.Locks.Length * 2];
+                Array.Copy(localTables.Locks, 0, newLocks, 0, localTables.Locks.Length);
+                for (var i = localTables.Locks.Length; i < newLocks.Length; i++)
+                    newLocks[i] = new();
+            }
+
+            var newBuckets = new Node[newLength];
+            var newCountPerLock = new int[newLocks.Length];
+
+            // Copy all data into a new table, creating new nodes for all elements
+            for (var i = 0; i < localTables.Buckets.Length; i++)
+            {
+                var current = localTables.Buckets[i];
+                while (current is not null)
+                {
+                    var next = current.Next;
+                    GetBucketAndLockNo(current.Hashcode,
+                        out var newBucketNo,
+                        out var newLockNo,
+                        newBuckets.Length,
+                        newLocks.Length);
+
+                    newBuckets[newBucketNo] = new(current.Item, current.Hashcode, newBuckets[newBucketNo]);
+
+                    checked
+                    {
+                        newCountPerLock[newLockNo]++;
+                    }
+
+                    current = next;
+                }
+            }
+
+            // Adjust the budget
+            budget = Math.Max(1, newBuckets.Length / newLocks.Length);
+
+            // Replace tables with the new versions
+            tables = new(newBuckets, newLocks, newCountPerLock);
+        }
+        finally
+        {
+            // Release all locks that we took earlier
+            ReleaseLocks(0, locksAcquired);
+        }
+    }
+
+    public int RemoveWhere(Func<T, bool> predicate)
+    {
+        var elems = this.Where(predicate);
+        var removed = 0;
+        foreach (var elem in elems)
+        {
+            if (TryRemove(elem))
+                removed++;
+        }
+
+        return removed;
+    }
+
+    private void AcquireAllLocks(ref int locksAcquired)
+    {
+        // First, acquire lock 0
+        AcquireLocks(0, 1, ref locksAcquired);
+
+        // Now that we have lock 0, the _locks array will not change (i.e., grow),
+        // and so we can safely read _locks.Length.
+        AcquireLocks(1, tables.Locks.Length, ref locksAcquired);
+        Debug.Assert(locksAcquired == tables.Locks.Length);
+    }
+
+    private void AcquireLocks(int fromInclusive, int toExclusive, ref int locksAcquired)
+    {
+        Debug.Assert(fromInclusive <= toExclusive);
+        var locks = tables.Locks;
+
+        for (var i = fromInclusive; i < toExclusive; i++)
+        {
+            var lockTaken = false;
+            try
+            {
+                Monitor.Enter(locks[i], ref lockTaken);
+            }
+            finally
+            {
+                if (lockTaken)
+                    locksAcquired++;
+            }
+        }
+    }
+
+    private void ReleaseLocks(int fromInclusive, int toExclusive)
+    {
+        Debug.Assert(fromInclusive <= toExclusive);
+
+        for (var i = fromInclusive; i < toExclusive; i++)
+            Monitor.Exit(tables.Locks[i]);
+    }
+
+    private void CopyToItems(T[] array, int index)
+    {
+        var buckets = tables.Buckets;
+        for (var i = 0; i < buckets.Length; i++)
+        for (var current = buckets[i]; current is not null; current = current.Next)
+        {
+            array[index] = current.Item;
+            index++; //this should never flow, CopyToItems is only called when there's no overflow risk
+        }
+    }
+
+    private sealed class Tables
+    {
+        public readonly Node[] Buckets;
+        public readonly object[] Locks;
+
+        public volatile int[] CountPerLock;
+
+        public Tables(Node[] buckets, object[] locks, int[] countPerLock)
+        {
+            Buckets = buckets;
+            Locks = locks;
+            CountPerLock = countPerLock;
+        }
+    }
+
+    private sealed class Node
+    {
+        public readonly int Hashcode;
+        public readonly T Item;
+
+        public volatile Node Next;
+
+        public Node(T item, int hashcode, Node next)
+        {
+            Item = item;
+            Hashcode = hashcode;
+            Next = next;
+        }
+    }
+}

src/NadekoBot/Common/Collections/IndexedCollection.cs

@@ -1,11 +1,8 @@
-using System.Collections;
+#nullable disable
+using NadekoBot.Services.Database.Models;
+using System.Collections;
 
-namespace Nadeko.Common;
-
-public interface IIndexed
-{
-    int Index { get; set; }
-}
+namespace NadekoBot.Common.Collections;
 
 public class IndexedCollection<T> : IList<T>
     where T : class, IIndexed

src/NadekoBot/Common/Configs/BotConfig.cs

@@ -0,0 +1,185 @@
+#nullable disable
+using Cloneable;
+using NadekoBot.Common.Yml;
+using SixLabors.ImageSharp.PixelFormats;
+using System.Globalization;
+using YamlDotNet.Core;
+using YamlDotNet.Serialization;
+
+namespace NadekoBot.Common.Configs;
+
+[Cloneable]
+public sealed partial class BotConfig : ICloneable<BotConfig>
+{
+    [Comment(@"DO NOT CHANGE")]
+    public int Version { get; set; } = 2;
+
+    [Comment(@"Most commands, when executed, have a small colored line
+next to the response. The color depends whether the command
+is completed, errored or in progress (pending)
+Color settings below are for the color of those lines.
+To get color's hex, you can go here https://htmlcolorcodes.com/
+and copy the hex code fo your selected color (marked as #)")]
+    public ColorConfig Color { get; set; }
+
+    [Comment("Default bot language. It has to be in the list of supported languages (.langli)")]
+    public CultureInfo DefaultLocale { get; set; }
+
+    [Comment(@"Style in which executed commands will show up in the console.
+Allowed values: Simple, Normal, None")]
+    public ConsoleOutputType ConsoleOutputType { get; set; }
+
+//         [Comment(@"For what kind of updates will the bot check.
+// Allowed values: Release, Commit, None")]
+//         public UpdateCheckType CheckForUpdates { get; set; }
+
+    // [Comment(@"How often will the bot check for updates, in hours")]
+    // public int CheckUpdateInterval { get; set; }
+
+    [Comment(@"Do you want any messages sent by users in Bot's DM to be forwarded to the owner(s)?")]
+    public bool ForwardMessages { get; set; }
+
+    [Comment(
+        @"Do you want the message to be forwarded only to the first owner specified in the list of owners (in creds.yml),
+or all owners? (this might cause the bot to lag if there's a lot of owners specified)")]
+    public bool ForwardToAllOwners { get; set; }
+
+    [Comment(@"When a user DMs the bot with a message which is not a command
+they will receive this message. Leave empty for no response. The string which will be sent whenever someone DMs the bot.
+Supports embeds. How it looks: https://puu.sh/B0BLV.png")]
+    [YamlMember(ScalarStyle = ScalarStyle.Literal)]
+    public string DmHelpText { get; set; }
+
+    [Comment(@"Only users who send a DM to the bot containing one of the specified words will get a DmHelpText response.
+Case insensitive.
+Leave empty to reply with DmHelpText to every DM.")]
+    public List<string> DmHelpTextKeywords { get; set; }
+
+    [Comment(@"This is the response for the .h command")]
+    [YamlMember(ScalarStyle = ScalarStyle.Literal)]
+    public string HelpText { get; set; }
+
+    [Comment(@"List of modules and commands completely blocked on the bot")]
+    public BlockedConfig Blocked { get; set; }
+
+    [Comment(@"Which string will be used to recognize the commands")]
+    public string Prefix { get; set; }
+
+    [Comment(@"Toggles whether your bot will group greet/bye messages into a single message every 5 seconds.
+1st user who joins will get greeted immediately
+If more users join within the next 5 seconds, they will be greeted in groups of 5.
+This will cause %user.mention% and other placeholders to be replaced with multiple users. 
+Keep in mind this might break some of your embeds - for example if you have %user.avatar% in the thumbnail,
+it will become invalid, as it will resolve to a list of avatars of grouped users.
+note: This setting is primarily used if you're afraid of raids, or you're running medium/large bots where some
+      servers might get hundreds of people join at once. This is used to prevent the bot from getting ratelimited,
+      and (slightly) reduce the greet spam in those servers.")]
+    public bool GroupGreets { get; set; }
+
+    [Comment(@"Whether the bot will rotate through all specified statuses.
+This setting can be changed via .ropl command.
+See RotatingStatuses submodule in Administration.")]
+    public bool RotateStatuses { get; set; }
+
+    public BotConfig()
+    {
+        var color = new ColorConfig();
+        Color = color;
+        DefaultLocale = new("en-US");
+        ConsoleOutputType = ConsoleOutputType.Normal;
+        ForwardMessages = false;
+        ForwardToAllOwners = false;
+        DmHelpText = @"{""description"": ""Type `%prefix%h` for help.""}";
+        HelpText = @"{
+  ""title"": ""To invite me to your server, use this link"",
+  ""description"": ""https://discordapp.com/oauth2/authorize?client_id={0}&scope=bot&permissions=66186303"",
+  ""color"": 53380,
+  ""thumbnail"": ""https://i.imgur.com/nKYyqMK.png"",
+  ""fields"": [
+    {
+      ""name"": ""Useful help commands"",
+      ""value"": ""`%bot.prefix%modules` Lists all bot modules.
+`%prefix%h CommandName` Shows some help about a specific command.
+`%prefix%commands ModuleName` Lists all commands in a module."",
+      ""inline"": false
+    },
+    {
+      ""name"": ""List of all Commands"",
+      ""value"": ""https://nadeko.bot/commands"",
+      ""inline"": false
+    },
+    {
+      ""name"": ""Nadeko Support Server"",
+      ""value"": ""https://discord.nadeko.bot/ "",
+      ""inline"": true
+    }
+  ]
+}";
+        var blocked = new BlockedConfig();
+        Blocked = blocked;
+        Prefix = ".";
+        RotateStatuses = false;
+        GroupGreets = false;
+        DmHelpTextKeywords = new()
+        {
+            "help",
+            "commands",
+            "cmds",
+            "module",
+            "can you do"
+        };
+    }
+
+//         [Comment(@"Whether the prefix will be a suffix, or prefix.
+// For example, if your prefix is ! you will run a command called 'cash' by typing either
+// '!cash @Someone' if your prefixIsSuffix: false or
+// 'cash @Someone!' if your prefixIsSuffix: true")]
+//         public bool PrefixIsSuffix { get; set; }
+
+    // public string Prefixed(string text) => PrefixIsSuffix
+    //     ? text + Prefix
+    //     : Prefix + text;
+
+    public string Prefixed(string text)
+        => Prefix + text;
+}
+
+[Cloneable]
+public sealed partial class BlockedConfig
+{
+    public HashSet<string> Commands { get; set; }
+    public HashSet<string> Modules { get; set; }
+
+    public BlockedConfig()
+    {
+        Modules = new();
+        Commands = new();
+    }
+}
+
+[Cloneable]
+public partial class ColorConfig
+{
+    [Comment(@"Color used for embed responses when command successfully executes")]
+    public Rgba32 Ok { get; set; }
+
+    [Comment(@"Color used for embed responses when command has an error")]
+    public Rgba32 Error { get; set; }
+
+    [Comment(@"Color used for embed responses while command is doing work or is in progress")]
+    public Rgba32 Pending { get; set; }
+
+    public ColorConfig()
+    {
+        Ok = Rgba32.ParseHex("00e584");
+        Error = Rgba32.ParseHex("ee281f");
+        Pending = Rgba32.ParseHex("faa61a");
+    }
+}
+
+public enum ConsoleOutputType
+{
+    Normal = 0,
+    Simple = 1,
+    None = 2
+}