Updated changelog

Updated Linux guide to list the following supported versions.

See merge request Kwoth/nadekobot!221

.dockerignore

@@ -1,11 +1,14 @@
 # Ignore all files
 *
 
-# Don't ignore nugetconfig
-!./NuGet.Config
-
-# Don't ignore src projects
-!src/**
+# 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,12 +1,5 @@
 #Manually added files
 
-src/NadekoBot/data/last_known_version.txt
-
-# medusa stuff
-src/NadekoBot/data/medusae/
-
-# other
-
 command_errors*.txt
 output/
 src/NadekoBot/output
@@ -15,7 +8,7 @@ src/NadekoBot/creds.yml
 src/NadekoBot/Command Errors*.txt
 
 src/NadekoBot/creds.yml
-# credentials file before and after v3
+# credentials file before and after migrations
 src/NadekoBot/credentials.json 
 src/NadekoBot/old_credentials.json 
 src/NadekoBot/credentials.json.bak
@@ -263,7 +256,7 @@ PublishScripts/
 !**/packages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
 #!**/packages/repositories.config
-# NuGet v4's project.json files produces more ignoreable files
+# NuGet v3's project.json files produces more ignoreable files
 *.nuget.props
 *.nuget.targets
 

.gitlab-ci.yml

@@ -1,94 +1,58 @@
-image: mcr.microsoft.com/dotnet/sdk:8.0
+image: mcr.microsoft.com/dotnet/sdk:5.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:
-    - "dotnet publish -c Release -r linux-x64 --self-contained -o $LINUX_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
-    - "dotnet publish -c Release -r linux-arm64 --self-contained -o $LINUX_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
-    - "dotnet publish -c Release -r win-x64 --self-contained -o $WIN_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
-    - "dotnet publish -c Release -r win-arm64 --self-contained -o $WIN_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
-    - "dotnet publish -c Release -r osx-x64 --self-contained -o $MACOS_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
-    - "dotnet publish -c Release -r osx-arm64 --self-contained -o $MACOS_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
+    - "dotnet publish -c Release -r 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:
-   - 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
+  stage: upload-builds
+  image: alpine:latest
+  rules:
+    - if: $CI_COMMIT_TAG
+  script:    
+    - apk add --no-cache curl tar zip
+    - "tar cvf $LINUX_X64_RELEASE $LINUX_X64_OUTPUT_DIR/*"
+    - "zip -r $WIN_X64_RELEASE $WIN_X64_OUTPUT_DIR/*"
+    - |
+      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 $WIN_X64_RELEASE $PACKAGE_REGISTRY_URL/$WIN_X64_RELEASE
 
 release:
- stage: release
- image: registry.gitlab.com/gitlab-org/release-cli:latest
- rules:
-   - 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 \
-       --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}\"}"
+  stage: release
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
+  rules:
+    - if: $CI_COMMIT_TAG
+  script:
+    - |
+      release-cli create --name "NadekoBot v$CI_COMMIT_TAG" --description "## [Changelog](https://gitlab.com/Kwoth/nadekobot/-/blob/v3/CHANGELOG.md#$(echo "$CI_COMMIT_TAG" | sed "s/\.//g")-$(date +%d%m%Y))" --tag-name $CI_COMMIT_TAG \
+        --assets-link "{\"name\":\"${LINUX_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${LINUX_X64_RELEASE}\"}" \
+        --assets-link "{\"name\":\"${WIN_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${WIN_X64_RELEASE}\"}"
 
 test:
   stage: test
@@ -98,63 +62,64 @@ test:
     - "cd $tests_path"
     - "dotnet test"
 
-build-installer:
- stage: build-installer
- rules:
-   - if: "$CI_COMMIT_TAG"
- image: scottyhardy/docker-wine
- before_script:
-   - choco install dotnet-runtime --version=8.0.4 -y
-   - choco install dotnet-sdk --version=8.0.204 -y
-   - choco install 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
-   - $env:NADEKOBOT_INSTALL_VERSION = $CI_COMMIT_TAG
-   - iscc.exe "/O+" ".\exe_builder.iss"
- tags:
-   - saas-windows-medium-amd64
+publish-windows:
+  stage: publish-windows 
+  rules:
+    - if: '$CI_COMMIT_TAG'
+  image: scottyhardy/docker-wine
+  before_script:
+    - choco install dotnet-5.0-runtime -y
+    - choco install dotnet-5.0-sdk -y
+    - choco install innosetup -y
+  artifacts:
+    paths:
+      - "$INSTALLER_OUTPUT_DIR/$INSTALLER_FILE_NAME"
+  script:
+    - dotnet clean
+    - dotnet restore
+    - 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:
+    - windows
 
