Merge pull request #6 from pk9r/dev

pk9r · web-flow · commit f5b1caee7198 · 2025-08-10T19:35:28.000+07:00
Add Redis and PostgreSQL support, new Discord entity
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,6 +4,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Aspire.Hosting.AppHost" Version="9.4.0" />
+    <PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="9.4.0" />
+    <PackageVersion Include="Aspire.Hosting.Redis" Version="9.4.0" />
     <PackageVersion Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.4.0" />
     <PackageVersion Include="Aspire.StackExchange.Redis.DistributedCaching" Version="9.4.0" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.8" />
diff --git a/GitcgNetCord.sln.DotSettings b/GitcgNetCord.sln.DotSettings
@@ -1,5 +1,6 @@
 ﻿<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=genshin/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=genshincards/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=gitcg/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=gitcgvn/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=hoyolab/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/GitcgNetCord.sln.DotSettings.user b/GitcgNetCord.sln.DotSettings.user
@@ -1,2 +1,4 @@
 ﻿<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEmojiProperties_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F6ab3be37dec913ef7d649338adbdc7ba6ecf9e17ad69af5d293b71d60e4be5a_003FEmojiProperties_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEmojiProperties_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F6ab3be37dec913ef7d649338adbdc7ba6ecf9e17ad69af5d293b71d60e4be5a_003FEmojiProperties_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AReactionEmojiProperties_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003Ffa944ea7b9c605f0445098be8ca0ce31dd212e446a97d32b344db96e36aa95_003FReactionEmojiProperties_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ASlashCommandChoiceAttribute_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F70977d8e8e415d5c5286c84b973d39d27dd1744ed6edc99adee5b82899ff31_003FSlashCommandChoiceAttribute_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>
diff --git a/script.sql b/script.sql
diff --git a/src/AppHost/AppHost.cs b/src/AppHost/AppHost.cs
@@ -1,8 +1,42 @@
-using Aspire.Hosting;
+using Microsoft.Extensions.Configuration;
 using Projects;
 
 var builder = DistributedApplication.CreateBuilder(args);
 
-builder.AddProject<GitcgNetCord_MainApp>("main");
+var redis = builder.AddRedis("redis")
+    .WithDataVolume();
 
-builder.Build().Run();
+var main = builder.AddProject<GitcgNetCord_MainApp>("main");
+
+main.WithReference(redis).WaitFor(redis);
+
+var useRemotePostgres = builder.Configuration
+    .GetValue<bool>("AppBuilderOptions:UseRemotePostgres");
+
+if (useRemotePostgres)
+{
+    var postgresConnectionString = builder
+        .AddConnectionString("gitcgnetcorddb");
+
+    main.WithReference(postgresConnectionString);
+}
+else
+{
+    var postgresPassword = builder.AddParameter(
+        name: "postgresql-password",
+        value: "PGPASSWORD"
+    );
+
+    var postgres = builder.AddPostgres(
+        name: "postgresql",
+        password: postgresPassword
+    );
+    
+    postgres
+        .WithDataVolume()
+        .WithPgAdmin();
+    
+    main.WithReference(postgres).WaitFor(postgres);
+}
+
+builder.Build().Run();
diff --git a/src/AppHost/AppHost.csproj b/src/AppHost/AppHost.csproj
@@ -12,6 +12,8 @@
 
   <ItemGroup>
     <PackageReference Include="Aspire.Hosting.AppHost" />
