From 656758ad12ca8a351d15c28e68d53b73e527446b Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Tue, 3 Feb 2026 03:09:24 +0100
Subject: [PATCH] Update C# db models

---
 .../Contexts/SpacebarDbContext.cs             | 21 ++++-
 .../Spacebar.Models.Db/Models/Application.cs  |  2 +-
 .../Models/ApplicationCommand.cs              |  2 +-
 .../Spacebar.Models.Db/Models/Attachment.cs   |  2 +-
 .../Spacebar.Models.Db/Models/AuditLog.cs     |  2 +-
 .../Spacebar.Models.Db/Models/AutomodRule.cs  |  2 +-
 .../Spacebar.Models.Db/Models/BackupCode.cs   |  2 +-
 .../Models/Spacebar.Models.Db/Models/Badge.cs |  2 +-
 .../Models/Spacebar.Models.Db/Models/Ban.cs   |  2 +-
 .../Spacebar.Models.Db/Models/Category.cs     |  2 +-
 .../Spacebar.Models.Db/Models/Channel.cs      | 24 +++++-
 .../Models/ClientRelease.cs                   |  2 +-
 .../Models/CloudAttachment.cs                 |  2 +-
 .../Spacebar.Models.Db/Models/Config.cs       |  2 +-
 .../Models/ConnectedAccount.cs                |  2 +-
 .../Models/ConnectionConfig.cs                |  2 +-
 .../Spacebar.Models.Db/Models/EmbedCache.cs   |  2 +-
 .../Models/Spacebar.Models.Db/Models/Emoji.cs |  2 +-
 .../Models/Spacebar.Models.Db/Models/Guild.cs |  2 +-
 .../Spacebar.Models.Db/Models/InstanceBan.cs  |  2 +-
 .../Spacebar.Models.Db/Models/Invite.cs       |  2 +-
 .../Spacebar.Models.Db/Models/Member.cs       | 14 +++-
 .../Spacebar.Models.Db/Models/Message.cs      | 13 +++-
 .../Spacebar.Models.Db/Models/Migration.cs    |  2 +-
 .../Models/Spacebar.Models.Db/Models/Note.cs  |  2 +-
 .../Spacebar.Models.Db/Models/RateLimit.cs    |  2 +-
 .../Spacebar.Models.Db/Models/ReadState.cs    |  2 +-
 .../Spacebar.Models.Db/Models/Recipient.cs    |  2 +-
 .../Spacebar.Models.Db/Models/Relationship.cs |  2 +-
 .../Models/Spacebar.Models.Db/Models/Role.cs  |  2 +-
 .../Spacebar.Models.Db/Models/SecurityKey.cs  |  2 +-
 .../Models/SecuritySetting.cs                 |  2 +-
 .../Spacebar.Models.Db/Models/Session.cs      |  2 +-
 .../Spacebar.Models.Db/Models/Sticker.cs      |  2 +-
 .../Spacebar.Models.Db/Models/StickerPack.cs  |  2 +-
 .../Spacebar.Models.Db/Models/Stream.cs       |  2 +-
 .../Models/StreamSession.cs                   |  2 +-
 .../Models/Spacebar.Models.Db/Models/Team.cs  |  2 +-
 .../Spacebar.Models.Db/Models/TeamMember.cs   |  2 +-
 .../Spacebar.Models.Db/Models/Template.cs     |  2 +-
 .../Spacebar.Models.Db/Models/ThreadMember.cs | 42 ++++++++++
 .../Models/Spacebar.Models.Db/Models/User.cs  | 18 ++++-
 .../Spacebar.Models.Db/Models/UserSetting.cs  |  2 +-
 .../Models/UserSettingsProto.cs               |  2 +-
 .../Models/ValidRegistrationToken.cs          |  2 +-
 .../Spacebar.Models.Db/Models/VoiceState.cs   |  2 +-
 .../Spacebar.Models.Db/Models/Webhook.cs      |  2 +-
 .../Spacebar.Models.Db.csproj                 |  8 +-
 .../Models/Spacebar.Models.Db/deps.json       | 77 -------------------
 49 files changed, 161 insertions(+), 138 deletions(-)
 create mode 100644 extra/admin-api/Models/Spacebar.Models.Db/Models/ThreadMember.cs
 delete mode 100644 extra/admin-api/Models/Spacebar.Models.Db/deps.json

diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Contexts/SpacebarDbContext.cs b/extra/admin-api/Models/Spacebar.Models.Db/Contexts/SpacebarDbContext.cs
index 716079d00..2a456964a 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Contexts/SpacebarDbContext.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Contexts/SpacebarDbContext.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore;
 using Spacebar.Models.Db.Models;
 using Stream = Spacebar.Models.Db.Models.Stream;
@@ -91,6 +89,8 @@ public partial class SpacebarDbContext : DbContext
 
     public virtual DbSet<Template> Templates { get; set; }
 
+    public virtual DbSet<ThreadMember> ThreadMembers { get; set; }
+
     public virtual DbSet<User> Users { get; set; }
 
     public virtual DbSet<UserSetting> UserSettings { get; set; }
@@ -355,7 +355,7 @@ public partial class SpacebarDbContext : DbContext
                 .OnDelete(DeleteBehavior.Cascade)
                 .HasConstraintName("FK_05535bc695e9f7ee104616459d3");
 
-            entity.HasOne(d => d.Channel).WithMany(p => p.Messages)
+            entity.HasOne(d => d.Channel).WithMany(p => p.MessageChannels)
                 .OnDelete(DeleteBehavior.Cascade)
                 .HasConstraintName("FK_86b9109b155eb70c0a2ca3b4b6d");
 
@@ -371,9 +371,13 @@ public partial class SpacebarDbContext : DbContext
                 .OnDelete(DeleteBehavior.SetNull)
                 .HasConstraintName("FK_61a92bb65b302a76d9c1fcd3174");
 
+            entity.HasOne(d => d.Thread).WithMany(p => p.MessageThreads)
+                .OnDelete(DeleteBehavior.Cascade)
+                .HasConstraintName("FK_bb3af7f695d50083e6523290d41");
+
             entity.HasOne(d => d.Webhook).WithMany(p => p.Messages).HasConstraintName("FK_f83c04bcf1df4e5c0e7a52ed348");
 
-            entity.HasMany(d => d.Channels).WithMany(p => p.MessagesNavigation)
+            entity.HasMany(d => d.Channels).WithMany(p => p.Messages)
                 .UsingEntity<Dictionary<string, object>>(
                     "MessageChannelMention",
                     r => r.HasOne<Channel>().WithMany()
@@ -620,6 +624,15 @@ public partial class SpacebarDbContext : DbContext
                 .HasConstraintName("FK_445d00eaaea0e60a017a5ed0c11");
         });
 