-publish-medusa-package:
- stage: publish-medusa-package
- allow_failure: true
- rules:
-   - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_TAG
- script:
-   - LAST_TAG=$(git describe --tags --abbrev=0)
-   - if [ $CI_COMMIT_TAG ];then MEDUSA_VERSION="$CI_COMMIT_TAG"; else MEDUSA_VERSION="$LAST_TAG-alpha$CI_COMMIT_SHORT_SHA"; fi
-   - 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"
+upload-windows-updater-release:
+  stage: upload-windows-updater-release
+  rules:
+    - if: '$CI_COMMIT_TAG'
+  image: 
+    name: amazon/aws-cli
+    entrypoint: [""]
+  script:  
+    - sed -i "s/_INSTALLER_FILE_NAME_/$INSTALLER_FILE_NAME/g" releases-v3.json
+    - sed -i "s/_VERSION_/$CI_COMMIT_TAG/g" releases-v3.json
+    - aws --version
+    - aws --endpoint-url $AWS_SERVICE_URL s3api put-object --bucket "$AWS_BUCKET_NAME" --key "dl/bot/$INSTALLER_FILE_NAME" --acl public-read --body "$INSTALLER_OUTPUT_DIR/$INSTALLER_FILE_NAME"
+    - aws --endpoint-url $AWS_SERVICE_URL s3api put-object --bucket "$AWS_BUCKET_NAME" --key "dl/bot/releases-v3.json" --acl public-read --body "releases-v3.json"
 
 docker-build:
- # Use the official docker image.
- image: docker:latest
- stage: build
- allow_failure: true
- services:
-   - docker:dind
- before_script:
-   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- # Default branch leaves tag empty (= latest tag)
- # All other branches are tagged with the escaped branch name (commit ref slug)
- script:
-   - |
-     if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
-       tag=""
-       echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'"
-     else
-       tag=":$CI_COMMIT_SHA"
-       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
-     exists:
-       - Dockerfile
+  # Use the official docker image.
+  image: docker:latest
+  stage: build
+  services:
+    - docker:dind
+  before_script:
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+  # Default branch leaves tag empty (= latest tag)
+  # All other branches are tagged with the escaped branch name (commit ref slug)
+  script:
+    - |
+      if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
+        tag=""
+        echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'"
+      else
+        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
+      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,12 +1,10 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:5.0-buster-slim AS build
 WORKDIR /source
 