+    <PackageReference Include="Aspire.Hosting.PostgreSQL" />
+    <PackageReference Include="Aspire.Hosting.Redis" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/AppHost/appsettings.Development.json b/src/AppHost/appsettings.Development.json
@@ -1,4 +1,7 @@
 {
+  "AppBuilderOptions": {
+    "UseRemotePostgres": false
+  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",
diff --git a/src/GitcgNetCord.MainApp/Entities/DiscordCardCodeChannel.cs b/src/GitcgNetCord.MainApp/Entities/DiscordCardCodeChannel.cs
@@ -0,0 +1,6 @@
+namespace GitcgNetCord.MainApp.Entities;
+
+public class DiscordCardCodeChannel
+{
+    public ulong Id { get; set; }
+}
diff --git a/src/GitcgNetCord.MainApp/Entities/Repositories/DiscordCardCodeChannelService.cs b/src/GitcgNetCord.MainApp/Entities/Repositories/DiscordCardCodeChannelService.cs
@@ -0,0 +1,15 @@
+using GitcgNetCord.MainApp.Infrastructure;
+
+namespace GitcgNetCord.MainApp.Entities.Repositories;
+
+public class DiscordCardCodeChannelService(
+    AppDbContext dbContext
+)
+{
+    public async ValueTask<DiscordCardCodeChannel?> FindAsync(ulong channelId)
+    {
+        return await dbContext
+            .DiscordCardCodeChannels
+            .FindAsync(channelId);
+    }
+}
diff --git a/src/GitcgNetCord.MainApp/Enums/SharingDecodeType.cs b/src/GitcgNetCord.MainApp/Enums/SharingDecodeType.cs
@@ -19,7 +19,7 @@ public enum SharingDecodeType
 
 public static class SharingDecodeTypeExtensions
 {
-    private static readonly IEnumerable<SharingDecodeType> _createImageTypes =
+    private static readonly IEnumerable<SharingDecodeType> CreateImageTypes =
     [
         SharingDecodeType.ImageSimplest,
         SharingDecodeType.ImageGameBackground,
@@ -28,7 +28,7 @@ public static class SharingDecodeTypeExtensions
 
     public static bool IsCreateImageType(this SharingDecodeType type)
     {
-        return _createImageTypes.Contains(type);
+        return CreateImageTypes.Contains(type);
     }
 }
 
diff --git a/src/GitcgNetCord.MainApp/Extensions/Extensions.cs b/src/GitcgNetCord.MainApp/Extensions/Extensions.cs
@@ -23,8 +23,8 @@ this IHost host
     {
         // Feature modules
         host.AddCardCodeModule();
-        // host.AddHoyolabAccountModule();
-        // host.AddHoyolabGcgModule();
+        host.AddHoyolabAccountModule();
+        host.AddHoyolabGcgModule();
 
         // Utility modules
         host.AddRoleEmojisModule();
@@ -75,6 +75,7 @@ this IServiceCollection services
     )
     {
         services.AddScoped<ActiveHoyolabAccountService>();
+        services.AddScoped<DiscordCardCodeChannelService>();
         services.AddScoped<DiscordUserService>();
         services.AddScoped<HoyolabAccountService>();
 
diff --git a/src/GitcgNetCord.MainApp/GatewayHandlers/CardCodeGatewayHandler.cs b/src/GitcgNetCord.MainApp/GatewayHandlers/CardCodeGatewayHandler.cs
@@ -3,6 +3,8 @@
 using System.Text.RegularExpressions;
 using GitcgNetCord.MainApp.Commands.Interactions;
 using GitcgNetCord.MainApp.Configuration;
+using GitcgNetCord.MainApp.Entities;
+using GitcgNetCord.MainApp.Entities.Repositories;
 using GitcgNetCord.MainApp.Infrastructure.HoyolabServices;
 using GitcgPainter.ImageCreators.Deck;
 using HoyolabHttpClient.Models.Interfaces;
@@ -18,7 +20,8 @@ public partial class CardCodeGatewayHandler(
     GatewayClient client,
     HoyolabDecoder decoder,
     IOptions<CardCodeModuleOptions> rawOptions,
-    DeckImageCreatorCollection deckImageCreatorCollection
+    DeckImageCreatorCollection deckImageCreatorCollection,
+    IServiceScopeFactory serviceScopeFactory
 ) : IMessageCreateGatewayHandler
 {
     private readonly CardCodeModuleOptions _options = rawOptions.Value;
@@ -28,7 +31,9 @@ public async ValueTask HandleAsync(Message message)
         if (message.Author.IsBot)
             return;
 
-        if (!IsCardCodeChannel(message.ChannelId))
+        var dbChannel = await FindDbChannelAsync(message.ChannelId);
+        
+        if (dbChannel == null)
             return;
 
         var channel = message.Channel;
@@ -178,12 +183,23 @@ await message.AddReactionAsync(
         //     .WithEmbeds());
     }
 
-    private bool IsCardCodeChannel(ulong channelId)
+    private async ValueTask<DiscordCardCodeChannel?> 
+        FindDbChannelAsync(ulong channelId)
     {
-        if (_options.CardCodeChannels.Contains(channelId))
-            return true;
+        await using var scope = serviceScopeFactory.CreateAsyncScope();
+        var cardCodeChannelService = scope.ServiceProvider
+            .GetRequiredService<DiscordCardCodeChannelService>();
+        
+        var dbChannel = await cardCodeChannelService
+            .FindAsync(channelId);
+        
+        return dbChannel;
+    }
 
-        return false;
+    [Obsolete]
+    private bool IsCardCodeChannel(ulong channelId)
+    {
+        return _options.CardCodeChannels.Contains(channelId);
     }
 
     private async Task<MatchesResult>
@@ -214,9 +230,11 @@ private async Task<MatchesResult>
         return new MatchesResult(items);
     }
 
-    record MatchesResult(List<ItemResult> Items);
+    private record MatchesResult(
+        List<ItemResult> Items
+    );
 
-    record ItemResult(
+    private record ItemResult(
         IDeckData Deck,
         string SharingCode
     );
diff --git a/src/GitcgNetCord.MainApp/Infrastructure/AppDbContext.cs b/src/GitcgNetCord.MainApp/Infrastructure/AppDbContext.cs
@@ -8,6 +8,7 @@ public class AppDbContext : DbContext
     public DbSet<DiscordUser> DiscordUsers { get; set; } = null!;
     public DbSet<HoyolabAccount> HoyolabAccounts { get; set; } = null!;
     public DbSet<ActiveHoyolabAccount> ActiveHoyolabAccounts { get; set; } = null!;
+    public DbSet<DiscordCardCodeChannel> DiscordCardCodeChannels { get; set; } = null!;
 
     public AppDbContext(DbContextOptions<AppDbContext> options) : base(options)
     {
diff --git a/src/GitcgNetCord.MainApp/Migrations/20250810114028_AddDiscordCardCodeChannelDataSet.Designer.cs b/src/GitcgNetCord.MainApp/Migrations/20250810114028_AddDiscordCardCodeChannelDataSet.Designer.cs
diff --git a/src/GitcgNetCord.MainApp/Migrations/20250810114028_AddDiscordCardCodeChannelDataSet.cs b/src/GitcgNetCord.MainApp/Migrations/20250810114028_AddDiscordCardCodeChannelDataSet.cs
diff --git a/src/GitcgNetCord.MainApp/Migrations/AppDbContextModelSnapshot.cs b/src/GitcgNetCord.MainApp/Migrations/AppDbContextModelSnapshot.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`	`1`	`{`
	`2`	`+ "AppBuilderOptions": {`
	`3`	`+ "UseRemotePostgres": false`
	`4`	`+ },`
`2`	`5`	`"Logging": {`
`3`	`6`	`"LogLevel": {`
`4`	`7`	`"Default": "Information",`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public enum SharingDecodeType`
`19`	`19`
`20`	`20`	`public static class SharingDecodeTypeExtensions`
`21`	`21`	`{`
`22`		`- private static readonly IEnumerable<SharingDecodeType> _createImageTypes =`
	`22`	`+ private static readonly IEnumerable<SharingDecodeType> CreateImageTypes =`
`23`	`23`	`[`
`24`	`24`	`SharingDecodeType.ImageSimplest,`
`25`	`25`	`SharingDecodeType.ImageGameBackground,`
`@@ -28,7 +28,7 @@ public static class SharingDecodeTypeExtensions`
`28`	`28`
`29`	`29`	`public static bool IsCreateImageType(this SharingDecodeType type)`
`30`	`30`	`{`
`31`		`- return _createImageTypes.Contains(type);`
	`31`	`+ return CreateImageTypes.Contains(type);`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`