Add full custom modded items support

Fix blazor reload garbage
danbopes · Aug 7, 2023 · 6ef9901 · 6ef9901
1 parent 273cc3e
commit 6ef9901
Show file tree

Hide file tree

Showing 25 changed files with 516 additions and 116 deletions.
diff --git a/BrotatoServer/Controllers/RunsController.cs b/BrotatoServer/Controllers/RunsController.cs
@@ -60,7 +60,7 @@ public async Task<IActionResult> PostRun([FromBody] RunInformation runInfo)
         {
             var user = HttpContext.GetUser();
 
-            var run = await _runRepository.AddRunAsync(user.SteamId, runInfo);
+            var run = await _runRepository.AddRunAsync(user.SteamId, runInfo, user.CustomData);
 
             if (user.TwitchUsername is not null)
             {

diff --git a/BrotatoServer/Controllers/UsersController.cs b/BrotatoServer/Controllers/UsersController.cs
@@ -6,7 +6,9 @@
 using Microsoft.EntityFrameworkCore;
 using System.Buffers;
 using BrotatoServer.Models.DB;
+using BrotatoServer.Models.JSON;
 using Microsoft.AspNetCore.Authorization;
+using Newtonsoft.Json;
 
 namespace BrotatoServer.Controllers;
 
@@ -15,10 +17,12 @@ namespace BrotatoServer.Controllers;
 public class UsersController : ControllerBase
 {
     private readonly BrotatoServerContext _db;
+    private readonly IUserRepository _userRepository;
 
-    public UsersController(BrotatoServerContext db)
+    public UsersController(BrotatoServerContext db, IUserRepository userRepository)
     {
         _db = db;
+        _userRepository = userRepository;
     }
 
     [HttpPost]
@@ -54,6 +58,18 @@ public async Task<IActionResult> GetApiKeyForUser([FromRoute] ulong steamId)
         return Ok(user.ApiKey);
     }
 
+    [HttpPost]
+    [Route("custom_data")]
+    [Authorize(AuthenticationSchemes = "ApiKey")]
+    public async Task<IActionResult> CustomData([FromBody] CustomData customData)
+    {
+        var user = HttpContext.GetUser();
+
+        await _userRepository.UpdateCustomDataAsync(user.SteamId, JsonConvert.SerializeObject(customData));
+
+        return Ok();
+    }
+
     [HttpGet]
     [Route("test")]
     [Authorize(AuthenticationSchemes = "Twitch")]

diff --git a/BrotatoServer/Data/IRunRepository.cs b/BrotatoServer/Data/IRunRepository.cs
@@ -8,7 +8,7 @@ public interface IRunRepository
 {
     IAsyncEnumerable<FullRun> GetAllRunsAsync(string twitchUsername);
     Task<FullRun?> GetRunAsync(Guid id);
-    Task<Run> AddRunAsync(ulong userId, RunInformation runInfo);
+    Task<Run> AddRunAsync(ulong userId, RunInformation runInfo, string? customData);
     Task<bool> UpdateCurrentRunAsync(RunInformation runInfo);
     Task<bool> DeleteCurrentRunAsync();
     Task<bool> DeleteRunAsync(Guid id);

diff --git a/BrotatoServer/Data/IUserRepository.cs b/BrotatoServer/Data/IUserRepository.cs
@@ -8,6 +8,8 @@ public interface IUserRepository
     IAsyncEnumerable<string> GetAllChatUsersAsync(CancellationToken ct = default);
     Task EnsureUserAsync(User user);
     Task<User?> GetUserAsync(ulong steamId);
+    Task<User?> GetUserByTwitchUsername(string twitchUsername);
     Task UpdateUserAsync(User user);
     Task SaveSettingsAsync(UserSettings userSettings);
+    Task UpdateCustomDataAsync(ulong userId, string customData);
 }
diff --git a/BrotatoServer/Data/RunRepository.cs b/BrotatoServer/Data/RunRepository.cs
@@ -46,7 +46,7 @@ public async IAsyncEnumerable<FullRun> GetAllRunsAsync(string twitchUsername)
         return run is null ? null : _mapper.Map<FullRun>(run);
     }
 
-    public async Task<Run> AddRunAsync(ulong userId, RunInformation runInfo)
+    public async Task<Run> AddRunAsync(ulong userId, RunInformation runInfo, string? customData)
     {
         var run = new Run
         {
@@ -55,7 +55,8 @@ public async Task<Run> AddRunAsync(ulong userId, RunInformation runInfo)
             Won = runInfo.RunData.Won,
             Date = DateTimeOffset.FromUnixTimeSeconds(runInfo.Created),
             CurrentRotation = true,
-            RunInformation = JsonConvert.SerializeObject(runInfo)
+            RunInformation = JsonConvert.SerializeObject(runInfo),
+            CustomData = customData
         };
 
         _context.Run.Add(run);

diff --git a/BrotatoServer/Data/UserRepository.cs b/BrotatoServer/Data/UserRepository.cs
@@ -60,6 +60,15 @@ public async Task EnsureUserAsync(User user)
             .FirstOrDefaultAsync(user => user.SteamId == steamId);
     }
 
+    public async Task<User?> GetUserByTwitchUsername(string twitchUsername)
+    {
+        return await _db
+            .Users
+            .Include(user => user.Settings)
+            .AsNoTracking()
+            .FirstOrDefaultAsync(user => user.TwitchUsername == twitchUsername);
+    }
+
     public async Task UpdateUserAsync(User user)
     {
         _db.Entry(user).State = EntityState.Modified;
@@ -84,4 +93,12 @@ public async Task SaveSettingsAsync(UserSettings userSettings)
 
         _db.Entry(userSettings).State = EntityState.Detached;
     }
+
+    public async Task UpdateCustomDataAsync(ulong userId, string customData)
+    {
+        await _db.Users
+            .Where(user => user.SteamId == userId)
+            .ExecuteUpdateAsync(setters =>
+                setters.SetProperty(r => r.CustomData, customData));
+    }
 }
