From 879d3256abc9a46400c9763e89ac8bc4d692c041 Mon Sep 17 00:00:00 2001 From: Sellara <147769367+Sella-GH@users.noreply.github.com> Date: Fri, 19 Jul 2024 00:23:37 +0200 Subject: [PATCH] Restructure the code base into multiple modules (#124) * Create new project * Fix * Introduce Directory.Packages.props * Move Database stuff to new project * Add another new project and rename Database to Data * Move everything package related to Directory.Packages.Props * Prepare AzzyBot.Core * Move stuff around * Fix building * `dotnet format` * Change the name of AzzyBot-Next to AzzyBot-Next.Bot * Fix docker * Fix CI * Try another way for docker * Embedd pdb files * Enable new GC mode * Improve test if bot is dev * Update AzzyStatsSoftware.cs * Really enable the new GC mode Signed-off-by: Sellara <147769367+Sella-GH@users.noreply.github.com> * Remove some more checks to fix bugs * Update dependabot.yml Signed-off-by: Sellara <147769367+Sella-GH@users.noreply.github.com> * Update changelog * Move AzzyBotStats.json * Rename FileComparer * Convert json values to null --------- Signed-off-by: Sellara <147769367+Sella-GH@users.noreply.github.com> --- .editorconfig | 2 +- .github/dependabot.yml | 14 +- .github/workflows/codeql.yml | 2 +- .github/workflows/docker.yml | 2 +- .github/workflows/dotnet-release-publish.yml | 12 +- .github/workflows/dotnet.yml | 12 +- .github/workflows/tag-creation.yml | 2 +- AzzyBot.sln | 67 ++++++-- CHANGELOG.md | 1 + Directory.Packages.props | 19 +++ Dockerfile | 8 +- dev.Dockerfile | 8 +- .../AzzyBot-Next.Bot.csproj} | 47 ++++-- .../Commands/AdminCommands.cs | 17 +- .../AzuraCastMountAutocomplete.cs | 8 +- .../AzuraCastPlaylistAutocomplete.cs | 18 +-- .../AzuraCastRequestAutocomplete.cs | 14 +- .../AzuraCastStationsAutocomplete.cs | 18 +-- .../AzuraCastSystemLogAutocomplete.cs | 14 +- .../Autocompletes/AzzyHelpAutocomplete.cs | 14 +- .../Autocompletes/GuildsAutocomplete.cs | 8 +- .../Commands/AzuraCastCommands.cs | 28 ++-- .../Checks/AzuraCastDiscordPermCheck.cs | 14 +- .../AzuraCastDiscordPermCheckAttribute.cs | 4 +- .../Commands/Checks/AzuraCastOnlineCheck.cs | 8 +- .../Checks/AzuraCastOnlineCheckAttribute.cs | 2 +- .../Commands/Checks/ModuleActivatedCheck.cs | 10 +- .../Checks/ModuleActivatedCheckAttribute.cs | 4 +- .../Choices/AzuraExportPlaylistProvider.cs | 2 +- .../BooleanEnabledDisabledStateProvider.cs | 2 +- .../Choices/BooleanYesNoStateProvider.cs | 2 +- .../Commands/Choices/BotActivityProvider.cs | 2 +- .../Commands/Choices/BotStatusProvider.cs | 2 +- .../Commands/ConfigCommands.cs | 23 +-- .../Converters/UriArgumentConverter.cs | 2 +- .../Commands/CoreCommands.cs | 16 +- .../Commands/DebugCommands.cs | 10 +- .../Extensions/HostExtensions.cs | 4 +- .../Extensions/ServiceCollectionExtensions.cs | 19 +-- .../Services/AzzyBackgroundService.cs | 8 +- .../Services/AzzyBackgroundServiceHost.cs | 6 +- .../Services/DiscordBotService.cs | 14 +- .../Services/DiscordBotServiceHost.cs | 19 +-- .../Services/Modules/AzuraCastApiService.cs | 16 +- .../Services/Modules/AzuraCastFileService.cs | 21 +-- .../Services/Modules/AzuraCastPingService.cs | 14 +- .../Modules/AzuraCastUpdateService.cs | 16 +- .../Services/Modules/CoreServiceHost.cs | 14 +- .../Services/TimerServiceHost.cs | 8 +- .../Services/UpdaterService.cs | 11 +- .../Services/WebRequestService.cs | 6 +- .../Settings/AzzyBotSettings-Docker.json | 8 +- .../Settings/AzzyBotSettings.json | 10 +- .../Settings/AzzyBotSettingsRecord.cs | 2 +- .../Settings/AzzyBotStatsRecord.cs | 2 +- .../Startup.cs | 7 +- .../Utilities/AzuraFileComparer.cs} | 6 +- .../Utilities/AzzyHelp.cs | 4 +- .../Utilities/EmbedBuilder.cs | 14 +- .../Utilities/Enums/AzuraCastChecks.cs | 2 +- .../Utilities/Enums/AzuraCastDiscordPerm.cs | 2 +- .../Utilities/Enums/AzzyModules.cs | 2 +- .../Utilities/Helpers/AzuraApiEndpoints.cs | 2 +- .../Utilities/Helpers/AzuraApiFilters.cs | 2 +- .../AzuraAdminStationConfigRecord.cs | 2 +- .../Records/AzuraCast/AzuraFilesRecord.cs | 2 +- .../AzuraCast/AzuraHardwareStatsRecord.cs | 2 +- .../AzuraCast/AzuraInstanceServiceRecord.cs | 2 +- .../Records/AzuraCast/AzuraMediaItemRecord.cs | 2 +- .../AzuraCast/AzuraNowPlayingDataRecord.cs | 2 +- .../Records/AzuraCast/AzuraPlaylistRecord.cs | 2 +- .../AzuraCast/AzuraPlaylistStateRecord.cs | 2 +- .../AzuraCast/AzuraRequestQueueItemRecord.cs | 2 +- .../Records/AzuraCast/AzuraRequestRecord.cs | 2 +- .../Records/AzuraCast/AzuraSongDataRecord.cs | 2 +- .../AzuraStationHistoryItemRecord.cs | 2 +- .../AzuraCast/AzuraStationQueueItemRecord.cs | 2 +- .../AzuraCast/AzuraStationStatusRecord.cs | 2 +- .../Records/AzuraCast/AzuraStatusRecord.cs | 2 +- .../Records/AzuraCast/AzuraSystemLogRecord.cs | 2 +- .../AzuraCast/AzuraSystemLogsRecord.cs | 2 +- .../Records/AzuraCast/AzuraTrackRecord.cs | 2 +- .../Records/AzuraCast/AzuraUpdateRecord.cs | 2 +- .../Utilities/Records/AzzyHelpRecord.cs | 2 +- .../Utilities/Records/AzzyUpdateRecord.cs | 2 +- .../runtimeconfig.template.json | 1 + .../AzzyBot-Next.Core.csproj | 148 ++++++++++++++++++ .../Extensions/LoggingBuilderExtensions.cs | 4 +- .../Logging/FileLogger.cs | 2 +- .../Logging/FileLoggerConfiguration.cs | 2 +- .../Logging/FileLoggerProvider.cs | 2 +- .../Logging/LoggerActions.cs | 75 +++++---- .../Modules/Core/Files/AzzyBotStats.json | 0 .../Interfaces/IQueuedBackgroundTask.cs | 2 +- .../Services/Queues/QueuedBackgroundTask.cs | 4 +- .../Settings/SettingsCheck.cs | 4 +- .../Utilities/AzzyStatsHardware.cs | 4 +- .../Utilities/AzzyStatsSoftware.cs | 4 +- .../Utilities/Converter.cs | 2 +- .../Utilities/Encryption/AesGcmCipher.cs | 2 +- .../Utilities/Encryption/Crypto.cs | 2 +- .../Utilities/Enums/ReadableBools.cs | 2 +- .../Utilities/FileOperations.cs | 2 +- .../Utilities/Misc.cs | 4 +- .../Utilities/Records/AzzyCpuLoadRecord.cs | 2 +- .../Records/AzzyDiscordEmbedRecord.cs | 2 +- .../Utilities/Records/AzzyDiskUsageRecord.cs | 2 +- .../Records/AzzyMemoryUsageRecord.cs | 2 +- .../Records/AzzyNetworkSpeedRecord.cs | 2 +- .../Records/AzzyNetworkStatsRecord.cs | 2 +- .../AzzyBot-Next.Data.csproj | 144 +++++++++++++++++ .../AzzyDbContext.cs | 4 +- .../DbActions.cs | 8 +- .../Entities/AzuraCastChecksEntity.cs | 2 +- .../Entities/AzuraCastEntity.cs | 2 +- .../Entities/AzuraCastStationChecksEntity.cs | 2 +- .../Entities/AzuraCastStationEntity.cs | 2 +- .../Entities/AzuraCastStationMountEntity.cs | 2 +- .../Entities/GuildsEntity.cs | 2 +- ...20240715112456_InitialCreation.Designer.cs | 48 +++--- .../20240715112456_InitialCreation.cs | 2 +- .../Migrations/AzzyDbContextModelSnapshot.cs | 48 +++--- src/AzzyBot/AzzyBot.csproj | 36 ++--- 123 files changed, 831 insertions(+), 468 deletions(-) create mode 100644 Directory.Packages.props rename src/{AzzyBot-Next/AzzyBot-Next.csproj => AzzyBot-Next.Bot/AzzyBot-Next.Bot.csproj} (82%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/AdminCommands.cs (97%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/Autocompletes/AzuraCastMountAutocomplete.cs (92%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/Autocompletes/AzuraCastPlaylistAutocomplete.cs (88%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/Autocompletes/AzuraCastRequestAutocomplete.cs (95%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/Autocompletes/AzuraCastStationsAutocomplete.cs (90%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/Autocompletes/AzuraCastSystemLogAutocomplete.cs (88%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/Autocompletes/AzzyHelpAutocomplete.cs (92%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/Autocompletes/GuildsAutocomplete.cs (95%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/AzuraCastCommands.cs (98%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/Checks/AzuraCastDiscordPermCheck.cs (95%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/Checks/AzuraCastDiscordPermCheckAttribute.cs (74%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/Checks/AzuraCastOnlineCheck.cs (91%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/Checks/AzuraCastOnlineCheckAttribute.cs (75%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/Checks/ModuleActivatedCheck.cs (91%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/Checks/ModuleActivatedCheckAttribute.cs (71%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/Choices/AzuraExportPlaylistProvider.cs (93%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/Choices/BooleanEnabledDisabledStateProvider.cs (93%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/Choices/BooleanYesNoStateProvider.cs (93%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/Choices/BotActivityProvider.cs (93%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/Choices/BotStatusProvider.cs (93%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/ConfigCommands.cs (98%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/Converters/UriArgumentConverter.cs (96%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/CoreCommands.cs (95%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Commands/DebugCommands.cs (95%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Extensions/HostExtensions.cs (95%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Extensions/ServiceCollectionExtensions.cs (94%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Services/AzzyBackgroundService.cs (95%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Services/AzzyBackgroundServiceHost.cs (95%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Services/DiscordBotService.cs (98%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Services/DiscordBotServiceHost.cs (97%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Services/Modules/AzuraCastApiService.cs (99%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Services/Modules/AzuraCastFileService.cs (94%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Services/Modules/AzuraCastPingService.cs (93%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Services/Modules/AzuraCastUpdateService.cs (92%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Services/Modules/CoreServiceHost.cs (95%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Services/TimerServiceHost.cs (96%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Services/UpdaterService.cs (96%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Services/WebRequestService.cs (99%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Settings/AzzyBotSettings-Docker.json (74%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Settings/AzzyBotSettings.json (75%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Settings/AzzyBotSettingsRecord.cs (98%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Settings/AzzyBotStatsRecord.cs (95%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Startup.cs (94%) rename src/{AzzyBot-Next/Utilities/FileComparer.cs => AzzyBot-Next.Bot/Utilities/AzuraFileComparer.cs} (84%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/AzzyHelp.cs (98%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/EmbedBuilder.cs (98%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Enums/AzuraCastChecks.cs (75%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Enums/AzuraCastDiscordPerm.cs (71%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Enums/AzzyModules.cs (50%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Helpers/AzuraApiEndpoints.cs (96%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Helpers/AzuraApiFilters.cs (89%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Records/AzuraCast/AzuraAdminStationConfigRecord.cs (93%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Records/AzuraCast/AzuraFilesRecord.cs (92%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Records/AzuraCast/AzuraHardwareStatsRecord.cs (98%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Records/AzuraCast/AzuraInstanceServiceRecord.cs (77%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Records/AzuraCast/AzuraMediaItemRecord.cs (78%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Records/AzuraCast/AzuraNowPlayingDataRecord.cs (95%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Records/AzuraCast/AzuraPlaylistRecord.cs (95%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Records/AzuraCast/AzuraPlaylistStateRecord.cs (85%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Records/AzuraCast/AzuraRequestQueueItemRecord.cs (87%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Records/AzuraCast/AzuraRequestRecord.cs (83%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Records/AzuraCast/AzuraSongDataRecord.cs (95%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Records/AzuraCast/AzuraStationHistoryItemRecord.cs (94%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Records/AzuraCast/AzuraStationQueueItemRecord.cs (93%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Records/AzuraCast/AzuraStationStatusRecord.cs (84%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Records/AzuraCast/AzuraStatusRecord.cs (75%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Records/AzuraCast/AzuraSystemLogRecord.cs (77%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Records/AzuraCast/AzuraSystemLogsRecord.cs (89%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Records/AzuraCast/AzuraTrackRecord.cs (89%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Records/AzuraCast/AzuraUpdateRecord.cs (93%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Records/AzzyHelpRecord.cs (92%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/Utilities/Records/AzzyUpdateRecord.cs (89%) rename src/{AzzyBot-Next => AzzyBot-Next.Bot}/runtimeconfig.template.json (91%) create mode 100644 src/AzzyBot-Next.Core/AzzyBot-Next.Core.csproj rename src/{AzzyBot-Next => AzzyBot-Next.Core}/Extensions/LoggingBuilderExtensions.cs (97%) rename src/{AzzyBot-Next => AzzyBot-Next.Core}/Logging/FileLogger.cs (98%) rename src/{AzzyBot-Next => AzzyBot-Next.Core}/Logging/FileLoggerConfiguration.cs (76%) rename src/{AzzyBot-Next => AzzyBot-Next.Core}/Logging/FileLoggerProvider.cs (96%) rename src/{AzzyBot-Next => AzzyBot-Next.Core}/Logging/LoggerActions.cs (74%) rename src/{AzzyBot-Next => AzzyBot-Next.Core}/Modules/Core/Files/AzzyBotStats.json (100%) rename src/{AzzyBot-Next => AzzyBot-Next.Core}/Services/Interfaces/IQueuedBackgroundTask.cs (91%) rename src/{AzzyBot-Next => AzzyBot-Next.Core}/Services/Queues/QueuedBackgroundTask.cs (91%) rename src/{AzzyBot-Next => AzzyBot-Next.Core}/Settings/SettingsCheck.cs (97%) rename src/{AzzyBot-Next => AzzyBot-Next.Core}/Utilities/AzzyStatsHardware.cs (99%) rename src/{AzzyBot-Next => AzzyBot-Next.Core}/Utilities/AzzyStatsSoftware.cs (87%) rename src/{AzzyBot-Next => AzzyBot-Next.Core}/Utilities/Converter.cs (96%) rename src/{AzzyBot-Next => AzzyBot-Next.Core}/Utilities/Encryption/AesGcmCipher.cs (95%) rename src/{AzzyBot-Next => AzzyBot-Next.Core}/Utilities/Encryption/Crypto.cs (96%) rename src/{AzzyBot-Next => AzzyBot-Next.Core}/Utilities/Enums/ReadableBools.cs (66%) rename src/{AzzyBot-Next => AzzyBot-Next.Core}/Utilities/FileOperations.cs (99%) rename src/{AzzyBot-Next => AzzyBot-Next.Core}/Utilities/Misc.cs (95%) rename src/{AzzyBot-Next => AzzyBot-Next.Core}/Utilities/Records/AzzyCpuLoadRecord.cs (88%) rename src/{AzzyBot-Next => AzzyBot-Next.Core}/Utilities/Records/AzzyDiscordEmbedRecord.cs (86%) rename src/{AzzyBot-Next => AzzyBot-Next.Core}/Utilities/Records/AzzyDiskUsageRecord.cs (90%) rename src/{AzzyBot-Next => AzzyBot-Next.Core}/Utilities/Records/AzzyMemoryUsageRecord.cs (84%) rename src/{AzzyBot-Next => AzzyBot-Next.Core}/Utilities/Records/AzzyNetworkSpeedRecord.cs (86%) rename src/{AzzyBot-Next => AzzyBot-Next.Core}/Utilities/Records/AzzyNetworkStatsRecord.cs (85%) create mode 100644 src/AzzyBot-Next.Data/AzzyBot-Next.Data.csproj rename src/{AzzyBot-Next/Database => AzzyBot-Next.Data}/AzzyDbContext.cs (91%) rename src/{AzzyBot-Next/Database => AzzyBot-Next.Data}/DbActions.cs (99%) rename src/{AzzyBot-Next/Database => AzzyBot-Next.Data}/Entities/AzuraCastChecksEntity.cs (97%) rename src/{AzzyBot-Next/Database => AzzyBot-Next.Data}/Entities/AzuraCastEntity.cs (98%) rename src/{AzzyBot-Next/Database => AzzyBot-Next.Data}/Entities/AzuraCastStationChecksEntity.cs (94%) rename src/{AzzyBot-Next/Database => AzzyBot-Next.Data}/Entities/AzuraCastStationEntity.cs (98%) rename src/{AzzyBot-Next/Database => AzzyBot-Next.Data}/Entities/AzuraCastStationMountEntity.cs (94%) rename src/{AzzyBot-Next/Database => AzzyBot-Next.Data}/Entities/GuildsEntity.cs (97%) rename src/{AzzyBot-Next => AzzyBot-Next.Data}/Migrations/20240715112456_InitialCreation.Designer.cs (81%) rename src/{AzzyBot-Next => AzzyBot-Next.Data}/Migrations/20240715112456_InitialCreation.cs (99%) rename src/{AzzyBot-Next => AzzyBot-Next.Data}/Migrations/AzzyDbContextModelSnapshot.cs (81%) diff --git a/.editorconfig b/.editorconfig index cb04cf6c..17ee806b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -17,7 +17,7 @@ end_of_line = crlf [*{_AssemblyInfo.cs,.notsupported.cs,AsmOffsets.cs}] generated_code = true -[src/AzzyBot-Next/Migrations/**] +[**/Migrations/**] generated_code = true # C# files diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 71d1f030..caf5e72a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -90,7 +90,7 @@ updates: open-pull-requests-limit: 25 - package-ecosystem: "nuget" # See documentation for possible values - directory: "/src/AzzyBot-Next" # Location of package manifests + directory: "/" # Location of package manifests schedule: interval: "daily" assignees: @@ -116,18 +116,11 @@ updates: applies-to: version-updates patterns: - "Microsoft.*" - - "MySqlConnector" - - "Pomelo.*" - update-types: - - "minor" - - "patch" + - "Npgsql.*" Roslynator: applies-to: version-updates patterns: - "Roslynator.*" - update-types: - - "minor" - - "patch" Others: applies-to: version-updates exclude-patterns: @@ -139,8 +132,5 @@ updates: - "Microsoft.*" - "Pomelo.*" - "Roslynator.*" - update-types: - - "minor" - - "patch" open-pull-requests-limit: 25 milestone: 6 diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 1d996001..776e1261 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -72,7 +72,7 @@ jobs: - name: Autobuild uses: github/codeql-action/autobuild@v3 with: - working-directory: "/home/runner/work/AzzyBot/AzzyBot/src/AzzyBot-Next" + working-directory: "/home/runner/work/AzzyBot/AzzyBot/src/AzzyBot-Next.Bot" # ℹ️ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e9f7dc26..06cb8e66 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -31,7 +31,7 @@ jobs: uses: kzrnm/get-net-sdk-project-versions-action@v2 id: get-version with: - proj-path: src/AzzyBot-Next/AzzyBot-Next.csproj + proj-path: src/AzzyBot-Next.Bot/AzzyBot-Next.Bot.csproj - name: Set version id: set-version diff --git a/.github/workflows/dotnet-release-publish.yml b/.github/workflows/dotnet-release-publish.yml index 0ce4ce28..649ba2f0 100644 --- a/.github/workflows/dotnet-release-publish.yml +++ b/.github/workflows/dotnet-release-publish.yml @@ -70,9 +70,9 @@ jobs: - name: Add some basic information run: | - sed -i 's\Commit not found\${{ github.sha }}\g' ./artifacts/publish/AzzyBot-Next/release_${{ matrix.os }}-${{ matrix.arch }}/Modules/Core/Files/AzzyBot.json - sed -i 's\Compilation date not found\${{ steps.dateTime.outputs.time }}\g' ./artifacts/publish/AzzyBot-Next/release_${{ matrix.os }}-${{ matrix.arch }}/Modules/Core/Files/AzzyBot.json - sed -i 's\Lines of source code not found\${{ steps.loc_cs.outputs.total_lines }}\g' ./artifacts/publish/AzzyBot-Next/release_${{ matrix.os }}-${{ matrix.arch }}/Modules/Core/Files/AzzyBot.json + sed -i 's\Commit not found\${{ github.sha }}\g' ./artifacts/publish/AzzyBot-Next.Bot/release_${{ matrix.os }}-${{ matrix.arch }}/Modules/Core/Files/AzzyBot.json + sed -i 's\Compilation date not found\${{ steps.dateTime.outputs.time }}\g' ./artifacts/publish/AzzyBot-Next.Bot/release_${{ matrix.os }}-${{ matrix.arch }}/Modules/Core/Files/AzzyBot.json + sed -i 's\Lines of source code not found\${{ steps.loc_cs.outputs.total_lines }}\g' ./artifacts/publish/AzzyBot-Next.Bot/release_${{ matrix.os }}-${{ matrix.arch }}/Modules/Core/Files/AzzyBot.json env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -80,7 +80,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: release-${{ matrix.os }}-${{ matrix.arch }} - path: ./artifacts/publish/AzzyBot-Next/release_${{ matrix.os }}-${{ matrix.arch }} + path: ./artifacts/publish/AzzyBot-Next.Bot/release_${{ matrix.os }}-${{ matrix.arch }} build-docker: name: Build docker .zip file @@ -108,7 +108,7 @@ jobs: #mv ./src/AzzyBot/Modules/MusicStreaming/Files/docker-compose.yml ./docker-zip/AzzyBot/Modules/MusicStreaming/Files/docker-compose.yml #wget -qO ./docker-zip/AzzyBot/Modules/MusicStreaming/Files/plugins/java-lyrics-plugin-1.6.4.jar https://maven.lavalink.dev/releases/me/duncte123/java-lyrics-plugin/1.6.4/java-lyrics-plugin-1.6.4.jar mkdir -p ./docker-zip/AzzyBot/Settings - mv ./src/AzzyBot-Next/Settings/AzzyBotSettings-Docker.json ./docker-zip/AzzyBot/Settings/AzzyBotSettings-Docker.json + mv ./src/AzzyBot-Next.Bot/Settings/AzzyBotSettings-Docker.json ./docker-zip/AzzyBot/Settings/AzzyBotSettings-Docker.json - name: Archive docker-zip artifact uses: actions/upload-artifact@v4 @@ -133,7 +133,7 @@ jobs: uses: kzrnm/get-net-sdk-project-versions-action@v2 id: get-version with: - proj-path: src/AzzyBot-Next/AzzyBot-Next.csproj + proj-path: src/AzzyBot-Next.Bot/AzzyBot-Next.Bot.csproj - name: Set version id: set-version diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 366e626a..aacadd8e 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -44,7 +44,7 @@ jobs: - name: Publish Debug run: | - dotnet publish /home/runner/work/AzzyBot/AzzyBot/src/AzzyBot-Next/AzzyBot-Next.csproj -c Debug -r ${{ matrix.os }}-${{ matrix.arch }} + dotnet publish /home/runner/work/AzzyBot/AzzyBot/src/AzzyBot-Next.Bot/AzzyBot-Next.Bot.csproj -c Debug -r ${{ matrix.os }}-${{ matrix.arch }} #- name: Download and extract Lavalink # run: | @@ -69,9 +69,9 @@ jobs: - name: Add some basic information run: | - sed -i 's\Commit not found\${{ github.sha }}\g' ./artifacts/publish/AzzyBot-Next/debug_${{ matrix.os }}-${{ matrix.arch }}/Modules/Core/Files/AzzyBotStats.json - sed -i 's\Compilation date not found\${{ steps.dateTime.outputs.time }}\g' ./artifacts/publish/AzzyBot-Next/debug_${{ matrix.os }}-${{ matrix.arch }}/Modules/Core/Files/AzzyBotStats.json - sed -i 's\Lines of source code not found\${{ steps.loc_cs.outputs.total_lines }}\g' ./artifacts/publish/AzzyBot-Next/debug_${{ matrix.os }}-${{ matrix.arch }}/Modules/Core/Files/AzzyBotStats.json + sed -i 's\Commit not found\${{ github.sha }}\g' ./artifacts/publish/AzzyBot-Next.Bot/debug_${{ matrix.os }}-${{ matrix.arch }}/Modules/Core/Files/AzzyBotStats.json + sed -i 's\Compilation date not found\${{ steps.dateTime.outputs.time }}\g' ./artifacts/publish/AzzyBot-Next.Bot/debug_${{ matrix.os }}-${{ matrix.arch }}/Modules/Core/Files/AzzyBotStats.json + sed -i 's\Lines of source code not found\${{ steps.loc_cs.outputs.total_lines }}\g' ./artifacts/publish/AzzyBot-Next.Bot/debug_${{ matrix.os }}-${{ matrix.arch }}/Modules/Core/Files/AzzyBotStats.json env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -79,7 +79,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: debug-${{ matrix.os }}-${{ matrix.arch }} - path: ./artifacts/publish/AzzyBot-Next/debug_${{ matrix.os }}-${{ matrix.arch }} + path: ./artifacts/publish/AzzyBot-Next.Bot/debug_${{ matrix.os }}-${{ matrix.arch }} build-docker: name: Build docker .zip file @@ -106,7 +106,7 @@ jobs: #mv ./src/AzzyBot/Modules/MusicStreaming/Files/docker-compose.yml ./docker-zip/AzzyBot/Modules/MusicStreaming/Files/docker-compose.yml #wget -qO ./docker-zip/AzzyBot/Modules/MusicStreaming/Files/plugins/java-lyrics-plugin-1.6.4.jar https://maven.lavalink.dev/releases/me/duncte123/java-lyrics-plugin/1.6.4/java-lyrics-plugin-1.6.4.jar mkdir -p ./docker-zip/AzzyBot/Settings - mv ./src/AzzyBot-Next/Settings/AzzyBotSettings-Docker.json ./docker-zip/AzzyBot/Settings/AzzyBotSettings-Docker.json + mv ./src/AzzyBot-Next.Bot/Settings/AzzyBotSettings-Docker.json ./docker-zip/AzzyBot/Settings/AzzyBotSettings-Docker.json - name: Archive docker-zip artifact uses: actions/upload-artifact@v4 diff --git a/.github/workflows/tag-creation.yml b/.github/workflows/tag-creation.yml index 79c1265f..9cc8e6dc 100644 --- a/.github/workflows/tag-creation.yml +++ b/.github/workflows/tag-creation.yml @@ -26,7 +26,7 @@ jobs: uses: kzrnm/get-net-sdk-project-versions-action@v2 id: get-version with: - proj-path: src/AzzyBot-Next/AzzyBot-Next.csproj + proj-path: src/AzzyBot-Next.Bot/AzzyBot-Next.Bot.csproj - name: Compare tags id: compare diff --git a/AzzyBot.sln b/AzzyBot.sln index 91659b8d..d28f46cb 100644 --- a/AzzyBot.sln +++ b/AzzyBot.sln @@ -1,10 +1,15 @@ + Microsoft Visual Studio Solution File, Format Version 12.00 # 17 VisualStudioVersion = 17.7.34202.233 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzzyBot", "src\AzzyBot\AzzyBot.csproj", "{91AAAF0E-4931-4247-BE86-74C595C7D5FC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzzyBot-Next", "src\AzzyBot-Next\AzzyBot-Next.csproj", "{6B05D8A4-AC04-4EA3-B625-C69DFE68761E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzzyBot-Next.Bot", "src\AzzyBot-Next.Bot\AzzyBot-Next.Bot.csproj", "{6B05D8A4-AC04-4EA3-B625-C69DFE68761E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzzyBot-Next.Data", "src\AzzyBot-Next.Data\AzzyBot-Next.Data.csproj", "{AEE73B92-94B6-4F6A-B29B-19C363B3D305}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzzyBot-Next.Core", "src\AzzyBot-Next.Core\AzzyBot-Next.Core.csproj", "{F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -23,29 +28,17 @@ Global EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Debug|Any CPU.Build.0 = Debug|Any CPU {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Debug|ARM64.Build.0 = Debug|ARM64 {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Debug|x64.ActiveCfg = Debug|x64 - {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Debug|x64.Build.0 = Debug|x64 {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Docker|Any CPU.ActiveCfg = Docker|Any CPU - {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Docker|Any CPU.Build.0 = Docker|Any CPU {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Docker|ARM64.ActiveCfg = Docker|ARM64 - {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Docker|ARM64.Build.0 = Docker|ARM64 {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Docker|x64.ActiveCfg = Docker|x64 - {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Docker|x64.Build.0 = Docker|x64 {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Docker-debug|Any CPU.ActiveCfg = Docker-debug|Any CPU - {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Docker-debug|Any CPU.Build.0 = Docker-debug|Any CPU {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Docker-debug|ARM64.ActiveCfg = Docker-debug|ARM64 - {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Docker-debug|ARM64.Build.0 = Docker-debug|ARM64 {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Docker-debug|x64.ActiveCfg = Docker-debug|x64 - {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Docker-debug|x64.Build.0 = Docker-debug|x64 {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Release|Any CPU.Build.0 = Release|Any CPU {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Release|ARM64.ActiveCfg = Release|ARM64 - {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Release|ARM64.Build.0 = Release|ARM64 {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Release|x64.ActiveCfg = Release|x64 - {91AAAF0E-4931-4247-BE86-74C595C7D5FC}.Release|x64.Build.0 = Release|x64 {6B05D8A4-AC04-4EA3-B625-C69DFE68761E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6B05D8A4-AC04-4EA3-B625-C69DFE68761E}.Debug|Any CPU.Build.0 = Debug|Any CPU {6B05D8A4-AC04-4EA3-B625-C69DFE68761E}.Debug|ARM64.ActiveCfg = Debug|Any CPU @@ -70,6 +63,54 @@ Global {6B05D8A4-AC04-4EA3-B625-C69DFE68761E}.Release|ARM64.Build.0 = Release|Any CPU {6B05D8A4-AC04-4EA3-B625-C69DFE68761E}.Release|x64.ActiveCfg = Release|Any CPU {6B05D8A4-AC04-4EA3-B625-C69DFE68761E}.Release|x64.Build.0 = Release|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Debug|ARM64.Build.0 = Debug|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Debug|x64.ActiveCfg = Debug|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Debug|x64.Build.0 = Debug|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Docker|Any CPU.ActiveCfg = Debug|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Docker|Any CPU.Build.0 = Debug|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Docker|ARM64.ActiveCfg = Debug|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Docker|ARM64.Build.0 = Debug|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Docker|x64.ActiveCfg = Debug|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Docker|x64.Build.0 = Debug|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Docker-debug|Any CPU.ActiveCfg = Debug|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Docker-debug|Any CPU.Build.0 = Debug|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Docker-debug|ARM64.ActiveCfg = Debug|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Docker-debug|ARM64.Build.0 = Debug|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Docker-debug|x64.ActiveCfg = Debug|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Docker-debug|x64.Build.0 = Debug|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Release|Any CPU.Build.0 = Release|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Release|ARM64.ActiveCfg = Release|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Release|ARM64.Build.0 = Release|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Release|x64.ActiveCfg = Release|Any CPU + {AEE73B92-94B6-4F6A-B29B-19C363B3D305}.Release|x64.Build.0 = Release|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Debug|ARM64.Build.0 = Debug|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Debug|x64.ActiveCfg = Debug|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Debug|x64.Build.0 = Debug|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Docker|Any CPU.ActiveCfg = Debug|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Docker|Any CPU.Build.0 = Debug|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Docker|ARM64.ActiveCfg = Debug|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Docker|ARM64.Build.0 = Debug|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Docker|x64.ActiveCfg = Debug|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Docker|x64.Build.0 = Debug|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Docker-debug|Any CPU.ActiveCfg = Debug|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Docker-debug|Any CPU.Build.0 = Debug|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Docker-debug|ARM64.ActiveCfg = Debug|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Docker-debug|ARM64.Build.0 = Debug|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Docker-debug|x64.ActiveCfg = Debug|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Docker-debug|x64.Build.0 = Debug|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Release|Any CPU.Build.0 = Release|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Release|ARM64.ActiveCfg = Release|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Release|ARM64.Build.0 = Release|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Release|x64.ActiveCfg = Release|Any CPU + {F2B56EF4-FC0A-4DC8-8C71-D8245EC562BF}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CHANGELOG.md b/CHANGELOG.md index 665d39b7..aff414f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## 2.0.0-preview4 ### General - Removed not needed internal events, meaning the performance should be *slightly* better +- Restructured the whole codebase to make it more readable and maintainable ### Improvements - The local station cache file is now also deleted when the station or the instance is deleted diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 00000000..f6d65654 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,19 @@ + + + true + + + + + + + + + + + + + + + + diff --git a/Dockerfile b/Dockerfile index 77907929..e22ca0c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,12 +3,12 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build USER root RUN apt update && apt upgrade -y && apt autoremove -y WORKDIR /build -COPY ./src/AzzyBot-Next ./ -RUN dotnet restore ./AzzyBot-Next.csproj +COPY ./ ./ +RUN dotnet restore ./src/AzzyBot-Next.Bot/AzzyBot-Next.Bot.csproj ARG ARCH ARG CONFIG ARG OS -RUN dotnet publish ./AzzyBot-Next.csproj -a $ARCH -c $CONFIG --os $OS -o out +RUN dotnet publish ./src/AzzyBot-Next.Bot/AzzyBot-Next.Bot.csproj -a $ARCH -c $CONFIG --os $OS -o out # RUNNER IMAGE FROM mcr.microsoft.com/dotnet/runtime:8.0-bookworm-slim @@ -40,4 +40,4 @@ USER azzy # Start the app WORKDIR /app -ENTRYPOINT ["dotnet", "AzzyBot-Docker.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "AzzyBot-Docker.dll"] diff --git a/dev.Dockerfile b/dev.Dockerfile index d644069e..1ccf9e93 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -3,12 +3,12 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build USER root RUN apt update && apt upgrade -y && apt autoremove -y WORKDIR /build -COPY ./src/AzzyBot-Next ./ -RUN dotnet restore ./AzzyBot-Next.csproj +COPY ./ ./ +RUN dotnet restore ./src/AzzyBot-Next.Bot/AzzyBot-Next.Bot.csproj ARG ARCH ARG CONFIG ARG OS -RUN dotnet publish ./AzzyBot-Next.csproj -a $ARCH -c $CONFIG --os $OS -o out +RUN dotnet publish ./src/AzzyBot-Next.Bot/AzzyBot-Next.Bot.csproj -a $ARCH -c $CONFIG --os $OS -o out # RUNNER IMAGE FROM mcr.microsoft.com/dotnet/runtime:8.0-bookworm-slim @@ -40,4 +40,4 @@ USER azzy # Start the app WORKDIR /app -ENTRYPOINT ["dotnet", "AzzyBot-Docker-Dev.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "AzzyBot-Docker-Dev.dll"] diff --git a/src/AzzyBot-Next/AzzyBot-Next.csproj b/src/AzzyBot-Next.Bot/AzzyBot-Next.Bot.csproj similarity index 82% rename from src/AzzyBot-Next/AzzyBot-Next.csproj rename to src/AzzyBot-Next.Bot/AzzyBot-Next.Bot.csproj index 2fd03a9f..c61f87aa 100644 --- a/src/AzzyBot-Next/AzzyBot-Next.csproj +++ b/src/AzzyBot-Next.Bot/AzzyBot-Next.Bot.csproj @@ -1,7 +1,7 @@ - AzzyBot + AzzyBot.Bot Exe net8.0 disable @@ -23,25 +23,28 @@ $(MSBuildProjectDirectory)\$(IntermediateOutputPath)=. Debug;Release;Docker;Docker-debug false - AzzyBot.Startup + AzzyBot.Bot.Startup True AzzyBot-Dev AzzyBot-Next-Dev + embedded True AzzyBot-Dev AzzyBot-Next-Dev + embedded True AzzyBot-Dev AzzyBot-Next-Dev + embedded @@ -49,6 +52,7 @@ AzzyBot-Docker AzzyBot-Next-Docker True + embedded @@ -56,6 +60,7 @@ AzzyBot-Docker AzzyBot-Next-Docker True + embedded @@ -63,81 +68,89 @@ AzzyBot-Docker AzzyBot-Next-Docker True + embedded True AzzyBot-Docker-Dev AzzyBot-Next-Docker-Dev + embedded True AzzyBot-Docker-Dev AzzyBot-Next-Docker-Dev + embedded True AzzyBot-Docker-Dev AzzyBot-Next-Docker-Dev + embedded True AzzyBot True + embedded True AzzyBot True + embedded True AzzyBot True + embedded - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - PreserveNewest - + + + + + PreserveNewest diff --git a/src/AzzyBot-Next/Commands/AdminCommands.cs b/src/AzzyBot-Next.Bot/Commands/AdminCommands.cs similarity index 97% rename from src/AzzyBot-Next/Commands/AdminCommands.cs rename to src/AzzyBot-Next.Bot/Commands/AdminCommands.cs index 2f33566d..328ed47c 100644 --- a/src/AzzyBot-Next/Commands/AdminCommands.cs +++ b/src/AzzyBot-Next.Bot/Commands/AdminCommands.cs @@ -6,13 +6,14 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using AzzyBot.Commands.Autocompletes; -using AzzyBot.Commands.Choices; -using AzzyBot.Database; -using AzzyBot.Database.Entities; -using AzzyBot.Logging; -using AzzyBot.Services; -using AzzyBot.Utilities; +using AzzyBot.Bot.Commands.Autocompletes; +using AzzyBot.Bot.Commands.Choices; +using AzzyBot.Bot.Services; +using AzzyBot.Bot.Utilities; +using AzzyBot.Core.Logging; +using AzzyBot.Core.Utilities; +using AzzyBot.Data; +using AzzyBot.Data.Entities; using DSharpPlus.Commands; using DSharpPlus.Commands.ArgumentModifiers; using DSharpPlus.Commands.ContextChecks; @@ -20,7 +21,7 @@ using DSharpPlus.Entities; using Microsoft.Extensions.Logging; -namespace AzzyBot.Commands; +namespace AzzyBot.Bot.Commands; [SuppressMessage("Design", "CA1034:Nested types should not be visible", Justification = "DSharpPlus best practice")] public sealed class AdminCommands diff --git a/src/AzzyBot-Next/Commands/Autocompletes/AzuraCastMountAutocomplete.cs b/src/AzzyBot-Next.Bot/Commands/Autocompletes/AzuraCastMountAutocomplete.cs similarity index 92% rename from src/AzzyBot-Next/Commands/Autocompletes/AzuraCastMountAutocomplete.cs rename to src/AzzyBot-Next.Bot/Commands/Autocompletes/AzuraCastMountAutocomplete.cs index 382cd8f5..369a94b8 100644 --- a/src/AzzyBot-Next/Commands/Autocompletes/AzuraCastMountAutocomplete.cs +++ b/src/AzzyBot-Next.Bot/Commands/Autocompletes/AzuraCastMountAutocomplete.cs @@ -3,13 +3,13 @@ using System.Globalization; using System.Linq; using System.Threading.Tasks; -using AzzyBot.Database; -using AzzyBot.Database.Entities; -using AzzyBot.Utilities.Encryption; +using AzzyBot.Core.Utilities.Encryption; +using AzzyBot.Data; +using AzzyBot.Data.Entities; using DSharpPlus.Commands.Processors.SlashCommands; using DSharpPlus.Commands.Processors.SlashCommands.ArgumentModifiers; -namespace AzzyBot.Commands.Autocompletes; +namespace AzzyBot.Bot.Commands.Autocompletes; public sealed class AzuraCastMountAutocomplete(DbActions dbActions) : IAutoCompleteProvider { diff --git a/src/AzzyBot-Next/Commands/Autocompletes/AzuraCastPlaylistAutocomplete.cs b/src/AzzyBot-Next.Bot/Commands/Autocompletes/AzuraCastPlaylistAutocomplete.cs similarity index 88% rename from src/AzzyBot-Next/Commands/Autocompletes/AzuraCastPlaylistAutocomplete.cs rename to src/AzzyBot-Next.Bot/Commands/Autocompletes/AzuraCastPlaylistAutocomplete.cs index e5e78480..79f041d9 100644 --- a/src/AzzyBot-Next/Commands/Autocompletes/AzuraCastPlaylistAutocomplete.cs +++ b/src/AzzyBot-Next.Bot/Commands/Autocompletes/AzuraCastPlaylistAutocomplete.cs @@ -3,19 +3,19 @@ using System.Globalization; using System.Linq; using System.Threading.Tasks; -using AzzyBot.Database; -using AzzyBot.Database.Entities; -using AzzyBot.Logging; -using AzzyBot.Services.Modules; -using AzzyBot.Utilities; -using AzzyBot.Utilities.Encryption; -using AzzyBot.Utilities.Enums; -using AzzyBot.Utilities.Records.AzuraCast; +using AzzyBot.Bot.Services.Modules; +using AzzyBot.Bot.Utilities.Records.AzuraCast; +using AzzyBot.Core.Logging; +using AzzyBot.Core.Utilities; +using AzzyBot.Core.Utilities.Encryption; +using AzzyBot.Core.Utilities.Enums; +using AzzyBot.Data; +using AzzyBot.Data.Entities; using DSharpPlus.Commands.Processors.SlashCommands; using DSharpPlus.Commands.Processors.SlashCommands.ArgumentModifiers; using Microsoft.Extensions.Logging; -namespace AzzyBot.Commands.Autocompletes; +namespace AzzyBot.Bot.Commands.Autocompletes; public sealed class AzuraCastPlaylistAutocomplete(ILogger logger, AzuraCastApiService azuraCast, DbActions dbActions) : IAutoCompleteProvider { diff --git a/src/AzzyBot-Next/Commands/Autocompletes/AzuraCastRequestAutocomplete.cs b/src/AzzyBot-Next.Bot/Commands/Autocompletes/AzuraCastRequestAutocomplete.cs similarity index 95% rename from src/AzzyBot-Next/Commands/Autocompletes/AzuraCastRequestAutocomplete.cs rename to src/AzzyBot-Next.Bot/Commands/Autocompletes/AzuraCastRequestAutocomplete.cs index b1b1d1ff..74c4b02f 100644 --- a/src/AzzyBot-Next/Commands/Autocompletes/AzuraCastRequestAutocomplete.cs +++ b/src/AzzyBot-Next.Bot/Commands/Autocompletes/AzuraCastRequestAutocomplete.cs @@ -4,17 +4,17 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using AzzyBot.Database; -using AzzyBot.Database.Entities; -using AzzyBot.Logging; -using AzzyBot.Services.Modules; -using AzzyBot.Utilities.Encryption; -using AzzyBot.Utilities.Records.AzuraCast; +using AzzyBot.Bot.Services.Modules; +using AzzyBot.Bot.Utilities.Records.AzuraCast; +using AzzyBot.Core.Logging; +using AzzyBot.Core.Utilities.Encryption; +using AzzyBot.Data; +using AzzyBot.Data.Entities; using DSharpPlus.Commands.Processors.SlashCommands; using DSharpPlus.Commands.Processors.SlashCommands.ArgumentModifiers; using Microsoft.Extensions.Logging; -namespace AzzyBot.Commands.Autocompletes; +namespace AzzyBot.Bot.Commands.Autocompletes; public sealed class AzuraCastRequestAutocomplete(ILogger logger, AzuraCastApiService azuraCast, DbActions dbActions) : IAutoCompleteProvider { diff --git a/src/AzzyBot-Next/Commands/Autocompletes/AzuraCastStationsAutocomplete.cs b/src/AzzyBot-Next.Bot/Commands/Autocompletes/AzuraCastStationsAutocomplete.cs similarity index 90% rename from src/AzzyBot-Next/Commands/Autocompletes/AzuraCastStationsAutocomplete.cs rename to src/AzzyBot-Next.Bot/Commands/Autocompletes/AzuraCastStationsAutocomplete.cs index f04a22c7..312b5093 100644 --- a/src/AzzyBot-Next/Commands/Autocompletes/AzuraCastStationsAutocomplete.cs +++ b/src/AzzyBot-Next.Bot/Commands/Autocompletes/AzuraCastStationsAutocomplete.cs @@ -1,19 +1,19 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using AzzyBot.Database; -using AzzyBot.Database.Entities; -using AzzyBot.Logging; -using AzzyBot.Services.Modules; -using AzzyBot.Utilities; -using AzzyBot.Utilities.Encryption; -using AzzyBot.Utilities.Enums; -using AzzyBot.Utilities.Records.AzuraCast; +using AzzyBot.Bot.Services.Modules; +using AzzyBot.Bot.Utilities.Records.AzuraCast; +using AzzyBot.Core.Logging; +using AzzyBot.Core.Utilities; +using AzzyBot.Core.Utilities.Encryption; +using AzzyBot.Core.Utilities.Enums; +using AzzyBot.Data; +using AzzyBot.Data.Entities; using DSharpPlus.Commands.Processors.SlashCommands; using DSharpPlus.Commands.Processors.SlashCommands.ArgumentModifiers; using Microsoft.Extensions.Logging; -namespace AzzyBot.Commands.Autocompletes; +namespace AzzyBot.Bot.Commands.Autocompletes; public sealed class AzuraCastStationsAutocomplete(ILogger logger, AzuraCastApiService azuraCastApi, DbActions dbActions) : IAutoCompleteProvider { diff --git a/src/AzzyBot-Next/Commands/Autocompletes/AzuraCastSystemLogAutocomplete.cs b/src/AzzyBot-Next.Bot/Commands/Autocompletes/AzuraCastSystemLogAutocomplete.cs similarity index 88% rename from src/AzzyBot-Next/Commands/Autocompletes/AzuraCastSystemLogAutocomplete.cs rename to src/AzzyBot-Next.Bot/Commands/Autocompletes/AzuraCastSystemLogAutocomplete.cs index 68d8a7d8..20746fbe 100644 --- a/src/AzzyBot-Next/Commands/Autocompletes/AzuraCastSystemLogAutocomplete.cs +++ b/src/AzzyBot-Next.Bot/Commands/Autocompletes/AzuraCastSystemLogAutocomplete.cs @@ -1,17 +1,17 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using AzzyBot.Database; -using AzzyBot.Database.Entities; -using AzzyBot.Logging; -using AzzyBot.Services.Modules; -using AzzyBot.Utilities.Encryption; -using AzzyBot.Utilities.Records.AzuraCast; +using AzzyBot.Bot.Services.Modules; +using AzzyBot.Bot.Utilities.Records.AzuraCast; +using AzzyBot.Core.Logging; +using AzzyBot.Core.Utilities.Encryption; +using AzzyBot.Data; +using AzzyBot.Data.Entities; using DSharpPlus.Commands.Processors.SlashCommands; using DSharpPlus.Commands.Processors.SlashCommands.ArgumentModifiers; using Microsoft.Extensions.Logging; -namespace AzzyBot.Commands.Autocompletes; +namespace AzzyBot.Bot.Commands.Autocompletes; public sealed class AzuraCastSystemLogAutocomplete(ILogger logger, AzuraCastApiService azuraCastApi, DbActions dbActions) : IAutoCompleteProvider { diff --git a/src/AzzyBot-Next/Commands/Autocompletes/AzzyHelpAutocomplete.cs b/src/AzzyBot-Next.Bot/Commands/Autocompletes/AzzyHelpAutocomplete.cs similarity index 92% rename from src/AzzyBot-Next/Commands/Autocompletes/AzzyHelpAutocomplete.cs rename to src/AzzyBot-Next.Bot/Commands/Autocompletes/AzzyHelpAutocomplete.cs index f8ba99eb..7881063d 100644 --- a/src/AzzyBot-Next/Commands/Autocompletes/AzzyHelpAutocomplete.cs +++ b/src/AzzyBot-Next.Bot/Commands/Autocompletes/AzzyHelpAutocomplete.cs @@ -2,18 +2,18 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using AzzyBot.Database; -using AzzyBot.Database.Entities; -using AzzyBot.Logging; -using AzzyBot.Settings; -using AzzyBot.Utilities; -using AzzyBot.Utilities.Records; +using AzzyBot.Bot.Settings; +using AzzyBot.Bot.Utilities; +using AzzyBot.Bot.Utilities.Records; +using AzzyBot.Core.Logging; +using AzzyBot.Data; +using AzzyBot.Data.Entities; using DSharpPlus.Commands.Processors.SlashCommands; using DSharpPlus.Commands.Processors.SlashCommands.ArgumentModifiers; using DSharpPlus.Entities; using Microsoft.Extensions.Logging; -namespace AzzyBot.Commands.Autocompletes; +namespace AzzyBot.Bot.Commands.Autocompletes; public sealed class AzzyHelpAutocomplete(ILogger logger, AzzyBotSettingsRecord settings, DbActions dbActions) : IAutoCompleteProvider { diff --git a/src/AzzyBot-Next/Commands/Autocompletes/GuildsAutocomplete.cs b/src/AzzyBot-Next.Bot/Commands/Autocompletes/GuildsAutocomplete.cs similarity index 95% rename from src/AzzyBot-Next/Commands/Autocompletes/GuildsAutocomplete.cs rename to src/AzzyBot-Next.Bot/Commands/Autocompletes/GuildsAutocomplete.cs index 73b98716..f5ad9c0a 100644 --- a/src/AzzyBot-Next/Commands/Autocompletes/GuildsAutocomplete.cs +++ b/src/AzzyBot-Next.Bot/Commands/Autocompletes/GuildsAutocomplete.cs @@ -3,14 +3,14 @@ using System.Globalization; using System.Linq; using System.Threading.Tasks; -using AzzyBot.Database; -using AzzyBot.Database.Entities; -using AzzyBot.Services; +using AzzyBot.Bot.Services; +using AzzyBot.Data; +using AzzyBot.Data.Entities; using DSharpPlus.Commands.Processors.SlashCommands; using DSharpPlus.Commands.Processors.SlashCommands.ArgumentModifiers; using DSharpPlus.Entities; -namespace AzzyBot.Commands.Autocompletes; +namespace AzzyBot.Bot.Commands.Autocompletes; public sealed class GuildsAutocomplete(DbActions dbActions, DiscordBotService botService) : IAutoCompleteProvider { diff --git a/src/AzzyBot-Next/Commands/AzuraCastCommands.cs b/src/AzzyBot-Next.Bot/Commands/AzuraCastCommands.cs similarity index 98% rename from src/AzzyBot-Next/Commands/AzuraCastCommands.cs rename to src/AzzyBot-Next.Bot/Commands/AzuraCastCommands.cs index 1403e85a..5f7311b5 100644 --- a/src/AzzyBot-Next/Commands/AzuraCastCommands.cs +++ b/src/AzzyBot-Next.Bot/Commands/AzuraCastCommands.cs @@ -8,18 +8,20 @@ using System.Net.Http; using System.Text; using System.Threading.Tasks; -using AzzyBot.Commands.Autocompletes; -using AzzyBot.Commands.Checks; -using AzzyBot.Commands.Choices; -using AzzyBot.Database; -using AzzyBot.Database.Entities; -using AzzyBot.Logging; -using AzzyBot.Services; -using AzzyBot.Services.Modules; -using AzzyBot.Utilities; -using AzzyBot.Utilities.Encryption; -using AzzyBot.Utilities.Enums; -using AzzyBot.Utilities.Records.AzuraCast; +using AzzyBot.Bot.Commands.Autocompletes; +using AzzyBot.Bot.Commands.Checks; +using AzzyBot.Bot.Commands.Choices; +using AzzyBot.Bot.Services; +using AzzyBot.Bot.Services.Modules; +using AzzyBot.Bot.Utilities; +using AzzyBot.Bot.Utilities.Enums; +using AzzyBot.Bot.Utilities.Records.AzuraCast; +using AzzyBot.Core.Logging; +using AzzyBot.Core.Utilities; +using AzzyBot.Core.Utilities.Encryption; +using AzzyBot.Core.Utilities.Enums; +using AzzyBot.Data; +using AzzyBot.Data.Entities; using DSharpPlus.Commands; using DSharpPlus.Commands.ContextChecks; using DSharpPlus.Commands.Processors.SlashCommands.ArgumentModifiers; @@ -29,7 +31,7 @@ using DSharpPlus.Interactivity.Extensions; using Microsoft.Extensions.Logging; -namespace AzzyBot.Commands; +namespace AzzyBot.Bot.Commands; [SuppressMessage("Design", "CA1034:Nested types should not be visible", Justification = "DSharpPlus best practice")] public sealed class AzuraCastCommands diff --git a/src/AzzyBot-Next/Commands/Checks/AzuraCastDiscordPermCheck.cs b/src/AzzyBot-Next.Bot/Commands/Checks/AzuraCastDiscordPermCheck.cs similarity index 95% rename from src/AzzyBot-Next/Commands/Checks/AzuraCastDiscordPermCheck.cs rename to src/AzzyBot-Next.Bot/Commands/Checks/AzuraCastDiscordPermCheck.cs index 2b9e2fe9..31908439 100644 --- a/src/AzzyBot-Next/Commands/Checks/AzuraCastDiscordPermCheck.cs +++ b/src/AzzyBot-Next.Bot/Commands/Checks/AzuraCastDiscordPermCheck.cs @@ -4,18 +4,18 @@ using System.Globalization; using System.Linq; using System.Threading.Tasks; -using AzzyBot.Database; -using AzzyBot.Database.Entities; -using AzzyBot.Logging; -using AzzyBot.Services; -using AzzyBot.Utilities.Enums; +using AzzyBot.Bot.Services; +using AzzyBot.Bot.Utilities.Enums; +using AzzyBot.Core.Logging; +using AzzyBot.Data; +using AzzyBot.Data.Entities; using DSharpPlus.Commands; using DSharpPlus.Commands.ContextChecks; using DSharpPlus.Commands.Processors.SlashCommands; using DSharpPlus.Entities; using Microsoft.Extensions.Logging; -namespace AzzyBot.Commands.Checks; +namespace AzzyBot.Bot.Commands.Checks; public class AzuraCastDiscordPermCheck(ILogger logger, DbActions dbActions, DiscordBotService discordBotService) : IContextCheck { @@ -47,11 +47,9 @@ public class AzuraCastDiscordPermCheck(ILogger logger { case "azuracast export-playlists": case "azuracast force-cache-refresh": - case "azuracast get-system-logs": case "azuracast start-station": case "azuracast stop-station": case "azuracast toggle-song-requests": - case "azuracast update-instance": case "config add-azuracast-station-mount": case "config modify-azuracast-station": case "config modify-azuracast-station-checks": diff --git a/src/AzzyBot-Next/Commands/Checks/AzuraCastDiscordPermCheckAttribute.cs b/src/AzzyBot-Next.Bot/Commands/Checks/AzuraCastDiscordPermCheckAttribute.cs similarity index 74% rename from src/AzzyBot-Next/Commands/Checks/AzuraCastDiscordPermCheckAttribute.cs rename to src/AzzyBot-Next.Bot/Commands/Checks/AzuraCastDiscordPermCheckAttribute.cs index 57445401..9d0fa40e 100644 --- a/src/AzzyBot-Next/Commands/Checks/AzuraCastDiscordPermCheckAttribute.cs +++ b/src/AzzyBot-Next.Bot/Commands/Checks/AzuraCastDiscordPermCheckAttribute.cs @@ -1,7 +1,7 @@ -using AzzyBot.Utilities.Enums; +using AzzyBot.Bot.Utilities.Enums; using DSharpPlus.Commands.ContextChecks; -namespace AzzyBot.Commands.Checks; +namespace AzzyBot.Bot.Commands.Checks; public sealed class AzuraCastDiscordPermCheckAttribute(AzuraCastDiscordPerm[] perms) : ContextCheckAttribute { diff --git a/src/AzzyBot-Next/Commands/Checks/AzuraCastOnlineCheck.cs b/src/AzzyBot-Next.Bot/Commands/Checks/AzuraCastOnlineCheck.cs similarity index 91% rename from src/AzzyBot-Next/Commands/Checks/AzuraCastOnlineCheck.cs rename to src/AzzyBot-Next.Bot/Commands/Checks/AzuraCastOnlineCheck.cs index 55849a02..2740d9ba 100644 --- a/src/AzzyBot-Next/Commands/Checks/AzuraCastOnlineCheck.cs +++ b/src/AzzyBot-Next.Bot/Commands/Checks/AzuraCastOnlineCheck.cs @@ -1,15 +1,15 @@ using System; using System.Threading.Tasks; -using AzzyBot.Database; -using AzzyBot.Database.Entities; -using AzzyBot.Logging; +using AzzyBot.Core.Logging; +using AzzyBot.Data; +using AzzyBot.Data.Entities; using DSharpPlus.Commands; using DSharpPlus.Commands.ContextChecks; using DSharpPlus.Commands.Processors.SlashCommands; using DSharpPlus.Entities; using Microsoft.Extensions.Logging; -namespace AzzyBot.Commands.Checks; +namespace AzzyBot.Bot.Commands.Checks; public sealed class AzuraCastOnlineCheck(ILogger logger, DbActions dbActions) : IContextCheck { diff --git a/src/AzzyBot-Next/Commands/Checks/AzuraCastOnlineCheckAttribute.cs b/src/AzzyBot-Next.Bot/Commands/Checks/AzuraCastOnlineCheckAttribute.cs similarity index 75% rename from src/AzzyBot-Next/Commands/Checks/AzuraCastOnlineCheckAttribute.cs rename to src/AzzyBot-Next.Bot/Commands/Checks/AzuraCastOnlineCheckAttribute.cs index 2988b611..e6a00396 100644 --- a/src/AzzyBot-Next/Commands/Checks/AzuraCastOnlineCheckAttribute.cs +++ b/src/AzzyBot-Next.Bot/Commands/Checks/AzuraCastOnlineCheckAttribute.cs @@ -1,5 +1,5 @@ using DSharpPlus.Commands.ContextChecks; -namespace AzzyBot.Commands.Checks; +namespace AzzyBot.Bot.Commands.Checks; public sealed class AzuraCastOnlineCheckAttribute : ContextCheckAttribute; diff --git a/src/AzzyBot-Next/Commands/Checks/ModuleActivatedCheck.cs b/src/AzzyBot-Next.Bot/Commands/Checks/ModuleActivatedCheck.cs similarity index 91% rename from src/AzzyBot-Next/Commands/Checks/ModuleActivatedCheck.cs rename to src/AzzyBot-Next.Bot/Commands/Checks/ModuleActivatedCheck.cs index 8834c3f3..4d1aa285 100644 --- a/src/AzzyBot-Next/Commands/Checks/ModuleActivatedCheck.cs +++ b/src/AzzyBot-Next.Bot/Commands/Checks/ModuleActivatedCheck.cs @@ -1,16 +1,16 @@ using System; using System.Threading.Tasks; -using AzzyBot.Database; -using AzzyBot.Database.Entities; -using AzzyBot.Logging; -using AzzyBot.Utilities.Enums; +using AzzyBot.Bot.Utilities.Enums; +using AzzyBot.Core.Logging; +using AzzyBot.Data; +using AzzyBot.Data.Entities; using DSharpPlus.Commands; using DSharpPlus.Commands.ContextChecks; using DSharpPlus.Commands.Processors.SlashCommands; using DSharpPlus.Entities; using Microsoft.Extensions.Logging; -namespace AzzyBot.Commands.Checks; +namespace AzzyBot.Bot.Commands.Checks; public sealed class ModuleActivatedCheck(ILogger logger, DbActions dbActions) : IContextCheck { diff --git a/src/AzzyBot-Next/Commands/Checks/ModuleActivatedCheckAttribute.cs b/src/AzzyBot-Next.Bot/Commands/Checks/ModuleActivatedCheckAttribute.cs similarity index 71% rename from src/AzzyBot-Next/Commands/Checks/ModuleActivatedCheckAttribute.cs rename to src/AzzyBot-Next.Bot/Commands/Checks/ModuleActivatedCheckAttribute.cs index bfa52eeb..8c427790 100644 --- a/src/AzzyBot-Next/Commands/Checks/ModuleActivatedCheckAttribute.cs +++ b/src/AzzyBot-Next.Bot/Commands/Checks/ModuleActivatedCheckAttribute.cs @@ -1,7 +1,7 @@ -using AzzyBot.Utilities.Enums; +using AzzyBot.Bot.Utilities.Enums; using DSharpPlus.Commands.ContextChecks; -namespace AzzyBot.Commands.Checks; +namespace AzzyBot.Bot.Commands.Checks; public sealed class ModuleActivatedCheckAttribute(AzzyModules module) : ContextCheckAttribute { diff --git a/src/AzzyBot-Next/Commands/Choices/AzuraExportPlaylistProvider.cs b/src/AzzyBot-Next.Bot/Commands/Choices/AzuraExportPlaylistProvider.cs similarity index 93% rename from src/AzzyBot-Next/Commands/Choices/AzuraExportPlaylistProvider.cs rename to src/AzzyBot-Next.Bot/Commands/Choices/AzuraExportPlaylistProvider.cs index 8bb92cba..6b072c5c 100644 --- a/src/AzzyBot-Next/Commands/Choices/AzuraExportPlaylistProvider.cs +++ b/src/AzzyBot-Next.Bot/Commands/Choices/AzuraExportPlaylistProvider.cs @@ -3,7 +3,7 @@ using DSharpPlus.Commands.Processors.SlashCommands.ArgumentModifiers; using DSharpPlus.Commands.Trees; -namespace AzzyBot.Commands.Choices; +namespace AzzyBot.Bot.Commands.Choices; public sealed class AzuraExportPlaylistProvider : IChoiceProvider { diff --git a/src/AzzyBot-Next/Commands/Choices/BooleanEnabledDisabledStateProvider.cs b/src/AzzyBot-Next.Bot/Commands/Choices/BooleanEnabledDisabledStateProvider.cs similarity index 93% rename from src/AzzyBot-Next/Commands/Choices/BooleanEnabledDisabledStateProvider.cs rename to src/AzzyBot-Next.Bot/Commands/Choices/BooleanEnabledDisabledStateProvider.cs index a86eda7c..fdf0f23c 100644 --- a/src/AzzyBot-Next/Commands/Choices/BooleanEnabledDisabledStateProvider.cs +++ b/src/AzzyBot-Next.Bot/Commands/Choices/BooleanEnabledDisabledStateProvider.cs @@ -3,7 +3,7 @@ using DSharpPlus.Commands.Processors.SlashCommands.ArgumentModifiers; using DSharpPlus.Commands.Trees; -namespace AzzyBot.Commands.Choices; +namespace AzzyBot.Bot.Commands.Choices; public sealed class BooleanEnableDisableStateProvider : IChoiceProvider { diff --git a/src/AzzyBot-Next/Commands/Choices/BooleanYesNoStateProvider.cs b/src/AzzyBot-Next.Bot/Commands/Choices/BooleanYesNoStateProvider.cs similarity index 93% rename from src/AzzyBot-Next/Commands/Choices/BooleanYesNoStateProvider.cs rename to src/AzzyBot-Next.Bot/Commands/Choices/BooleanYesNoStateProvider.cs index 4f2ef816..cf273f86 100644 --- a/src/AzzyBot-Next/Commands/Choices/BooleanYesNoStateProvider.cs +++ b/src/AzzyBot-Next.Bot/Commands/Choices/BooleanYesNoStateProvider.cs @@ -3,7 +3,7 @@ using DSharpPlus.Commands.Processors.SlashCommands.ArgumentModifiers; using DSharpPlus.Commands.Trees; -namespace AzzyBot.Commands.Choices; +namespace AzzyBot.Bot.Commands.Choices; public sealed class BooleanYesNoStateProvider : IChoiceProvider { diff --git a/src/AzzyBot-Next/Commands/Choices/BotActivityProvider.cs b/src/AzzyBot-Next.Bot/Commands/Choices/BotActivityProvider.cs similarity index 93% rename from src/AzzyBot-Next/Commands/Choices/BotActivityProvider.cs rename to src/AzzyBot-Next.Bot/Commands/Choices/BotActivityProvider.cs index f57d030e..2c8afc8c 100644 --- a/src/AzzyBot-Next/Commands/Choices/BotActivityProvider.cs +++ b/src/AzzyBot-Next.Bot/Commands/Choices/BotActivityProvider.cs @@ -3,7 +3,7 @@ using DSharpPlus.Commands.Processors.SlashCommands.ArgumentModifiers; using DSharpPlus.Commands.Trees; -namespace AzzyBot.Commands.Choices; +namespace AzzyBot.Bot.Commands.Choices; public sealed class BotActivityProvider : IChoiceProvider { diff --git a/src/AzzyBot-Next/Commands/Choices/BotStatusProvider.cs b/src/AzzyBot-Next.Bot/Commands/Choices/BotStatusProvider.cs similarity index 93% rename from src/AzzyBot-Next/Commands/Choices/BotStatusProvider.cs rename to src/AzzyBot-Next.Bot/Commands/Choices/BotStatusProvider.cs index 5c2c1ca8..e03c5c41 100644 --- a/src/AzzyBot-Next/Commands/Choices/BotStatusProvider.cs +++ b/src/AzzyBot-Next.Bot/Commands/Choices/BotStatusProvider.cs @@ -3,7 +3,7 @@ using DSharpPlus.Commands.Processors.SlashCommands.ArgumentModifiers; using DSharpPlus.Commands.Trees; -namespace AzzyBot.Commands.Choices; +namespace AzzyBot.Bot.Commands.Choices; public sealed class BotStatusProvider : IChoiceProvider { diff --git a/src/AzzyBot-Next/Commands/ConfigCommands.cs b/src/AzzyBot-Next.Bot/Commands/ConfigCommands.cs similarity index 98% rename from src/AzzyBot-Next/Commands/ConfigCommands.cs rename to src/AzzyBot-Next.Bot/Commands/ConfigCommands.cs index 699bed99..24585a2d 100644 --- a/src/AzzyBot-Next/Commands/ConfigCommands.cs +++ b/src/AzzyBot-Next.Bot/Commands/ConfigCommands.cs @@ -4,16 +4,17 @@ using System.Diagnostics.CodeAnalysis; using System.IO; using System.Threading.Tasks; -using AzzyBot.Commands.Autocompletes; -using AzzyBot.Commands.Checks; -using AzzyBot.Commands.Choices; -using AzzyBot.Database; -using AzzyBot.Database.Entities; -using AzzyBot.Logging; -using AzzyBot.Services; -using AzzyBot.Services.Modules; -using AzzyBot.Utilities; -using AzzyBot.Utilities.Enums; +using AzzyBot.Bot.Commands.Autocompletes; +using AzzyBot.Bot.Commands.Checks; +using AzzyBot.Bot.Commands.Choices; +using AzzyBot.Bot.Services; +using AzzyBot.Bot.Services.Modules; +using AzzyBot.Bot.Utilities; +using AzzyBot.Bot.Utilities.Enums; +using AzzyBot.Core.Logging; +using AzzyBot.Core.Utilities; +using AzzyBot.Data; +using AzzyBot.Data.Entities; using DSharpPlus.Commands; using DSharpPlus.Commands.ArgumentModifiers; using DSharpPlus.Commands.ContextChecks; @@ -21,7 +22,7 @@ using DSharpPlus.Entities; using Microsoft.Extensions.Logging; -namespace AzzyBot.Commands; +namespace AzzyBot.Bot.Commands; [SuppressMessage("Design", "CA1034:Nested types should not be visible", Justification = "DSharpPlus best practice")] public sealed class ConfigCommands diff --git a/src/AzzyBot-Next/Commands/Converters/UriArgumentConverter.cs b/src/AzzyBot-Next.Bot/Commands/Converters/UriArgumentConverter.cs similarity index 96% rename from src/AzzyBot-Next/Commands/Converters/UriArgumentConverter.cs rename to src/AzzyBot-Next.Bot/Commands/Converters/UriArgumentConverter.cs index d1fac39b..80283f75 100644 --- a/src/AzzyBot-Next/Commands/Converters/UriArgumentConverter.cs +++ b/src/AzzyBot-Next.Bot/Commands/Converters/UriArgumentConverter.cs @@ -4,7 +4,7 @@ using DSharpPlus.Entities; using DSharpPlus.EventArgs; -namespace AzzyBot.Commands.Converters; +namespace AzzyBot.Bot.Commands.Converters; public sealed class UriArgumentConverter : ISlashArgumentConverter { diff --git a/src/AzzyBot-Next/Commands/CoreCommands.cs b/src/AzzyBot-Next.Bot/Commands/CoreCommands.cs similarity index 95% rename from src/AzzyBot-Next/Commands/CoreCommands.cs rename to src/AzzyBot-Next.Bot/Commands/CoreCommands.cs index fc87cc6a..dc0132e5 100644 --- a/src/AzzyBot-Next/Commands/CoreCommands.cs +++ b/src/AzzyBot-Next.Bot/Commands/CoreCommands.cs @@ -4,20 +4,20 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Threading.Tasks; -using AzzyBot.Commands.Autocompletes; -using AzzyBot.Database; -using AzzyBot.Database.Entities; -using AzzyBot.Logging; -using AzzyBot.Settings; -using AzzyBot.Utilities; -using AzzyBot.Utilities.Records; +using AzzyBot.Bot.Commands.Autocompletes; +using AzzyBot.Bot.Settings; +using AzzyBot.Bot.Utilities; +using AzzyBot.Bot.Utilities.Records; +using AzzyBot.Core.Logging; +using AzzyBot.Data; +using AzzyBot.Data.Entities; using DSharpPlus.Commands; using DSharpPlus.Commands.ContextChecks; using DSharpPlus.Commands.Processors.SlashCommands.ArgumentModifiers; using DSharpPlus.Entities; using Microsoft.Extensions.Logging; -namespace AzzyBot.Commands; +namespace AzzyBot.Bot.Commands; [SuppressMessage("Design", "CA1034:Nested types should not be visible", Justification = "DSharpPlus best practice")] public sealed class CoreCommands diff --git a/src/AzzyBot-Next/Commands/DebugCommands.cs b/src/AzzyBot-Next.Bot/Commands/DebugCommands.cs similarity index 95% rename from src/AzzyBot-Next/Commands/DebugCommands.cs rename to src/AzzyBot-Next.Bot/Commands/DebugCommands.cs index 3f5a5df5..5f774ee1 100644 --- a/src/AzzyBot-Next/Commands/DebugCommands.cs +++ b/src/AzzyBot-Next.Bot/Commands/DebugCommands.cs @@ -2,10 +2,10 @@ using System.ComponentModel; using System.Diagnostics.CodeAnalysis; using System.Threading.Tasks; -using AzzyBot.Commands.Choices; -using AzzyBot.Logging; -using AzzyBot.Services; -using AzzyBot.Utilities.Encryption; +using AzzyBot.Bot.Commands.Choices; +using AzzyBot.Bot.Services; +using AzzyBot.Core.Logging; +using AzzyBot.Core.Utilities.Encryption; using DSharpPlus.Commands; using DSharpPlus.Commands.ArgumentModifiers; using DSharpPlus.Commands.ContextChecks; @@ -13,7 +13,7 @@ using DSharpPlus.Entities; using Microsoft.Extensions.Logging; -namespace AzzyBot.Commands; +namespace AzzyBot.Bot.Commands; [SuppressMessage("Design", "CA1034:Nested types should not be visible", Justification = "DSharpPlus best practice")] public sealed class DebugCommands diff --git a/src/AzzyBot-Next/Extensions/HostExtensions.cs b/src/AzzyBot-Next.Bot/Extensions/HostExtensions.cs similarity index 95% rename from src/AzzyBot-Next/Extensions/HostExtensions.cs rename to src/AzzyBot-Next.Bot/Extensions/HostExtensions.cs index 23ae08fe..04175bf9 100644 --- a/src/AzzyBot-Next/Extensions/HostExtensions.cs +++ b/src/AzzyBot-Next.Bot/Extensions/HostExtensions.cs @@ -1,13 +1,13 @@ using System; using System.Linq; using System.Threading.Tasks; -using AzzyBot.Database; +using AzzyBot.Data; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Npgsql; -namespace AzzyBot.Extensions; +namespace AzzyBot.Bot.Extensions; public static class HostExtensions { diff --git a/src/AzzyBot-Next/Extensions/ServiceCollectionExtensions.cs b/src/AzzyBot-Next.Bot/Extensions/ServiceCollectionExtensions.cs similarity index 94% rename from src/AzzyBot-Next/Extensions/ServiceCollectionExtensions.cs rename to src/AzzyBot-Next.Bot/Extensions/ServiceCollectionExtensions.cs index 168fd465..acfcdcbf 100644 --- a/src/AzzyBot-Next/Extensions/ServiceCollectionExtensions.cs +++ b/src/AzzyBot-Next.Bot/Extensions/ServiceCollectionExtensions.cs @@ -2,19 +2,20 @@ using System.Collections.Generic; using System.IO; using System.Text; -using AzzyBot.Database; -using AzzyBot.Services; -using AzzyBot.Services.Interfaces; -using AzzyBot.Services.Modules; -using AzzyBot.Services.Queues; -using AzzyBot.Settings; -using AzzyBot.Utilities; -using AzzyBot.Utilities.Encryption; +using AzzyBot.Bot.Services; +using AzzyBot.Bot.Services.Modules; +using AzzyBot.Bot.Settings; +using AzzyBot.Core.Services.Interfaces; +using AzzyBot.Core.Services.Queues; +using AzzyBot.Core.Settings; +using AzzyBot.Core.Utilities; +using AzzyBot.Core.Utilities.Encryption; +using AzzyBot.Data; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -namespace AzzyBot.Extensions; +namespace AzzyBot.Bot.Extensions; public static class ServiceCollectionExtensions { diff --git a/src/AzzyBot-Next/Services/AzzyBackgroundService.cs b/src/AzzyBot-Next.Bot/Services/AzzyBackgroundService.cs similarity index 95% rename from src/AzzyBot-Next/Services/AzzyBackgroundService.cs rename to src/AzzyBot-Next.Bot/Services/AzzyBackgroundService.cs index 06154d3b..ea2b472b 100644 --- a/src/AzzyBot-Next/Services/AzzyBackgroundService.cs +++ b/src/AzzyBot-Next.Bot/Services/AzzyBackgroundService.cs @@ -1,12 +1,12 @@ using System.Threading; using System.Threading.Tasks; -using AzzyBot.Logging; -using AzzyBot.Services.Modules; -using AzzyBot.Utilities.Enums; +using AzzyBot.Bot.Services.Modules; +using AzzyBot.Bot.Utilities.Enums; +using AzzyBot.Core.Logging; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -namespace AzzyBot.Services; +namespace AzzyBot.Bot.Services; public sealed class AzzyBackgroundService(IHostApplicationLifetime applicationLifetime, ILogger logger, AzuraCastApiService azuraCastApiService, AzuraCastFileService azuraCastFileService, AzuraCastPingService azuraCastPingService, AzuraCastUpdateService updaterService) { diff --git a/src/AzzyBot-Next/Services/AzzyBackgroundServiceHost.cs b/src/AzzyBot-Next.Bot/Services/AzzyBackgroundServiceHost.cs similarity index 95% rename from src/AzzyBot-Next/Services/AzzyBackgroundServiceHost.cs rename to src/AzzyBot-Next.Bot/Services/AzzyBackgroundServiceHost.cs index 545de422..86b09a94 100644 --- a/src/AzzyBot-Next/Services/AzzyBackgroundServiceHost.cs +++ b/src/AzzyBot-Next.Bot/Services/AzzyBackgroundServiceHost.cs @@ -2,12 +2,12 @@ using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; -using AzzyBot.Logging; -using AzzyBot.Services.Interfaces; +using AzzyBot.Core.Logging; +using AzzyBot.Core.Services.Interfaces; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -namespace AzzyBot.Services; +namespace AzzyBot.Bot.Services; public sealed class AzzyBackgroundServiceHost(ILogger logger, IQueuedBackgroundTask taskQueue, DiscordBotService discordBotService) : BackgroundService { diff --git a/src/AzzyBot-Next/Services/DiscordBotService.cs b/src/AzzyBot-Next.Bot/Services/DiscordBotService.cs similarity index 98% rename from src/AzzyBot-Next/Services/DiscordBotService.cs rename to src/AzzyBot-Next.Bot/Services/DiscordBotService.cs index 8e57eb11..0e1453de 100644 --- a/src/AzzyBot-Next/Services/DiscordBotService.cs +++ b/src/AzzyBot-Next.Bot/Services/DiscordBotService.cs @@ -6,12 +6,12 @@ using System.Security; using System.Text; using System.Threading.Tasks; -using AzzyBot.Commands.Checks; -using AzzyBot.Database; -using AzzyBot.Database.Entities; -using AzzyBot.Logging; -using AzzyBot.Settings; -using AzzyBot.Utilities; +using AzzyBot.Bot.Commands.Checks; +using AzzyBot.Bot.Settings; +using AzzyBot.Core.Logging; +using AzzyBot.Core.Utilities; +using AzzyBot.Data; +using AzzyBot.Data.Entities; using DSharpPlus; using DSharpPlus.Commands.ContextChecks; using DSharpPlus.Commands.Exceptions; @@ -21,7 +21,7 @@ using DSharpPlus.Exceptions; using Microsoft.Extensions.Logging; -namespace AzzyBot.Services; +namespace AzzyBot.Bot.Services; public sealed class DiscordBotService { diff --git a/src/AzzyBot-Next/Services/DiscordBotServiceHost.cs b/src/AzzyBot-Next.Bot/Services/DiscordBotServiceHost.cs similarity index 97% rename from src/AzzyBot-Next/Services/DiscordBotServiceHost.cs rename to src/AzzyBot-Next.Bot/Services/DiscordBotServiceHost.cs index bf6c11d4..5dc3c4f6 100644 --- a/src/AzzyBot-Next/Services/DiscordBotServiceHost.cs +++ b/src/AzzyBot-Next.Bot/Services/DiscordBotServiceHost.cs @@ -3,14 +3,15 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using AzzyBot.Commands; -using AzzyBot.Commands.Checks; -using AzzyBot.Commands.Converters; -using AzzyBot.Database; -using AzzyBot.Database.Entities; -using AzzyBot.Logging; -using AzzyBot.Settings; -using AzzyBot.Utilities; +using AzzyBot.Bot.Commands; +using AzzyBot.Bot.Commands.Checks; +using AzzyBot.Bot.Commands.Converters; +using AzzyBot.Bot.Settings; +using AzzyBot.Bot.Utilities; +using AzzyBot.Core.Logging; +using AzzyBot.Core.Utilities; +using AzzyBot.Data; +using AzzyBot.Data.Entities; using DSharpPlus; using DSharpPlus.Commands; using DSharpPlus.Commands.EventArgs; @@ -26,7 +27,7 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -namespace AzzyBot.Services; +namespace AzzyBot.Bot.Services; public sealed class DiscordBotServiceHost : IHostedService { diff --git a/src/AzzyBot-Next/Services/Modules/AzuraCastApiService.cs b/src/AzzyBot-Next.Bot/Services/Modules/AzuraCastApiService.cs similarity index 99% rename from src/AzzyBot-Next/Services/Modules/AzuraCastApiService.cs rename to src/AzzyBot-Next.Bot/Services/Modules/AzuraCastApiService.cs index 6dad09f8..e8e58e13 100644 --- a/src/AzzyBot-Next/Services/Modules/AzuraCastApiService.cs +++ b/src/AzzyBot-Next.Bot/Services/Modules/AzuraCastApiService.cs @@ -7,17 +7,17 @@ using System.Text; using System.Text.Json; using System.Threading.Tasks; -using AzzyBot.Database; -using AzzyBot.Database.Entities; -using AzzyBot.Logging; -using AzzyBot.Utilities; -using AzzyBot.Utilities.Encryption; -using AzzyBot.Utilities.Helpers; -using AzzyBot.Utilities.Records.AzuraCast; +using AzzyBot.Bot.Utilities.Helpers; +using AzzyBot.Bot.Utilities.Records.AzuraCast; +using AzzyBot.Core.Logging; +using AzzyBot.Core.Utilities; +using AzzyBot.Core.Utilities.Encryption; +using AzzyBot.Data; +using AzzyBot.Data.Entities; using DSharpPlus.Commands; using Microsoft.Extensions.Logging; -namespace AzzyBot.Services.Modules; +namespace AzzyBot.Bot.Services.Modules; public sealed class AzuraCastApiService(ILogger logger, DbActions dbActions, DiscordBotService botService, WebRequestService webService) { diff --git a/src/AzzyBot-Next/Services/Modules/AzuraCastFileService.cs b/src/AzzyBot-Next.Bot/Services/Modules/AzuraCastFileService.cs similarity index 94% rename from src/AzzyBot-Next/Services/Modules/AzuraCastFileService.cs rename to src/AzzyBot-Next.Bot/Services/Modules/AzuraCastFileService.cs index e923df3f..cd0ecd0b 100644 --- a/src/AzzyBot-Next/Services/Modules/AzuraCastFileService.cs +++ b/src/AzzyBot-Next.Bot/Services/Modules/AzuraCastFileService.cs @@ -6,17 +6,18 @@ using System.Text.Json; using System.Threading; using System.Threading.Tasks; -using AzzyBot.Database; -using AzzyBot.Database.Entities; -using AzzyBot.Logging; -using AzzyBot.Services.Interfaces; -using AzzyBot.Utilities; -using AzzyBot.Utilities.Encryption; -using AzzyBot.Utilities.Records.AzuraCast; +using AzzyBot.Bot.Utilities; +using AzzyBot.Bot.Utilities.Records.AzuraCast; +using AzzyBot.Core.Logging; +using AzzyBot.Core.Services.Interfaces; +using AzzyBot.Core.Utilities; +using AzzyBot.Core.Utilities.Encryption; +using AzzyBot.Data; +using AzzyBot.Data.Entities; using DSharpPlus.Entities; using Microsoft.Extensions.Logging; -namespace AzzyBot.Services.Modules; +namespace AzzyBot.Bot.Services.Modules; public sealed class AzuraCastFileService(ILogger logger, IQueuedBackgroundTask taskQueue, AzuraCastApiService azuraCast, DbActions dbActions, DiscordBotService discordBotService) { @@ -101,8 +102,8 @@ private async ValueTask CheckIfFilesWereModifiedAsync(IReadOnlyList onlineHashSet = new(onlineFiles, new FileComparer()); - HashSet localHashSet = new(localFiles, new FileComparer()); + HashSet onlineHashSet = new(onlineFiles, new AzuraFileComparer()); + HashSet localHashSet = new(localFiles, new AzuraFileComparer()); List addedFiles = onlineHashSet.Except(localHashSet).ToList(); List removedFiles = localHashSet.Except(onlineHashSet).ToList(); diff --git a/src/AzzyBot-Next/Services/Modules/AzuraCastPingService.cs b/src/AzzyBot-Next.Bot/Services/Modules/AzuraCastPingService.cs similarity index 93% rename from src/AzzyBot-Next/Services/Modules/AzuraCastPingService.cs rename to src/AzzyBot-Next.Bot/Services/Modules/AzuraCastPingService.cs index c6bdf002..fc85bc3b 100644 --- a/src/AzzyBot-Next/Services/Modules/AzuraCastPingService.cs +++ b/src/AzzyBot-Next.Bot/Services/Modules/AzuraCastPingService.cs @@ -4,15 +4,15 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; -using AzzyBot.Database; -using AzzyBot.Database.Entities; -using AzzyBot.Logging; -using AzzyBot.Services.Interfaces; -using AzzyBot.Utilities.Encryption; -using AzzyBot.Utilities.Records.AzuraCast; +using AzzyBot.Bot.Utilities.Records.AzuraCast; +using AzzyBot.Core.Logging; +using AzzyBot.Core.Services.Interfaces; +using AzzyBot.Core.Utilities.Encryption; +using AzzyBot.Data; +using AzzyBot.Data.Entities; using Microsoft.Extensions.Logging; -namespace AzzyBot.Services.Modules; +namespace AzzyBot.Bot.Services.Modules; public sealed class AzuraCastPingService(ILogger logger, IQueuedBackgroundTask taskQueue, AzuraCastApiService azuraCast, DbActions dbActions, DiscordBotService discordBotService) { diff --git a/src/AzzyBot-Next/Services/Modules/AzuraCastUpdateService.cs b/src/AzzyBot-Next.Bot/Services/Modules/AzuraCastUpdateService.cs similarity index 92% rename from src/AzzyBot-Next/Services/Modules/AzuraCastUpdateService.cs rename to src/AzzyBot-Next.Bot/Services/Modules/AzuraCastUpdateService.cs index 342978fd..272fd007 100644 --- a/src/AzzyBot-Next/Services/Modules/AzuraCastUpdateService.cs +++ b/src/AzzyBot-Next.Bot/Services/Modules/AzuraCastUpdateService.cs @@ -3,17 +3,17 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using AzzyBot.Database; -using AzzyBot.Database.Entities; -using AzzyBot.Logging; -using AzzyBot.Services.Interfaces; -using AzzyBot.Utilities; -using AzzyBot.Utilities.Encryption; -using AzzyBot.Utilities.Records.AzuraCast; +using AzzyBot.Bot.Utilities; +using AzzyBot.Bot.Utilities.Records.AzuraCast; +using AzzyBot.Core.Logging; +using AzzyBot.Core.Services.Interfaces; +using AzzyBot.Core.Utilities.Encryption; +using AzzyBot.Data; +using AzzyBot.Data.Entities; using DSharpPlus.Entities; using Microsoft.Extensions.Logging; -namespace AzzyBot.Services.Modules; +namespace AzzyBot.Bot.Services.Modules; public sealed class AzuraCastUpdateService(ILogger logger, IQueuedBackgroundTask taskQueue, AzuraCastApiService azuraCastApiService, DbActions dbActions, DiscordBotService botService) { diff --git a/src/AzzyBot-Next/Services/Modules/CoreServiceHost.cs b/src/AzzyBot-Next.Bot/Services/Modules/CoreServiceHost.cs similarity index 95% rename from src/AzzyBot-Next/Services/Modules/CoreServiceHost.cs rename to src/AzzyBot-Next.Bot/Services/Modules/CoreServiceHost.cs index d063450a..ae08aaa2 100644 --- a/src/AzzyBot-Next/Services/Modules/CoreServiceHost.cs +++ b/src/AzzyBot-Next.Bot/Services/Modules/CoreServiceHost.cs @@ -5,18 +5,18 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using AzzyBot.Database; -using AzzyBot.Database.Entities; -using AzzyBot.Logging; -using AzzyBot.Settings; -using AzzyBot.Utilities; -using AzzyBot.Utilities.Encryption; +using AzzyBot.Bot.Settings; +using AzzyBot.Core.Logging; +using AzzyBot.Core.Utilities; +using AzzyBot.Core.Utilities.Encryption; +using AzzyBot.Data; +using AzzyBot.Data.Entities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Storage; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -namespace AzzyBot.Services.Modules; +namespace AzzyBot.Bot.Services.Modules; public sealed class CoreServiceHost(IDbContextFactory dbContextFactory, ILogger logger, AzzyBotSettingsRecord settings) : IHostedService { diff --git a/src/AzzyBot-Next/Services/TimerServiceHost.cs b/src/AzzyBot-Next.Bot/Services/TimerServiceHost.cs similarity index 96% rename from src/AzzyBot-Next/Services/TimerServiceHost.cs rename to src/AzzyBot-Next.Bot/Services/TimerServiceHost.cs index 114579ed..7b24444e 100644 --- a/src/AzzyBot-Next/Services/TimerServiceHost.cs +++ b/src/AzzyBot-Next.Bot/Services/TimerServiceHost.cs @@ -2,13 +2,13 @@ using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; -using AzzyBot.Logging; -using AzzyBot.Utilities; -using AzzyBot.Utilities.Enums; +using AzzyBot.Bot.Utilities.Enums; +using AzzyBot.Core.Logging; +using AzzyBot.Core.Utilities; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -namespace AzzyBot.Services; +namespace AzzyBot.Bot.Services; public sealed class TimerServiceHost(ILogger logger, AzzyBackgroundService azuraCastBackgroundService, DiscordBotService discordBotService, UpdaterService updaterService) : IAsyncDisposable, IHostedService { diff --git a/src/AzzyBot-Next/Services/UpdaterService.cs b/src/AzzyBot-Next.Bot/Services/UpdaterService.cs similarity index 96% rename from src/AzzyBot-Next/Services/UpdaterService.cs rename to src/AzzyBot-Next.Bot/Services/UpdaterService.cs index af4f672d..d23c8c8c 100644 --- a/src/AzzyBot-Next/Services/UpdaterService.cs +++ b/src/AzzyBot-Next.Bot/Services/UpdaterService.cs @@ -2,14 +2,15 @@ using System.Collections.Generic; using System.Text.Json; using System.Threading.Tasks; -using AzzyBot.Logging; -using AzzyBot.Settings; -using AzzyBot.Utilities; -using AzzyBot.Utilities.Records; +using AzzyBot.Bot.Settings; +using AzzyBot.Bot.Utilities; +using AzzyBot.Bot.Utilities.Records; +using AzzyBot.Core.Logging; +using AzzyBot.Core.Utilities; using DSharpPlus.Entities; using Microsoft.Extensions.Logging; -namespace AzzyBot.Services; +namespace AzzyBot.Bot.Services; public sealed class UpdaterService(ILogger logger, AzzyBotSettingsRecord settings, DiscordBotService botService, WebRequestService webService) { diff --git a/src/AzzyBot-Next/Services/WebRequestService.cs b/src/AzzyBot-Next.Bot/Services/WebRequestService.cs similarity index 99% rename from src/AzzyBot-Next/Services/WebRequestService.cs rename to src/AzzyBot-Next.Bot/Services/WebRequestService.cs index aac5c57e..0a43f1c5 100644 --- a/src/AzzyBot-Next/Services/WebRequestService.cs +++ b/src/AzzyBot-Next.Bot/Services/WebRequestService.cs @@ -11,11 +11,11 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using AzzyBot.Logging; -using AzzyBot.Utilities; +using AzzyBot.Core.Logging; +using AzzyBot.Core.Utilities; using Microsoft.Extensions.Logging; -namespace AzzyBot.Services; +namespace AzzyBot.Bot.Services; public sealed class WebRequestService(ILogger logger) : IDisposable { diff --git a/src/AzzyBot-Next/Settings/AzzyBotSettings-Docker.json b/src/AzzyBot-Next.Bot/Settings/AzzyBotSettings-Docker.json similarity index 74% rename from src/AzzyBot-Next/Settings/AzzyBotSettings-Docker.json rename to src/AzzyBot-Next.Bot/Settings/AzzyBotSettings-Docker.json index f1191778..b20473e8 100644 --- a/src/AzzyBot-Next/Settings/AzzyBotSettings-Docker.json +++ b/src/AzzyBot-Next.Bot/Settings/AzzyBotSettings-Docker.json @@ -1,18 +1,18 @@ { - "BotToken": "", + "BotToken": null, "ServerId": 0, "ErrorChannelId": 0, "NotificationChannelId": 0, "LogRetentionDays": 7, "Database": { - "EncryptionKey": "", - "NewEncryptionKey": "" + "EncryptionKey": null, + "NewEncryptionKey": null }, "DiscordStatus": { "Activity": 2, "Doing": "Music", "Status": 1, - "StreamUrl": "" + "StreamUrl": null }, "Updater": { "DisplayChangelog": true, diff --git a/src/AzzyBot-Next/Settings/AzzyBotSettings.json b/src/AzzyBot-Next.Bot/Settings/AzzyBotSettings.json similarity index 75% rename from src/AzzyBot-Next/Settings/AzzyBotSettings.json rename to src/AzzyBot-Next.Bot/Settings/AzzyBotSettings.json index 4bb79665..b12a851e 100644 --- a/src/AzzyBot-Next/Settings/AzzyBotSettings.json +++ b/src/AzzyBot-Next.Bot/Settings/AzzyBotSettings.json @@ -1,23 +1,23 @@ { - "BotToken": "", + "BotToken": null, "ServerId": 0, "ErrorChannelId": 0, "NotificationChannelId": 0, "LogRetentionDays": 7, "Database": { - "EncryptionKey": "", - "NewEncryptionKey": "", + "EncryptionKey": null, + "NewEncryptionKey": null, "Host": "localhost", "Port": 5432, "User": "azzybot", - "Password": "", + "Password": null, "DatabaseName": "azzybot" }, "DiscordStatus": { "Activity": 2, "Doing": "Music", "Status": 1, - "StreamUrl": "" + "StreamUrl": null }, "Updater": { "DisplayChangelog": true, diff --git a/src/AzzyBot-Next/Settings/AzzyBotSettingsRecord.cs b/src/AzzyBot-Next.Bot/Settings/AzzyBotSettingsRecord.cs similarity index 98% rename from src/AzzyBot-Next/Settings/AzzyBotSettingsRecord.cs rename to src/AzzyBot-Next.Bot/Settings/AzzyBotSettingsRecord.cs index 258e8157..ca7398ba 100644 --- a/src/AzzyBot-Next/Settings/AzzyBotSettingsRecord.cs +++ b/src/AzzyBot-Next.Bot/Settings/AzzyBotSettingsRecord.cs @@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis; using System.Text.Json.Serialization; -namespace AzzyBot.Settings; +namespace AzzyBot.Bot.Settings; public sealed record AzzyBotSettingsRecord { diff --git a/src/AzzyBot-Next/Settings/AzzyBotStatsRecord.cs b/src/AzzyBot-Next.Bot/Settings/AzzyBotStatsRecord.cs similarity index 95% rename from src/AzzyBot-Next/Settings/AzzyBotStatsRecord.cs rename to src/AzzyBot-Next.Bot/Settings/AzzyBotStatsRecord.cs index 209530b0..ba6faf28 100644 --- a/src/AzzyBot-Next/Settings/AzzyBotStatsRecord.cs +++ b/src/AzzyBot-Next.Bot/Settings/AzzyBotStatsRecord.cs @@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis; using System.Text.Json.Serialization; -namespace AzzyBot.Settings; +namespace AzzyBot.Bot.Settings; public sealed record AzzyBotStatsRecord { diff --git a/src/AzzyBot-Next/Startup.cs b/src/AzzyBot-Next.Bot/Startup.cs similarity index 94% rename from src/AzzyBot-Next/Startup.cs rename to src/AzzyBot-Next.Bot/Startup.cs index d8b55f2d..c68cbcec 100644 --- a/src/AzzyBot-Next/Startup.cs +++ b/src/AzzyBot-Next.Bot/Startup.cs @@ -2,11 +2,12 @@ using System.IO; using System.Linq; using System.Threading.Tasks; -using AzzyBot.Extensions; -using AzzyBot.Utilities; +using AzzyBot.Bot.Extensions; +using AzzyBot.Core.Extensions; +using AzzyBot.Core.Utilities; using Microsoft.Extensions.Hosting; -namespace AzzyBot; +namespace AzzyBot.Bot; public static class Startup { diff --git a/src/AzzyBot-Next/Utilities/FileComparer.cs b/src/AzzyBot-Next.Bot/Utilities/AzuraFileComparer.cs similarity index 84% rename from src/AzzyBot-Next/Utilities/FileComparer.cs rename to src/AzzyBot-Next.Bot/Utilities/AzuraFileComparer.cs index db899ba3..fa4d0dcd 100644 --- a/src/AzzyBot-Next/Utilities/FileComparer.cs +++ b/src/AzzyBot-Next.Bot/Utilities/AzuraFileComparer.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using AzzyBot.Utilities.Records.AzuraCast; +using AzzyBot.Bot.Utilities.Records.AzuraCast; -namespace AzzyBot.Utilities; +namespace AzzyBot.Bot.Utilities; [SuppressMessage("Roslynator", "RCS1241:Implement non-generic counterpart", Justification = "Not needed")] -public sealed class FileComparer : IEqualityComparer +public sealed class AzuraFileComparer : IEqualityComparer { public bool Equals(AzuraFilesRecord? x, AzuraFilesRecord? y) { diff --git a/src/AzzyBot-Next/Utilities/AzzyHelp.cs b/src/AzzyBot-Next.Bot/Utilities/AzzyHelp.cs similarity index 98% rename from src/AzzyBot-Next/Utilities/AzzyHelp.cs rename to src/AzzyBot-Next.Bot/Utilities/AzzyHelp.cs index be30b283..724a5299 100644 --- a/src/AzzyBot-Next/Utilities/AzzyHelp.cs +++ b/src/AzzyBot-Next.Bot/Utilities/AzzyHelp.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using System.Linq; -using AzzyBot.Utilities.Records; +using AzzyBot.Bot.Utilities.Records; using DSharpPlus.Commands.Trees; using DSharpPlus.Entities; -namespace AzzyBot.Utilities; +namespace AzzyBot.Bot.Utilities; public static class AzzyHelp { diff --git a/src/AzzyBot-Next/Utilities/EmbedBuilder.cs b/src/AzzyBot-Next.Bot/Utilities/EmbedBuilder.cs similarity index 98% rename from src/AzzyBot-Next/Utilities/EmbedBuilder.cs rename to src/AzzyBot-Next.Bot/Utilities/EmbedBuilder.cs index f0c663b1..7eca9f56 100644 --- a/src/AzzyBot-Next/Utilities/EmbedBuilder.cs +++ b/src/AzzyBot-Next.Bot/Utilities/EmbedBuilder.cs @@ -4,14 +4,16 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using AzzyBot.Database.Entities; -using AzzyBot.Utilities.Encryption; -using AzzyBot.Utilities.Enums; -using AzzyBot.Utilities.Records; -using AzzyBot.Utilities.Records.AzuraCast; +using AzzyBot.Bot.Utilities.Records; +using AzzyBot.Bot.Utilities.Records.AzuraCast; +using AzzyBot.Core.Utilities; +using AzzyBot.Core.Utilities.Encryption; +using AzzyBot.Core.Utilities.Enums; +using AzzyBot.Core.Utilities.Records; +using AzzyBot.Data.Entities; using DSharpPlus.Entities; -namespace AzzyBot.Utilities; +namespace AzzyBot.Bot.Utilities; public static class EmbedBuilder { diff --git a/src/AzzyBot-Next/Utilities/Enums/AzuraCastChecks.cs b/src/AzzyBot-Next.Bot/Utilities/Enums/AzuraCastChecks.cs similarity index 75% rename from src/AzzyBot-Next/Utilities/Enums/AzuraCastChecks.cs rename to src/AzzyBot-Next.Bot/Utilities/Enums/AzuraCastChecks.cs index 45300b8c..2f37a4fe 100644 --- a/src/AzzyBot-Next/Utilities/Enums/AzuraCastChecks.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Enums/AzuraCastChecks.cs @@ -1,4 +1,4 @@ -namespace AzzyBot.Utilities.Enums; +namespace AzzyBot.Bot.Utilities.Enums; public enum AzuraCastChecks { diff --git a/src/AzzyBot-Next/Utilities/Enums/AzuraCastDiscordPerm.cs b/src/AzzyBot-Next.Bot/Utilities/Enums/AzuraCastDiscordPerm.cs similarity index 71% rename from src/AzzyBot-Next/Utilities/Enums/AzuraCastDiscordPerm.cs rename to src/AzzyBot-Next.Bot/Utilities/Enums/AzuraCastDiscordPerm.cs index 326349b7..59c39091 100644 --- a/src/AzzyBot-Next/Utilities/Enums/AzuraCastDiscordPerm.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Enums/AzuraCastDiscordPerm.cs @@ -1,4 +1,4 @@ -namespace AzzyBot.Utilities.Enums; +namespace AzzyBot.Bot.Utilities.Enums; public enum AzuraCastDiscordPerm { diff --git a/src/AzzyBot-Next/Utilities/Enums/AzzyModules.cs b/src/AzzyBot-Next.Bot/Utilities/Enums/AzzyModules.cs similarity index 50% rename from src/AzzyBot-Next/Utilities/Enums/AzzyModules.cs rename to src/AzzyBot-Next.Bot/Utilities/Enums/AzzyModules.cs index 3fda39ff..ad892fcd 100644 --- a/src/AzzyBot-Next/Utilities/Enums/AzzyModules.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Enums/AzzyModules.cs @@ -1,4 +1,4 @@ -namespace AzzyBot.Utilities.Enums; +namespace AzzyBot.Bot.Utilities.Enums; public enum AzzyModules { diff --git a/src/AzzyBot-Next/Utilities/Helpers/AzuraApiEndpoints.cs b/src/AzzyBot-Next.Bot/Utilities/Helpers/AzuraApiEndpoints.cs similarity index 96% rename from src/AzzyBot-Next/Utilities/Helpers/AzuraApiEndpoints.cs rename to src/AzzyBot-Next.Bot/Utilities/Helpers/AzuraApiEndpoints.cs index 0ac0bf9b..136c96b0 100644 --- a/src/AzzyBot-Next/Utilities/Helpers/AzuraApiEndpoints.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Helpers/AzuraApiEndpoints.cs @@ -1,4 +1,4 @@ -namespace AzzyBot.Utilities.Helpers; +namespace AzzyBot.Bot.Utilities.Helpers; public static class AzuraApiEndpoints { diff --git a/src/AzzyBot-Next/Utilities/Helpers/AzuraApiFilters.cs b/src/AzzyBot-Next.Bot/Utilities/Helpers/AzuraApiFilters.cs similarity index 89% rename from src/AzzyBot-Next/Utilities/Helpers/AzuraApiFilters.cs rename to src/AzzyBot-Next.Bot/Utilities/Helpers/AzuraApiFilters.cs index efec0841..df2c1281 100644 --- a/src/AzzyBot-Next/Utilities/Helpers/AzuraApiFilters.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Helpers/AzuraApiFilters.cs @@ -1,4 +1,4 @@ -namespace AzzyBot.Utilities.Helpers; +namespace AzzyBot.Bot.Utilities.Helpers; public static class AzuraApiFilters { diff --git a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraAdminStationConfigRecord.cs b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraAdminStationConfigRecord.cs similarity index 93% rename from src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraAdminStationConfigRecord.cs rename to src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraAdminStationConfigRecord.cs index 7628de28..7376042f 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraAdminStationConfigRecord.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraAdminStationConfigRecord.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace AzzyBot.Utilities.Records.AzuraCast; +namespace AzzyBot.Bot.Utilities.Records.AzuraCast; public sealed record AzuraAdminStationConfigRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraFilesRecord.cs b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraFilesRecord.cs similarity index 92% rename from src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraFilesRecord.cs rename to src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraFilesRecord.cs index 7f7a8d11..3e303042 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraFilesRecord.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraFilesRecord.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace AzzyBot.Utilities.Records.AzuraCast; +namespace AzzyBot.Bot.Utilities.Records.AzuraCast; public sealed record AzuraFilesRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraHardwareStatsRecord.cs b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraHardwareStatsRecord.cs similarity index 98% rename from src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraHardwareStatsRecord.cs rename to src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraHardwareStatsRecord.cs index eca52641..00039b87 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraHardwareStatsRecord.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraHardwareStatsRecord.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -namespace AzzyBot.Utilities.Records.AzuraCast; +namespace AzzyBot.Bot.Utilities.Records.AzuraCast; public sealed record AzuraHardwareStatsRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraInstanceServiceRecord.cs b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraInstanceServiceRecord.cs similarity index 77% rename from src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraInstanceServiceRecord.cs rename to src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraInstanceServiceRecord.cs index e9bf1cea..a95fa464 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraInstanceServiceRecord.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraInstanceServiceRecord.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace AzzyBot.Utilities.Records.AzuraCast; +namespace AzzyBot.Bot.Utilities.Records.AzuraCast; public sealed record AzuraInstanceServiceRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraMediaItemRecord.cs b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraMediaItemRecord.cs similarity index 78% rename from src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraMediaItemRecord.cs rename to src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraMediaItemRecord.cs index d0f733ca..d04276a8 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraMediaItemRecord.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraMediaItemRecord.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace AzzyBot.Utilities.Records.AzuraCast; +namespace AzzyBot.Bot.Utilities.Records.AzuraCast; public sealed record AzuraMediaItemRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraNowPlayingDataRecord.cs b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraNowPlayingDataRecord.cs similarity index 95% rename from src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraNowPlayingDataRecord.cs rename to src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraNowPlayingDataRecord.cs index 6f55652f..0b65c571 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraNowPlayingDataRecord.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraNowPlayingDataRecord.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace AzzyBot.Utilities.Records.AzuraCast; +namespace AzzyBot.Bot.Utilities.Records.AzuraCast; public sealed record AzuraNowPlayingDataRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraPlaylistRecord.cs b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraPlaylistRecord.cs similarity index 95% rename from src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraPlaylistRecord.cs rename to src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraPlaylistRecord.cs index 668da70c..a333549f 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraPlaylistRecord.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraPlaylistRecord.cs @@ -1,7 +1,7 @@ using System; using System.Text.Json.Serialization; -namespace AzzyBot.Utilities.Records.AzuraCast; +namespace AzzyBot.Bot.Utilities.Records.AzuraCast; public sealed record AzuraPlaylistRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraPlaylistStateRecord.cs b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraPlaylistStateRecord.cs similarity index 85% rename from src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraPlaylistStateRecord.cs rename to src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraPlaylistStateRecord.cs index 6b543645..dfe967e1 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraPlaylistStateRecord.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraPlaylistStateRecord.cs @@ -1,4 +1,4 @@ -namespace AzzyBot.Utilities.Records.AzuraCast; +namespace AzzyBot.Bot.Utilities.Records.AzuraCast; public sealed record AzuraPlaylistStateRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraRequestQueueItemRecord.cs b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraRequestQueueItemRecord.cs similarity index 87% rename from src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraRequestQueueItemRecord.cs rename to src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraRequestQueueItemRecord.cs index 191ecab7..f83cc89e 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraRequestQueueItemRecord.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraRequestQueueItemRecord.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace AzzyBot.Utilities.Records.AzuraCast; +namespace AzzyBot.Bot.Utilities.Records.AzuraCast; public sealed record AzuraRequestQueueItemRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraRequestRecord.cs b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraRequestRecord.cs similarity index 83% rename from src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraRequestRecord.cs rename to src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraRequestRecord.cs index e51e6651..5287966c 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraRequestRecord.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraRequestRecord.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace AzzyBot.Utilities.Records.AzuraCast; +namespace AzzyBot.Bot.Utilities.Records.AzuraCast; public sealed record AzuraRequestRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraSongDataRecord.cs b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraSongDataRecord.cs similarity index 95% rename from src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraSongDataRecord.cs rename to src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraSongDataRecord.cs index 73d00f65..edbd8300 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraSongDataRecord.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraSongDataRecord.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace AzzyBot.Utilities.Records.AzuraCast; +namespace AzzyBot.Bot.Utilities.Records.AzuraCast; public sealed record AzuraSongDataRecord : AzuraSongAdvancedDataRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraStationHistoryItemRecord.cs b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraStationHistoryItemRecord.cs similarity index 94% rename from src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraStationHistoryItemRecord.cs rename to src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraStationHistoryItemRecord.cs index fac3eb43..bae2a76e 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraStationHistoryItemRecord.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraStationHistoryItemRecord.cs @@ -1,7 +1,7 @@ using System; using System.Text.Json.Serialization; -namespace AzzyBot.Utilities.Records.AzuraCast; +namespace AzzyBot.Bot.Utilities.Records.AzuraCast; public sealed record AzuraStationHistoryItemRecord : AzuraStationQueueItemRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraStationQueueItemRecord.cs b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraStationQueueItemRecord.cs similarity index 93% rename from src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraStationQueueItemRecord.cs rename to src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraStationQueueItemRecord.cs index bc471730..6396d769 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraStationQueueItemRecord.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraStationQueueItemRecord.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace AzzyBot.Utilities.Records.AzuraCast; +namespace AzzyBot.Bot.Utilities.Records.AzuraCast; public record AzuraStationQueueItemRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraStationStatusRecord.cs b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraStationStatusRecord.cs similarity index 84% rename from src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraStationStatusRecord.cs rename to src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraStationStatusRecord.cs index f78f60dc..8d195326 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraStationStatusRecord.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraStationStatusRecord.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace AzzyBot.Utilities.Records.AzuraCast; +namespace AzzyBot.Bot.Utilities.Records.AzuraCast; public sealed record AzuraStationStatusRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraStatusRecord.cs b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraStatusRecord.cs similarity index 75% rename from src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraStatusRecord.cs rename to src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraStatusRecord.cs index 4755daae..fca09dca 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraStatusRecord.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraStatusRecord.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace AzzyBot.Utilities.Records.AzuraCast; +namespace AzzyBot.Bot.Utilities.Records.AzuraCast; public record AzuraStatusRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraSystemLogRecord.cs b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraSystemLogRecord.cs similarity index 77% rename from src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraSystemLogRecord.cs rename to src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraSystemLogRecord.cs index 65f09a7a..ff22cfe2 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraSystemLogRecord.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraSystemLogRecord.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace AzzyBot.Utilities.Records.AzuraCast; +namespace AzzyBot.Bot.Utilities.Records.AzuraCast; public sealed record AzuraSystemLogRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraSystemLogsRecord.cs b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraSystemLogsRecord.cs similarity index 89% rename from src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraSystemLogsRecord.cs rename to src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraSystemLogsRecord.cs index 40c495c9..d24f6471 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraSystemLogsRecord.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraSystemLogsRecord.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -namespace AzzyBot.Utilities.Records.AzuraCast; +namespace AzzyBot.Bot.Utilities.Records.AzuraCast; public sealed record AzuraSystemLogsRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraTrackRecord.cs b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraTrackRecord.cs similarity index 89% rename from src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraTrackRecord.cs rename to src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraTrackRecord.cs index 7a9c511b..1b6ef722 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraTrackRecord.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraTrackRecord.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace AzzyBot.Utilities.Records.AzuraCast; +namespace AzzyBot.Bot.Utilities.Records.AzuraCast; public sealed record AzuraTrackRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraUpdateRecord.cs b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraUpdateRecord.cs similarity index 93% rename from src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraUpdateRecord.cs rename to src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraUpdateRecord.cs index da6715b8..fe480fd1 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzuraCast/AzuraUpdateRecord.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Records/AzuraCast/AzuraUpdateRecord.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -namespace AzzyBot.Utilities.Records.AzuraCast; +namespace AzzyBot.Bot.Utilities.Records.AzuraCast; public sealed record AzuraUpdateRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzzyHelpRecord.cs b/src/AzzyBot-Next.Bot/Utilities/Records/AzzyHelpRecord.cs similarity index 92% rename from src/AzzyBot-Next/Utilities/Records/AzzyHelpRecord.cs rename to src/AzzyBot-Next.Bot/Utilities/Records/AzzyHelpRecord.cs index 63e78c14..9e67459a 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzzyHelpRecord.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Records/AzzyHelpRecord.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace AzzyBot.Utilities.Records; +namespace AzzyBot.Bot.Utilities.Records; public sealed record AzzyHelpRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzzyUpdateRecord.cs b/src/AzzyBot-Next.Bot/Utilities/Records/AzzyUpdateRecord.cs similarity index 89% rename from src/AzzyBot-Next/Utilities/Records/AzzyUpdateRecord.cs rename to src/AzzyBot-Next.Bot/Utilities/Records/AzzyUpdateRecord.cs index daae536e..8bfe6757 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzzyUpdateRecord.cs +++ b/src/AzzyBot-Next.Bot/Utilities/Records/AzzyUpdateRecord.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace AzzyBot.Utilities.Records; +namespace AzzyBot.Bot.Utilities.Records; public sealed record AzzyUpdateRecord { diff --git a/src/AzzyBot-Next/runtimeconfig.template.json b/src/AzzyBot-Next.Bot/runtimeconfig.template.json similarity index 91% rename from src/AzzyBot-Next/runtimeconfig.template.json rename to src/AzzyBot-Next.Bot/runtimeconfig.template.json index 13da682a..ed037206 100644 --- a/src/AzzyBot-Next/runtimeconfig.template.json +++ b/src/AzzyBot-Next.Bot/runtimeconfig.template.json @@ -6,6 +6,7 @@ "System.GC.Server": true, "System.GC.Concurrent": true, "System.GC.NoAffinitize": true, + "System.GC.DynamicAdaptationMode": 1, "System.Globalization.Invariant": false, "System.Net.Http.SocketsHttpHandler.Http2Support": true, "System.Net.SocketsHttpHandler.Http3Support": true diff --git a/src/AzzyBot-Next.Core/AzzyBot-Next.Core.csproj b/src/AzzyBot-Next.Core/AzzyBot-Next.Core.csproj new file mode 100644 index 00000000..586cc170 --- /dev/null +++ b/src/AzzyBot-Next.Core/AzzyBot-Next.Core.csproj @@ -0,0 +1,148 @@ + + + + AzzyBot.Core + Library + net8.0 + disable + enable + nullable + True + x64;ARM64;AnyCPU + AnyCPU + True + False + Sella-GH, AzzyBot Contributors + 2.0.0-preview3.1 + © 2024 - $(Authors) + AzzyBot-Next.Core + Kind of music bot for discord, written in C# and with DSharpPlus. This bot is dedicated for the use with AzuraCast and does not work at it's fully glory without it. + https://github.com/Sella-GH/AzzyBot + latest-all + $(NoWarn);CA1812;CA2007 + $(MSBuildProjectDirectory)\$(IntermediateOutputPath)=. + Debug;Release;Docker;Docker-debug + false + + + + True + AzzyBot-Dev.Core + AzzyBot-Next-Dev.Core + embedded + + + + True + AzzyBot-Dev.Core + AzzyBot-Next-Dev.Core + embedded + + + + True + AzzyBot-Dev.Core + AzzyBot-Next-Dev.Core + embedded + + + + True + AzzyBot-Docker.Core + AzzyBot-Next-Docker.Core + True + embedded + + + + True + AzzyBot-Docker.Core + AzzyBot-Next-Docker.Core + True + embedded + + + + True + AzzyBot-Docker.Core + AzzyBot-Next-Docker.Core + True + embedded + + + + True + AzzyBot-Docker-Dev.Core + AzzyBot-Next-Docker-Dev.Core + embedded + + + + True + AzzyBot-Docker-Dev.Core + AzzyBot-Next-Docker-Dev.Core + embedded + + + + True + AzzyBot-Docker-Dev.Core + AzzyBot-Next-Docker-Dev.Core + embedded + + + + True + AzzyBot.Core + True + embedded + + + + True + AzzyBot.Core + True + embedded + + + + True + AzzyBot.Core + True + embedded + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + PreserveNewest + + + + diff --git a/src/AzzyBot-Next/Extensions/LoggingBuilderExtensions.cs b/src/AzzyBot-Next.Core/Extensions/LoggingBuilderExtensions.cs similarity index 97% rename from src/AzzyBot-Next/Extensions/LoggingBuilderExtensions.cs rename to src/AzzyBot-Next.Core/Extensions/LoggingBuilderExtensions.cs index 154bf67a..6e220486 100644 --- a/src/AzzyBot-Next/Extensions/LoggingBuilderExtensions.cs +++ b/src/AzzyBot-Next.Core/Extensions/LoggingBuilderExtensions.cs @@ -1,13 +1,13 @@ using System; using System.IO; -using AzzyBot.Logging; +using AzzyBot.Core.Logging; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Configuration; using Microsoft.Extensions.Logging.Console; -namespace AzzyBot.Extensions; +namespace AzzyBot.Core.Extensions; public static class LoggingBuilderExtensions { diff --git a/src/AzzyBot-Next/Logging/FileLogger.cs b/src/AzzyBot-Next.Core/Logging/FileLogger.cs similarity index 98% rename from src/AzzyBot-Next/Logging/FileLogger.cs rename to src/AzzyBot-Next.Core/Logging/FileLogger.cs index 95fedc7d..e5e16dc6 100644 --- a/src/AzzyBot-Next/Logging/FileLogger.cs +++ b/src/AzzyBot-Next.Core/Logging/FileLogger.cs @@ -3,7 +3,7 @@ using System.Text; using Microsoft.Extensions.Logging; -namespace AzzyBot.Logging; +namespace AzzyBot.Core.Logging; public sealed class FileLogger : ILogger { diff --git a/src/AzzyBot-Next/Logging/FileLoggerConfiguration.cs b/src/AzzyBot-Next.Core/Logging/FileLoggerConfiguration.cs similarity index 76% rename from src/AzzyBot-Next/Logging/FileLoggerConfiguration.cs rename to src/AzzyBot-Next.Core/Logging/FileLoggerConfiguration.cs index d2979209..c5437ba9 100644 --- a/src/AzzyBot-Next/Logging/FileLoggerConfiguration.cs +++ b/src/AzzyBot-Next.Core/Logging/FileLoggerConfiguration.cs @@ -1,4 +1,4 @@ -namespace AzzyBot.Logging; +namespace AzzyBot.Core.Logging; public sealed class FileLoggerConfiguration { diff --git a/src/AzzyBot-Next/Logging/FileLoggerProvider.cs b/src/AzzyBot-Next.Core/Logging/FileLoggerProvider.cs similarity index 96% rename from src/AzzyBot-Next/Logging/FileLoggerProvider.cs rename to src/AzzyBot-Next.Core/Logging/FileLoggerProvider.cs index eb7705be..54a11207 100644 --- a/src/AzzyBot-Next/Logging/FileLoggerProvider.cs +++ b/src/AzzyBot-Next.Core/Logging/FileLoggerProvider.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -namespace AzzyBot.Logging; +namespace AzzyBot.Core.Logging; public sealed class FileLoggerProvider : ILoggerProvider { diff --git a/src/AzzyBot-Next/Logging/LoggerActions.cs b/src/AzzyBot-Next.Core/Logging/LoggerActions.cs similarity index 74% rename from src/AzzyBot-Next/Logging/LoggerActions.cs rename to src/AzzyBot-Next.Core/Logging/LoggerActions.cs index eb07ecbb..394e9eea 100644 --- a/src/AzzyBot-Next/Logging/LoggerActions.cs +++ b/src/AzzyBot-Next.Core/Logging/LoggerActions.cs @@ -1,115 +1,112 @@ using System; using System.Net.Http; -using AzzyBot.Commands.Checks; -using AzzyBot.Services; -using AzzyBot.Services.Modules; using Microsoft.Extensions.Logging; -namespace AzzyBot.Logging; +namespace AzzyBot.Core.Logging; public static partial class LoggerActions { [LoggerMessage(0, LogLevel.Debug, "Starting logfile cleaning")] - public static partial void LogfileCleaning(this ILogger logger); + public static partial void LogfileCleaning(this ILogger logger); [LoggerMessage(1, LogLevel.Debug, "{number} logfiles were deleted")] - public static partial void LogfileDeleted(this ILogger logger, int number); + public static partial void LogfileDeleted(this ILogger logger, int number); [LoggerMessage(10, LogLevel.Debug, "Starting global timer")] - public static partial void GlobalTimerStart(this ILogger logger); + public static partial void GlobalTimerStart(this ILogger logger); [LoggerMessage(11, LogLevel.Debug, "Global timer ticked")] - public static partial void GlobalTimerTick(this ILogger logger); + public static partial void GlobalTimerTick(this ILogger logger); [LoggerMessage(12, LogLevel.Debug, "Global timer checking for bot updates")] - public static partial void GlobalTimerCheckForUpdates(this ILogger logger); + public static partial void GlobalTimerCheckForUpdates(this ILogger logger); [LoggerMessage(13, LogLevel.Debug, "Global timer checking for AzuraCast files changes")] - public static partial void GlobalTimerCheckForAzuraCastFiles(this ILogger logger); + public static partial void GlobalTimerCheckForAzuraCastFiles(this ILogger logger); [LoggerMessage(14, LogLevel.Debug, "Global timer checking for AzuraCast updates")] - public static partial void GlobalTimerCheckForAzuraCastUpdates(this ILogger logger); + public static partial void GlobalTimerCheckForAzuraCastUpdates(this ILogger logger); [LoggerMessage(15, LogLevel.Debug, "Global timer checking for AzuraCast instance status")] - public static partial void GlobalTimerCheckForAzuraCastStatus(this ILogger logger); + public static partial void GlobalTimerCheckForAzuraCastStatus(this ILogger logger); [LoggerMessage(16, LogLevel.Debug, "Global timer checking for AzuraCast api permissions")] - public static partial void GlobalTimerCheckForAzuraCastApi(this ILogger logger); + public static partial void GlobalTimerCheckForAzuraCastApi(this ILogger logger); [LoggerMessage(20, LogLevel.Debug, "BackgroundServiceHost started")] - public static partial void BackgroundServiceHostStart(this ILogger logger); + public static partial void BackgroundServiceHostStart(this ILogger logger); [LoggerMessage(21, LogLevel.Debug, "BackgroundService started")] - public static partial void BackgroundServiceStart(this ILogger logger); + public static partial void BackgroundServiceStart(this ILogger logger); [LoggerMessage(22, LogLevel.Debug, "BackgroundServiceHost running")] - public static partial void BackgroundServiceHostRun(this ILogger logger); + public static partial void BackgroundServiceHostRun(this ILogger logger); [LoggerMessage(23, LogLevel.Debug, "Creating work items for: {item}")] public static partial void BackgroundServiceWorkItem(this ILogger logger, string item); [LoggerMessage(30, LogLevel.Debug, "Station {iId}-{dId}-{sId} has different files")] - public static partial void BackgroundServiceStationFilesChanged(this ILogger logger, int iId, int dId, int sId); + public static partial void BackgroundServiceStationFilesChanged(this ILogger logger, int iId, int dId, int sId); [LoggerMessage(31, LogLevel.Debug, "Instance {id} is {status}")] - public static partial void BackgroundServiceInstanceStatus(this ILogger logger, int id, string status); + public static partial void BackgroundServiceInstanceStatus(this ILogger logger, int id, string status); [LoggerMessage(40, LogLevel.Debug, "AzuraCastDiscordPermission is {perm}")] - public static partial void AzuraCastDiscordPermission(this ILogger logger, string perm); + public static partial void AzuraCastDiscordPermission(this ILogger logger, string perm); [LoggerMessage(90, LogLevel.Debug, "Stopping global timer")] - public static partial void GlobalTimerStop(this ILogger logger); + public static partial void GlobalTimerStop(this ILogger logger); [LoggerMessage(91, LogLevel.Debug, "BackgroundServiceHost stopped")] - public static partial void BackgroundServiceHostStop(this ILogger logger); + public static partial void BackgroundServiceHostStop(this ILogger logger); [LoggerMessage(99, LogLevel.Debug, "Operation {ops} canceled by CancellationToken")] public static partial void OperationCanceled(this ILogger logger, string ops); [LoggerMessage(100, LogLevel.Information, "Starting {name} in version {version} on {os}-{arch}")] - public static partial void BotStarting(this ILogger logger, string name, string version, string os, string arch); + public static partial void BotStarting(this ILogger logger, string name, string version, string os, string arch); [LoggerMessage(101, LogLevel.Information, "AzzyBot is ready to accept commands")] - public static partial void BotReady(this ILogger logger); + public static partial void BotReady(this ILogger logger); [LoggerMessage(102, LogLevel.Information, "Invite me using the following url: {invite}")] - public static partial void InviteUrl(this ILogger logger, string invite); + public static partial void InviteUrl(this ILogger logger, string invite); [LoggerMessage(103, LogLevel.Information, "Command {command} requested by {user} to execute")] public static partial void CommandRequested(this ILogger logger, string command, string user); [LoggerMessage(104, LogLevel.Information, "Commands error is: {ex}")] - public static partial void CommandsErrorType(this ILogger logger, string ex); + public static partial void CommandsErrorType(this ILogger logger, string ex); [LoggerMessage(105, LogLevel.Information, "Starting Database Reencryption")] - public static partial void DatabaseReencryptionStart(this ILogger logger); + public static partial void DatabaseReencryptionStart(this ILogger logger); [LoggerMessage(106, LogLevel.Information, "Database Reencryption completed")] - public static partial void DatabaseReencryptionComplete(this ILogger logger); + public static partial void DatabaseReencryptionComplete(this ILogger logger); [LoggerMessage(110, LogLevel.Information, "AzzyBot joined the following Guild: {guild}")] - public static partial void GuildCreated(this ILogger logger, string guild); + public static partial void GuildCreated(this ILogger logger, string guild); [LoggerMessage(111, LogLevel.Information, "AzzyBot was removed from the following Guild: {guild}")] - public static partial void GuildDeleted(this ILogger logger, string guild); + public static partial void GuildDeleted(this ILogger logger, string guild); [LoggerMessage(112, LogLevel.Information, "The following guild is unavailable due to an outage: {guild}")] - public static partial void GuildUnavailable(this ILogger logger, string guild); + public static partial void GuildUnavailable(this ILogger logger, string guild); [LoggerMessage(198, LogLevel.Information, "An update for Azzy is available! Please update now to version: {version} to get the latest fixes and improvements.")] - public static partial void UpdateAvailable(this ILogger logger, string version); + public static partial void UpdateAvailable(this ILogger logger, string version); [LoggerMessage(199, LogLevel.Information, "Stopping AzzyBot")] - public static partial void BotStopping(this ILogger logger); + public static partial void BotStopping(this ILogger logger); [LoggerMessage(200, LogLevel.Warning, "AzzyBot is not connected to Discord!")] public static partial void BotNotConnected(this ILogger logger); [LoggerMessage(201, LogLevel.Warning, "Commands error occured!")] - public static partial void CommandsError(this ILogger logger); + public static partial void CommandsError(this ILogger logger); [LoggerMessage(202, LogLevel.Warning, "Could not fetch channel for id {id}")] - public static partial void ChannelNotFound(this ILogger logger, ulong id); + public static partial void ChannelNotFound(this ILogger logger, ulong id); [LoggerMessage(210, LogLevel.Warning, "Could not find Guild item for guild {guild}")] public static partial void DatabaseGuildNotFound(this ILogger logger, ulong guild); @@ -133,10 +130,10 @@ public static partial class LoggerActions public static partial void DiscordItemNotFound(this ILogger logger, string item, ulong guild); [LoggerMessage(290, LogLevel.Warning, "Latest online version of the bot is empty")] - public static partial void OnlineVersionEmpty(this ILogger logger); + public static partial void OnlineVersionEmpty(this ILogger logger); [LoggerMessage(291, LogLevel.Warning, "Body of online version could not be deserialized")] - public static partial void OnlineVersionUnserializable(this ILogger logger); + public static partial void OnlineVersionUnserializable(this ILogger logger); [LoggerMessage(300, LogLevel.Error, "An error occured while logging the exception to discord: {ex}")] public static partial void UnableToLogException(this ILogger logger, string ex); @@ -157,11 +154,11 @@ public static partial class LoggerActions public static partial void DatabaseTransactionFailed(this ILogger logger, Exception ex); [LoggerMessage(400, LogLevel.Critical, "The given settings can't be parsed, are they filled out?")] - public static partial void UnableToParseSettings(this ILogger logger); + public static partial void UnableToParseSettings(this ILogger logger); [LoggerMessage(401, LogLevel.Critical, "The given BotToken is either missing or invalid")] - public static partial void BotTokenInvalid(this ILogger logger); + public static partial void BotTokenInvalid(this ILogger logger); [LoggerMessage(402, LogLevel.Critical, "An exception occured: ")] - public static partial void ExceptionOccured(this ILogger logger, Exception ex); + public static partial void ExceptionOccured(this ILogger logger, Exception ex); } diff --git a/src/AzzyBot-Next/Modules/Core/Files/AzzyBotStats.json b/src/AzzyBot-Next.Core/Modules/Core/Files/AzzyBotStats.json similarity index 100% rename from src/AzzyBot-Next/Modules/Core/Files/AzzyBotStats.json rename to src/AzzyBot-Next.Core/Modules/Core/Files/AzzyBotStats.json diff --git a/src/AzzyBot-Next/Services/Interfaces/IQueuedBackgroundTask.cs b/src/AzzyBot-Next.Core/Services/Interfaces/IQueuedBackgroundTask.cs similarity index 91% rename from src/AzzyBot-Next/Services/Interfaces/IQueuedBackgroundTask.cs rename to src/AzzyBot-Next.Core/Services/Interfaces/IQueuedBackgroundTask.cs index a3c2fc88..a455dd29 100644 --- a/src/AzzyBot-Next/Services/Interfaces/IQueuedBackgroundTask.cs +++ b/src/AzzyBot-Next.Core/Services/Interfaces/IQueuedBackgroundTask.cs @@ -3,7 +3,7 @@ using System.Threading; using System.Threading.Tasks; -namespace AzzyBot.Services.Interfaces; +namespace AzzyBot.Core.Services.Interfaces; [SuppressMessage("Roslynator", "RCS0036:Remove blank line between single-line declarations of same kind", Justification = "Code Style")] public interface IQueuedBackgroundTask diff --git a/src/AzzyBot-Next/Services/Queues/QueuedBackgroundTask.cs b/src/AzzyBot-Next.Core/Services/Queues/QueuedBackgroundTask.cs similarity index 91% rename from src/AzzyBot-Next/Services/Queues/QueuedBackgroundTask.cs rename to src/AzzyBot-Next.Core/Services/Queues/QueuedBackgroundTask.cs index 58aaa8e3..d3b11008 100644 --- a/src/AzzyBot-Next/Services/Queues/QueuedBackgroundTask.cs +++ b/src/AzzyBot-Next.Core/Services/Queues/QueuedBackgroundTask.cs @@ -2,9 +2,9 @@ using System.Threading; using System.Threading.Channels; using System.Threading.Tasks; -using AzzyBot.Services.Interfaces; +using AzzyBot.Core.Services.Interfaces; -namespace AzzyBot.Services.Queues; +namespace AzzyBot.Core.Services.Queues; public sealed class QueuedBackgroundTask : IQueuedBackgroundTask { diff --git a/src/AzzyBot-Next/Settings/SettingsCheck.cs b/src/AzzyBot-Next.Core/Settings/SettingsCheck.cs similarity index 97% rename from src/AzzyBot-Next/Settings/SettingsCheck.cs rename to src/AzzyBot-Next.Core/Settings/SettingsCheck.cs index eb6a195b..d24ffa84 100644 --- a/src/AzzyBot-Next/Settings/SettingsCheck.cs +++ b/src/AzzyBot-Next.Core/Settings/SettingsCheck.cs @@ -3,9 +3,9 @@ using System.Globalization; using System.Linq; using System.Reflection; -using AzzyBot.Utilities; +using AzzyBot.Core.Utilities; -namespace AzzyBot.Settings; +namespace AzzyBot.Core.Settings; public static class SettingsCheck { diff --git a/src/AzzyBot-Next/Utilities/AzzyStatsHardware.cs b/src/AzzyBot-Next.Core/Utilities/AzzyStatsHardware.cs similarity index 99% rename from src/AzzyBot-Next/Utilities/AzzyStatsHardware.cs rename to src/AzzyBot-Next.Core/Utilities/AzzyStatsHardware.cs index 389deb86..5e39fc4e 100644 --- a/src/AzzyBot-Next/Utilities/AzzyStatsHardware.cs +++ b/src/AzzyBot-Next.Core/Utilities/AzzyStatsHardware.cs @@ -5,9 +5,9 @@ using System.Linq; using System.Runtime.InteropServices; using System.Threading.Tasks; -using AzzyBot.Utilities.Records; +using AzzyBot.Core.Utilities.Records; -namespace AzzyBot.Utilities; +namespace AzzyBot.Core.Utilities; public static class AzzyStatsHardware { diff --git a/src/AzzyBot-Next/Utilities/AzzyStatsSoftware.cs b/src/AzzyBot-Next.Core/Utilities/AzzyStatsSoftware.cs similarity index 87% rename from src/AzzyBot-Next/Utilities/AzzyStatsSoftware.cs rename to src/AzzyBot-Next.Core/Utilities/AzzyStatsSoftware.cs index 3d0ecb7f..44d88197 100644 --- a/src/AzzyBot-Next/Utilities/AzzyStatsSoftware.cs +++ b/src/AzzyBot-Next.Core/Utilities/AzzyStatsSoftware.cs @@ -3,13 +3,13 @@ using System.Reflection; using Microsoft.Extensions.Hosting; -namespace AzzyBot.Utilities; +namespace AzzyBot.Core.Utilities; public static class AzzyStatsSoftware { public static string GetBotAuthors => FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).CompanyName ?? "Bot authors not found"; public static string GetBotDotNetVersion => Environment.Version.ToString() ?? ".NET version not found"; - public static string GetBotEnvironment => (GetBotName.EndsWith("Dev", StringComparison.OrdinalIgnoreCase)) ? Environments.Development : Environments.Production; + public static string GetBotEnvironment => (GetBotName.Contains("Dev", StringComparison.OrdinalIgnoreCase)) ? Environments.Development : Environments.Production; public static string GetBotName => FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).ProductName ?? "Bot name not found"; public static string GetBotVersion => FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).ProductVersion ?? "Bot version not found"; diff --git a/src/AzzyBot-Next/Utilities/Converter.cs b/src/AzzyBot-Next.Core/Utilities/Converter.cs similarity index 96% rename from src/AzzyBot-Next/Utilities/Converter.cs rename to src/AzzyBot-Next.Core/Utilities/Converter.cs index 4e905e07..427f45e8 100644 --- a/src/AzzyBot-Next/Utilities/Converter.cs +++ b/src/AzzyBot-Next.Core/Utilities/Converter.cs @@ -1,6 +1,6 @@ using System; -namespace AzzyBot.Utilities; +namespace AzzyBot.Core.Utilities; public static class Converter { diff --git a/src/AzzyBot-Next/Utilities/Encryption/AesGcmCipher.cs b/src/AzzyBot-Next.Core/Utilities/Encryption/AesGcmCipher.cs similarity index 95% rename from src/AzzyBot-Next/Utilities/Encryption/AesGcmCipher.cs rename to src/AzzyBot-Next.Core/Utilities/Encryption/AesGcmCipher.cs index c99f8be3..b2b418aa 100644 --- a/src/AzzyBot-Next/Utilities/Encryption/AesGcmCipher.cs +++ b/src/AzzyBot-Next.Core/Utilities/Encryption/AesGcmCipher.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Security.Cryptography; -namespace AzzyBot.Utilities.Encryption; +namespace AzzyBot.Core.Utilities.Encryption; [SuppressMessage("Performance", "CA1819:Properties should not return arrays", Justification = "Needed for security")] public sealed class AesGcmCipher(byte[] nonce, byte[] tag, byte[] cipher) diff --git a/src/AzzyBot-Next/Utilities/Encryption/Crypto.cs b/src/AzzyBot-Next.Core/Utilities/Encryption/Crypto.cs similarity index 96% rename from src/AzzyBot-Next/Utilities/Encryption/Crypto.cs rename to src/AzzyBot-Next.Core/Utilities/Encryption/Crypto.cs index 5f6ffe28..2c2cc895 100644 --- a/src/AzzyBot-Next/Utilities/Encryption/Crypto.cs +++ b/src/AzzyBot-Next.Core/Utilities/Encryption/Crypto.cs @@ -2,7 +2,7 @@ using System.Security.Cryptography; using System.Text; -namespace AzzyBot.Utilities.Encryption; +namespace AzzyBot.Core.Utilities.Encryption; [SuppressMessage("Usage", "CA2211:Non-constant fields should not be visible", Justification = "This is an application not a library")] public static class Crypto diff --git a/src/AzzyBot-Next/Utilities/Enums/ReadableBools.cs b/src/AzzyBot-Next.Core/Utilities/Enums/ReadableBools.cs similarity index 66% rename from src/AzzyBot-Next/Utilities/Enums/ReadableBools.cs rename to src/AzzyBot-Next.Core/Utilities/Enums/ReadableBools.cs index 1f715b21..7c4dc6da 100644 --- a/src/AzzyBot-Next/Utilities/Enums/ReadableBools.cs +++ b/src/AzzyBot-Next.Core/Utilities/Enums/ReadableBools.cs @@ -1,4 +1,4 @@ -namespace AzzyBot.Utilities.Enums; +namespace AzzyBot.Core.Utilities.Enums; public enum ReadbleBool { diff --git a/src/AzzyBot-Next/Utilities/FileOperations.cs b/src/AzzyBot-Next.Core/Utilities/FileOperations.cs similarity index 99% rename from src/AzzyBot-Next/Utilities/FileOperations.cs rename to src/AzzyBot-Next.Core/Utilities/FileOperations.cs index 06dc52a1..3bec1eb2 100644 --- a/src/AzzyBot-Next/Utilities/FileOperations.cs +++ b/src/AzzyBot-Next.Core/Utilities/FileOperations.cs @@ -9,7 +9,7 @@ using CsvHelper; using CsvHelper.Configuration; -namespace AzzyBot.Utilities; +namespace AzzyBot.Core.Utilities; public static class FileOperations { diff --git a/src/AzzyBot-Next/Utilities/Misc.cs b/src/AzzyBot-Next.Core/Utilities/Misc.cs similarity index 95% rename from src/AzzyBot-Next/Utilities/Misc.cs rename to src/AzzyBot-Next.Core/Utilities/Misc.cs index 448ca9f5..4078cc34 100644 --- a/src/AzzyBot-Next/Utilities/Misc.cs +++ b/src/AzzyBot-Next.Core/Utilities/Misc.cs @@ -1,9 +1,9 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Text; -using AzzyBot.Utilities.Enums; +using AzzyBot.Core.Utilities.Enums; -namespace AzzyBot.Utilities; +namespace AzzyBot.Core.Utilities; public static class Misc { diff --git a/src/AzzyBot-Next/Utilities/Records/AzzyCpuLoadRecord.cs b/src/AzzyBot-Next.Core/Utilities/Records/AzzyCpuLoadRecord.cs similarity index 88% rename from src/AzzyBot-Next/Utilities/Records/AzzyCpuLoadRecord.cs rename to src/AzzyBot-Next.Core/Utilities/Records/AzzyCpuLoadRecord.cs index a3c7a3f9..b3c6bfd7 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzzyCpuLoadRecord.cs +++ b/src/AzzyBot-Next.Core/Utilities/Records/AzzyCpuLoadRecord.cs @@ -1,4 +1,4 @@ -namespace AzzyBot.Utilities.Records; +namespace AzzyBot.Core.Utilities.Records; public sealed record AzzyCpuLoadRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzzyDiscordEmbedRecord.cs b/src/AzzyBot-Next.Core/Utilities/Records/AzzyDiscordEmbedRecord.cs similarity index 86% rename from src/AzzyBot-Next/Utilities/Records/AzzyDiscordEmbedRecord.cs rename to src/AzzyBot-Next.Core/Utilities/Records/AzzyDiscordEmbedRecord.cs index 72b770ed..505aadd7 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzzyDiscordEmbedRecord.cs +++ b/src/AzzyBot-Next.Core/Utilities/Records/AzzyDiscordEmbedRecord.cs @@ -1,4 +1,4 @@ -namespace AzzyBot.Utilities.Records; +namespace AzzyBot.Core.Utilities.Records; public sealed record AzzyDiscordEmbedRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzzyDiskUsageRecord.cs b/src/AzzyBot-Next.Core/Utilities/Records/AzzyDiskUsageRecord.cs similarity index 90% rename from src/AzzyBot-Next/Utilities/Records/AzzyDiskUsageRecord.cs rename to src/AzzyBot-Next.Core/Utilities/Records/AzzyDiskUsageRecord.cs index 6e1b606c..5d1c101a 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzzyDiskUsageRecord.cs +++ b/src/AzzyBot-Next.Core/Utilities/Records/AzzyDiskUsageRecord.cs @@ -1,4 +1,4 @@ -namespace AzzyBot.Utilities.Records; +namespace AzzyBot.Core.Utilities.Records; public sealed record AzzyDiskUsageRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzzyMemoryUsageRecord.cs b/src/AzzyBot-Next.Core/Utilities/Records/AzzyMemoryUsageRecord.cs similarity index 84% rename from src/AzzyBot-Next/Utilities/Records/AzzyMemoryUsageRecord.cs rename to src/AzzyBot-Next.Core/Utilities/Records/AzzyMemoryUsageRecord.cs index 374d7618..390a2aab 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzzyMemoryUsageRecord.cs +++ b/src/AzzyBot-Next.Core/Utilities/Records/AzzyMemoryUsageRecord.cs @@ -1,4 +1,4 @@ -namespace AzzyBot.Utilities.Records; +namespace AzzyBot.Core.Utilities.Records; public sealed record AzzyMemoryUsageRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzzyNetworkSpeedRecord.cs b/src/AzzyBot-Next.Core/Utilities/Records/AzzyNetworkSpeedRecord.cs similarity index 86% rename from src/AzzyBot-Next/Utilities/Records/AzzyNetworkSpeedRecord.cs rename to src/AzzyBot-Next.Core/Utilities/Records/AzzyNetworkSpeedRecord.cs index 5deee100..206e251d 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzzyNetworkSpeedRecord.cs +++ b/src/AzzyBot-Next.Core/Utilities/Records/AzzyNetworkSpeedRecord.cs @@ -1,4 +1,4 @@ -namespace AzzyBot.Utilities.Records; +namespace AzzyBot.Core.Utilities.Records; public sealed record AzzyNetworkSpeedRecord { diff --git a/src/AzzyBot-Next/Utilities/Records/AzzyNetworkStatsRecord.cs b/src/AzzyBot-Next.Core/Utilities/Records/AzzyNetworkStatsRecord.cs similarity index 85% rename from src/AzzyBot-Next/Utilities/Records/AzzyNetworkStatsRecord.cs rename to src/AzzyBot-Next.Core/Utilities/Records/AzzyNetworkStatsRecord.cs index 59da80be..d5d73fdf 100644 --- a/src/AzzyBot-Next/Utilities/Records/AzzyNetworkStatsRecord.cs +++ b/src/AzzyBot-Next.Core/Utilities/Records/AzzyNetworkStatsRecord.cs @@ -1,4 +1,4 @@ -namespace AzzyBot.Utilities.Records; +namespace AzzyBot.Core.Utilities.Records; public sealed record AzzyNetworkStatsRecord { diff --git a/src/AzzyBot-Next.Data/AzzyBot-Next.Data.csproj b/src/AzzyBot-Next.Data/AzzyBot-Next.Data.csproj new file mode 100644 index 00000000..2eff08c9 --- /dev/null +++ b/src/AzzyBot-Next.Data/AzzyBot-Next.Data.csproj @@ -0,0 +1,144 @@ + + + + AzzyBot.Data + Library + net8.0 + disable + enable + nullable + True + x64;ARM64;AnyCPU + AnyCPU + True + False + Sella-GH, AzzyBot Contributors + 2.0.0-preview3.1 + © 2024 - $(Authors) + AzzyBot-Next.Data + Kind of music bot for discord, written in C# and with DSharpPlus. This bot is dedicated for the use with AzuraCast and does not work at it's fully glory without it. + https://github.com/Sella-GH/AzzyBot + latest-all + $(NoWarn);CA1812;CA2007 + $(MSBuildProjectDirectory)\$(IntermediateOutputPath)=. + Debug;Release;Docker;Docker-debug + false + + + + True + AzzyBot-Dev.Data + AzzyBot-Next-Dev.Data + embedded + + + + True + AzzyBot-Dev.Data + AzzyBot-Next-Dev.Data + embedded + + + + True + AzzyBot-Dev.Data + AzzyBot-Next-Dev.Data + embedded + + + + True + AzzyBot-Docker.Data + AzzyBot-Next-Docker.Data + True + embedded + + + + True + AzzyBot-Docker.Data + AzzyBot-Next-Docker.Data + True + embedded + + + + True + AzzyBot-Docker.Data + AzzyBot-Next-Docker.Data + True + embedded + + + + True + AzzyBot-Docker-Dev.Data + AzzyBot-Next-Docker-Dev.Data + embedded + + + + True + AzzyBot-Docker-Dev.Data + AzzyBot-Next-Docker-Dev.Data + embedded + + + + True + AzzyBot-Docker-Dev.Data + AzzyBot-Next-Docker-Dev.Data + embedded + + + + True + AzzyBot.Data + True + embedded + + + + True + AzzyBot.Data + True + embedded + + + + True + AzzyBot.Data + True + embedded + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + diff --git a/src/AzzyBot-Next/Database/AzzyDbContext.cs b/src/AzzyBot-Next.Data/AzzyDbContext.cs similarity index 91% rename from src/AzzyBot-Next/Database/AzzyDbContext.cs rename to src/AzzyBot-Next.Data/AzzyDbContext.cs index 1e01c5ac..ab9db57a 100644 --- a/src/AzzyBot-Next/Database/AzzyDbContext.cs +++ b/src/AzzyBot-Next.Data/AzzyDbContext.cs @@ -1,7 +1,7 @@ -using AzzyBot.Database.Entities; +using AzzyBot.Data.Entities; using Microsoft.EntityFrameworkCore; -namespace AzzyBot.Database; +namespace AzzyBot.Data; public sealed class AzzyDbContext : DbContext { diff --git a/src/AzzyBot-Next/Database/DbActions.cs b/src/AzzyBot-Next.Data/DbActions.cs similarity index 99% rename from src/AzzyBot-Next/Database/DbActions.cs rename to src/AzzyBot-Next.Data/DbActions.cs index 2f17757c..3f1407c3 100644 --- a/src/AzzyBot-Next/Database/DbActions.cs +++ b/src/AzzyBot-Next.Data/DbActions.cs @@ -2,15 +2,15 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using AzzyBot.Database.Entities; -using AzzyBot.Logging; -using AzzyBot.Utilities.Encryption; +using AzzyBot.Core.Logging; +using AzzyBot.Core.Utilities.Encryption; +using AzzyBot.Data.Entities; using DSharpPlus.Entities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Storage; using Microsoft.Extensions.Logging; -namespace AzzyBot.Database; +namespace AzzyBot.Data; public sealed class DbActions(IDbContextFactory dbContextFactory, ILogger logger) { diff --git a/src/AzzyBot-Next/Database/Entities/AzuraCastChecksEntity.cs b/src/AzzyBot-Next.Data/Entities/AzuraCastChecksEntity.cs similarity index 97% rename from src/AzzyBot-Next/Database/Entities/AzuraCastChecksEntity.cs rename to src/AzzyBot-Next.Data/Entities/AzuraCastChecksEntity.cs index 2519b301..d7c881df 100644 --- a/src/AzzyBot-Next/Database/Entities/AzuraCastChecksEntity.cs +++ b/src/AzzyBot-Next.Data/Entities/AzuraCastChecksEntity.cs @@ -1,6 +1,6 @@ using System; -namespace AzzyBot.Database.Entities; +namespace AzzyBot.Data.Entities; public sealed class AzuraCastChecksEntity { diff --git a/src/AzzyBot-Next/Database/Entities/AzuraCastEntity.cs b/src/AzzyBot-Next.Data/Entities/AzuraCastEntity.cs similarity index 98% rename from src/AzzyBot-Next/Database/Entities/AzuraCastEntity.cs rename to src/AzzyBot-Next.Data/Entities/AzuraCastEntity.cs index c128cc15..bd7d726e 100644 --- a/src/AzzyBot-Next/Database/Entities/AzuraCastEntity.cs +++ b/src/AzzyBot-Next.Data/Entities/AzuraCastEntity.cs @@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis; using DSharpPlus.Entities; -namespace AzzyBot.Database.Entities; +namespace AzzyBot.Data.Entities; [SuppressMessage("Design", "CA1056:URI-like properties should not be strings", Justification = "Entity Framework Core is unable to handle Uri")] public sealed class AzuraCastEntity diff --git a/src/AzzyBot-Next/Database/Entities/AzuraCastStationChecksEntity.cs b/src/AzzyBot-Next.Data/Entities/AzuraCastStationChecksEntity.cs similarity index 94% rename from src/AzzyBot-Next/Database/Entities/AzuraCastStationChecksEntity.cs rename to src/AzzyBot-Next.Data/Entities/AzuraCastStationChecksEntity.cs index 0d5c4b90..2530047b 100644 --- a/src/AzzyBot-Next/Database/Entities/AzuraCastStationChecksEntity.cs +++ b/src/AzzyBot-Next.Data/Entities/AzuraCastStationChecksEntity.cs @@ -1,4 +1,4 @@ -namespace AzzyBot.Database.Entities; +namespace AzzyBot.Data.Entities; public sealed class AzuraCastStationChecksEntity { diff --git a/src/AzzyBot-Next/Database/Entities/AzuraCastStationEntity.cs b/src/AzzyBot-Next.Data/Entities/AzuraCastStationEntity.cs similarity index 98% rename from src/AzzyBot-Next/Database/Entities/AzuraCastStationEntity.cs rename to src/AzzyBot-Next.Data/Entities/AzuraCastStationEntity.cs index 1170a3f3..41aac2c1 100644 --- a/src/AzzyBot-Next/Database/Entities/AzuraCastStationEntity.cs +++ b/src/AzzyBot-Next.Data/Entities/AzuraCastStationEntity.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using DSharpPlus.Entities; -namespace AzzyBot.Database.Entities; +namespace AzzyBot.Data.Entities; public sealed class AzuraCastStationEntity { diff --git a/src/AzzyBot-Next/Database/Entities/AzuraCastStationMountEntity.cs b/src/AzzyBot-Next.Data/Entities/AzuraCastStationMountEntity.cs similarity index 94% rename from src/AzzyBot-Next/Database/Entities/AzuraCastStationMountEntity.cs rename to src/AzzyBot-Next.Data/Entities/AzuraCastStationMountEntity.cs index ccb58579..7d459803 100644 --- a/src/AzzyBot-Next/Database/Entities/AzuraCastStationMountEntity.cs +++ b/src/AzzyBot-Next.Data/Entities/AzuraCastStationMountEntity.cs @@ -1,4 +1,4 @@ -namespace AzzyBot.Database.Entities; +namespace AzzyBot.Data.Entities; public sealed class AzuraCastStationMountEntity { diff --git a/src/AzzyBot-Next/Database/Entities/GuildsEntity.cs b/src/AzzyBot-Next.Data/Entities/GuildsEntity.cs similarity index 97% rename from src/AzzyBot-Next/Database/Entities/GuildsEntity.cs rename to src/AzzyBot-Next.Data/Entities/GuildsEntity.cs index 8697f0de..ffb3ebf5 100644 --- a/src/AzzyBot-Next/Database/Entities/GuildsEntity.cs +++ b/src/AzzyBot-Next.Data/Entities/GuildsEntity.cs @@ -1,6 +1,6 @@ using DSharpPlus.Entities; -namespace AzzyBot.Database.Entities; +namespace AzzyBot.Data.Entities; public sealed class GuildsEntity { diff --git a/src/AzzyBot-Next/Migrations/20240715112456_InitialCreation.Designer.cs b/src/AzzyBot-Next.Data/Migrations/20240715112456_InitialCreation.Designer.cs similarity index 81% rename from src/AzzyBot-Next/Migrations/20240715112456_InitialCreation.Designer.cs rename to src/AzzyBot-Next.Data/Migrations/20240715112456_InitialCreation.Designer.cs index 62c3d658..f9cf051c 100644 --- a/src/AzzyBot-Next/Migrations/20240715112456_InitialCreation.Designer.cs +++ b/src/AzzyBot-Next.Data/Migrations/20240715112456_InitialCreation.Designer.cs @@ -1,6 +1,6 @@ // using System; -using AzzyBot.Database; +using AzzyBot.Data; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; @@ -9,7 +9,7 @@ #nullable disable -namespace AzzyBot.Migrations +namespace AzzyBot.Data.Migrations { [DbContext(typeof(AzzyDbContext))] [Migration("20240715112456_InitialCreation")] @@ -25,7 +25,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastChecksEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastChecksEntity", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -59,7 +59,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("AzuraCastChecks"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastEntity", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -98,7 +98,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("AzuraCast"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastStationChecksEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastStationChecksEntity", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -120,7 +120,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("AzuraCastStationChecks"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastStationEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastStationEntity", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -167,7 +167,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("AzuraCastStations"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastStationMountEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastStationMountEntity", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -193,7 +193,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("AzuraCastStationMounts"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.GuildsEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.GuildsEntity", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -224,42 +224,42 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("Guilds"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastChecksEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastChecksEntity", b => { - b.HasOne("AzzyBot.Database.Entities.AzuraCastEntity", "AzuraCast") + b.HasOne("AzzyBot.Data.Entities.AzuraCastEntity", "AzuraCast") .WithOne("Checks") - .HasForeignKey("AzzyBot.Database.Entities.AzuraCastChecksEntity", "AzuraCastId") + .HasForeignKey("AzzyBot.Data.Entities.AzuraCastChecksEntity", "AzuraCastId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("AzuraCast"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastEntity", b => { - b.HasOne("AzzyBot.Database.Entities.GuildsEntity", "Guild") + b.HasOne("AzzyBot.Data.Entities.GuildsEntity", "Guild") .WithOne("AzuraCast") - .HasForeignKey("AzzyBot.Database.Entities.AzuraCastEntity", "GuildId") + .HasForeignKey("AzzyBot.Data.Entities.AzuraCastEntity", "GuildId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Guild"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastStationChecksEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastStationChecksEntity", b => { - b.HasOne("AzzyBot.Database.Entities.AzuraCastStationEntity", "Station") + b.HasOne("AzzyBot.Data.Entities.AzuraCastStationEntity", "Station") .WithOne("Checks") - .HasForeignKey("AzzyBot.Database.Entities.AzuraCastStationChecksEntity", "StationId") + .HasForeignKey("AzzyBot.Data.Entities.AzuraCastStationChecksEntity", "StationId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Station"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastStationEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastStationEntity", b => { - b.HasOne("AzzyBot.Database.Entities.AzuraCastEntity", "AzuraCast") + b.HasOne("AzzyBot.Data.Entities.AzuraCastEntity", "AzuraCast") .WithMany("Stations") .HasForeignKey("AzuraCastId") .OnDelete(DeleteBehavior.Cascade) @@ -268,9 +268,9 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.Navigation("AzuraCast"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastStationMountEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastStationMountEntity", b => { - b.HasOne("AzzyBot.Database.Entities.AzuraCastStationEntity", "Station") + b.HasOne("AzzyBot.Data.Entities.AzuraCastStationEntity", "Station") .WithMany("Mounts") .HasForeignKey("StationId") .OnDelete(DeleteBehavior.Cascade) @@ -279,7 +279,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.Navigation("Station"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastEntity", b => { b.Navigation("Checks") .IsRequired(); @@ -287,7 +287,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.Navigation("Stations"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastStationEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastStationEntity", b => { b.Navigation("Checks") .IsRequired(); @@ -295,7 +295,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.Navigation("Mounts"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.GuildsEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.GuildsEntity", b => { b.Navigation("AzuraCast"); }); diff --git a/src/AzzyBot-Next/Migrations/20240715112456_InitialCreation.cs b/src/AzzyBot-Next.Data/Migrations/20240715112456_InitialCreation.cs similarity index 99% rename from src/AzzyBot-Next/Migrations/20240715112456_InitialCreation.cs rename to src/AzzyBot-Next.Data/Migrations/20240715112456_InitialCreation.cs index caa80588..02fec038 100644 --- a/src/AzzyBot-Next/Migrations/20240715112456_InitialCreation.cs +++ b/src/AzzyBot-Next.Data/Migrations/20240715112456_InitialCreation.cs @@ -4,7 +4,7 @@ #nullable disable -namespace AzzyBot.Migrations +namespace AzzyBot.Data.Migrations { /// public partial class InitialCreation : Migration diff --git a/src/AzzyBot-Next/Migrations/AzzyDbContextModelSnapshot.cs b/src/AzzyBot-Next.Data/Migrations/AzzyDbContextModelSnapshot.cs similarity index 81% rename from src/AzzyBot-Next/Migrations/AzzyDbContextModelSnapshot.cs rename to src/AzzyBot-Next.Data/Migrations/AzzyDbContextModelSnapshot.cs index 5dab2971..851e7577 100644 --- a/src/AzzyBot-Next/Migrations/AzzyDbContextModelSnapshot.cs +++ b/src/AzzyBot-Next.Data/Migrations/AzzyDbContextModelSnapshot.cs @@ -1,6 +1,6 @@ // using System; -using AzzyBot.Database; +using AzzyBot.Data; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; @@ -8,7 +8,7 @@ #nullable disable -namespace AzzyBot.Migrations +namespace AzzyBot.Data.Migrations { [DbContext(typeof(AzzyDbContext))] partial class AzzyDbContextModelSnapshot : ModelSnapshot @@ -22,7 +22,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastChecksEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastChecksEntity", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -56,7 +56,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("AzuraCastChecks"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastEntity", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -95,7 +95,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("AzuraCast"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastStationChecksEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastStationChecksEntity", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -117,7 +117,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("AzuraCastStationChecks"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastStationEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastStationEntity", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -164,7 +164,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("AzuraCastStations"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastStationMountEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastStationMountEntity", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -190,7 +190,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("AzuraCastStationMounts"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.GuildsEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.GuildsEntity", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -221,42 +221,42 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("Guilds"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastChecksEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastChecksEntity", b => { - b.HasOne("AzzyBot.Database.Entities.AzuraCastEntity", "AzuraCast") + b.HasOne("AzzyBot.Data.Entities.AzuraCastEntity", "AzuraCast") .WithOne("Checks") - .HasForeignKey("AzzyBot.Database.Entities.AzuraCastChecksEntity", "AzuraCastId") + .HasForeignKey("AzzyBot.Data.Entities.AzuraCastChecksEntity", "AzuraCastId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("AzuraCast"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastEntity", b => { - b.HasOne("AzzyBot.Database.Entities.GuildsEntity", "Guild") + b.HasOne("AzzyBot.Data.Entities.GuildsEntity", "Guild") .WithOne("AzuraCast") - .HasForeignKey("AzzyBot.Database.Entities.AzuraCastEntity", "GuildId") + .HasForeignKey("AzzyBot.Data.Entities.AzuraCastEntity", "GuildId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Guild"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastStationChecksEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastStationChecksEntity", b => { - b.HasOne("AzzyBot.Database.Entities.AzuraCastStationEntity", "Station") + b.HasOne("AzzyBot.Data.Entities.AzuraCastStationEntity", "Station") .WithOne("Checks") - .HasForeignKey("AzzyBot.Database.Entities.AzuraCastStationChecksEntity", "StationId") + .HasForeignKey("AzzyBot.Data.Entities.AzuraCastStationChecksEntity", "StationId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Station"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastStationEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastStationEntity", b => { - b.HasOne("AzzyBot.Database.Entities.AzuraCastEntity", "AzuraCast") + b.HasOne("AzzyBot.Data.Entities.AzuraCastEntity", "AzuraCast") .WithMany("Stations") .HasForeignKey("AzuraCastId") .OnDelete(DeleteBehavior.Cascade) @@ -265,9 +265,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("AzuraCast"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastStationMountEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastStationMountEntity", b => { - b.HasOne("AzzyBot.Database.Entities.AzuraCastStationEntity", "Station") + b.HasOne("AzzyBot.Data.Entities.AzuraCastStationEntity", "Station") .WithMany("Mounts") .HasForeignKey("StationId") .OnDelete(DeleteBehavior.Cascade) @@ -276,7 +276,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("Station"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastEntity", b => { b.Navigation("Checks") .IsRequired(); @@ -284,7 +284,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("Stations"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.AzuraCastStationEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.AzuraCastStationEntity", b => { b.Navigation("Checks") .IsRequired(); @@ -292,7 +292,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("Mounts"); }); - modelBuilder.Entity("AzzyBot.Database.Entities.GuildsEntity", b => + modelBuilder.Entity("AzzyBot.Data.Entities.GuildsEntity", b => { b.Navigation("AzuraCast"); }); diff --git a/src/AzzyBot/AzzyBot.csproj b/src/AzzyBot/AzzyBot.csproj index 3863b5e1..9d8c693d 100644 --- a/src/AzzyBot/AzzyBot.csproj +++ b/src/AzzyBot/AzzyBot.csproj @@ -94,39 +94,39 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - +