Migrate frontend to Blazor

.gitignore

@@ -26,6 +26,7 @@ bld/
 .vs/
 # Uncomment if you have tasks that create the project's static files in wwwroot
 wwwroot/
+!Modix.Web/wwwroot/
 dataprotection/
 
 # VS Code
@@ -261,5 +262,5 @@ Modix/config
 /Modix/Properties/launchSettings.json
 
 *.DotSettings
-Modix/developmentSettings\.json
-Modix/logs/*
+**/developmentSettings\.json
+**/logs/*

Directory.Build.targets

@@ -14,28 +14,28 @@
   <ItemGroup>
     <PackageReference Update="Discord.Net" Version="3.11.0" />
 
-    <PackageReference Update="Microsoft.EntityFrameworkCore" Version="8.0.0-preview.4.*" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-preview.4.*"/>
-    <PackageReference Update="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0-preview.4.*" />
-    <PackageReference Update="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-preview.4" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="8.0.0"/>
+    <PackageReference Update="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
+    <PackageReference Update="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
 
     <PackageReference Update="Nito.AsyncEx.Coordination" Version="5.1.2" />
 
-    <PackageReference Update="AspNet.Security.OAuth.Discord" Version="7.0.2" />
+    <PackageReference Update="AspNet.Security.OAuth.Discord" Version="8.0.0" />
 
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0-preview.6.*" />
-    <PackageReference Update="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.0-preview.6.*" />
-    <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="8.0.0-preview.6.*" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0-preview.6.*" />
-    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="8.0.0-preview.6.*" />
-    <PackageReference Update="Microsoft.Extensions.Hosting" Version="8.0.0-preview.6.*" />
-    <PackageReference Update="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0-preview.6.*" />
-    <PackageReference Update="Microsoft.Extensions.Http" Version="8.0.0-preview.6.*" />
-    <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="8.0.0-preview.6.*" />
-    <PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-preview.6.*" />
-    <PackageReference Update="Microsoft.Extensions.Logging.Console" Version="8.0.0-preview.6.*" />
-    <PackageReference Update="Microsoft.Extensions.Options" Version="8.0.0-preview.6.*" />
-    <PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0-preview.6.*" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
+    <PackageReference Update="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
+    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Options" Version="8.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
     <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.*" />
 
     <PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
@@ -44,13 +44,12 @@
 
     <PackageReference Update="LinqKit.Microsoft.EntityFrameworkCore" Version="7.1.4" />
 
-    <PackageReference Update="Serilog" Version="3.0.1" />
-    <PackageReference Update="Serilog.AspNetCore" Version="7.0.0" />
-    <PackageReference Update="Serilog.Expressions" Version="3.4.1" />
-    <PackageReference Update="Serilog.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Update="Serilog.Sinks.Console" Version="4.1.0" />
+    <PackageReference Update="Serilog" Version="3.1.1" />
+    <PackageReference Update="Serilog.AspNetCore" Version="8.0.0" />
+    <PackageReference Update="Serilog.Expressions" Version="4.0.0" />
+    <PackageReference Update="Serilog.Sinks.Console" Version="5.0.1" />
     <PackageReference Update="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Update="Serilog.Sinks.Seq" Version="5.2.2" />
+    <PackageReference Update="Serilog.Sinks.Seq" Version="6.0.0" />
 
     <PackageReference Update="Humanizer.Core" Version="2.14.1" />
 

Dockerfile

@@ -1,7 +1,7 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0-preview AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 WORKDIR /app
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0-preview AS dotnet-build-base
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS dotnet-build-base
 WORKDIR /src
 RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 600\n' > /etc/apt/preferences.d/nodesource
 RUN apt-get update && apt-get install curl -y \
@@ -15,13 +15,13 @@ RUN dotnet restore Modix.sln
 COPY . . 
 
 FROM dotnet-build-base AS dotnet-build
-RUN dotnet build -c Release --no-restore Modix.sln
+RUN dotnet build -maxcpucount:1 -c Release --no-restore Modix.sln
 
 FROM dotnet-build as dotnet-test
 RUN dotnet test -c Release --no-build --no-restore Modix.sln
 
 FROM dotnet-build AS publish
-RUN dotnet publish -c Release --no-build --no-restore -o /app  Modix/Modix.csproj
+RUN dotnet publish -maxcpucount:1 -c Release --no-build --no-restore -o /app  Modix/Modix.csproj
 
 FROM base AS final
 COPY --from=publish /app .

Modix.Bot.Test/Modix.Bot.Test.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Discord.Net" Version="2.4.0" />
+    <PackageReference Include="Discord.Net" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Moq" />
     <PackageReference Include="NUnit"/>

Modix.Data.Test/Assertions/DbContextSequenceExtensions.cs

@@ -86,8 +86,8 @@ private static ResettableSequenceValueGenerator<TProperty> GetGetResettableSeque
                                                                        .GetOrAdd(property, entity, valueGeneratorConstructor);
         }
 
-        private static readonly Dictionary<Type, Func<IProperty, IEntityType, ValueGenerator>> _valueGeneratorConstructorsByValueType
-            = new Dictionary<Type, Func<IProperty, IEntityType, ValueGenerator>>()
+        private static readonly Dictionary<Type, Func<IProperty, ITypeBase, ValueGenerator>> _valueGeneratorConstructorsByValueType
+            = new Dictionary<Type, Func<IProperty, ITypeBase, ValueGenerator>>()
             {
                 [typeof(long)] = (p, e) => new ResettableInt64SequenceValueGenerator()
             };

Modix.Data/Models/Core/ModixConfig.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace Modix.Data.Models.Core
+namespace Modix.Data.Models.Core
 {
     public class ModixConfig
     {
@@ -31,5 +29,6 @@ public class ModixConfig
         public string WebsiteBaseUrl { get; set; } = "https://mod.gg";
 
         public bool EnableStatsd { get; set; }
+        public bool UseBlazor { get; set; }
     }
 }

Modix.Data/Models/Moderation/DeletedMessageSearchCriteria.cs

@@ -132,10 +132,16 @@ public static IQueryable<DeletedMessageEntity> FilterBy(this IQueryable<DeletedM
                     x => ReusableQueries.StringContainsUser.Invoke(x.Author, criteria!.Author!),
                     !string.IsNullOrWhiteSpace(criteria?.Author))
                 .FilterBy(
-                    x => x.CreateAction.CreatedById == criteria!.CreatedById,
+                    x => x.Batch == null
+                        ? x.CreateAction.CreatedById == criteria!.CreatedById
+                        : x.Batch.CreateAction.CreatedById == criteria!.CreatedById,
                     criteria?.CreatedById != null)
                 .FilterBy(
-                    x => ReusableQueries.StringContainsUser.Invoke(x.CreateAction.CreatedBy!, criteria!.CreatedBy!),
+                    x => ReusableQueries.StringContainsUser.Invoke(
+                        x.Batch == null
+                            ? x.CreateAction.CreatedBy!
+                            : x.Batch.CreateAction.CreatedBy,
+                        criteria!.CreatedBy!),
                     !string.IsNullOrWhiteSpace(criteria?.CreatedBy))
                 .FilterBy(
                     x => ReusableQueries.DbCaseInsensitiveContains.Invoke(x.Content, criteria!.Content!),

Modix.Data/Repositories/DeletedMessageRepository.cs

@@ -93,13 +93,12 @@ public async Task CreateAsync(
         public async Task<RecordsPage<DeletedMessageSummary>> SearchSummariesPagedAsync(
             DeletedMessageSearchCriteria searchCriteria, IEnumerable<SortingCriteria> sortingCriteria, PagingCriteria pagingCriteria)
         {
-            var sourceQuery = ModixContext.Set<DeletedMessageEntity>().AsNoTracking();
+            var sourceQuery = ModixContext.Set<DeletedMessageEntity>().AsNoTracking().AsExpandable();
 
             var filteredQuery = sourceQuery
                 .FilterBy(searchCriteria);
 
             var pagedQuery = filteredQuery
-                .AsExpandable()
                 .Select(DeletedMessageSummary.FromEntityProjection)
                 .SortBy(sortingCriteria, DeletedMessageSummary.SortablePropertyMap)
                 .OrderThenBy(x => x.MessageId, SortDirection.Ascending)

Modix.Services.Test/Modix.Services.Test.csproj

@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" />
         <PackageReference Include="Moq" />

Modix.Services/Core/DesignatedChannelService.cs

@@ -1,15 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
-
 using Discord;
-
-using Serilog;
-
 using Modix.Data.Models.Core;
 using Modix.Data.Repositories;
-using System.Threading;
+using Serilog;
 
 namespace Modix.Services.Core
 {
@@ -25,7 +22,7 @@ public interface IDesignatedChannelService
         /// <param name="channel">The channel to be assigned.</param>
         /// <param name="type">The type of designation to be assigned.</param>
         /// <returns>A <see cref="Task"/> that will complete when the operation has completed.</returns>
-        Task AddDesignatedChannelAsync(IGuild guild, IMessageChannel channel, DesignatedChannelType type);
+        Task<long> AddDesignatedChannelAsync(IGuild guild, IMessageChannel channel, DesignatedChannelType type);
 
         /// <summary>
         /// Unassigns a channel's previously given designation, for a given guild.
@@ -117,7 +114,7 @@ public DesignatedChannelService(IDesignatedChannelMappingRepository designatedCh
         }
 
         /// <inheritdoc />
-        public async Task AddDesignatedChannelAsync(IGuild guild, IMessageChannel logChannel, DesignatedChannelType type)
+        public async Task<long> AddDesignatedChannelAsync(IGuild guild, IMessageChannel logChannel, DesignatedChannelType type)
         {
             AuthorizationService.RequireAuthenticatedUser();
             AuthorizationService.RequireClaims(AuthorizationClaim.DesignatedChannelMappingCreate);
@@ -135,7 +132,7 @@ public async Task AddDesignatedChannelAsync(IGuild guild, IMessageChannel logCha
                     throw new InvalidOperationException($"{logChannel.Name} in {guild.Name} is already assigned to {type}");
                 }
 
-                await DesignatedChannelMappingRepository.CreateAsync(new DesignatedChannelMappingCreationData()
+                var id = await DesignatedChannelMappingRepository.CreateAsync(new DesignatedChannelMappingCreationData()
                 {
                     GuildId = guild.Id,
                     ChannelId = logChannel.Id,
@@ -144,6 +141,8 @@ await DesignatedChannelMappingRepository.CreateAsync(new DesignatedChannelMappin
                 });
 
                 transaction.Commit();
+
+                return id;
             }
         }
 
@@ -205,11 +204,11 @@ public Task<bool> AnyDesignatedChannelAsync(ulong guildId, DesignatedChannelType
         /// <inheritdoc />
         public Task<IReadOnlyCollection<ulong>> GetDesignatedChannelIdsAsync(ulong guildId, DesignatedChannelType type)
             => DesignatedChannelMappingRepository.SearchChannelIdsAsync(new DesignatedChannelMappingSearchCriteria()
-                {
-                    GuildId = guildId,
-                    Type = type,
-                    IsDeleted = false
-                });
+            {
+                GuildId = guildId,
+                Type = type,
+                IsDeleted = false
+            });
 
         /// <inheritdoc />
         public async Task<IReadOnlyCollection<IMessageChannel>> GetDesignatedChannelsAsync(IGuild guild, DesignatedChannelType type)

Modix.Services/Core/DesignatedRoleService.cs

@@ -21,7 +21,7 @@ public interface IDesignatedRoleService
         /// <param name="roleId">The Discord snowflake ID of the role being designated</param>
         /// <param name="type">The type of designation to be made</param>
         /// <returns>A <see cref="Task"/> that will complete when the operation has completed.</returns>
-        Task AddDesignatedRoleAsync(ulong guildId, ulong roleId, DesignatedRoleType type);
+        Task<long> AddDesignatedRoleAsync(ulong guildId, ulong roleId, DesignatedRoleType type);
 
         /// <summary>
         /// Unassigns a role's previously given designation.
@@ -95,7 +95,7 @@ public DesignatedRoleService(IAuthorizationService authorizationService, IDesign
         }
 
         /// <inheritdoc />
-        public async Task AddDesignatedRoleAsync(ulong guildId, ulong roleId, DesignatedRoleType type)
+        public async Task<long> AddDesignatedRoleAsync(ulong guildId, ulong roleId, DesignatedRoleType type)
         {
             AuthorizationService.RequireAuthenticatedUser();
             AuthorizationService.RequireClaims(AuthorizationClaim.DesignatedRoleMappingCreate);
@@ -111,7 +111,7 @@ public async Task AddDesignatedRoleAsync(ulong guildId, ulong roleId, Designated
                 }, default))
                     throw new InvalidOperationException($"Role {roleId} already has a {type} designation");
 
-                await DesignatedRoleMappingRepository.CreateAsync(new DesignatedRoleMappingCreationData()
+                var entityId = await DesignatedRoleMappingRepository.CreateAsync(new DesignatedRoleMappingCreationData()
                 {
                     GuildId = guildId,
                     RoleId = roleId,
@@ -120,6 +120,8 @@ await DesignatedRoleMappingRepository.CreateAsync(new DesignatedRoleMappingCreat
                 });
 
                 transaction.Commit();
+
+                return entityId;
             }
         }
 

Modix.Services/Promotions/PromotionsService.cs

@@ -50,7 +50,7 @@ public interface IPromotionsService
         /// <param name="sentiment">The <see cref="PromotionCommentEntity.Sentiment"/> value to use for the new comment.</param>
         /// <param name="content">The <see cref="PromotionCommentEntity.Content"/> value to use for the new comment.</param>
         /// <returns>A <see cref="Task"/> that will complete when the operation has completed.</returns>
-        Task AddCommentAsync(long campaignId, PromotionSentiment sentiment, string? content);
+        Task<PromotionActionSummary> AddCommentAsync(long campaignId, PromotionSentiment sentiment, string? content);
 
         /// <summary>
         /// Updates an existing comment on a promotion campaign by deleting the comment and adding a new one.
@@ -59,7 +59,7 @@ public interface IPromotionsService
         /// <param name="newSentiment">The <see cref="PromotionCommentEntity.Sentiment"/> value of the updated comment.</param>
         /// <param name="newContent">The <see cref="PromotionCommentEntity.Content"/> value of the updated comment.</param>
         /// <returns>A <see cref="Task"/> that will complete when the operation has completed.</returns>
-        Task UpdateCommentAsync(long commentId, PromotionSentiment newSentiment, string? newContent);
+        Task<PromotionActionSummary> UpdateCommentAsync(long commentId, PromotionSentiment newSentiment, string? newContent);
 
         Task AddOrUpdateCommentAsync(long campaignId, Optional<PromotionSentiment> sentiment, Optional<string?> comment = default);
 
@@ -187,7 +187,7 @@ public async Task CreateCampaignAsync(ulong subjectId, string? comment = null)
         }
 
         /// <inheritdoc />
-        public async Task AddCommentAsync(long campaignId, PromotionSentiment sentiment, string? content)
+        public async Task<PromotionActionSummary> AddCommentAsync(long campaignId, PromotionSentiment sentiment, string? content)
         {
             AuthorizationService.RequireAuthenticatedGuild();
             AuthorizationService.RequireAuthenticatedUser();
@@ -234,10 +234,12 @@ public async Task AddCommentAsync(long campaignId, PromotionSentiment sentiment,
             }
 
             PublishActionNotificationAsync(resultAction);
+
+            return resultAction;
         }
 
         /// <inheritdoc />
-        public async Task UpdateCommentAsync(long commentId, PromotionSentiment newSentiment, string? newContent)
+        public async Task<PromotionActionSummary> UpdateCommentAsync(long commentId, PromotionSentiment newSentiment, string? newContent)
         {
             AuthorizationService.RequireAuthenticatedUser();
             AuthorizationService.RequireClaims(AuthorizationClaim.PromotionsComment);
@@ -263,6 +265,8 @@ public async Task UpdateCommentAsync(long commentId, PromotionSentiment newSenti
             }
 
             PublishActionNotificationAsync(resultAction);
+
+            return resultAction;
         }
 
         public async Task AddOrUpdateCommentAsync(long campaignId, Optional<PromotionSentiment> sentiment, Optional<string?> content = default)