diff --git a/extra/admin-api/Models/Spacebar.Models.AdminApi/DiscoverableGuildModel.cs b/extra/admin-api/Models/Spacebar.Models.AdminApi/DiscoverableGuildModel.cs
index f98d62b7e..fc75f7a09 100644
--- a/extra/admin-api/Models/Spacebar.Models.AdminApi/DiscoverableGuildModel.cs
+++ b/extra/admin-api/Models/Spacebar.Models.AdminApi/DiscoverableGuildModel.cs
@@ -3,11 +3,11 @@ using System.Text.Json.Serialization;
namespace Spacebar.Models.AdminApi;
public class DiscoverableGuildModel {
- [JsonPropertyName("id")]
- public string Id { get; set; } = null!;
+ [JsonPropertyName("id"), JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public required long Id { get; set; }
- [JsonPropertyName("afk_channel_id")]
- public string? AfkChannelId { get; set; }
+ [JsonPropertyName("afk_channel_id"), JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? AfkChannelId { get; set; }
[JsonPropertyName("afk_timeout")]
public int? AfkTimeout { get; set; }
@@ -31,7 +31,7 @@ public class DiscoverableGuildModel {
public List<string> Features { get; set; }
[JsonPropertyName("primary_category_id")]
- public string? PrimaryCategoryId { get; set; }
+ public long? PrimaryCategoryId { get; set; }
[JsonPropertyName("icon")]
public string? Icon { get; set; }
@@ -54,8 +54,8 @@ public class DiscoverableGuildModel {
[JsonPropertyName("presence_count")]
public int? PresenceCount { get; set; }
- [JsonPropertyName("template_id")]
- public string? TemplateId { get; set; }
+ [JsonPropertyName("template_id"), JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? TemplateId { get; set; }
[JsonPropertyName("mfa_level")]
public int? MfaLevel { get; set; }
@@ -63,8 +63,8 @@ public class DiscoverableGuildModel {
[JsonPropertyName("name")]
public string Name { get; set; } = null!;
- [JsonPropertyName("owner_id")]
- public string? OwnerId { get; set; }
+ [JsonPropertyName("owner_id"), JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? OwnerId { get; set; }
[JsonPropertyName("preferred_locale")]
public string? PreferredLocale { get; set; }
@@ -75,11 +75,11 @@ public class DiscoverableGuildModel {
[JsonPropertyName("premium_tier")]
public int PremiumTier { get; set; }
- [JsonPropertyName("public_updates_channel_id")]
- public string? PublicUpdatesChannelId { get; set; }
+ [JsonPropertyName("public_updates_channel_id"), JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? PublicUpdatesChannelId { get; set; }
- [JsonPropertyName("rules_channel_id")]
- public string? RulesChannelId { get; set; }
+ [JsonPropertyName("rules_channel_id"), JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? RulesChannelId { get; set; }
[JsonPropertyName("region")]
public string? Region { get; set; }
@@ -87,8 +87,8 @@ public class DiscoverableGuildModel {
[JsonPropertyName("splash")]
public string? Splash { get; set; }
- [JsonPropertyName("system_channel_id")]
- public string? SystemChannelId { get; set; }
+ [JsonPropertyName("system_channel_id"), JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? SystemChannelId { get; set; }
[JsonPropertyName("system_channel_flags")]
public int? SystemChannelFlags { get; set; }
@@ -102,8 +102,8 @@ public class DiscoverableGuildModel {
[JsonPropertyName("welcome_screen")]
public string WelcomeScreen { get; set; } = null!;
- [JsonPropertyName("widget_channel_id")]
- public string? WidgetChannelId { get; set; }
+ [JsonPropertyName("widget_channel_id"), JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? WidgetChannelId { get; set; }
[JsonPropertyName("widget_enabled")]
public bool WidgetEnabled { get; set; }
diff --git a/extra/admin-api/Models/Spacebar.Models.AdminApi/ForceJoinRequest.cs b/extra/admin-api/Models/Spacebar.Models.AdminApi/ForceJoinRequest.cs
index 10c6eecfa..bbb36ab20 100644
--- a/extra/admin-api/Models/Spacebar.Models.AdminApi/ForceJoinRequest.cs
+++ b/extra/admin-api/Models/Spacebar.Models.AdminApi/ForceJoinRequest.cs
@@ -3,10 +3,12 @@ using System.Text.Json.Serialization;
namespace Spacebar.Models.AdminApi;
public class ForceJoinRequest {
- [JsonPropertyName("user_id")]
- public string? UserId { get; set; } = null!;
+ [JsonPropertyName("user_id"), JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? UserId { get; set; } = null!;
+
[JsonPropertyName("make_admin")]
public bool MakeAdmin { get; set; } = false;
+
[JsonPropertyName("make_owner")]
public bool MakeOwner { get; set; } = false;
}
\ No newline at end of file
diff --git a/extra/admin-api/Models/Spacebar.Models.AdminApi/GuildModel.cs b/extra/admin-api/Models/Spacebar.Models.AdminApi/GuildModel.cs
index ae516f15d..f4cad9d7d 100644
--- a/extra/admin-api/Models/Spacebar.Models.AdminApi/GuildModel.cs
+++ b/extra/admin-api/Models/Spacebar.Models.AdminApi/GuildModel.cs
@@ -1,8 +1,14 @@
+using System.Text.Json.Serialization;
+
namespace Spacebar.Models.AdminApi;
public class GuildModel {
- public string Id { get; set; } = null!;
- public string? AfkChannelId { get; set; }
+ [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public required long Id { get; set; }
+
+ [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? AfkChannelId { get; set; }
+
public int? AfkTimeout { get; set; }
public string? Banner { get; set; }
public int? DefaultMessageNotifications { get; set; }
@@ -10,7 +16,10 @@ public class GuildModel {
public string? DiscoverySplash { get; set; }
public int? ExplicitContentFilter { get; set; }
public string Features { get; set; } = null!;
- public string? PrimaryCategoryId { get; set; }
+
+ [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? PrimaryCategoryId { get; set; }
+
public string? Icon { get; set; }
public bool Large { get; set; }
public int? MaxMembers { get; set; }
@@ -18,23 +27,40 @@ public class GuildModel {
public int? MaxVideoChannelUsers { get; set; }
public int? MemberCount { get; set; }
public int? PresenceCount { get; set; }
- public string? TemplateId { get; set; }
+
+ [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? TemplateId { get; set; }
+
public int? MfaLevel { get; set; }
public string Name { get; set; } = null!;
- public string? OwnerId { get; set; }
+
+ [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? OwnerId { get; set; }
+
public string? PreferredLocale { get; set; }
public int? PremiumSubscriptionCount { get; set; }
public int PremiumTier { get; set; }
- public string? PublicUpdatesChannelId { get; set; }
- public string? RulesChannelId { get; set; }
+
+ [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? PublicUpdatesChannelId { get; set; }
+
+ [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? RulesChannelId { get; set; }
+
public string? Region { get; set; }
public string? Splash { get; set; }
- public string? SystemChannelId { get; set; }
+
+ [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? SystemChannelId { get; set; }
+
public int? SystemChannelFlags { get; set; }
public bool Unavailable { get; set; }
public int? VerificationLevel { get; set; }
public string WelcomeScreen { get; set; } = null!;
- public string? WidgetChannelId { get; set; }
+
+ [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? WidgetChannelId { get; set; }
+
public bool WidgetEnabled { get; set; }
public int? NsfwLevel { get; set; }
public bool Nsfw { get; set; }
diff --git a/extra/admin-api/Models/Spacebar.Models.AdminApi/StickerModel.cs b/extra/admin-api/Models/Spacebar.Models.AdminApi/StickerModel.cs
index 0ad81b8f8..c22a7a563 100644
--- a/extra/admin-api/Models/Spacebar.Models.AdminApi/StickerModel.cs
+++ b/extra/admin-api/Models/Spacebar.Models.AdminApi/StickerModel.cs
@@ -1,15 +1,27 @@
+using System.Text.Json.Serialization;
+
namespace Spacebar.Models.AdminApi;
public class StickerModel {
- public string Id { get; set; } = null!;
+ [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public required long Id { get; set; }
+
public string Name { get; set; } = null!;
public string? Description { get; set; }
public bool? Available { get; set; }
public string? Tags { get; set; }
- public string? PackId { get; set; }
- public string? GuildId { get; set; }
- public string? UserId { get; set; }
+
+ [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? PackId { get; set; }
+
+ [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? GuildId { get; set; }
+
+ [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? UserId { get; set; }
+
public int Type { get; set; }
+
public int FormatType { get; set; }
// public virtual Guild? Guild { get; set; }
// public virtual StickerPack? Pack { get; set; }
diff --git a/extra/admin-api/Models/Spacebar.Models.AdminApi/UserModel.cs b/extra/admin-api/Models/Spacebar.Models.AdminApi/UserModel.cs
index dd1d48394..7e2590484 100644
--- a/extra/admin-api/Models/Spacebar.Models.AdminApi/UserModel.cs
+++ b/extra/admin-api/Models/Spacebar.Models.AdminApi/UserModel.cs
@@ -3,7 +3,9 @@
namespace Spacebar.Models.AdminApi;
public class UserModel {
- public string Id { get; set; } = null!;
+ [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public required long Id { get; set; }
+
public string Username { get; set; } = null!;
public string Discriminator { get; set; } = null!;
public string? Avatar { get; set; }
|
