fix bad merge

This commit is contained in:
2024-08-28 10:21:28 +01:00
parent 97e43c8cbd
commit 51393b20f2
4 changed files with 18 additions and 69 deletions

View File

@ -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);
}

View File

@ -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>

View File

@ -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");

View File

@ -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");