From 51393b20f2fd233c5f15afc57f88b4033ded690f Mon Sep 17 00:00:00 2001
From: kieran <kieran@harkin.me>
Date: Wed, 28 Aug 2024 10:21:28 +0100
Subject: [PATCH] fix bad merge

---
 .../Configuration/UserConfiguration.cs        |  3 --
 NostrStreamer/Database/User.cs                | 30 ----------------
 .../20240826103113_AccountFlags.Designer.cs   | 36 +++++++++----------
 .../StreamerContextModelSnapshot.cs           | 18 ----------
 4 files changed, 18 insertions(+), 69 deletions(-)

diff --git a/NostrStreamer/Database/Configuration/UserConfiguration.cs b/NostrStreamer/Database/Configuration/UserConfiguration.cs
index e9c8f12..ab566ff 100644
--- a/NostrStreamer/Database/Configuration/UserConfiguration.cs
+++ b/NostrStreamer/Database/Configuration/UserConfiguration.cs
@@ -19,9 +19,6 @@ public class UserConfiguration : IEntityTypeConfiguration<User>
         builder.Property(a => a.Version)
             .IsRowVersion();
 
-        builder.Property(a => a.Tags);
-        builder.Property(a => a.ContentWarning);
-        builder.Property(a => a.Goal);
         builder.Property(a => a.IsAdmin);
         builder.Property(a => a.IsBlocked);
     }
diff --git a/NostrStreamer/Database/User.cs b/NostrStreamer/Database/User.cs
index d20b12b..a280d0c 100644
--- a/NostrStreamer/Database/User.cs
+++ b/NostrStreamer/Database/User.cs
@@ -14,41 +14,11 @@ public class User
     /// </summary>
     public long Balance { get; set; }
 
-    /// <summary>
-    /// Stream title
-    /// </summary>
-    public string? Title { get; set; }
-
-    /// <summary>
-    /// Stream summary
-    /// </summary>
-    public string? Summary { get; set; }
-
-    /// <summary>
-    /// Stream cover image
-    /// </summary>
-    public string? Image { get; set; }
-
-    /// <summary>
-    /// Comma seperated tags
-    /// </summary>
-    public string? Tags { get; set; }
-
-    /// <summary>
-    /// Any content warning tag (NIP-36)
-    /// </summary>
-    public string? ContentWarning { get; set; }
-
     /// <summary>
     /// Date when user accepted TOS
     /// </summary>
     public DateTime? TosAccepted { get; init; }
 
-    /// <summary>
-    /// Stream goal
-    /// </summary>
-    public string? Goal { get; init; }
-
     /// <summary>
     /// Concurrency token
     /// </summary>
diff --git a/NostrStreamer/Migrations/20240826103113_AccountFlags.Designer.cs b/NostrStreamer/Migrations/20240826103113_AccountFlags.Designer.cs
index 4da8f3d..09bc5ea 100644
--- a/NostrStreamer/Migrations/20240826103113_AccountFlags.Designer.cs
+++ b/NostrStreamer/Migrations/20240826103113_AccountFlags.Designer.cs
@@ -168,15 +168,6 @@ namespace NostrStreamer.Migrations
                     b.Property<long>("Balance")
                         .HasColumnType("bigint");
 
-                    b.Property<string>("ContentWarning")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Goal")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Image")
-                        .HasColumnType("text");
-
                     b.Property<bool>("IsAdmin")
                         .HasColumnType("boolean");
 
@@ -187,15 +178,6 @@ namespace NostrStreamer.Migrations
                         .IsRequired()
                         .HasColumnType("text");
 
-                    b.Property<string>("Summary")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Tags")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Title")
-                        .HasColumnType("text");
-
                     b.Property<DateTime?>("TosAccepted")
                         .HasColumnType("timestamp with time zone");
 
@@ -220,12 +202,21 @@ namespace NostrStreamer.Migrations
                         .IsRequired()
                         .HasColumnType("text");
 
+                    b.Property<string>("ContentWarning")
+                        .HasColumnType("text");
+
                     b.Property<Guid>("EndpointId")
                         .HasColumnType("uuid");
 
                     b.Property<DateTime?>("Ends")
                         .HasColumnType("timestamp with time zone");
 
+                    b.Property<string>("Goal")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Image")
+                        .HasColumnType("text");
+                    
                     b.Property<string>("Event")
                         .IsRequired()
                         .HasColumnType("text");
@@ -257,9 +248,18 @@ namespace NostrStreamer.Migrations
                         .IsRequired()
                         .HasColumnType("text");
 
+                    b.Property<string>("Summary")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tags")
+                        .HasColumnType("text");
+
                     b.Property<string>("Thumbnail")
                         .HasColumnType("text");
 
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
                     b.HasKey("Id");
 
                     b.HasIndex("EndpointId");
diff --git a/NostrStreamer/Migrations/StreamerContextModelSnapshot.cs b/NostrStreamer/Migrations/StreamerContextModelSnapshot.cs
index 8098ac6..b84bb67 100644
--- a/NostrStreamer/Migrations/StreamerContextModelSnapshot.cs
+++ b/NostrStreamer/Migrations/StreamerContextModelSnapshot.cs
@@ -187,15 +187,6 @@ namespace NostrStreamer.Migrations
                     b.Property<long>("Balance")
                         .HasColumnType("bigint");
 
-                    b.Property<string>("ContentWarning")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Goal")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Image")
-                        .HasColumnType("text");
-
                     b.Property<bool>("IsAdmin")
                         .HasColumnType("boolean");
 
@@ -206,15 +197,6 @@ namespace NostrStreamer.Migrations
                         .IsRequired()
                         .HasColumnType("text");
 
-                    b.Property<string>("Summary")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Tags")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Title")
-                        .HasColumnType("text");
-
                     b.Property<DateTime?>("TosAccepted")
                         .HasColumnType("timestamp with time zone");