diff --git a/extra/admin-api/Models/Spacebar.Models.Gateway/BulkMessageDeleteResponse.cs b/extra/admin-api/Models/Spacebar.Models.Gateway/BulkMessageDeleteResponse.cs
index f4cb669a..4e6eb71a 100644
--- a/extra/admin-api/Models/Spacebar.Models.Gateway/BulkMessageDeleteResponse.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Gateway/BulkMessageDeleteResponse.cs
@@ -3,12 +3,12 @@ using System.Text.Json.Serialization;
namespace Spacebar.Models.Gateway;
public class BulkMessageDeleteResponse {
- [JsonPropertyName("guild_id")]
- public string? GuildId { get; set; }
-
- [JsonPropertyName("channel_id")]
- public required string ChannelId { get; set; }
-
- [JsonPropertyName("ids")]
- public required List<string> MessageIds { get; set; }
+ [JsonPropertyName("guild_id"), JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? GuildId { get; set; }
+
+ [JsonPropertyName("channel_id"), JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public required long ChannelId { get; set; }
+
+ [JsonPropertyName("ids"), JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public required List<long> MessageIds { get; set; }
}
\ No newline at end of file
diff --git a/extra/admin-api/Models/Spacebar.Models.Gateway/ChannelStatusesRequest.cs b/extra/admin-api/Models/Spacebar.Models.Gateway/ChannelStatusesRequest.cs
index 94737ffe..ae7830cd 100644
--- a/extra/admin-api/Models/Spacebar.Models.Gateway/ChannelStatusesRequest.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Gateway/ChannelStatusesRequest.cs
@@ -6,19 +6,21 @@ using System.Text.Json.Serialization;
namespace Spacebar.Models.Gateway;
public class ChannelStatusesRequest {
- [JsonPropertyName("guild_id")]
[JsonRequired]
+ [JsonPropertyName("guild_id")]
+ [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+
public JsonValue GuildIdRawValue { get; set; } = null!;
[JsonIgnore]
- public string? GuildId {
- get => GuildIdRawValue.GetValueKind() == JsonValueKind.String ? GuildIdRawValue.GetValue<string>() : null;
+ public long? GuildId {
+ get => GuildIdRawValue.GetValueKind() == JsonValueKind.String ? GuildIdRawValue.GetValue<long>() : null;
[MemberNotNull] set => GuildIdRawValue = JsonValue.Create(value!);
}
[JsonIgnore]
- public List<string>? GuildIds {
- get => GuildIdRawValue.GetValueKind() == JsonValueKind.Array ? GuildIdRawValue.AsArray().Deserialize<List<string>>() : null;
+ public List<long>? GuildIds {
+ get => GuildIdRawValue.GetValueKind() == JsonValueKind.Array ? GuildIdRawValue.AsArray().Deserialize<List<long>>() : null;
[MemberNotNull] set => GuildIdRawValue = JsonValue.Create(value!)!;
}
}
@@ -30,7 +32,8 @@ public class ChannelInfoRequest : ChannelStatusesRequest {
public class ChannelStatus {
[JsonPropertyName("id")]
- public string ChannelId { get; set; }
+ [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long ChannelId { get; set; }
[JsonPropertyName("status")]
public string Status { get; set; }
@@ -38,7 +41,8 @@ public class ChannelStatus {
public class ChannelStatusesResponse {
[JsonPropertyName("guild_id")]
- public string GuildId { get; set; }
+ [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long GuildId { get; set; }
[JsonPropertyName("channels")]
public List<ChannelStatus> Channels { get; set; }
@@ -46,7 +50,8 @@ public class ChannelStatusesResponse {
public class ChannelInfo {
[JsonPropertyName("id")]
- public required string ChannelId { get; set; }
+ [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public required long ChannelId { get; set; }
[JsonPropertyName("status")]
public string? Status { get; set; }
@@ -57,7 +62,8 @@ public class ChannelInfo {
public class ChannelInfoResponse {
[JsonPropertyName("guild_id")]
- public string GuildId { get; set; }
+ [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long GuildId { get; set; }
[JsonPropertyName("channels")]
public List<ChannelInfo> Channels { get; set; }
diff --git a/extra/admin-api/Models/Spacebar.Models.Gateway/GuildSyncResponse.cs b/extra/admin-api/Models/Spacebar.Models.Gateway/GuildSyncResponse.cs
index fcd38c10..1b576cf9 100644
--- a/extra/admin-api/Models/Spacebar.Models.Gateway/GuildSyncResponse.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Gateway/GuildSyncResponse.cs
@@ -5,7 +5,8 @@ namespace Spacebar.Models.Gateway;
public class GuildSyncResponse {
[JsonPropertyName("id")]
- public string GuildId { get; set; }
+ [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long GuildId { get; set; }
[JsonPropertyName("presences")]
public List<Presence> Presences { get; set; }
diff --git a/extra/admin-api/Models/Spacebar.Models.Gateway/LazyRequest.cs b/extra/admin-api/Models/Spacebar.Models.Gateway/LazyRequest.cs
index 200dccea..c144eb72 100644
--- a/extra/admin-api/Models/Spacebar.Models.Gateway/LazyRequest.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Gateway/LazyRequest.cs
@@ -5,8 +5,10 @@ namespace Spacebar.Models.Gateway;
public class LazyRequest
{
[JsonPropertyName("guild_id")]
- public string GuildId { get; set; }
+ [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long GuildId { get; set; }
+ // key is string because json...
[JsonPropertyName("channels")]
public Dictionary<string, List<List<int>>> Channels { get; set; }
diff --git a/extra/admin-api/Models/Spacebar.Models.Gateway/SbWebsocketMeta.cs b/extra/admin-api/Models/Spacebar.Models.Gateway/SbWebsocketMeta.cs
index 6281426f..258b8418 100644
--- a/extra/admin-api/Models/Spacebar.Models.Gateway/SbWebsocketMeta.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Gateway/SbWebsocketMeta.cs
@@ -3,10 +3,11 @@ using System.Text.Json.Serialization;
namespace Spacebar.Models.Gateway;
// TODO: move to interop
-public class SbWebsocketMeta
-{
+public class SbWebsocketMeta {
[JsonPropertyName("user_id")]
- public string UserId { get; set; } = string.Empty;
+ [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+
+ public required long UserId { get; set; }
[JsonPropertyName("session_id")]
public string SessionId { get; set; } = string.Empty;
|
