misc fixes

Simyon264 · Aug 29, 2024 · fe68d3d · fe68d3d
1 parent 5cea37e
commit fe68d3d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 47 deletions.
diff --git a/ReplayBrowser/Data/Migrations/ReplayDbContextModelSnapshot.cs b/ReplayBrowser/Data/Migrations/ReplayDbContextModelSnapshot.cs
@@ -559,39 +559,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("ReplayParticipants");
                 });
 
-            modelBuilder.Entity("ReplayBrowser.Models.Ingested.ReplayEvents.ReplayEventPlayer", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string[]>("AntagPrototypes")
-                        .IsRequired()
-                        .HasColumnType("text[]");
-
-                    b.Property<string[]>("JobPrototypes")
-                        .IsRequired()
-                        .HasColumnType("text[]");
-
-                    b.Property<Guid?>("PlayerGuid")
-                        .IsRequired()
-                        .HasColumnType("uuid");
-
-                    b.Property<string>("PlayerIcName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("PlayerOocName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("ReplayEventPlayer");
-                });
-
             modelBuilder.Entity("ReplayBrowser.Models.Ingested.ReplayEvents.EventTypes.AlertLevelChangedReplayEvent", b =>
                 {
                     b.HasBaseType("ReplayBrowser.Data.Models.ReplayDbEvent");

diff --git a/ReplayBrowser/Models/Ingested/ReplayEvents/EventTypes/CargoProductsOrderedReplayEvent.cs b/ReplayBrowser/Models/Ingested/ReplayEvents/EventTypes/CargoProductsOrderedReplayEvent.cs
@@ -1,4 +1,5 @@
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Newtonsoft.Json;
 using ReplayBrowser.Data.Models;
@@ -24,7 +25,11 @@ public void Configure(EntityTypeBuilder<CargoProductsOrderedReplayEvent> builder
         builder.Property(e => e.Products)
             .HasConversion(
                 v => JsonConvert.SerializeObject(v),
-                v => JsonConvert.DeserializeObject<CargoReplayProduct[]>(v));
+                v => JsonConvert.DeserializeObject<CargoReplayProduct[]>(v))
+            .Metadata.SetValueComparer(new ValueComparer<CargoReplayProduct[]>(
+                (c1, c2) => c1.SequenceEqual(c2),
+                c => c.Aggregate(0, (a, v) => HashCode.Combine(a, v.GetHashCode())),
+                c => (CargoReplayProduct[])c.Clone()));
     }
 }
 

diff --git a/ReplayBrowser/Models/Ingested/ReplayEvents/ReplayEventPlayer.cs b/ReplayBrowser/Models/Ingested/ReplayEvents/ReplayEventPlayer.cs
@@ -8,20 +8,8 @@ namespace ReplayBrowser.Models.Ingested.ReplayEvents;
 /// <summary>
 /// Represents a player in a replay event.
 /// </summary>
-public class ReplayEventPlayer : IEntityTypeConfiguration<ReplayEventPlayer>
+public class ReplayEventPlayer
 {
-    public int Id { get; set; }
-
-    public void Configure(EntityTypeBuilder<ReplayEventPlayer> builder)
-    {
-        builder.HasKey(e => e.Id);
-        builder.Property(e => e.PlayerOocName).IsRequired();
-        builder.Property(e => e.PlayerIcName).IsRequired();
-        builder.Property(e => e.PlayerGuid).IsRequired();
-        builder.Property(e => e.JobPrototypes).IsRequired();
-        builder.Property(e => e.AntagPrototypes).IsRequired();
-    }
-
     /// <summary>
     /// The username of the player.
     /// </summary>

diff --git a/ReplayBrowser/Services/WebhookService.cs b/ReplayBrowser/Services/WebhookService.cs
@@ -34,6 +34,12 @@ public async Task SendReplayToWebhooks(Replay parsedReplay)
         {
             foreach (var webhook in account.Webhooks)
             {
+                // URL check, don't send if empty, doesn't parse as URL or points to localhost
+                if (string.IsNullOrWhiteSpace(webhook.Url) || !Uri.TryCreate(webhook.Url, UriKind.Absolute, out var url) || url.Host == "localhost")
+                {
+                    continue;
+                }
+
                 var servers = webhook.Servers.Split(',');
                 if (!servers.Contains(parsedReplay.ServerName) && !string.IsNullOrWhiteSpace(webhook.Servers))
                 {