diff --git a/BrotatoServer/Hubs/RunsHub.cs b/BrotatoServer/Hubs/RunsHub.cs
@@ -1,8 +1,8 @@
 using System.Collections.Concurrent;
+using BrotatoServer.Data;
 using BrotatoServer.Models.JSON;
-using BrotatoServer.Services;
-using BrotatoServer.Utilities;
 using Microsoft.AspNetCore.SignalR;
+using Newtonsoft.Json;
 
 namespace BrotatoServer.Hubs;
 
@@ -34,29 +34,38 @@ public async Task UpdateRunAsync(string twitchUsername, RunData? newRun)
 public interface IRunHub
 {
     Task RunUpdate(RunData? newRun);
+    Task CustomDataUpdate(CustomData? newCustomData);
 }
 
 public class RunsHub : Hub<IRunHub>
 {
     private readonly CurrentRunProvider _currentRunProvider;
+    private readonly IUserRepository _userRepo;
 
-    public RunsHub(CurrentRunProvider currentRunProvider)
+    public RunsHub(CurrentRunProvider currentRunProvider, IUserRepository userRepo)
     {
         _currentRunProvider = currentRunProvider;
+        _userRepo = userRepo;
     }
 
     public override async Task OnConnectedAsync()
     {
-        var twitchUsername = Context.GetHttpContext()?.Request.Query["twitchUsername"];
+        var twitchUsername = Context.GetHttpContext()?.Request.Query["twitchUsername"].FirstOrDefault();
 
         if (string.IsNullOrEmpty(twitchUsername))
             throw new InvalidOperationException("No twitchUsername was provided.");
 
-        await Groups.AddToGroupAsync(Context.ConnectionId, twitchUsername!);
+        await Groups.AddToGroupAsync(Context.ConnectionId, twitchUsername);
+
+        _currentRunProvider.Current.TryGetValue(twitchUsername, out var currentRun);
+
+        var user = await _userRepo.GetUserByTwitchUsername(twitchUsername);
+        if (user?.CustomData is not null)
+            await Clients.Caller.CustomDataUpdate(JsonConvert.DeserializeObject<CustomData>(user.CustomData));
 
-        _currentRunProvider.Current.TryGetValue(twitchUsername!, out var currentRun);
 
         await Clients.Caller.RunUpdate(currentRun);
+
         await base.OnConnectedAsync();
     }
 }
diff --git a/BrotatoServer/Migrations/20230807212228_CustomData.Designer.cs b/BrotatoServer/Migrations/20230807212228_CustomData.Designer.cs
diff --git a/BrotatoServer/Migrations/20230807212228_CustomData.cs b/BrotatoServer/Migrations/20230807212228_CustomData.cs
@@ -0,0 +1,38 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BrotatoServer.Migrations
+{
+    /// <inheritdoc />
+    public partial class CustomData : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "CustomData",
+                table: "Users",
+                type: "TEXT",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "CustomData",
+                table: "Run",
+                type: "TEXT",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "CustomData",
+                table: "Users");
+
+            migrationBuilder.DropColumn(
+                name: "CustomData",
+                table: "Run");
+        }
+    }
+}
diff --git a/BrotatoServer/Migrations/BrotatoServerContextModelSnapshot.cs b/BrotatoServer/Migrations/BrotatoServerContextModelSnapshot.cs
@@ -26,6 +26,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<bool>("CurrentRotation")
                         .HasColumnType("INTEGER");
 
+                    b.Property<string>("CustomData")
+                        .HasColumnType("TEXT");
+
                     b.Property<long>("Date")
                         .HasColumnType("INTEGER");
 
@@ -57,6 +60,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("ApiKey")
                         .HasColumnType("TEXT");
 
+                    b.Property<string>("CustomData")
+                        .HasColumnType("TEXT");
+
                     b.Property<bool>("JoinedChat")
                         .HasColumnType("INTEGER");
 

diff --git a/BrotatoServer/Models/DB/FullRun.cs b/BrotatoServer/Models/DB/FullRun.cs
@@ -9,4 +9,5 @@ public class FullRun
     public DateTimeOffset Date { get; set; }
     public bool CurrentRotation { get; set; }
     public RunData RunData { get; set; }
+    public CustomData? CustomData { get; set; }
 }
diff --git a/BrotatoServer/Models/DB/Run.cs b/BrotatoServer/Models/DB/Run.cs
@@ -8,6 +8,7 @@ public class Run
     public bool CurrentRotation { get; set; }
     public bool Won { get; set; }
     public string RunInformation { get; set; }
+    public string? CustomData { get; set; }
     public virtual User? User { get; set; }
 
     public string? TwitchClip { get; set; }