-COPY src/Nadeko.Medusa/*.csproj src/Nadeko.Medusa/
 COPY src/NadekoBot/*.csproj src/NadekoBot/
 COPY src/NadekoBot.Coordinator/*.csproj src/NadekoBot.Coordinator/
 COPY src/NadekoBot.Generators/*.csproj src/NadekoBot.Generators/
-COPY src/NadekoBot.Voice/*.csproj src/NadekoBot.Voice/
-COPY NuGet.Config ./
+COPY src/ayu/Ayu.Discord.Voice/*.csproj src/ayu/Ayu.Discord.Voice/
 RUN dotnet restore src/NadekoBot/
 
 COPY . .
@@ -20,27 +18,25 @@ RUN set -xe; \
     chmod +x /app/NadekoBot
 
 # final stage/image
-FROM mcr.microsoft.com/dotnet/runtime:8.0
+FROM mcr.microsoft.com/dotnet/runtime:5.0-buster-slim
 WORKDIR /app
 
 RUN set -xe; \
     useradd -m nadeko; \
     apt-get update; \
-    apt-get install -y --no-install-recommends libopus0 libsodium23 libsqlite3-0 curl ffmpeg python3 sudo; \
-    update-alternatives --install /usr/local/bin/python python /usr/bin/python3.9 1; \
+    apt-get install -y libopus0 libsodium23 libsqlite3-0 curl ffmpeg python3 python3-pip sudo; \
+    update-alternatives --install /usr/bin/python python /usr/bin/python3.7 1; \
     echo 'Defaults>nadeko env_keep+="ASPNETCORE_* DOTNET_* NadekoBot_* shard_id total_shards TZ"' > /etc/sudoers.d/nadeko; \
-    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 --from=build /app ./
 COPY docker-entrypoint.sh /usr/local/sbin
 
 ENV shard_id=0
 ENV total_shards=1
-ENV NadekoBot__creds=/app/data/creds.yml
 
-VOLUME [ "/app/data" ]
+VOLUME [ "app/data" ]
 ENTRYPOINT [ "/usr/local/sbin/docker-entrypoint.sh" ]
-CMD dotnet NadekoBot.dll "$shard_id" "$total_shards"
+CMD dotnet NadekoBot.dll "$shard_id" "$total_shards"

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

@@ -11,26 +11,22 @@ ProjectSection(SolutionItems) = preProject
 	LICENSE.md = LICENSE.md
 	README.md = README.md
 	.gitlab-ci.yml = .gitlab-ci.yml
-	Dockerfile = Dockerfile
-	NuGet.Config = NuGet.Config
-	migrate.ps1 = migrate.ps1
-	remove-migration.ps1 = remove-migration.ps1
 EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NadekoBot", "src\NadekoBot\NadekoBot.csproj", "{45EC1473-C678-4857-A544-07DFE0D0B478}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.Voice", "src\NadekoBot.Voice\NadekoBot.Voice.csproj", "{2F4CF6D6-0C2F-4944-B204-9508CDA53195}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ayu", "ayu", "{6058FEDF-A318-4CD4-8F04-A7E8E7EC8874}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ayu.Discord.Voice", "src\ayu\Ayu.Discord.Voice\Ayu.Discord.Voice.csproj", "{2F4CF6D6-0C2F-4944-B204-9508CDA53195}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.Tests", "src\NadekoBot.Tests\NadekoBot.Tests.csproj", "{DB448DD4-C97F-40E9-8BD3-F605FF1FF833}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.Coordinator", "src\NadekoBot.Coordinator\NadekoBot.Coordinator.csproj", "{AE9B7F8C-81D7-4401-83A3-643B38258374}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.Generators", "src\NadekoBot.Generators\NadekoBot.Generators.csproj", "{3BC3BDF8-1A0B-45EB-AB2B-C0891D4D37B8}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.VotesApi", "src\NadekoBot.VotesApi\NadekoBot.VotesApi.csproj", "{3BC82CFE-BEE7-451F-986B-17EDD1570C4F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nadeko.Medusa", "src\Nadeko.Medusa\Nadeko.Medusa.csproj", "{E685977E-31A4-46F4-A5D7-4E3E39E82E43}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.Generators", "src\NadekoBot.Generators\NadekoBot.Generators.csproj", "{92770AF3-83EE-49F1-A0BB-79124D19A13D}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -62,36 +58,30 @@ 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
 		{3BC82CFE-BEE7-451F-986B-17EDD1570C4F}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU
 		{3BC82CFE-BEE7-451F-986B-17EDD1570C4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3BC82CFE-BEE7-451F-986B-17EDD1570C4F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E685977E-31A4-46F4-A5D7-4E3E39E82E43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E685977E-31A4-46F4-A5D7-4E3E39E82E43}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E685977E-31A4-46F4-A5D7-4E3E39E82E43}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU
-		{E685977E-31A4-46F4-A5D7-4E3E39E82E43}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU
-		{E685977E-31A4-46F4-A5D7-4E3E39E82E43}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E685977E-31A4-46F4-A5D7-4E3E39E82E43}.Release|Any CPU.Build.0 = Release|Any CPU
-		{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
 	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}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5F3F555C-855F-4BE8-B526-D062D3E8ACA4}

NuGet.Config

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

README.md

@@ -1,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/v3/?badge=v3)
+[![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,6 @@
 [![nadeko2](https://cdn.nadeko.bot/tutorial/docs-bot.png)](https://nadeko.bot/commands)
 
 ### Useful links
-- [Self hosting Guides and Docs](https://nadekobot.readthedocs.io/en/latest)
+- ❗ [2.x to v3 migration guide](https://nadekobot.readthedocs.io/en/v3/guides/migration-guide/)
+- [Self hosting Guides and Docs](https://nadekobot.readthedocs.io/en/v3)
 - [Discord support server](https://discord.nadeko.bot)

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 [**v3 branch**](https://gitlab.com/Kwoth/nadekobot/tree/v3)
 2. Keep a single Merge Request to a single feature
 3. Fill out the MR template
 

docs/creds-guide.md

@@ -13,11 +13,11 @@ This document aims to guide you through the process of creating a Discord accoun
 - Click on the `Add a Bot` button and confirm that you do want to add a bot to this app.
 - **Optional:** Add bot's avatar and description.
 - Copy your Token to `creds.yml` as shown above.
-- Scroll down to the **`Privileged Gateway Intents`** section
-    - **Enable the following:**
-         - **PRESENCE INTENT**
-         - **SERVER MEMBERS INTENT**
-         - **MESSAGE CONTENT INTENT**
+- Scroll down to the `Privileged Gateway Intents` section
+    - Enabled the following:
+        - PRESENCE INTENT
+        - SERVER MEMBERS INTENT
+        - MESSAGE CONTENT INTENT
 
 These are required for a number of features to function properly, and all should be on.
 
@@ -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,25 +1,20 @@
 # Setting up NadekoBot with Docker
 
-# WORK IN PROGRESS
+# DO NOT USE YET - WORK IN PROGRESS
 
-### Installation
+Upgrade from 2.x to v3 does not work because the file is mount readonly
 
-1. Create a `/srv/nadeko` folder 
-  - `mkdir -p /srv/nadeko`
-2. Create a `docker-compose.yml`
-  - nano `docker-compose.yml`
-  - copy the following contents into it:
-##### docker-compose.yml 
+### Docker Compose 
 ```yml
 version: "3.7"
 services:
   nadeko:
-    image: registry.gitlab.com/kwoth/nadekobot:latest
+    image: registry.gitlab.com/veovis/nadekobot:v3-docker
     depends_on:
       - redis
     environment:
       TZ: Europe/Paris
-      NadekoBot_RedisOptions: redis,name=nadeko
+      #NadekoBot_RedisOptions: redis,name=nadeko
       #NadekoBot_ShardRunCommand: dotnet
       #NadekoBot_ShardRunArguments: /app/NadekoBot.dll {0} {1}
     volumes:
@@ -34,12 +29,6 @@ services:
     volumes:
       - /srv/nadeko/redis-data:/data
 ```
-3. Save your file and run docker compose
-  - `docker-compose up`  
-4. Edit creds in `/srv/nadeko/conf/creds.yml`
-5. Run it again with
-  - `docker-compose up`
-
 ### Updating
 - `cd /srv/nadeko`
 - `docker-compose pull`

docs/guides/linux-guide.md

@@ -1,48 +1,32 @@
-# Setting up NadekoBot on Linux
+## Migration from 2.x 
 
-| Table of Contents                                   |
-| :-------------------------------------------------- |
-| [Linux From Source]                                 |
-| [Source Update Instructions]                        |
-| [Linux Release]                                     |
-| [Release Update Instructions]                       |
-| [Tmux (Preferred Method)]                           |
-| [Systemd]                                           |
-| [Systemd + Script]                                  |
-| [Setting up Nadeko on a VPS (Digital Ocean)]        |
+##### ⚠ If you're already hosting NadekoBot, _You **MUST** update to latest version of 2.x and **run your bot at least once**_ before switching over to v3.
+
+#### [Linux migration instructions](../migration-guide/#linux)
 
 #### Operating System Compatibility
 
+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, 21.04, 21.10, 22.04
+- Ubuntu: 16.04, 18.04, 20.04, 21.04, 21.10
 - Mint: 19, 20
-- Debian: 10, 11, 12
-- RockyLinux: 8, 9
-- AlmaLinux: 8, 9
-- openSUSE Leap: 15.5, 15.6 & Tumbleweed
-- Fedora: 38, 39, 40, 41, 42
+- Debian: 9, 10
+- CentOS: 7
+- openSUSE
+- Fedora: 33, 34, 35
 
 ## Linux From Source 
 
-##### Migration from v3 -> v5
-
-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`
-> - Install prerequisites (type `1` and press `enter`)
-> - Download (type `2` and press `enter`)
-> - Run (type `3` and press `enter`)
-> - Done
+Open Terminal (if you're on an installation with a window manager) and navigate to the location where you want to install the bot (for example `cd ~`) 
 
 ##### Installation Instructions
 
-Open Terminal (if you're on an installation with a window manager) and navigate to the location where you want to install the bot (for example `cd ~`) 
-
-1. Download and run the **new** installer script `cd ~ && wget -N https://gitlab.com/kwoth/nadeko-bash-installer/-/raw/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/master/linuxAIO.sh && bash linuxAIO.sh`
 2. Install prerequisites (type `1` and press enter)
 3. Download the bot (type `2` and press enter)
-4. Exit the installer (type `6` and press enter)
+4. Exit the installer (type `5` and press enter)
 5. Copy the creds.yml template `cp nadekobot/output/creds_example.yml nadekobot/output/creds.yml` 
 6. Open `nadekobot/output/creds.yml` with your favorite text editor. We will use nano here
     - `nano nadekobot/output/creds.yml`
@@ -51,35 +35,23 @@ 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`
-9. Run the bot (type `3` and press enter)
+8. Run the bot (type `3` and press enter)
 
-##### Source Update Instructions
+##### Update Instructions
 
-1. ⚠ Stop the bot ⚠
-2. Update and run the **new** installer script `cd ~ && wget -N https://gitlab.com/kwoth/nadeko-bash-installer/-/raw/v5/linuxAIO.sh && bash linuxAIO.sh`
+1. ⚠ Stop the bot
+2. Update and run the **new** installer script `cd ~ && wget -N https://gitlab.com/Kwoth/nadeko-bash-installer/-/raw/master/linuxAIO.sh && bash linuxAIO.sh`
 3. Update the bot (type `2` and press enter)
 4. Run the bot (type `3` and press enter)
 5. 🎉 
 
-## **⚠ IF YOU ARE FOLLOWING THE GUIDE ABOVE, IGNORE THIS SECTION ⚠** 
-
 ## Linux Release
 
-###### Prerequisites
-
-1. (Optional) Installing Redis
-    - ubuntu installation command: `sudo apt-get install redis-server`
-2. Playing music requires `ffmpeg`, `libopus`, `libsodium` and `youtube-dl` (which in turn requires python3)
-    - ubuntu installation command: `sudo apt-get install ffmpeg libopus0 opus-tools libopus-dev libsodium-dev -y`
-3. Make sure your python is version 3+ with `python --version`
-    - if it's not, you can install python 3 and make it the default with: `sudo apt-get install python3.8 python-is-python3`
-
-*You can use nadeko bash script [prerequisites installer](https://gitlab.com/kwoth/nadeko-bash-installer/-/blob/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!
@@ -100,10 +72,10 @@ Open Terminal (if you're on an installation with a window manager) and navigate
 9. Run the bot
     - `./NadekoBot`
 
-##### Release Update Instructions
+##### Update Instructions
 
 1. Stop the bot
-2. Download the latest release from <https://gitlab.com/kwoth/nadekobot/-/releases>
+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!
@@ -147,46 +119,23 @@ cd nadekobot && chmod +x NadekoBot
 
 While there are two run modes built into the installer, these options only run Nadeko within the current session. Below are 3 methods of running Nadeko as a background process.
 
-### Tmux Method (Preferred)
+### Tmux (Preferred Method)
 
 Using `tmux` is the simplest method, and is therefore recommended for most users.
 
-**Before proceeding, make sure your bot is not running by either running `.die` in your Discord server or exiting the process with `Ctrl+C`.**
-
-If you are presented with the installer main menu, exit it by choosing Option `8`.
-
-1. Create a new session: `tmux new -s nadeko`
-
-The above command will create a new session named **nadeko** *(you can replace “nadeko” with anything you prefer, it's your session name)*.
-
-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:
+1. Start a tmux session:
+    - `tmux`
+2. Navigate to the project's root directory
+    - Project root directory location example: `/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.)*
-
+Nadeko should now be running in the background of your system. To re-open the tmux session to either update, restart, or whatever, execute `tmux a`.
 
 ### Systemd
 
@@ -315,26 +264,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.
 
@@ -361,12 +290,3 @@ If you are running your droplet for the first time, it will most likely ask you
 **Save the new password somewhere safe.**
 
 After that, your droplet should be ready for use. [Follow the guide from the beginning](#linux-from-source) to set Nadeko up on your newly created VPS.
-
-[Linux From Source]: #linux-from-source
-[Source Update Instructions]: #source-update-instructions
-[Linux Release]: #linux-release
-[Release Update Instructions]: #release-update-instructions
-[Tmux (Preferred Method)]: #tmux-preferred-method
-[Systemd]: #systemd
-[Systemd + Script]: #systemd-script
-[Setting up Nadeko on a VPS (Digital Ocean)]: #setting-up-nadeko-on-a-linux-vps-digital-ocean-droplet

docs/guides/migration-guide.md

@@ -0,0 +1,66 @@
+# Migration instructions (2.x to v3)
+
+## Windows
+
+1. Run your NadekoBot Updater first, and **make sure your bot is updated to at least 2.46.5**
+    - **Run your 2.46.5 Bot** and make sure it works, and then **stop it**  
+    - Close your old NadekoBot Updater
+2. Get the new NadekoBot v3 Updater [here](https://dl.nadeko.bot/v3)
+3. Click on the + icon to add a new bot
+4. Next to the path, click on the folder icon and select the folder where your 2.46.5 bot is
+    - ℹ In case you're not sure where it's located, you can open your old updater and see it
+5. If you've selected the correct path, you should have an **Update** button available, click it
+6. You're done; you can now run your bot, and you can uninstall your old updater if you no longer have 2.x bots
+7. 🎉
+
+## Linux
+
+1. In order to migrate a bot hosted on **Linux**, first update your current version to the latest 2.x version using the 2.x installer, run the bot, and make sure it works. Then:
+    - Run the **old** installer with `cd ~ && wget -N https://github.com/Kwoth/NadekoBot-BashScript/raw/1.9/linuxAIO.sh && bash linuxAIO.sh`
+    - Run option **1** again
+    - You **MUST** Run the bot now to ensure database is ready for migration
+    - Type `.stats` and ensure the version is `2.46.5` or later
+    - Stop the bot
+2. Make sure your bot's folder is called `NadekoBot`
+    - Run `cd ~ && ls`
+    - Confirm there is a folder called NadekoBot (not nadekobot, in all lowercase)
+3. Migrate your bot's data using the new installer:
+    - Run the **new** installer `cd ~ && wget -N https://gitlab.com/Kwoth/nadeko-bash-installer/-/raw/master/linuxAIO.sh && bash linuxAIO.sh`
+    - The installer should notify you that your data is ready for migration in a message above the menu.
+    - Install prerequisites (type `1` and press enter), and make sure it is successful
+    - Download NadekoBot v3 (type `2` and press enter)
+    - Run the bot (type `3` and press enter)
+4. Make sure your permissions, custom reactions, credentials, and other data is preserved
+    - `.stats` to ensure owner id (credentials) is correct
+    - `.lcr` to see custom reactions
+    - `.lp` to list permissions
+5. 🎉 Enjoy. If you want to learn how to update the bot, click [here](../linux-guide/#update-instructions)
+
+## Manual 
+
+⚠ NOT RECOMMENDED  
+⚠ NadekoBot v3 requires [.net 5](https://dotnet.microsoft.com/download/dotnet/5.0)
+
+1. In order to migrate a bot hosted **on Linux or from source on Windows**
+    - First update your current version to the latest 2.x version using the 2.x installer
+    - Then you **must** run the bot to prepare the database for the migration, and make sure the bot works prior to upgrade.
+ Then:
+2. Rename your old nadeko bot folder to `nadekobot_2x`
+    - `mv NadekoBot nadekobot_2x`
+3. Build the new version and move old data to the output folder 
+    1. Clone the v3 branch to a separate folder 
+        - `git clone https://gitlab.com/kwoth/nadekobot -b v3 --depth 1`
+    2. Build the bot
+        - `dotnet publish -c Release -o output/ src/NadekoBot/`
+    3. Copy old data
+        - ⚠ Be sure you copy the correct command for your system!
+        - **Windows:** `cp -r -fo nadekobot_2x/src/NadekoBot/data nadekobot/src/NadekoBot/data`
+        - **Linux:** `cp -rf nadekobot_2x/src/NadekoBot/data nadekobot/src/NadekoBot/data`
+    4. Copy the database 
+        - `cp nadekobot_2x/src/NadekoBot/bin/Release/netcoreapp2.1/data/NadekoBot.db nadekobot/output/data`
+    5. Copy your credentials
+        - `cp nadekobot_2x/src/NadekoBot/credentials.json nadekobot/output/`
+4. Run the bot
+    - `cd nadekobot/output`
+    - `dotnet NadekoBot.dll`
+5. That's it. Just make sure that when you're updating the bot, you're properly backing up your old data.

docs/guides/osx-guide.md

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

@@ -1,3 +1,9 @@
+## Migration from 2.x 
+
+⚠ If you're already hosting NadekoBot, You **MUST** update to latest version of 2.x and **run your bot at least once** before switching over to v3.
+
+#### [Windows migration instructions](../migration-guide#windows)
+
 ## Setting Up NadekoBot on Windows With the Updater
 
 | Table of Contents|
@@ -10,14 +16,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 +37,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.
@@ -39,11 +48,9 @@
 
 - Either click on **`RUN`** button in the updater or run the bot via its desktop shortcut.
 
-### If you get a "No owner channels created..." message. Please follow the creds guide again [**HERE**](../../creds-guide).
-
 #### Updating Nadeko
 
-- Make sure Nadeko is closed and not running
+- 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 +63,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 5](https://dotnet.microsoft.com/download/dotnet/5.0)  - needed to compile and run the bot
 - [git](https://git-scm.com/downloads) - needed to clone the repository (you can also download the zip manually and extract it, but this guide assumes you're using git)
-- [Redis] (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 v3 --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 +100,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 +115,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/v3
 [Notepad++]: https://notepad-plus-plus.org/
 [.net]: https://dotnet.microsoft.com/download/dotnet/5.0
 [Redis]: https://github.com/MicrosoftArchive/redis/releases/download/win-3.0.504/Redis-x64-3.0.504.msi
@@ -131,4 +134,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/jsons-explained.md

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

docs/medusa/creating-a-medusa.md

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

docs/medusa/getting-started.md

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

docs/medusa/snek-lifecycle.md

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

docs/permissions-system.md

@@ -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.
 
@@ -28,8 +28,6 @@ Some features have their own specific placeholders which are noted in that featu
 - `%server.id%` - Server ID
 - `%server.name%` - Server name
 - `%server.members%` - Member count
-- `%server.boosters%` - Number of users boosting the server
-- `%server.boost_level%` - Server Boost level
 - `%server.time%` - Server time (requires `.timezone` to be set)
 
 ### Channel placeholders
@@ -38,7 +36,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 +66,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
@@ -76,13 +79,16 @@ Some features have their own specific placeholders which are noted in that featu
 
 ### Music placeholders
 
-- `%music.queued%` - Number of songs currently queued
-- `%music.playing%` - Current song name (random playing song if bot is playing on multiple servers)
-- `%music.servers%` - Number of servers currently listening to music
+!!! Note
+    These placeholders will only work in rotating playing statuses.
+
+- `%music.queued%` - Amount of songs currently queued
+- `%music.playing%` - Current song name
 
 ### Miscellaneous placeholders
 
 - `%rngX-Y%` - Returns a random number between X and Y
-- `%target%` - Returns anything the user has written after the trigger (only works on Expressions)
+- `%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 "net5.0"
 
 [Setup]
 AppName = {param:botname|NadekoBot}

migrate.ps1

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

mkdocs.yml

@@ -1,6 +1,6 @@
 site_name: 'NadekoBot'
 site_url: 'https://nadeko.bot'
-repo_url: 'https://gitlab.com/nadeko/nadekobot'
+repo_url: 'https://gitlab.com/kwoth/nadekobot'
 site_author: 'Kwoth'
 
 theme:
@@ -72,6 +72,7 @@ markdown_extensions:
 nav:
     - Home: index.md
     - Guides:
+        - ❗ Migration Guide: guides/migration-guide.md
         - Windows Guide: guides/windows-guide.md
         - Linux Guide: guides/linux-guide.md
         - OSX Guide: guides/osx-guide.md
@@ -86,9 +87,7 @@ nav:
         - Custom Reactions: custom-reactions.md
         - Placeholders: placeholders.md
         - Config: config-guide.md
-        - Medusa System:
-            - medusa/getting-started.md
-            - medusa/creating-a-medusa.md
-            - medusa/snek-lifecycle.md
+        - Bot Config: bce-guide.md
     - Contribution Guide: contribution-guide.md
     - Donate: donate.md
+    - License: license.md

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

remove-migration.ps1

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

src/Nadeko.Medusa/Attributes/FilterAttribute.cs

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

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

src/Nadeko.Medusa/Attributes/injectAttribute.cs

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

src/Nadeko.Medusa/Attributes/leftoverAttribute.cs

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

src/Nadeko.Medusa/Attributes/prioAttribute.cs

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

src/Nadeko.Medusa/Attributes/svcAttribute.cs

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

src/Nadeko.Medusa/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,43 +0,0 @@
-using Discord;
-using NadekoBot;
-
-namespace NadekoBot.Medusa;
-
-/// <summary>
-/// Commands which take this class as a first parameter can be executed in both DMs and Servers 
-/// </summary>
-public abstract class AnyContext
-{
-    /// <summary>
-    /// Channel from the which the command is invoked
-    /// </summary>
-    public abstract IMessageChannel Channel { get; }
-    
-    /// <summary>
-    /// Message which triggered the command
-    /// </summary>
-    public abstract IUserMessage Message { get; }
-    
-    /// <summary>
-    /// The user who invoked the command
-    /// </summary>
-    public abstract IUser User { get; }
-    
-    /// <summary>
-    /// Bot user
-    /// </summary>
-    public abstract ISelfUser Bot { get; }
-
-    /// <summary>
-    /// Provides access to strings used by this medusa
-    /// </summary>
-    public abstract IMedusaStrings Strings { get; } 
-    
-    /// <summary>
-    /// Gets a formatted localized string using a key and arguments which should be formatted in
-    /// </summary>
-    /// <param name="key">The key of the string as specified in localization files</param>
-    /// <param name="args">Arguments (if any) to format in</param>
-    /// <returns>A formatted localized string</returns>
-    public abstract string GetText(string key, object[]? args = null);
-}

src/Nadeko.Medusa/Context/DmContext.cs

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

src/Nadeko.Medusa/Context/GuildContext.cs

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

src/Nadeko.Medusa/EmbedColor.cs

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

src/Nadeko.Medusa/Extensions/MedusaExtensions.cs

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

src/Nadeko.Medusa/Nadeko.Medusa.csproj

@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-        
-        <Authors>The NadekoBot Team</Authors>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <PackageReference Include="Discord.Net.Core" Version="3.204.0" />
-      <PackageReference Include="Serilog" Version="3.1.1" />
-      <PackageReference Include="YamlDotNet" Version="15.1.4" />
-    </ItemGroup>
-
-    <PropertyGroup Condition=" '$(Version)' == '' ">
-        <Version>9.0.0</Version>
-    </PropertyGroup>
-</Project>

src/Nadeko.Medusa/ParamParser/ParamParser.cs

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

src/Nadeko.Medusa/ParamParser/ParseResult.cs

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

src/Nadeko.Medusa/README.md

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

src/Nadeko.Medusa/Snek.cs

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

src/Nadeko.Medusa/Strings/CommandStrings.cs

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

src/Nadeko.Medusa/Strings/IMedusaStrings.cs

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

src/Nadeko.Medusa/Strings/IMedusaStringsProvider.cs

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

src/Nadeko.Medusa/Strings/LocalMedusaStringsProvider.cs

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

src/Nadeko.Medusa/Strings/MedusaStrings.cs

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

src/Nadeko.Medusa/Strings/StringsLoader.cs

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

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

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

src/NadekoBot.Coordinator/CoordStartup.cs

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

src/NadekoBot.Coordinator/LogSetup.cs

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

src/NadekoBot.Coordinator/NadekoBot.Coordinator.csproj

@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <NoWarn>CS8981</NoWarn>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,11 +9,10 @@
   </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.41.0" />
+    <PackageReference Include="Serilog" Version="2.10.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="YamlDotNet" Version="11.2.1" />
   </ItemGroup>
   
 </Project>

src/NadekoBot.Coordinator/Services/CoordinatorRunner.cs

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

src/NadekoBot.Coordinator/Services/CoordinatorService.cs

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

src/NadekoBot.Coordinator/Shared/JsonStatusObject.cs

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

src/NadekoBot.Generators/Cloneable/CloneableGenerator.cs

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

src/NadekoBot.Generators/Cloneable/SymbolExtensions.cs

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

src/NadekoBot.Generators/Cloneable/SyntaxReceiver.cs

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

src/NadekoBot.Generators/LocalizedStringsGenerator.cs

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

src/NadekoBot.Generators/NadekoBot.Generators.csproj

@@ -1,19 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <LangVersion>latest</LangVersion>
         <IncludeBuildOutput>false</IncludeBuildOutput>
-        <IsRoslynComponent>true</IsRoslynComponent>
-        <ImplicitUsings>true</ImplicitUsings>
     </PropertyGroup>
-
+    
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
-        <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" PrivateAssets="all" GeneratePathProperty="true" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" PrivateAssets="all" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" PrivateAssets="all" GeneratePathProperty="true" />
     </ItemGroup>
-
+    
     <PropertyGroup>
         <GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPaths</GetTargetPathDependsOn>
     </PropertyGroup>
@@ -24,4 +21,3 @@
         </ItemGroup>
     </Target>
 </Project>
-

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

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

src/NadekoBot.Tests/IndexedCollectionTests.cs

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

src/NadekoBot.Tests/KwumTests.cs

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

src/NadekoBot.Tests/NadekoBot.Tests.csproj

@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
+        <LangVersion>9.0</LangVersion>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="NUnit" Version="3.13.3" />
-        <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+        <PackageReference Include="NUnit" Version="3.13.2" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     </ItemGroup>
 
-
     <ItemGroup>
       <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.Tests/Random.cs

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

src/NadekoBot.VotesApi/Common/AuthHandler.cs

@@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using NadekoBot.VotesApi.Controllers;
 
 namespace NadekoBot.VotesApi
 {
@@ -20,9 +21,12 @@ namespace NadekoBot.VotesApi
         public AuthHandler(IOptionsMonitor<AuthenticationSchemeOptions> options,
             ILoggerFactory logger,
             UrlEncoder encoder,
+            ISystemClock clock,
             IConfiguration conf)
-            : base(options, logger, encoder)
-            => _conf = conf;
+            : base(options, logger, encoder, clock)
+        {
+            _conf = conf;
+        }
 
         protected override Task<AuthenticateResult> HandleAuthenticateAsync()
         {

src/NadekoBot.VotesApi/Common/TopggVoteWebhookModel.cs

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

src/NadekoBot.VotesApi/Controllers/DiscordsController.cs

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

src/NadekoBot.VotesApi/Controllers/TopGgController.cs

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

src/NadekoBot.VotesApi/Controllers/WebhookController.cs

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

src/NadekoBot.VotesApi/NadekoBot.VotesApi.csproj

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

src/NadekoBot.VotesApi/Program.cs

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

src/NadekoBot.VotesApi/Services/FileVotesCache.cs

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

src/NadekoBot.VotesApi/Startup.cs

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

src/NadekoBot.VotesApi/WeatherForecast.cs

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

src/NadekoBot/.editorconfig

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

src/NadekoBot/Bot.cs

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

src/NadekoBot/Common/AsyncLazy.cs

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

src/NadekoBot/Common/Attributes/Aliases.cs

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

src/NadekoBot/Common/Attributes/BotPerm.cs

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

src/NadekoBot/Common/Attributes/CommandNameLoadHelper.cs

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

src/NadekoBot/Common/Attributes/Description.cs

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

src/NadekoBot/Common/Attributes/LeftoverAttribute.cs

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