diff --git a/Data/CachedUser.cs b/Data/CachedUser.cs
index 939d27b..ac7ed04 100644
--- a/Data/CachedUser.cs
+++ b/Data/CachedUser.cs
@@ -25,10 +25,15 @@ public class CachedUser {
public string Username { get; set; } = null!;
///
- /// Gets the user's discriminator value.
+ /// Gets the user's discriminator value. A value of "0000" means the user is on the new username system.
///
public string Discriminator { get; set; } = null!;
-
+
+ ///
+ /// Gets the user's display name. A user may have a global name if they are on the new username system.
+ ///
+ public string? GlobalName { get; set; } = null!;
+
///
/// Gets the avatar URL, if any, for the associated user.
///
diff --git a/Data/Migrations/20231115032040_NewUsernames.Designer.cs b/Data/Migrations/20231115032040_NewUsernames.Designer.cs
new file mode 100644
index 0000000..9173923
--- /dev/null
+++ b/Data/Migrations/20231115032040_NewUsernames.Designer.cs
@@ -0,0 +1,239 @@
+//
+using System;
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using RegexBot.Data;
+
+#nullable disable
+
+namespace RegexBot.Data.Migrations
+{
+ [DbContext(typeof(BotDatabaseContext))]
+ [Migration("20231115032040_NewUsernames")]
+ partial class NewUsernames
+ {
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "6.0.7")
+ .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+ NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "mod_log_type", new[] { "other", "note", "warn", "timeout", "kick", "ban" });
+ NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+ modelBuilder.Entity("RegexBot.Data.CachedGuildMessage", b =>
+ {
+ b.Property("MessageId")
+ .HasColumnType("bigint")
+ .HasColumnName("message_id");
+
+ b.Property>("AttachmentNames")
+ .IsRequired()
+ .HasColumnType("text[]")
+ .HasColumnName("attachment_names");
+
+ b.Property("AuthorId")
+ .HasColumnType("bigint")
+ .HasColumnName("author_id");
+
+ b.Property("ChannelId")
+ .HasColumnType("bigint")
+ .HasColumnName("channel_id");
+
+ b.Property("Content")
+ .HasColumnType("text")
+ .HasColumnName("content");
+
+ b.Property("CreatedAt")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at")
+ .HasDefaultValueSql("now()");
+
+ b.Property("EditedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("edited_at");
+
+ b.Property("GuildId")
+ .HasColumnType("bigint")
+ .HasColumnName("guild_id");
+
+ b.HasKey("MessageId")
+ .HasName("pk_cache_guildmessages");
+
+ b.HasIndex("AuthorId")
+ .HasDatabaseName("ix_cache_guildmessages_author_id");
+
+ b.ToTable("cache_guildmessages", (string)null);
+ });
+
+ modelBuilder.Entity("RegexBot.Data.CachedGuildUser", b =>
+ {
+ b.Property("GuildId")
+ .HasColumnType("bigint")
+ .HasColumnName("guild_id");
+
+ b.Property("UserId")
+ .HasColumnType("bigint")
+ .HasColumnName("user_id");
+
+ b.Property("FirstSeenTime")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("first_seen_time")
+ .HasDefaultValueSql("now()");
+
+ b.Property("GULastUpdateTime")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("gu_last_update_time");
+
+ b.Property("Nickname")
+ .HasColumnType("text")
+ .HasColumnName("nickname");
+
+ b.HasKey("GuildId", "UserId")
+ .HasName("pk_cache_usersinguild");
+
+ b.HasIndex("UserId")
+ .HasDatabaseName("ix_cache_usersinguild_user_id");
+
+ b.ToTable("cache_usersinguild", (string)null);
+ });
+
+ modelBuilder.Entity("RegexBot.Data.CachedUser", b =>
+ {
+ b.Property("UserId")
+ .HasColumnType("bigint")
+ .HasColumnName("user_id");
+
+ b.Property("AvatarUrl")
+ .HasColumnType("text")
+ .HasColumnName("avatar_url");
+
+ b.Property("Discriminator")
+ .IsRequired()
+ .HasMaxLength(4)
+ .HasColumnType("character(4)")
+ .HasColumnName("discriminator")
+ .IsFixedLength();
+
+ b.Property("GlobalName")
+ .HasColumnType("text")
+ .HasColumnName("global_name");
+
+ b.Property("ULastUpdateTime")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("u_last_update_time");
+
+ b.Property("Username")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("username");
+
+ b.HasKey("UserId")
+ .HasName("pk_cache_users");
+
+ b.ToTable("cache_users", (string)null);
+ });
+
+ modelBuilder.Entity("RegexBot.Data.ModLogEntry", b =>
+ {
+ b.Property("LogId")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer")
+ .HasColumnName("log_id");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("LogId"));
+
+ b.Property("GuildId")
+ .HasColumnType("bigint")
+ .HasColumnName("guild_id");
+
+ b.Property("IssuedBy")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("issued_by");
+
+ b.Property("LogType")
+ .HasColumnType("integer")
+ .HasColumnName("log_type");
+
+ b.Property("Message")
+ .HasColumnType("text")
+ .HasColumnName("message");
+
+ b.Property("Timestamp")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("timestamp")
+ .HasDefaultValueSql("now()");
+
+ b.Property("UserId")
+ .HasColumnType("bigint")
+ .HasColumnName("user_id");
+
+ b.HasKey("LogId")
+ .HasName("pk_modlogs");
+
+ b.HasIndex("GuildId", "UserId")
+ .HasDatabaseName("ix_modlogs_guild_id_user_id");
+
+ b.ToTable("modlogs", (string)null);
+ });
+
+ modelBuilder.Entity("RegexBot.Data.CachedGuildMessage", b =>
+ {
+ b.HasOne("RegexBot.Data.CachedUser", "Author")
+ .WithMany("GuildMessages")
+ .HasForeignKey("AuthorId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_cache_guildmessages_cache_users_author_id");
+
+ b.Navigation("Author");
+ });
+
+ modelBuilder.Entity("RegexBot.Data.CachedGuildUser", b =>
+ {
+ b.HasOne("RegexBot.Data.CachedUser", "User")
+ .WithMany("Guilds")
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_cache_usersinguild_cache_users_user_id");
+
+ b.Navigation("User");
+ });
+
+ modelBuilder.Entity("RegexBot.Data.ModLogEntry", b =>
+ {
+ b.HasOne("RegexBot.Data.CachedGuildUser", "User")
+ .WithMany("Logs")
+ .HasForeignKey("GuildId", "UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_modlogs_cache_usersinguild_user_temp_id");
+
+ b.Navigation("User");
+ });
+
+ modelBuilder.Entity("RegexBot.Data.CachedGuildUser", b =>
+ {
+ b.Navigation("Logs");
+ });
+
+ modelBuilder.Entity("RegexBot.Data.CachedUser", b =>
+ {
+ b.Navigation("GuildMessages");
+
+ b.Navigation("Guilds");
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/Data/Migrations/20231115032040_NewUsernames.cs b/Data/Migrations/20231115032040_NewUsernames.cs
new file mode 100644
index 0000000..b213dc3
--- /dev/null
+++ b/Data/Migrations/20231115032040_NewUsernames.cs
@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace RegexBot.Data.Migrations
+{
+ public partial class NewUsernames : Migration
+ {
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.AddColumn(
+ name: "global_name",
+ table: "cache_users",
+ type: "text",
+ nullable: true);
+ }
+
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropColumn(
+ name: "global_name",
+ table: "cache_users");
+ }
+ }
+}
diff --git a/Data/Migrations/BotDatabaseContextModelSnapshot.cs b/Data/Migrations/BotDatabaseContextModelSnapshot.cs
index e19c408..59be248 100644
--- a/Data/Migrations/BotDatabaseContextModelSnapshot.cs
+++ b/Data/Migrations/BotDatabaseContextModelSnapshot.cs
@@ -120,6 +120,10 @@ namespace RegexBot.Data.Migrations
.HasColumnName("discriminator")
.IsFixedLength();
+ b.Property("GlobalName")
+ .HasColumnType("text")
+ .HasColumnName("global_name");
+
b.Property("ULastUpdateTime")
.HasColumnType("timestamp with time zone")
.HasColumnName("u_last_update_time");
diff --git a/RegexBot.csproj b/RegexBot.csproj
index 095d8f2..e1a4cf4 100644
--- a/RegexBot.csproj
+++ b/RegexBot.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/Services/EntityCache/UserCachingSubservice.cs b/Services/EntityCache/UserCachingSubservice.cs
index e7c5c2f..e05360b 100644
--- a/Services/EntityCache/UserCachingSubservice.cs
+++ b/Services/EntityCache/UserCachingSubservice.cs
@@ -60,6 +60,7 @@ class UserCachingSubservice {
uinfo.Username = user.Username;
uinfo.Discriminator = user.Discriminator;
+ uinfo.GlobalName = user.GlobalName;
uinfo.AvatarUrl = user.GetAvatarUrl(size: 512);
uinfo.ULastUpdateTime = DateTimeOffset.UtcNow;
}