+        modelBuilder.Entity<ThreadMember>(entity =>
+        {
+            entity.HasKey(e => e.Index).HasName("PK_22232a9f7a08fb9967a9c78da53");
+
+            entity.HasOne(d => d.IdNavigation).WithMany(p => p.ThreadMembers).HasConstraintName("FK_cf20e37d71b0e1bf1ab633861c8");
+
+            entity.HasOne(d => d.MemberIdxNavigation).WithMany(p => p.ThreadMembers).HasConstraintName("FK_4721015b4e24ad29da55dbd2de0");
+        });
+
         modelBuilder.Entity<User>(entity =>
         {
             entity.HasKey(e => e.Id).HasName("PK_a3ffb1c0c8416b9fc6f907b7433");
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Application.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Application.cs
index bb9661d05..fabe14197 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Application.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Application.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/ApplicationCommand.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/ApplicationCommand.cs
index bad2fd9e1..bb1254ff8 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/ApplicationCommand.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/ApplicationCommand.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Attachment.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Attachment.cs
index 7cff94823..094a39b07 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Attachment.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Attachment.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/AuditLog.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/AuditLog.cs
index 68bcf5896..dcd563d36 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/AuditLog.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/AuditLog.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/AutomodRule.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/AutomodRule.cs
index e0da822b3..6e89f1e7d 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/AutomodRule.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/AutomodRule.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/BackupCode.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/BackupCode.cs
index 579333600..41d70abf3 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/BackupCode.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/BackupCode.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Badge.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Badge.cs
index e92ddd45a..792dbf87c 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Badge.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Badge.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Ban.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Ban.cs
index 634dad138..54e84c599 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Ban.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Ban.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Category.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Category.cs
index accd6c20c..35e5bbfbd 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Category.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Category.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Channel.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Channel.cs
index 057a9a329..536e73c33 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Channel.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Channel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
@@ -73,6 +73,18 @@ public partial class Channel
     [Column("default_thread_rate_limit_per_user")]
     public int? DefaultThreadRateLimitPerUser { get; set; }
 
+    [Column("thread_metadata")]
+    public string? ThreadMetadata { get; set; }
+
+    [Column("member_count")]
+    public int? MemberCount { get; set; }
+
+    [Column("message_count")]
+    public int? MessageCount { get; set; }
+
+    [Column("total_message_sent")]
+    public int? TotalMessageSent { get; set; }
+
     [InverseProperty("Channel")]
     public virtual ICollection<CloudAttachment> CloudAttachments { get; set; } = new List<CloudAttachment>();
 
@@ -102,7 +114,10 @@ public partial class Channel
     public virtual ICollection<Invite> Invites { get; set; } = new List<Invite>();
 
     [InverseProperty("Channel")]
-    public virtual ICollection<Message> Messages { get; set; } = new List<Message>();
+    public virtual ICollection<Message> MessageChannels { get; set; } = new List<Message>();
+
+    [InverseProperty("Thread")]
+    public virtual ICollection<Message> MessageThreads { get; set; } = new List<Message>();
 
     [ForeignKey("OwnerId")]
     [InverseProperty("Channels")]
@@ -121,6 +136,9 @@ public partial class Channel
     [InverseProperty("Channel")]
     public virtual ICollection<Stream> Streams { get; set; } = new List<Stream>();
 
+    [InverseProperty("IdNavigation")]
+    public virtual ICollection<ThreadMember> ThreadMembers { get; set; } = new List<ThreadMember>();
+
     [InverseProperty("Channel")]
     public virtual ICollection<VoiceState> VoiceStates { get; set; } = new List<VoiceState>();
 
@@ -132,5 +150,5 @@ public partial class Channel
 
     [ForeignKey("ChannelsId")]
     [InverseProperty("Channels")]
-    public virtual ICollection<Message> MessagesNavigation { get; set; } = new List<Message>();
+    public virtual ICollection<Message> Messages { get; set; } = new List<Message>();
 }
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/ClientRelease.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/ClientRelease.cs
index ad4befb9f..b0611b016 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/ClientRelease.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/ClientRelease.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/CloudAttachment.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/CloudAttachment.cs
index 3b7806044..63162681c 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/CloudAttachment.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/CloudAttachment.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Config.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Config.cs
index 31016c6a6..6f5f81047 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Config.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Config.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/ConnectedAccount.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/ConnectedAccount.cs
index 977797b71..2dccc056e 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/ConnectedAccount.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/ConnectedAccount.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/ConnectionConfig.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/ConnectionConfig.cs
index 0bbd0dd97..4e95d6c64 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/ConnectionConfig.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/ConnectionConfig.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/EmbedCache.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/EmbedCache.cs
index 3ae84bc1e..6ca4e69c1 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/EmbedCache.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/EmbedCache.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Emoji.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Emoji.cs
index faa522493..1690c08a3 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Emoji.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Emoji.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Guild.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Guild.cs
index f4729ae1e..f997daf5a 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Guild.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Guild.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/InstanceBan.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/InstanceBan.cs
index 48ff0e77c..5837bd513 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/InstanceBan.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/InstanceBan.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Invite.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Invite.cs
index b53a397cf..de4b8f5b0 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Invite.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Invite.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Member.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Member.cs
index dfa24f31f..1db2ec9c4 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Member.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Member.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
@@ -65,6 +65,15 @@ public partial class Member
     [Column("communication_disabled_until", TypeName = "timestamp without time zone")]
     public DateTime? CommunicationDisabledUntil { get; set; }
 
+    [Column("avatar_decoration_data")]
+    public string? AvatarDecorationData { get; set; }
+
+    [Column("display_name_styles")]
+    public string? DisplayNameStyles { get; set; }
+
+    [Column("collectibles")]
+    public string? Collectibles { get; set; }
+
     [ForeignKey("GuildId")]
     [InverseProperty("Members")]
     public virtual Guild Guild { get; set; } = null!;
@@ -73,6 +82,9 @@ public partial class Member
     [InverseProperty("Members")]
     public virtual User IdNavigation { get; set; } = null!;
 
+    [InverseProperty("MemberIdxNavigation")]
+    public virtual ICollection<ThreadMember> ThreadMembers { get; set; } = new List<ThreadMember>();
+
     [ForeignKey("Index")]
     [InverseProperty("Indices")]
     public virtual ICollection<Role> Roles { get; set; } = new List<Role>();
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Message.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Message.cs
index ca0abd78f..b6b30979a 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Message.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Message.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
@@ -97,6 +97,9 @@ public partial class Message
     [Column("message_snapshots")]
     public string MessageSnapshots { get; set; } = null!;
 
+    [Column("thread_id", TypeName = "character varying")]
+    public string? ThreadId { get; set; }
+
     [ForeignKey("ApplicationId")]
     [InverseProperty("Messages")]
     public virtual Application? Application { get; set; }
@@ -109,7 +112,7 @@ public partial class Message
     public virtual User? Author { get; set; }
 
     [ForeignKey("ChannelId")]
-    [InverseProperty("Messages")]
+    [InverseProperty("MessageChannels")]
     public virtual Channel? Channel { get; set; }
 
     [ForeignKey("GuildId")]
@@ -127,12 +130,16 @@ public partial class Message
     [InverseProperty("InverseMessageReferenceNavigation")]
     public virtual Message? MessageReferenceNavigation { get; set; }
 
+    [ForeignKey("ThreadId")]
+    [InverseProperty("MessageThreads")]
+    public virtual Channel? Thread { get; set; }
+
     [ForeignKey("WebhookId")]
     [InverseProperty("Messages")]
     public virtual Webhook? Webhook { get; set; }
 
     [ForeignKey("MessagesId")]
-    [InverseProperty("MessagesNavigation")]
+    [InverseProperty("Messages")]
     public virtual ICollection<Channel> Channels { get; set; } = new List<Channel>();
 
     [ForeignKey("MessagesId")]
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Migration.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Migration.cs
index d5748e512..0796e22df 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Migration.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Migration.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Note.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Note.cs
index 38b230f9f..c3f591aa1 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Note.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Note.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/RateLimit.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/RateLimit.cs
index 9748832d3..21c289f68 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/RateLimit.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/RateLimit.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/ReadState.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/ReadState.cs
index 43bc0ac7d..c5fdeb884 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/ReadState.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/ReadState.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Recipient.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Recipient.cs
index 50fa20caf..8a757d73f 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Recipient.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Recipient.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Relationship.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Relationship.cs
index 799c9ae6f..b4514d4af 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Relationship.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Relationship.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Role.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Role.cs
index a57875c0b..c5ef4e5d0 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Role.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Role.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/SecurityKey.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/SecurityKey.cs
index a7a962e33..5017cef05 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/SecurityKey.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/SecurityKey.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/SecuritySetting.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/SecuritySetting.cs
index cb52206ad..42a66102f 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/SecuritySetting.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/SecuritySetting.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Session.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Session.cs
index 31c559d98..a8e12b4b3 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Session.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Session.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Sticker.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Sticker.cs
index 048d3a013..9bf0b9d3c 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Sticker.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Sticker.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/StickerPack.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/StickerPack.cs
index 96369f8a4..476003227 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/StickerPack.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/StickerPack.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Stream.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Stream.cs
index db1b2cb80..950b9b152 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Stream.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Stream.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/StreamSession.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/StreamSession.cs
index cbc64dc65..71a3d6fd7 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/StreamSession.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/StreamSession.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Team.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Team.cs
index 3443ad3b9..edb743525 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Team.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Team.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/TeamMember.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/TeamMember.cs
index 106ddee9e..e8fa56864 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/TeamMember.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/TeamMember.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Template.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Template.cs
index 4c65ed935..703a75155 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Template.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Template.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/ThreadMember.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/ThreadMember.cs
new file mode 100644
index 000000000..6284db30a
--- /dev/null
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/ThreadMember.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.EntityFrameworkCore;
+
+namespace Spacebar.Models.Db.Models;
+
+[Table("thread_members")]
+[Index("Id", "MemberIdx", Name = "IDX_38d4f704373da3f0dc9b352ac9", IsUnique = true)]
+public partial class ThreadMember
+{
+    [Key]
+    [Column("index")]
+    public int Index { get; set; }
+
+    [Column("id", TypeName = "character varying")]
+    public string Id { get; set; } = null!;
+
+    [Column("member_idx")]
+    public int MemberIdx { get; set; }
+
+    [Column("join_timestamp", TypeName = "timestamp without time zone")]
+    public DateTime JoinTimestamp { get; set; }
+
+    [Column("muted")]
+    public bool Muted { get; set; }
+
+    [Column("mute_config")]
+    public string? MuteConfig { get; set; }
+
+    [Column("flags")]
+    public int Flags { get; set; }
+
+    [ForeignKey("Id")]
+    [InverseProperty("ThreadMembers")]
+    public virtual Channel IdNavigation { get; set; } = null!;
+
+    [ForeignKey("MemberIdx")]
+    [InverseProperty("ThreadMembers")]
+    public virtual Member MemberIdxNavigation { get; set; } = null!;
+}
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/User.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/User.cs
index 242402b2f..f0aa08790 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/User.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/User.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
@@ -89,14 +89,14 @@ public partial class User
     [Column("email", TypeName = "character varying")]
     public string? Email { get; set; }
 
-    [Column("flags", TypeName = "character varying")]
+    [Column("flags")]
     public ulong Flags { get; set; }
 
     [Column("public_flags")]
     public ulong PublicFlags { get; set; }
 
     [Column("purchased_flags")]
-    public long PurchasedFlags { get; set; }
+    public ulong PurchasedFlags { get; set; }
 
     [Column("premium_usage_flags")]
     public int PremiumUsageFlags { get; set; }
@@ -119,6 +119,18 @@ public partial class User
     [Column("badge_ids")]
     public string? BadgeIds { get; set; }
 
+    [Column("avatar_decoration_data")]
+    public string? AvatarDecorationData { get; set; }
+
+    [Column("display_name_styles")]
+    public string? DisplayNameStyles { get; set; }
+
+    [Column("collectibles")]
+    public string? Collectibles { get; set; }
+
+    [Column("primary_guild")]
+    public string? PrimaryGuild { get; set; }
+
     [InverseProperty("BotUser")]
     public virtual Application? ApplicationBotUser { get; set; }
 
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/UserSetting.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/UserSetting.cs
index a8d6d91cf..caf4e2ba0 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/UserSetting.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/UserSetting.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/UserSettingsProto.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/UserSettingsProto.cs
index 1e458592c..411c967cb 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/UserSettingsProto.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/UserSettingsProto.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/ValidRegistrationToken.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/ValidRegistrationToken.cs
index 32c2b30a6..68a382c64 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/ValidRegistrationToken.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/ValidRegistrationToken.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/VoiceState.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/VoiceState.cs
index f1d8504d8..657489997 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/VoiceState.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/VoiceState.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Webhook.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Webhook.cs
index 122db3aab..f7d57a5a5 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Webhook.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Webhook.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Spacebar.Models.Db.csproj b/extra/admin-api/Models/Spacebar.Models.Db/Spacebar.Models.Db.csproj
index 77d5d1747..2d1dcaf5b 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Spacebar.Models.Db.csproj
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Spacebar.Models.Db.csproj
@@ -7,12 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-
-<!--    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.2">-->
-<!--      <PrivateAssets>all</PrivateAssets>-->
-<!--      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>-->
-<!--    </PackageReference>-->
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="*" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="*" />
   </ItemGroup>
 
 </Project>
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/deps.json b/extra/admin-api/Models/Spacebar.Models.Db/deps.json
deleted file mode 100644
index da63af918..000000000
--- a/extra/admin-api/Models/Spacebar.Models.Db/deps.json
+++ /dev/null
@@ -1,77 +0,0 @@
-[
-  {
-    "pname": "Microsoft.EntityFrameworkCore",
-    "version": "10.0.0",
-    "hash": "sha256-xfgrlxhtOkQwF5Q7j8gSm41URJiH8IuJ/T/Dh88++hE="
-  },
-  {
-    "pname": "Microsoft.EntityFrameworkCore.Abstractions",
-    "version": "10.0.0",
-    "hash": "sha256-UDgZbRQcGPaKsE53EH6bvJiv+Q4KSxAbnsVhTVFGG4Q="
-  },
-  {
-    "pname": "Microsoft.EntityFrameworkCore.Analyzers",
-    "version": "10.0.0",
-    "hash": "sha256-7Q0jYJO50cqGI+u6gLpootbB8GZvgsgtg0F9FZI1jig="
-  },
-  {
-    "pname": "Microsoft.EntityFrameworkCore.Relational",
-    "version": "10.0.0",
-    "hash": "sha256-vOP2CE5YA551BlpbOuIy6RuAiAEPEpCVS1cEE33/zN4="
-  },
-  {
-    "pname": "Microsoft.Extensions.Caching.Abstractions",
-    "version": "10.0.0",
-    "hash": "sha256-IciARPnXx/S6HZc4t2ED06UyUwfZI9LKSzwKSGdpsfI="
-  },
-  {
-    "pname": "Microsoft.Extensions.Caching.Memory",
-    "version": "10.0.0",
-    "hash": "sha256-AMgDSm1k6q0s17spGtyR5q8nAqUFDOxl/Fe38f9M+d4="
-  },
-  {
-    "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "10.0.0",
-    "hash": "sha256-GcgrnTAieCV7AVT13zyOjfwwL86e99iiO/MiMOxPGG0="
-  },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "10.0.0",
-    "hash": "sha256-LYm9hVlo/R9c2aAKHsDYJ5vY9U0+3Jvclme3ou3BtvQ="
-  },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "10.0.0",
-    "hash": "sha256-9iodXP39YqgxomnOPOxd/mzbG0JfOSXzFoNU3omT2Ps="
-  },
-  {
-    "pname": "Microsoft.Extensions.Logging",
-    "version": "10.0.0",
-    "hash": "sha256-P+zPAadLL63k/GqK34/qChqQjY9aIRxZfxlB9lqsSrs="
-  },
-  {
-    "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "10.0.0",
-    "hash": "sha256-BnhgGZc01HwTSxogavq7Ueq4V7iMA3wPnbfRwQ4RhGk="
-  },
-  {
-    "pname": "Microsoft.Extensions.Options",
-    "version": "10.0.0",
-    "hash": "sha256-j5MOqZSKeUtxxzmZjzZMGy0vELHdvPraqwTQQQNVsYA="
-  },
-  {
-    "pname": "Microsoft.Extensions.Primitives",
-    "version": "10.0.0",
-    "hash": "sha256-Dup08KcptLjlnpN5t5//+p4n8FUTgRAq4n/w1s6us+I="
-  },
-  {
-    "pname": "Npgsql",
-    "version": "10.0.0",
-    "hash": "sha256-UVKz9dH/rVCCbMyFdqA31RYpht1XgDRLIqUy0Dp9ACQ="
-  },
-  {
-    "pname": "Npgsql.EntityFrameworkCore.PostgreSQL",
-    "version": "10.0.0",
-    "hash": "sha256-XIJxnTMektQVP1qtslEIGbmBGrIQsvjQjCMRTs9UIbg="
-  }
-]