diff --git a/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/deps.json b/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/deps.json
index bfeb4cbe0..f6ee1a167 100644
--- a/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/deps.json
+++ b/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/deps.json
@@ -51,8 +51,8 @@
},
{
"pname": "Microsoft.EntityFrameworkCore",
- "version": "10.0.5",
- "hash": "sha256-SR8KBOuIx9e1j/cMwYRCO62WEB+CUrGptexl9MSgp8M="
+ "version": "10.0.6",
+ "hash": "sha256-wEA3ySJvLjAs6O9feF8vZXFM8GgyP+1ufQCaawj20dU="
},
{
"pname": "Microsoft.EntityFrameworkCore.Abstractions",
@@ -61,8 +61,8 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-qMKa7YGJUfaPTRMsAYYPlLxXdhZeyAZLiOSDcNFzDnA="
+ "version": "10.0.6",
+ "hash": "sha256-izcDKxbfeMBNxXmri20mESugr7NHxJEE4Hnvia6hVS4="
},
{
"pname": "Microsoft.EntityFrameworkCore.Analyzers",
@@ -71,13 +71,13 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Analyzers",
- "version": "10.0.5",
- "hash": "sha256-jPTN3RkI1J7vb7O4xiCHjMczMKh//NnKhJAGTuT7v88="
+ "version": "10.0.6",
+ "hash": "sha256-qTZ9ZhnPM7Nqy/ZWjloDTEUO91CymeJ07Yp1SKMJWiY="
},
{
"pname": "Microsoft.EntityFrameworkCore.Design",
- "version": "10.0.5",
- "hash": "sha256-+D17/sNpPhhDaLJJR4fFjSMySFU4yKQzHgzPcAJAdR0="
+ "version": "10.0.6",
+ "hash": "sha256-9WAXxXdAM0rNbGq6j7VGubHslxzmpTYKZ9gFyxh/N74="
},
{
"pname": "Microsoft.EntityFrameworkCore.Relational",
@@ -86,13 +86,13 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Relational",
- "version": "10.0.5",
- "hash": "sha256-5jfkvUKSexKCbCsYZYkBAWd4BIN48dlF5pP6htfDMMQ="
+ "version": "10.0.6",
+ "hash": "sha256-gyA+zXeRaMZl9qs9WXrvc0sEnptZy1nxC6kBux5bTQ0="
},
{
"pname": "Microsoft.Extensions.Caching.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-3rW3DjoyIIgfeJOHvdZJSrtsZ76V3MNxH5RLICRXWv4="
+ "version": "10.0.6",
+ "hash": "sha256-9yCnv7SmbNOq21W0rmnpiT4GkkE2pceU3xA1HE7zAM4="
},
{
"pname": "Microsoft.Extensions.Caching.Memory",
@@ -101,18 +101,18 @@
},
{
"pname": "Microsoft.Extensions.Caching.Memory",
- "version": "10.0.5",
- "hash": "sha256-WP2/64G4k48qdIohuOOgln9p0b2SJzxWzECfPqX6lQk="
+ "version": "10.0.6",
+ "hash": "sha256-3dWBnlBfEbfC50yrB8isuAOCMeYVaVQo/JfuRvpVBlI="
},
{
"pname": "Microsoft.Extensions.Configuration.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-DNK+lL2jeHFYyd43zfgVY32UskEfQ4YsTapztuQbYwo="
+ "version": "10.0.6",
+ "hash": "sha256-jxtne26QF7bASCRmLNwYsKruY3QhsnuzN9Us11WUdSQ="
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
- "version": "10.0.5",
- "hash": "sha256-ofDRirUV9XLSz4oksCqErwBJFtAieHACFfyZukHKFng="
+ "version": "10.0.6",
+ "hash": "sha256-K3ODZC+Bwd3Tze5wF7BQvJJGlNObdf2PNA35F41jHTE="
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
@@ -121,8 +121,8 @@
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-KrP+hE3gk7pATbJYZsJ1LHiXjzLA+ntHW7G/VGgHk2g="
+ "version": "10.0.6",
+ "hash": "sha256-lFiZb81kfBJK7J0b0A2UIpydPRT73Xcs57Gzf/+1xXc="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
@@ -131,8 +131,8 @@
},
{
"pname": "Microsoft.Extensions.DependencyModel",
- "version": "10.0.5",
- "hash": "sha256-UfG98EJ+0JTQA8Kx8yxt9mg19s0RSIOO+pG9JJy8uB0="
+ "version": "10.0.6",
+ "hash": "sha256-WY/CGoll5mwtiG3pBN/jDpt5/g4qcQuBL62LeS8KgmM="
},
{
"pname": "Microsoft.Extensions.Logging",
@@ -141,8 +141,8 @@
},
{
"pname": "Microsoft.Extensions.Logging",
- "version": "10.0.5",
- "hash": "sha256-4gVrKZfo/YHZKgKNsgGZZYqa79XWK9wDUuiVfguUV6U="
+ "version": "10.0.6",
+ "hash": "sha256-tskLj/WXLK35gkuJAWaAhPjMW92N1JKOTzTLupR30pE="
},
{
"pname": "Microsoft.Extensions.Logging",
@@ -156,8 +156,8 @@
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-e3A/l+II+n+D7/OPwjdyQM1IBtKHfHeIdlkJmuRw77w="
+ "version": "10.0.6",
+ "hash": "sha256-4ijpXt4PoTNcmF5dl/rEZkRWBAjukB229lXtBtJhxn4="
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
@@ -166,8 +166,8 @@
},
{
"pname": "Microsoft.Extensions.Options",
- "version": "10.0.5",
- "hash": "sha256-nw+m6VWXjmaBqZ1aH/l9SR9Oy62N9dmiMKloJ78kxv8="
+ "version": "10.0.6",
+ "hash": "sha256-GJCULaUcN2FxCA9fKOLe5EDEtkKLrEuP2Kw0jRqospA="
},
{
"pname": "Microsoft.Extensions.Options",
@@ -176,8 +176,8 @@
},
{
"pname": "Microsoft.Extensions.Primitives",
- "version": "10.0.5",
- "hash": "sha256-uvrur+0dg4zAAQcpLkkhPA77ST0tA3+EpGdDlCckC+E="
+ "version": "10.0.6",
+ "hash": "sha256-/iSFDryQIl8rl+TtrzunT5LcbPsQCeC2V+9CnS1P4Cc="
},
{
"pname": "Microsoft.Extensions.Primitives",
diff --git a/extra/admin-api/Interop/Spacebar.Interop.Authentication.AspNetCore/deps.json b/extra/admin-api/Interop/Spacebar.Interop.Authentication.AspNetCore/deps.json
index 39069977f..f65425509 100644
--- a/extra/admin-api/Interop/Spacebar.Interop.Authentication.AspNetCore/deps.json
+++ b/extra/admin-api/Interop/Spacebar.Interop.Authentication.AspNetCore/deps.json
@@ -61,8 +61,8 @@
},
{
"pname": "Microsoft.EntityFrameworkCore",
- "version": "10.0.5",
- "hash": "sha256-SR8KBOuIx9e1j/cMwYRCO62WEB+CUrGptexl9MSgp8M="
+ "version": "10.0.6",
+ "hash": "sha256-wEA3ySJvLjAs6O9feF8vZXFM8GgyP+1ufQCaawj20dU="
},
{
"pname": "Microsoft.EntityFrameworkCore.Abstractions",
@@ -71,8 +71,8 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-qMKa7YGJUfaPTRMsAYYPlLxXdhZeyAZLiOSDcNFzDnA="
+ "version": "10.0.6",
+ "hash": "sha256-izcDKxbfeMBNxXmri20mESugr7NHxJEE4Hnvia6hVS4="
},
{
"pname": "Microsoft.EntityFrameworkCore.Analyzers",
@@ -81,13 +81,13 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Analyzers",
- "version": "10.0.5",
- "hash": "sha256-jPTN3RkI1J7vb7O4xiCHjMczMKh//NnKhJAGTuT7v88="
+ "version": "10.0.6",
+ "hash": "sha256-qTZ9ZhnPM7Nqy/ZWjloDTEUO91CymeJ07Yp1SKMJWiY="
},
{
"pname": "Microsoft.EntityFrameworkCore.Design",
- "version": "10.0.5",
- "hash": "sha256-+D17/sNpPhhDaLJJR4fFjSMySFU4yKQzHgzPcAJAdR0="
+ "version": "10.0.6",
+ "hash": "sha256-9WAXxXdAM0rNbGq6j7VGubHslxzmpTYKZ9gFyxh/N74="
},
{
"pname": "Microsoft.EntityFrameworkCore.Relational",
@@ -96,13 +96,13 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Relational",
- "version": "10.0.5",
- "hash": "sha256-5jfkvUKSexKCbCsYZYkBAWd4BIN48dlF5pP6htfDMMQ="
+ "version": "10.0.6",
+ "hash": "sha256-gyA+zXeRaMZl9qs9WXrvc0sEnptZy1nxC6kBux5bTQ0="
},
{
"pname": "Microsoft.Extensions.DependencyModel",
- "version": "10.0.5",
- "hash": "sha256-UfG98EJ+0JTQA8Kx8yxt9mg19s0RSIOO+pG9JJy8uB0="
+ "version": "10.0.6",
+ "hash": "sha256-WY/CGoll5mwtiG3pBN/jDpt5/g4qcQuBL62LeS8KgmM="
},
{
"pname": "Microsoft.IdentityModel.Abstractions",
diff --git a/extra/admin-api/Interop/Spacebar.Interop.Authentication/Spacebar.Interop.Authentication.csproj b/extra/admin-api/Interop/Spacebar.Interop.Authentication/Spacebar.Interop.Authentication.csproj
index a56ed4f81..741f9a561 100644
--- a/extra/admin-api/Interop/Spacebar.Interop.Authentication/Spacebar.Interop.Authentication.csproj
+++ b/extra/admin-api/Interop/Spacebar.Interop.Authentication/Spacebar.Interop.Authentication.csproj
@@ -14,8 +14,8 @@
-
-
+
+
diff --git a/extra/admin-api/Interop/Spacebar.Interop.Authentication/deps.json b/extra/admin-api/Interop/Spacebar.Interop.Authentication/deps.json
index 079864d08..ff52c9e73 100644
--- a/extra/admin-api/Interop/Spacebar.Interop.Authentication/deps.json
+++ b/extra/admin-api/Interop/Spacebar.Interop.Authentication/deps.json
@@ -61,8 +61,8 @@
},
{
"pname": "Microsoft.EntityFrameworkCore",
- "version": "10.0.5",
- "hash": "sha256-SR8KBOuIx9e1j/cMwYRCO62WEB+CUrGptexl9MSgp8M="
+ "version": "10.0.6",
+ "hash": "sha256-wEA3ySJvLjAs6O9feF8vZXFM8GgyP+1ufQCaawj20dU="
},
{
"pname": "Microsoft.EntityFrameworkCore.Abstractions",
@@ -71,8 +71,8 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-qMKa7YGJUfaPTRMsAYYPlLxXdhZeyAZLiOSDcNFzDnA="
+ "version": "10.0.6",
+ "hash": "sha256-izcDKxbfeMBNxXmri20mESugr7NHxJEE4Hnvia6hVS4="
},
{
"pname": "Microsoft.EntityFrameworkCore.Analyzers",
@@ -81,13 +81,13 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Analyzers",
- "version": "10.0.5",
- "hash": "sha256-jPTN3RkI1J7vb7O4xiCHjMczMKh//NnKhJAGTuT7v88="
+ "version": "10.0.6",
+ "hash": "sha256-qTZ9ZhnPM7Nqy/ZWjloDTEUO91CymeJ07Yp1SKMJWiY="
},
{
"pname": "Microsoft.EntityFrameworkCore.Design",
- "version": "10.0.5",
- "hash": "sha256-+D17/sNpPhhDaLJJR4fFjSMySFU4yKQzHgzPcAJAdR0="
+ "version": "10.0.6",
+ "hash": "sha256-9WAXxXdAM0rNbGq6j7VGubHslxzmpTYKZ9gFyxh/N74="
},
{
"pname": "Microsoft.EntityFrameworkCore.Relational",
@@ -96,13 +96,13 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Relational",
- "version": "10.0.5",
- "hash": "sha256-5jfkvUKSexKCbCsYZYkBAWd4BIN48dlF5pP6htfDMMQ="
+ "version": "10.0.6",
+ "hash": "sha256-gyA+zXeRaMZl9qs9WXrvc0sEnptZy1nxC6kBux5bTQ0="
},
{
"pname": "Microsoft.Extensions.Caching.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-3rW3DjoyIIgfeJOHvdZJSrtsZ76V3MNxH5RLICRXWv4="
+ "version": "10.0.6",
+ "hash": "sha256-9yCnv7SmbNOq21W0rmnpiT4GkkE2pceU3xA1HE7zAM4="
},
{
"pname": "Microsoft.Extensions.Caching.Memory",
@@ -111,33 +111,33 @@
},
{
"pname": "Microsoft.Extensions.Caching.Memory",
- "version": "10.0.5",
- "hash": "sha256-WP2/64G4k48qdIohuOOgln9p0b2SJzxWzECfPqX6lQk="
+ "version": "10.0.6",
+ "hash": "sha256-3dWBnlBfEbfC50yrB8isuAOCMeYVaVQo/JfuRvpVBlI="
},
{
"pname": "Microsoft.Extensions.Configuration",
- "version": "10.0.5",
- "hash": "sha256-6rOmJD7Jzq5MPLDd1aV+7gCQwIM9j4c+iT1pGea/daI="
+ "version": "10.0.6",
+ "hash": "sha256-CSd5RC5pMsmglpnE6Vm3JabMnbmziqtUGrZE5Rg7uF4="
},
{
"pname": "Microsoft.Extensions.Configuration.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-DNK+lL2jeHFYyd43zfgVY32UskEfQ4YsTapztuQbYwo="
+ "version": "10.0.6",
+ "hash": "sha256-jxtne26QF7bASCRmLNwYsKruY3QhsnuzN9Us11WUdSQ="
},
{
"pname": "Microsoft.Extensions.Configuration.Binder",
- "version": "10.0.5",
- "hash": "sha256-cVG2NEW1rgLfeq/Gnh/XXqzDx2Tt8ecvgCAB4uFzcQo="
+ "version": "10.0.6",
+ "hash": "sha256-34blBlrQ3FRS7iCS7/gxPZMa9xgDW0p3iEERqwgXFMA="
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
- "version": "10.0.5",
- "hash": "sha256-ofDRirUV9XLSz4oksCqErwBJFtAieHACFfyZukHKFng="
+ "version": "10.0.6",
+ "hash": "sha256-K3ODZC+Bwd3Tze5wF7BQvJJGlNObdf2PNA35F41jHTE="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-KrP+hE3gk7pATbJYZsJ1LHiXjzLA+ntHW7G/VGgHk2g="
+ "version": "10.0.6",
+ "hash": "sha256-lFiZb81kfBJK7J0b0A2UIpydPRT73Xcs57Gzf/+1xXc="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
@@ -151,8 +151,8 @@
},
{
"pname": "Microsoft.Extensions.DependencyModel",
- "version": "10.0.5",
- "hash": "sha256-UfG98EJ+0JTQA8Kx8yxt9mg19s0RSIOO+pG9JJy8uB0="
+ "version": "10.0.6",
+ "hash": "sha256-WY/CGoll5mwtiG3pBN/jDpt5/g4qcQuBL62LeS8KgmM="
},
{
"pname": "Microsoft.Extensions.Logging",
@@ -161,8 +161,8 @@
},
{
"pname": "Microsoft.Extensions.Logging",
- "version": "10.0.5",
- "hash": "sha256-4gVrKZfo/YHZKgKNsgGZZYqa79XWK9wDUuiVfguUV6U="
+ "version": "10.0.6",
+ "hash": "sha256-tskLj/WXLK35gkuJAWaAhPjMW92N1JKOTzTLupR30pE="
},
{
"pname": "Microsoft.Extensions.Logging",
@@ -176,8 +176,8 @@
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-e3A/l+II+n+D7/OPwjdyQM1IBtKHfHeIdlkJmuRw77w="
+ "version": "10.0.6",
+ "hash": "sha256-4ijpXt4PoTNcmF5dl/rEZkRWBAjukB229lXtBtJhxn4="
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
@@ -191,8 +191,8 @@
},
{
"pname": "Microsoft.Extensions.Options",
- "version": "10.0.5",
- "hash": "sha256-nw+m6VWXjmaBqZ1aH/l9SR9Oy62N9dmiMKloJ78kxv8="
+ "version": "10.0.6",
+ "hash": "sha256-GJCULaUcN2FxCA9fKOLe5EDEtkKLrEuP2Kw0jRqospA="
},
{
"pname": "Microsoft.Extensions.Options",
@@ -201,8 +201,8 @@
},
{
"pname": "Microsoft.Extensions.Primitives",
- "version": "10.0.5",
- "hash": "sha256-uvrur+0dg4zAAQcpLkkhPA77ST0tA3+EpGdDlCckC+E="
+ "version": "10.0.6",
+ "hash": "sha256-/iSFDryQIl8rl+TtrzunT5LcbPsQCeC2V+9CnS1P4Cc="
},
{
"pname": "Microsoft.Extensions.Primitives",
diff --git a/extra/admin-api/Interop/Spacebar.Interop.Cdn.Signing/Spacebar.Interop.Cdn.Signing.csproj b/extra/admin-api/Interop/Spacebar.Interop.Cdn.Signing/Spacebar.Interop.Cdn.Signing.csproj
index 65f5d0caa..378e21288 100644
--- a/extra/admin-api/Interop/Spacebar.Interop.Cdn.Signing/Spacebar.Interop.Cdn.Signing.csproj
+++ b/extra/admin-api/Interop/Spacebar.Interop.Cdn.Signing/Spacebar.Interop.Cdn.Signing.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/extra/admin-api/Interop/Spacebar.Interop.Replication.Abstractions/ReplicationMessage.cs b/extra/admin-api/Interop/Spacebar.Interop.Replication.Abstractions/ReplicationMessage.cs
index 630ef47e4..5cffa012b 100644
--- a/extra/admin-api/Interop/Spacebar.Interop.Replication.Abstractions/ReplicationMessage.cs
+++ b/extra/admin-api/Interop/Spacebar.Interop.Replication.Abstractions/ReplicationMessage.cs
@@ -3,17 +3,17 @@ using System.Text.Json.Serialization;
namespace Spacebar.Interop.Replication.Abstractions;
public class ContentlessReplicationMessage {
- [JsonPropertyName("channel_id")]
- public string? ChannelId { get; set; }
+ [JsonPropertyName("channel_id"), JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? ChannelId { get; set; }
- [JsonPropertyName("guild_id")]
- public string? GuildId { get; set; }
+ [JsonPropertyName("guild_id"), JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? GuildId { get; set; }
- [JsonPropertyName("user_id")]
- public string? UserId { get; set; }
+ [JsonPropertyName("user_id"), JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? UserId { get; set; }
- [JsonPropertyName("session_id")]
- public string? SessionId { get; set; }
+ [JsonPropertyName("session_id"), JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? SessionId { get; set; }
[JsonPropertyName("created_at")]
public DateTime? CreatedAt { get; set; }
diff --git a/extra/admin-api/Interop/Spacebar.Interop.Replication.RabbitMq/RabbitMqSpacebarReplication.cs b/extra/admin-api/Interop/Spacebar.Interop.Replication.RabbitMq/RabbitMqSpacebarReplication.cs
index b818b13ea..f2b6bf75a 100644
--- a/extra/admin-api/Interop/Spacebar.Interop.Replication.RabbitMq/RabbitMqSpacebarReplication.cs
+++ b/extra/admin-api/Interop/Spacebar.Interop.Replication.RabbitMq/RabbitMqSpacebarReplication.cs
@@ -24,7 +24,7 @@ public class RabbitMqSpacebarReplication : ISpacebarReplication {
// HACK: body is required in rabbitmq...
private async Task SendAsyncInternal(ContentlessReplicationMessage message, object? body = null) {
- var exchangeId = message.GuildId ?? message.ChannelId ?? message.UserId ?? "global";
+ var exchangeId = (message.GuildId ?? message.ChannelId ?? message.UserId)?.ToString() ?? "global";
await _mqChannel.ExchangeDeclareAsync(exchange: exchangeId, type: ExchangeType.Fanout, durable: false);
var props = new BasicProperties() { Type = message.Event };
var publishSuccess = false;
diff --git a/extra/admin-api/Interop/Spacebar.Interop.Replication.RabbitMq/Spacebar.Interop.Replication.RabbitMq.csproj b/extra/admin-api/Interop/Spacebar.Interop.Replication.RabbitMq/Spacebar.Interop.Replication.RabbitMq.csproj
index 8a23201e4..f74f7ba94 100644
--- a/extra/admin-api/Interop/Spacebar.Interop.Replication.RabbitMq/Spacebar.Interop.Replication.RabbitMq.csproj
+++ b/extra/admin-api/Interop/Spacebar.Interop.Replication.RabbitMq/Spacebar.Interop.Replication.RabbitMq.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/extra/admin-api/Interop/Spacebar.Interop.Replication.RabbitMq/deps.json b/extra/admin-api/Interop/Spacebar.Interop.Replication.RabbitMq/deps.json
index f2af5d4ed..8061ce3c6 100644
--- a/extra/admin-api/Interop/Spacebar.Interop.Replication.RabbitMq/deps.json
+++ b/extra/admin-api/Interop/Spacebar.Interop.Replication.RabbitMq/deps.json
@@ -6,23 +6,23 @@
},
{
"pname": "Microsoft.Extensions.Configuration",
- "version": "10.0.5",
- "hash": "sha256-6rOmJD7Jzq5MPLDd1aV+7gCQwIM9j4c+iT1pGea/daI="
+ "version": "10.0.6",
+ "hash": "sha256-CSd5RC5pMsmglpnE6Vm3JabMnbmziqtUGrZE5Rg7uF4="
},
{
"pname": "Microsoft.Extensions.Configuration.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-DNK+lL2jeHFYyd43zfgVY32UskEfQ4YsTapztuQbYwo="
+ "version": "10.0.6",
+ "hash": "sha256-jxtne26QF7bASCRmLNwYsKruY3QhsnuzN9Us11WUdSQ="
},
{
"pname": "Microsoft.Extensions.Configuration.Binder",
- "version": "10.0.5",
- "hash": "sha256-cVG2NEW1rgLfeq/Gnh/XXqzDx2Tt8ecvgCAB4uFzcQo="
+ "version": "10.0.6",
+ "hash": "sha256-34blBlrQ3FRS7iCS7/gxPZMa9xgDW0p3iEERqwgXFMA="
},
{
"pname": "Microsoft.Extensions.Primitives",
- "version": "10.0.5",
- "hash": "sha256-uvrur+0dg4zAAQcpLkkhPA77ST0tA3+EpGdDlCckC+E="
+ "version": "10.0.6",
+ "hash": "sha256-/iSFDryQIl8rl+TtrzunT5LcbPsQCeC2V+9CnS1P4Cc="
},
{
"pname": "RabbitMQ.Client",
diff --git a/extra/admin-api/Interop/Spacebar.Interop.Replication.UnixSocket/Spacebar.Interop.Replication.UnixSocket.csproj b/extra/admin-api/Interop/Spacebar.Interop.Replication.UnixSocket/Spacebar.Interop.Replication.UnixSocket.csproj
index 0d86aa534..a4c14b81f 100644
--- a/extra/admin-api/Interop/Spacebar.Interop.Replication.UnixSocket/Spacebar.Interop.Replication.UnixSocket.csproj
+++ b/extra/admin-api/Interop/Spacebar.Interop.Replication.UnixSocket/Spacebar.Interop.Replication.UnixSocket.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/extra/admin-api/Interop/Spacebar.Interop.Replication.UnixSocket/deps.json b/extra/admin-api/Interop/Spacebar.Interop.Replication.UnixSocket/deps.json
index f35bcf257..bd26fa0df 100644
--- a/extra/admin-api/Interop/Spacebar.Interop.Replication.UnixSocket/deps.json
+++ b/extra/admin-api/Interop/Spacebar.Interop.Replication.UnixSocket/deps.json
@@ -1,22 +1,22 @@
[
{
"pname": "Microsoft.Extensions.Configuration",
- "version": "10.0.5",
- "hash": "sha256-6rOmJD7Jzq5MPLDd1aV+7gCQwIM9j4c+iT1pGea/daI="
+ "version": "10.0.6",
+ "hash": "sha256-CSd5RC5pMsmglpnE6Vm3JabMnbmziqtUGrZE5Rg7uF4="
},
{
"pname": "Microsoft.Extensions.Configuration.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-DNK+lL2jeHFYyd43zfgVY32UskEfQ4YsTapztuQbYwo="
+ "version": "10.0.6",
+ "hash": "sha256-jxtne26QF7bASCRmLNwYsKruY3QhsnuzN9Us11WUdSQ="
},
{
"pname": "Microsoft.Extensions.Configuration.Binder",
- "version": "10.0.5",
- "hash": "sha256-cVG2NEW1rgLfeq/Gnh/XXqzDx2Tt8ecvgCAB4uFzcQo="
+ "version": "10.0.6",
+ "hash": "sha256-34blBlrQ3FRS7iCS7/gxPZMa9xgDW0p3iEERqwgXFMA="
},
{
"pname": "Microsoft.Extensions.Primitives",
- "version": "10.0.5",
- "hash": "sha256-uvrur+0dg4zAAQcpLkkhPA77ST0tA3+EpGdDlCckC+E="
+ "version": "10.0.6",
+ "hash": "sha256-/iSFDryQIl8rl+TtrzunT5LcbPsQCeC2V+9CnS1P4Cc="
}
]
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 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; }
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 c590e092e..a9f47c8d0 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Contexts/SpacebarDbContext.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Contexts/SpacebarDbContext.cs
@@ -111,6 +111,8 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_938c0a27255637bde919591888f");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.BotUser).WithOne(p => p.ApplicationBotUser)
.OnDelete(DeleteBehavior.Cascade)
.HasConstraintName("FK_2ce5a55796fe4c2f77ece57a647");
@@ -130,16 +132,25 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_0f73c2f025989c407947e1f75fe");
+ entity.Property(e => e.Id).ValueGeneratedNever();
entity.Property(e => e.DmPermission).HasDefaultValue(true);
- entity.Property(e => e.Options).HasDefaultValueSql("'[]'::text");
+ entity.Property(e => e.Options).HasDefaultValueSql("'[]'::jsonb");
entity.Property(e => e.Type).HasDefaultValue(1);
- entity.Property(e => e.Version).HasDefaultValueSql("'0'::character varying");
+ entity.Property(e => e.Version).HasDefaultValueSql("(0)::bigint");
+
+ entity.HasOne(d => d.Application).WithMany(p => p.ApplicationCommands).HasConstraintName("application_commands_applications_fk");
});
modelBuilder.Entity(entity =>
{
entity.HasKey(e => e.Id).HasName("PK_5e1f050bcff31e3084a1d662412");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
+ entity.HasOne(d => d.Channel).WithMany(p => p.Attachments)
+ .OnDelete(DeleteBehavior.Cascade)
+ .HasConstraintName("attachments_channels_fk");
+
entity.HasOne(d => d.Message).WithMany(p => p.Attachments)
.OnDelete(DeleteBehavior.Cascade)
.HasConstraintName("FK_623e10eec51ada466c5038979e3");
@@ -149,6 +160,8 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_1bb179d048bbc581caa3b013439");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.Target).WithMany(p => p.AuditLogTargets).HasConstraintName("FK_3cd01cd3ae7aab010310d96ac8e");
entity.HasOne(d => d.User).WithMany(p => p.AuditLogUsers).HasConstraintName("FK_bd2726fd31b35443f2245b93ba0");
@@ -158,15 +171,21 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_99789ae863507f5aed9e58d7866");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.Creator).WithMany(p => p.AutomodRules)
.OnDelete(DeleteBehavior.Cascade)
.HasConstraintName("FK_12d3d60b961393d310429c062b7");
+
+ entity.HasOne(d => d.Guild).WithMany(p => p.AutomodRules).HasConstraintName("automod_rules_guilds_fk");
});
modelBuilder.Entity(entity =>
{
entity.HasKey(e => e.Id).HasName("PK_34ab957382dbc57e8fb53f1638f");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.User).WithMany(p => p.BackupCodes)
.OnDelete(DeleteBehavior.Cascade)
.HasConstraintName("FK_70066ea80d2f4b871beda32633b");
@@ -175,12 +194,16 @@ public partial class SpacebarDbContext : DbContext
modelBuilder.Entity(entity =>
{
entity.HasKey(e => e.Id).HasName("PK_8a651318b8de577e8e217676466");
+
+ entity.Property(e => e.Id).ValueGeneratedNever();
});
modelBuilder.Entity(entity =>
{
entity.HasKey(e => e.Id).HasName("PK_a4d6f261bffa4615c62d756566a");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.Executor).WithMany(p => p.BanExecutors).HasConstraintName("FK_07ad88c86d1f290d46748410d58");
entity.HasOne(d => d.Guild).WithMany(p => p.Bans)
@@ -203,6 +226,8 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_bc603823f3f741359c2339389f9");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.Guild).WithMany(p => p.Channels)
.OnDelete(DeleteBehavior.Cascade)
.HasConstraintName("FK_c253dafe5f3a03ec00cd8fb4581");
@@ -215,12 +240,16 @@ public partial class SpacebarDbContext : DbContext
modelBuilder.Entity(entity =>
{
entity.HasKey(e => e.Id).HasName("PK_4c4ea258342d2d6ba1be0a71a43");
+
+ entity.Property(e => e.Id).ValueGeneratedNever();
});
modelBuilder.Entity(entity =>
{
entity.HasKey(e => e.Id).HasName("PK_5794827a3ee7c9318612dcb70c8");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.Channel).WithMany(p => p.CloudAttachments)
.OnDelete(DeleteBehavior.SetNull)
.HasConstraintName("FK_998d5fe91008ba5b09e1322104c");
@@ -239,6 +268,8 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_70416f1da0be645bb31da01c774");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.User).WithMany(p => p.ConnectedAccounts)
.OnDelete(DeleteBehavior.Cascade)
.HasConstraintName("FK_f47244225a6a1eac04a3463dd90");
@@ -253,6 +284,7 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_0abb7581d4efc5a8b1361389c5e");
+ entity.Property(e => e.Id).ValueGeneratedNever();
entity.Property(e => e.CreatedAt).HasDefaultValueSql("now()");
});
@@ -260,6 +292,8 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_9adb96a675f555c6169bad7ba62");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.Guild).WithMany(p => p.Emojis).HasConstraintName("FK_4b988e0db89d94cebcf07f598cc");
entity.HasOne(d => d.User).WithMany(p => p.Emojis).HasConstraintName("FK_fa7ddd5f9a214e28ce596548421");
@@ -269,9 +303,17 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_e7e7f2a51bd6d96a9ac2aa560f9");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.AfkChannel).WithMany(p => p.GuildAfkChannels).HasConstraintName("FK_f591a66b8019d87b0fe6c12dad6");
- entity.HasOne(d => d.Owner).WithMany(p => p.Guilds).HasConstraintName("FK_fc1a451727e3643ca572a3bb394");
+ entity.HasOne(d => d.Owner).WithMany(p => p.Guilds)
+ .OnDelete(DeleteBehavior.Cascade)
+ .HasConstraintName("FK_fc1a451727e3643ca572a3bb394");
+
+ entity.HasOne(d => d.PrimaryCategory).WithMany(p => p.Guilds)
+ .OnDelete(DeleteBehavior.SetNull)
+ .HasConstraintName("guilds_categories_fk");
entity.HasOne(d => d.PublicUpdatesChannel).WithMany(p => p.GuildPublicUpdatesChannels).HasConstraintName("FK_8d450b016dc8bec35f36729e4b0");
@@ -294,6 +336,7 @@ public partial class SpacebarDbContext : DbContext
entity.HasIndex(e => e.UserId, "instance_bans_user_id_idx").HasMethod("hash");
+ entity.Property(e => e.Id).ValueGeneratedNever();
entity.Property(e => e.CreatedAt).HasDefaultValueSql("now()");
entity.HasOne(d => d.OriginInstanceBan).WithOne(p => p.InverseOriginInstanceBan)
@@ -346,9 +389,7 @@ public partial class SpacebarDbContext : DbContext
j.HasIndex(new[] { "Index" }, "IDX_5d7ddc8a5f9c167f548625e772");
j.HasIndex(new[] { "RoleId" }, "IDX_e9080e7a7997a0170026d5139c");
j.IndexerProperty("Index").HasColumnName("index");
- j.IndexerProperty("RoleId")
- .HasColumnType("character varying")
- .HasColumnName("role_id");
+ j.IndexerProperty("RoleId").HasColumnName("role_id");
});
});
@@ -356,7 +397,8 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_18325f38ae6de43878487eff986");
- entity.Property(e => e.MessageSnapshots).HasDefaultValueSql("'[]'::text");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+ entity.Property(e => e.MessageSnapshots).HasDefaultValueSql("'[]'::jsonb");
entity.Property(e => e.Timestamp).HasDefaultValueSql("now()");
entity.HasOne(d => d.Application).WithMany(p => p.Messages).HasConstraintName("FK_5d3ec1cb962de6488637fd779d6");
@@ -402,12 +444,8 @@ public partial class SpacebarDbContext : DbContext
j.ToTable("message_channel_mentions");
j.HasIndex(new[] { "MessagesId" }, "IDX_2a27102ecd1d81b4582a436092");
j.HasIndex(new[] { "ChannelsId" }, "IDX_bdb8c09e1464cabf62105bf4b9");
- j.IndexerProperty("MessagesId")
- .HasColumnType("character varying")
- .HasColumnName("messagesId");
- j.IndexerProperty("ChannelsId")
- .HasColumnType("character varying")
- .HasColumnName("channelsId");
+ j.IndexerProperty("MessagesId").HasColumnName("messagesId");
+ j.IndexerProperty("ChannelsId").HasColumnName("channelsId");
});
entity.HasMany(d => d.Roles).WithMany(p => p.Messages)
@@ -425,12 +463,8 @@ public partial class SpacebarDbContext : DbContext
j.ToTable("message_role_mentions");
j.HasIndex(new[] { "RolesId" }, "IDX_29d63eb1a458200851bc37d074");
j.HasIndex(new[] { "MessagesId" }, "IDX_a8242cf535337a490b0feaea0b");
- j.IndexerProperty("MessagesId")
- .HasColumnType("character varying")
- .HasColumnName("messagesId");
- j.IndexerProperty("RolesId")
- .HasColumnType("character varying")
- .HasColumnName("rolesId");
+ j.IndexerProperty("MessagesId").HasColumnName("messagesId");
+ j.IndexerProperty("RolesId").HasColumnName("rolesId");
});
entity.HasMany(d => d.Stickers).WithMany(p => p.Messages)
@@ -448,12 +482,8 @@ public partial class SpacebarDbContext : DbContext
j.ToTable("message_stickers");
j.HasIndex(new[] { "MessagesId" }, "IDX_40bb6f23e7cc133292e92829d2");
j.HasIndex(new[] { "StickersId" }, "IDX_e22a70819d07659c7a71c112a1");
- j.IndexerProperty("MessagesId")
- .HasColumnType("character varying")
- .HasColumnName("messagesId");
- j.IndexerProperty("StickersId")
- .HasColumnType("character varying")
- .HasColumnName("stickersId");
+ j.IndexerProperty("MessagesId").HasColumnName("messagesId");
+ j.IndexerProperty("StickersId").HasColumnName("stickersId");
});
entity.HasMany(d => d.Users).WithMany(p => p.Messages)
@@ -471,12 +501,8 @@ public partial class SpacebarDbContext : DbContext
j.ToTable("message_user_mentions");
j.HasIndex(new[] { "MessagesId" }, "IDX_a343387fc560ef378760681c23");
j.HasIndex(new[] { "UsersId" }, "IDX_b831eb18ceebd28976239b1e2f");
- j.IndexerProperty("MessagesId")
- .HasColumnType("character varying")
- .HasColumnName("messagesId");
- j.IndexerProperty("UsersId")
- .HasColumnType("character varying")
- .HasColumnName("usersId");
+ j.IndexerProperty("MessagesId").HasColumnName("messagesId");
+ j.IndexerProperty("UsersId").HasColumnName("usersId");
});
});
@@ -489,6 +515,8 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_af6206538ea96c4e77e9f400c3d");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.Owner).WithMany(p => p.NoteOwners)
.OnDelete(DeleteBehavior.Cascade)
.HasConstraintName("FK_f9e103f8ae67cb1787063597925");
@@ -501,12 +529,16 @@ public partial class SpacebarDbContext : DbContext
modelBuilder.Entity(entity =>
{
entity.HasKey(e => e.Id).HasName("PK_3b4449f1f5fc167d921ee619f65");
+
+ entity.Property(e => e.Id).ValueGeneratedNever();
});
modelBuilder.Entity(entity =>
{
entity.HasKey(e => e.Id).HasName("PK_e6956a804978f01b713b1ed58e2");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.Channel).WithMany(p => p.ReadStates).HasConstraintName("FK_40da2fca4e0eaf7a23b5bfc5d34");
entity.HasOne(d => d.User).WithMany(p => p.ReadStates).HasConstraintName("FK_195f92e4dd1254a4e348c043763");
@@ -516,6 +548,8 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_de8fc5a9c364568f294798fe1e9");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.Channel).WithMany(p => p.Recipients).HasConstraintName("FK_2f18ee1ba667f233ae86c0ea60e");
entity.HasOne(d => d.User).WithMany(p => p.Recipients).HasConstraintName("FK_6157e8b6ba4e6e3089616481fe2");
@@ -525,6 +559,8 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_ba20e2f5cf487408e08e4dcecaf");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.From).WithMany(p => p.RelationshipFroms).HasConstraintName("FK_9af4194bab1250b1c584ae4f1d7");
entity.HasOne(d => d.To).WithMany(p => p.RelationshipTos).HasConstraintName("FK_9c7f6b98a9843b76dce1b0c878b");
@@ -534,6 +570,8 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_c1433d71a4838793a49dcad46ab");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.Guild).WithMany(p => p.Roles).HasConstraintName("FK_c32c1ab1c4dc7dcb0278c4b1b8b");
});
@@ -541,6 +579,8 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_6e95cdd91779e7cca06d1fff89c");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.User).WithMany(p => p.SecurityKeys)
.OnDelete(DeleteBehavior.Cascade)
.HasConstraintName("FK_24c97d0771cafedce6d7163eaad");
@@ -549,13 +589,15 @@ public partial class SpacebarDbContext : DbContext
modelBuilder.Entity(entity =>
{
entity.HasKey(e => e.Id).HasName("PK_4aec436cf81177ae97a1bcec3c7");
+
+ entity.Property(e => e.Id).ValueGeneratedNever();
});
modelBuilder.Entity(entity =>
{
entity.HasKey(e => e.SessionId).HasName("PK_9340188c93349808f10d1db74a8");
- entity.Property(e => e.Activities).HasDefaultValueSql("'[]'::text");
+ entity.Property(e => e.Activities).HasDefaultValueSql("'[]'::jsonb");
entity.Property(e => e.CreatedAt).HasDefaultValueSql("now()");
entity.HasOne(d => d.User).WithMany(p => p.Sessions).HasConstraintName("FK_085d540d9f418cfbdc7bd55bb19");
@@ -565,6 +607,8 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_e1dafa4063a5532645cc2810374");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.Guild).WithMany(p => p.Stickers)
.OnDelete(DeleteBehavior.Cascade)
.HasConstraintName("FK_193d551d852aca5347ef5c9f205");
@@ -582,6 +626,8 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_a27381efea0f876f5d3233af655");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.CoverStickerId1Navigation).WithMany(p => p.StickerPacks).HasConstraintName("FK_448fafba4355ee1c837bbc865f1");
});
@@ -589,6 +635,8 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_40440b6f569ebc02bc71c25c499");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.Channel).WithMany(p => p.Streams).HasConstraintName("FK_5101f0cded27ff0aae78fc4eed7");
entity.HasOne(d => d.Owner).WithMany(p => p.Streams).HasConstraintName("FK_1b566f9b54d1cda271da53ac82f");
@@ -598,6 +646,8 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_49bdc3f66394c12478f8371c546");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.Stream).WithMany(p => p.StreamSessions).HasConstraintName("FK_8b5a028a34dae9ee54af37c9c32");
entity.HasOne(d => d.User).WithMany(p => p.StreamSessions).HasConstraintName("FK_13ae5c29aff4d0890c54179511a");
@@ -607,6 +657,8 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_e7dc17249a1148a1970748eda99");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.Channel).WithMany(p => p.Tags).HasConstraintName("FK_2e2df07f6dacc12e1932b361fe4");
});
@@ -614,6 +666,8 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_7e5523774a38b08a6236d322403");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.OwnerUser).WithMany(p => p.Teams).HasConstraintName("FK_13f00abf7cb6096c43ecaf8c108");
});
@@ -621,6 +675,8 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_ca3eae89dcf20c9fd95bf7460aa");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.Team).WithMany(p => p.TeamMembers)
.OnDelete(DeleteBehavior.Cascade)
.HasConstraintName("FK_fdad7d5768277e60c40e01cdcea");
@@ -634,6 +690,8 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_515948649ce0bbbe391de702ae5");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.Creator).WithMany(p => p.Templates).HasConstraintName("FK_d7374b7f8f5fbfdececa4fb62e1");
entity.HasOne(d => d.SourceGuild).WithMany(p => p.Templates)
@@ -654,6 +712,8 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_a3ffb1c0c8416b9fc6f907b7433");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.SettingsIndexNavigation).WithOne(p => p.User).HasConstraintName("FK_0c14beb78d8c5ccba66072adbc7");
});
@@ -666,6 +726,8 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.UserId).HasName("PK_8ff3d1961a48b693810c9f99853");
+ entity.Property(e => e.UserId).ValueGeneratedNever();
+
entity.HasOne(d => d.User).WithOne(p => p.UserSettingsProto)
.OnDelete(DeleteBehavior.ClientSetNull)
.HasConstraintName("FK_8ff3d1961a48b693810c9f99853");
@@ -680,6 +742,8 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_ada09a50c134fad1369b510e3ce");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
entity.HasOne(d => d.Channel).WithMany(p => p.VoiceStates)
.OnDelete(DeleteBehavior.Cascade)
.HasConstraintName("FK_9f8d389866b40b6657edd026dd4");
@@ -697,9 +761,9 @@ public partial class SpacebarDbContext : DbContext
{
entity.HasKey(e => e.Id).HasName("PK_9e8795cfc899ab7bdaa831e8527");
- entity.HasOne(d => d.Application).WithMany(p => p.Webhooks)
- .OnDelete(DeleteBehavior.Cascade)
- .HasConstraintName("FK_c3e5305461931763b56aa905f1c");
+ entity.Property(e => e.Id).ValueGeneratedNever();
+
+ entity.HasOne(d => d.Application).WithMany(p => p.Webhooks).HasConstraintName("FK_c3e5305461931763b56aa905f1c");
entity.HasOne(d => d.Channel).WithMany(p => p.WebhookChannels)
.OnDelete(DeleteBehavior.Cascade)
@@ -711,7 +775,7 @@ public partial class SpacebarDbContext : DbContext
entity.HasOne(d => d.SourceChannel).WithMany(p => p.WebhookSourceChannels)
.OnDelete(DeleteBehavior.Cascade)
- .HasConstraintName("fk_d64f38834fa676f6caa4786ddd6");
+ .HasConstraintName("FK_4495b7032a33c6b8b605d030398");
entity.HasOne(d => d.SourceGuild).WithMany(p => p.WebhookSourceGuilds)
.OnDelete(DeleteBehavior.Cascade)
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 fabe14197..921f108d6 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Application.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Application.cs
@@ -11,8 +11,8 @@ namespace Spacebar.Models.Db.Models;
public partial class Application
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
[Column("name", TypeName = "character varying")]
public string Name { get; set; } = null!;
@@ -26,7 +26,7 @@ public partial class Application
[Column("summary", TypeName = "character varying")]
public string? Summary { get; set; }
- [Column("type")]
+ [Column("type", TypeName = "jsonb")]
public string? Type { get; set; }
[Column("hook")]
@@ -77,7 +77,7 @@ public partial class Application
[Column("cover_image", TypeName = "character varying")]
public string? CoverImage { get; set; }
- [Column("install_params")]
+ [Column("install_params", TypeName = "jsonb")]
public string? InstallParams { get; set; }
[Column("terms_of_service_url", TypeName = "character varying")]
@@ -86,21 +86,24 @@ public partial class Application
[Column("privacy_policy_url", TypeName = "character varying")]
public string? PrivacyPolicyUrl { get; set; }
- [Column("owner_id", TypeName = "character varying")]
- public string? OwnerId { get; set; }
+ [Column("owner_id")]
+ public long? OwnerId { get; set; }
- [Column("bot_user_id", TypeName = "character varying")]
- public string? BotUserId { get; set; }
+ [Column("bot_user_id")]
+ public long? BotUserId { get; set; }
- [Column("team_id", TypeName = "character varying")]
- public string? TeamId { get; set; }
+ [Column("team_id")]
+ public long? TeamId { get; set; }
- [Column("guild_id", TypeName = "character varying")]
- public string? GuildId { get; set; }
+ [Column("guild_id")]
+ public long? GuildId { get; set; }
[Column("custom_install_url", TypeName = "character varying")]
public string? CustomInstallUrl { get; set; }
+ [InverseProperty("Application")]
+ public virtual ICollection ApplicationCommands { get; set; } = new List();
+
[ForeignKey("BotUserId")]
[InverseProperty("ApplicationBotUser")]
public virtual User? BotUser { get; set; }
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 bb1254ff8..e654bc1b0 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/ApplicationCommand.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/ApplicationCommand.cs
@@ -10,14 +10,14 @@ namespace Spacebar.Models.Db.Models;
public partial class ApplicationCommand
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
[Column("type")]
public int Type { get; set; }
- [Column("application_id", TypeName = "character varying")]
- public string ApplicationId { get; set; } = null!;
+ [Column("application_id")]
+ public long ApplicationId { get; set; }
[Column("guild_id", TypeName = "character varying")]
public string? GuildId { get; set; }
@@ -31,10 +31,10 @@ public partial class ApplicationCommand
[Column("description", TypeName = "character varying")]
public string Description { get; set; } = null!;
- [Column("description_localizations")]
+ [Column("description_localizations", TypeName = "jsonb")]
public string? DescriptionLocalizations { get; set; }
- [Column("options")]
+ [Column("options", TypeName = "jsonb")]
public string Options { get; set; } = null!;
[Column("default_member_permissions", TypeName = "character varying")]
@@ -43,24 +43,28 @@ public partial class ApplicationCommand
[Column("dm_permission")]
public bool DmPermission { get; set; }
- [Column("permissions")]
+ [Column("permissions", TypeName = "jsonb")]
public string? Permissions { get; set; }
[Column("nsfw")]
public bool Nsfw { get; set; }
- [Column("integration_types")]
+ [Column("integration_types", TypeName = "jsonb")]
public string? IntegrationTypes { get; set; }
[Column("global_popularity_rank")]
public int GlobalPopularityRank { get; set; }
- [Column("contexts")]
+ [Column("contexts", TypeName = "jsonb")]
public string? Contexts { get; set; }
- [Column("version", TypeName = "character varying")]
- public string Version { get; set; } = null!;
+ [Column("version")]
+ public long Version { get; set; }
[Column("handler")]
public int Handler { get; set; }
+
+ [ForeignKey("ApplicationId")]
+ [InverseProperty("ApplicationCommands")]
+ public virtual Application Application { get; set; } = null!;
}
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 094a39b07..b67c3266a 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Attachment.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Attachment.cs
@@ -10,8 +10,8 @@ namespace Spacebar.Models.Db.Models;
public partial class Attachment
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
[Column("filename", TypeName = "character varying")]
public string Filename { get; set; } = null!;
@@ -19,12 +19,6 @@ public partial class Attachment
[Column("size")]
public int Size { get; set; }
- [Column("url", TypeName = "character varying")]
- public string Url { get; set; } = null!;
-
- [Column("proxy_url", TypeName = "character varying")]
- public string ProxyUrl { get; set; } = null!;
-
[Column("height")]
public int? Height { get; set; }
@@ -34,8 +28,15 @@ public partial class Attachment
[Column("content_type", TypeName = "character varying")]
public string? ContentType { get; set; }
- [Column("message_id", TypeName = "character varying")]
- public string? MessageId { get; set; }
+ [Column("message_id")]
+ public long? MessageId { get; set; }
+
+ [Column("channel_id")]
+ public long? ChannelId { get; set; }
+
+ [ForeignKey("ChannelId")]
+ [InverseProperty("Attachments")]
+ public virtual Channel? Channel { get; set; }
[ForeignKey("MessageId")]
[InverseProperty("Attachments")]
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 dcd563d36..9ddf379bb 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/AuditLog.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/AuditLog.cs
@@ -10,26 +10,26 @@ namespace Spacebar.Models.Db.Models;
public partial class AuditLog
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
- [Column("user_id", TypeName = "character varying")]
- public string? UserId { get; set; }
+ [Column("user_id")]
+ public long? UserId { get; set; }
[Column("action_type")]
public int ActionType { get; set; }
- [Column("options")]
+ [Column("options", TypeName = "jsonb")]
public string? Options { get; set; }
- [Column("changes")]
+ [Column("changes", TypeName = "jsonb")]
public string Changes { get; set; } = null!;
[Column("reason", TypeName = "character varying")]
public string? Reason { get; set; }
- [Column("target_id", TypeName = "character varying")]
- public string? TargetId { get; set; }
+ [Column("target_id")]
+ public long? TargetId { get; set; }
[ForeignKey("TargetId")]
[InverseProperty("AuditLogTargets")]
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 6e89f1e7d..d0aebfce4 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/AutomodRule.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/AutomodRule.cs
@@ -10,8 +10,8 @@ namespace Spacebar.Models.Db.Models;
public partial class AutomodRule
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
[Column("enabled")]
public bool Enabled { get; set; }
@@ -25,8 +25,8 @@ public partial class AutomodRule
[Column("exempt_roles")]
public string ExemptRoles { get; set; } = null!;
- [Column("guild_id", TypeName = "character varying")]
- public string GuildId { get; set; } = null!;
+ [Column("guild_id")]
+ public long GuildId { get; set; }
[Column("name", TypeName = "character varying")]
public string Name { get; set; } = null!;
@@ -37,16 +37,20 @@ public partial class AutomodRule
[Column("trigger_type")]
public int TriggerType { get; set; }
- [Column("trigger_metadata")]
+ [Column("trigger_metadata", TypeName = "jsonb")]
public string? TriggerMetadata { get; set; }
- [Column("actions")]
+ [Column("actions", TypeName = "jsonb")]
public string Actions { get; set; } = null!;
- [Column("creator_id", TypeName = "character varying")]
- public string? CreatorId { get; set; }
+ [Column("creator_id")]
+ public long? CreatorId { get; set; }
[ForeignKey("CreatorId")]
[InverseProperty("AutomodRules")]
public virtual User? Creator { get; set; }
+
+ [ForeignKey("GuildId")]
+ [InverseProperty("AutomodRules")]
+ public virtual Guild Guild { get; set; } = null!;
}
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 41d70abf3..3ee653187 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/BackupCode.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/BackupCode.cs
@@ -10,8 +10,8 @@ namespace Spacebar.Models.Db.Models;
public partial class BackupCode
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
[Column("code", TypeName = "character varying")]
public string Code { get; set; } = null!;
@@ -22,8 +22,8 @@ public partial class BackupCode
[Column("expired")]
public bool Expired { get; set; }
- [Column("user_id", TypeName = "character varying")]
- public string? UserId { get; set; }
+ [Column("user_id")]
+ public long? UserId { get; set; }
[ForeignKey("UserId")]
[InverseProperty("BackupCodes")]
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 792dbf87c..77a542955 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Badge.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Badge.cs
@@ -10,8 +10,8 @@ namespace Spacebar.Models.Db.Models;
public partial class Badge
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
[Column("description", TypeName = "character varying")]
public string Description { get; set; } = null!;
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 54e84c599..72cda52f9 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Ban.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Ban.cs
@@ -10,17 +10,17 @@ namespace Spacebar.Models.Db.Models;
public partial class Ban
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
- [Column("user_id", TypeName = "character varying")]
- public string? UserId { get; set; }
+ [Column("user_id")]
+ public long? UserId { get; set; }
- [Column("guild_id", TypeName = "character varying")]
- public string? GuildId { get; set; }
+ [Column("guild_id")]
+ public long? GuildId { get; set; }
- [Column("executor_id", TypeName = "character varying")]
- public string? ExecutorId { get; set; }
+ [Column("executor_id")]
+ public long? ExecutorId { get; set; }
[Column("ip", TypeName = "character varying")]
public string? Ip { get; set; }
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 35e5bbfbd..b1bf04df7 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Category.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Category.cs
@@ -11,12 +11,12 @@ public partial class Category
{
[Key]
[Column("id")]
- public int Id { get; set; }
+ public long Id { get; set; }
[Column("name", TypeName = "character varying")]
public string? Name { get; set; }
- [Column("localizations")]
+ [Column("localizations", TypeName = "jsonb")]
public string Localizations { get; set; } = null!;
[Column("is_primary")]
@@ -24,4 +24,7 @@ public partial class Category
[Column("icon", TypeName = "character varying")]
public string? Icon { get; set; }
+
+ [InverseProperty("PrimaryCategory")]
+ public virtual ICollection Guilds { get; set; } = new List();
}
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 63989751a..44dc65809 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Channel.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Channel.cs
@@ -10,8 +10,8 @@ namespace Spacebar.Models.Db.Models;
public partial class Channel
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
[Column("created_at", TypeName = "timestamp without time zone")]
public DateTime CreatedAt { get; set; }
@@ -25,22 +25,22 @@ public partial class Channel
[Column("type")]
public int Type { get; set; }
- [Column("last_message_id", TypeName = "character varying")]
- public string? LastMessageId { get; set; }
+ [Column("last_message_id")]
+ public long? LastMessageId { get; set; }
- [Column("guild_id", TypeName = "character varying")]
- public string? GuildId { get; set; }
+ [Column("guild_id")]
+ public long? GuildId { get; set; }
- [Column("parent_id", TypeName = "character varying")]
- public string? ParentId { get; set; }
+ [Column("parent_id")]
+ public long? ParentId { get; set; }
- [Column("owner_id", TypeName = "character varying")]
- public string? OwnerId { get; set; }
+ [Column("owner_id")]
+ public long? OwnerId { get; set; }
[Column("default_auto_archive_duration")]
public int? DefaultAutoArchiveDuration { get; set; }
- [Column("permission_overwrites")]
+ [Column("permission_overwrites", TypeName = "jsonb")]
public string? PermissionOverwrites { get; set; }
[Column("video_quality_mode")]
@@ -70,7 +70,7 @@ public partial class Channel
[Column("default_thread_rate_limit_per_user")]
public int? DefaultThreadRateLimitPerUser { get; set; }
- [Column("thread_metadata")]
+ [Column("thread_metadata", TypeName = "jsonb")]
public string? ThreadMetadata { get; set; }
[Column("member_count")]
@@ -91,6 +91,9 @@ public partial class Channel
[Column("status")]
public string? Status { get; set; }
+ [InverseProperty("Channel")]
+ public virtual ICollection Attachments { get; set; } = new List();
+
[InverseProperty("Channel")]
public virtual ICollection CloudAttachments { get; set; } = new List();
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 b0611b016..e985a72e5 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/ClientRelease.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/ClientRelease.cs
@@ -10,8 +10,8 @@ namespace Spacebar.Models.Db.Models;
public partial class ClientRelease
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
[Column("name", TypeName = "character varying")]
public string Name { get; set; } = null!;
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 63162681c..18b72dc45 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/CloudAttachment.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/CloudAttachment.cs
@@ -10,14 +10,14 @@ namespace Spacebar.Models.Db.Models;
public partial class CloudAttachment
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
- [Column("user_id", TypeName = "character varying")]
- public string? UserId { get; set; }
+ [Column("user_id")]
+ public long? UserId { get; set; }
- [Column("channel_id", TypeName = "character varying")]
- public string? ChannelId { get; set; }
+ [Column("channel_id")]
+ public long? ChannelId { get; set; }
[Column("upload_filename", TypeName = "character varying")]
public string UploadFilename { get; set; } = null!;
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 2dccc056e..276fb07e9 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/ConnectedAccount.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/ConnectedAccount.cs
@@ -10,14 +10,14 @@ namespace Spacebar.Models.Db.Models;
public partial class ConnectedAccount
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
[Column("external_id", TypeName = "character varying")]
public string ExternalId { get; set; } = null!;
- [Column("user_id", TypeName = "character varying")]
- public string? UserId { get; set; }
+ [Column("user_id")]
+ public long? UserId { get; set; }
[Column("friend_sync")]
public bool FriendSync { get; set; }
@@ -43,7 +43,7 @@ public partial class ConnectedAccount
[Column("integrations")]
public string Integrations { get; set; } = null!;
- [Column("metadata")]
+ [Column("metadata", TypeName = "jsonb")]
public string? Metadata { get; set; }
[Column("metadata_visibility")]
@@ -52,7 +52,7 @@ public partial class ConnectedAccount
[Column("two_way_link")]
public bool TwoWayLink { get; set; }
- [Column("token_data")]
+ [Column("token_data", TypeName = "jsonb")]
public string? TokenData { get; set; }
[ForeignKey("UserId")]
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 a5071a106..1fe473575 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/EmbedCache.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/EmbedCache.cs
@@ -10,18 +10,18 @@ namespace Spacebar.Models.Db.Models;
public partial class EmbedCache
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
[Column("url", TypeName = "character varying")]
public string Url { get; set; } = null!;
- [Column("embed")]
+ [Column("embed", TypeName = "jsonb")]
public string? Embed { get; set; }
[Column("created_at")]
public DateTime? CreatedAt { get; set; }
- [Column("embeds")]
+ [Column("embeds", TypeName = "jsonb")]
public string? Embeds { get; set; }
}
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 1690c08a3..e8f925560 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Emoji.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Emoji.cs
@@ -10,8 +10,8 @@ namespace Spacebar.Models.Db.Models;
public partial class Emoji
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
[Column("animated")]
public bool Animated { get; set; }
@@ -19,11 +19,11 @@ public partial class Emoji
[Column("available")]
public bool Available { get; set; }
- [Column("guild_id", TypeName = "character varying")]
- public string GuildId { get; set; } = null!;
+ [Column("guild_id")]
+ public long GuildId { get; set; }
- [Column("user_id", TypeName = "character varying")]
- public string? UserId { get; set; }
+ [Column("user_id")]
+ public long? UserId { get; set; }
[Column("managed")]
public bool Managed { get; set; }
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 9dbba150d..e93b49ad2 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Guild.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Guild.cs
@@ -10,11 +10,11 @@ namespace Spacebar.Models.Db.Models;
public partial class Guild
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
- [Column("afk_channel_id", TypeName = "character varying")]
- public string? AfkChannelId { get; set; }
+ [Column("afk_channel_id")]
+ public long? AfkChannelId { get; set; }
[Column("afk_timeout")]
public int? AfkTimeout { get; set; }
@@ -37,8 +37,8 @@ public partial class Guild
[Column("features")]
public string Features { get; set; } = null!;
- [Column("primary_category_id", TypeName = "character varying")]
- public string? PrimaryCategoryId { get; set; }
+ [Column("primary_category_id")]
+ public long? PrimaryCategoryId { get; set; }
[Column("icon", TypeName = "character varying")]
public string? Icon { get; set; }
@@ -61,8 +61,8 @@ public partial class Guild
[Column("presence_count")]
public int? PresenceCount { get; set; }
- [Column("template_id", TypeName = "character varying")]
- public string? TemplateId { get; set; }
+ [Column("template_id")]
+ public long? TemplateId { get; set; }
[Column("mfa_level")]
public int? MfaLevel { get; set; }
@@ -70,8 +70,8 @@ public partial class Guild
[Column("name", TypeName = "character varying")]
public string Name { get; set; } = null!;
- [Column("owner_id", TypeName = "character varying")]
- public string? OwnerId { get; set; }
+ [Column("owner_id")]
+ public long? OwnerId { get; set; }
[Column("preferred_locale", TypeName = "character varying")]
public string? PreferredLocale { get; set; }
@@ -82,11 +82,11 @@ public partial class Guild
[Column("premium_tier")]
public int PremiumTier { get; set; }
- [Column("public_updates_channel_id", TypeName = "character varying")]
- public string? PublicUpdatesChannelId { get; set; }
+ [Column("public_updates_channel_id")]
+ public long? PublicUpdatesChannelId { get; set; }
- [Column("rules_channel_id", TypeName = "character varying")]
- public string? RulesChannelId { get; set; }
+ [Column("rules_channel_id")]
+ public long? RulesChannelId { get; set; }
[Column("region", TypeName = "character varying")]
public string? Region { get; set; }
@@ -94,8 +94,8 @@ public partial class Guild
[Column("splash", TypeName = "character varying")]
public string? Splash { get; set; }
- [Column("system_channel_id", TypeName = "character varying")]
- public string? SystemChannelId { get; set; }
+ [Column("system_channel_id")]
+ public long? SystemChannelId { get; set; }
[Column("system_channel_flags")]
public int? SystemChannelFlags { get; set; }
@@ -106,11 +106,11 @@ public partial class Guild
[Column("verification_level")]
public int? VerificationLevel { get; set; }
- [Column("welcome_screen")]
+ [Column("welcome_screen", TypeName = "jsonb")]
public string WelcomeScreen { get; set; } = null!;
- [Column("widget_channel_id", TypeName = "character varying")]
- public string? WidgetChannelId { get; set; }
+ [Column("widget_channel_id")]
+ public long? WidgetChannelId { get; set; }
[Column("widget_enabled")]
public bool WidgetEnabled { get; set; }
@@ -143,6 +143,9 @@ public partial class Guild
[InverseProperty("Guild")]
public virtual ICollection Applications { get; set; } = new List();
+ [InverseProperty("Guild")]
+ public virtual ICollection AutomodRules { get; set; } = new List();
+
[InverseProperty("Guild")]
public virtual ICollection Bans { get; set; } = new List();
@@ -165,6 +168,10 @@ public partial class Guild
[InverseProperty("Guilds")]
public virtual User? Owner { get; set; }
+ [ForeignKey("PrimaryCategoryId")]
+ [InverseProperty("Guilds")]
+ public virtual Category? PrimaryCategory { get; set; }
+
[ForeignKey("PublicUpdatesChannelId")]
[InverseProperty("GuildPublicUpdatesChannels")]
public virtual Channel? PublicUpdatesChannel { get; set; }
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 5837bd513..76b147ef1 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/InstanceBan.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/InstanceBan.cs
@@ -11,8 +11,8 @@ namespace Spacebar.Models.Db.Models;
public partial class InstanceBan
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
[Column("created_at", TypeName = "timestamp without time zone")]
public DateTime CreatedAt { get; set; }
@@ -20,8 +20,8 @@ public partial class InstanceBan
[Column("reason", TypeName = "character varying")]
public string Reason { get; set; } = null!;
- [Column("user_id", TypeName = "character varying")]
- public string? UserId { get; set; }
+ [Column("user_id")]
+ public long? UserId { get; set; }
[Column("fingerprint", TypeName = "character varying")]
public string? Fingerprint { get; set; }
@@ -32,8 +32,8 @@ public partial class InstanceBan
[Column("is_from_other_instance_ban")]
public bool IsFromOtherInstanceBan { get; set; }
- [Column("origin_instance_ban_id", TypeName = "character varying")]
- public string? OriginInstanceBanId { get; set; }
+ [Column("origin_instance_ban_id")]
+ public long? OriginInstanceBanId { get; set; }
[Column("is_allowlisted")]
public bool IsAllowlisted { get; set; }
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 de4b8f5b0..a8e526e67 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Invite.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Invite.cs
@@ -31,17 +31,17 @@ public partial class Invite
[Column("expires_at", TypeName = "timestamp without time zone")]
public DateTime? ExpiresAt { get; set; }
- [Column("guild_id", TypeName = "character varying")]
- public string? GuildId { get; set; }
+ [Column("guild_id")]
+ public long? GuildId { get; set; }
- [Column("channel_id", TypeName = "character varying")]
- public string? ChannelId { get; set; }
+ [Column("channel_id")]
+ public long? ChannelId { get; set; }
- [Column("inviter_id", TypeName = "character varying")]
- public string? InviterId { get; set; }
+ [Column("inviter_id")]
+ public long? InviterId { get; set; }
- [Column("target_user_id", TypeName = "character varying")]
- public string? TargetUserId { get; set; }
+ [Column("target_user_id")]
+ public long? TargetUserId { get; set; }
[Column("target_user_type")]
public int? TargetUserType { get; set; }
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 b65aba959..d8311ca55 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Member.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Member.cs
@@ -14,11 +14,11 @@ public partial class Member
[Column("index")]
public int Index { get; set; }
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
- [Column("guild_id", TypeName = "character varying")]
- public string GuildId { get; set; } = null!;
+ [Column("guild_id")]
+ public long GuildId { get; set; }
[Column("nick", TypeName = "character varying")]
public string? Nick { get; set; }
@@ -38,11 +38,11 @@ public partial class Member
[Column("pending")]
public bool Pending { get; set; }
- [Column("settings")]
+ [Column("settings", TypeName = "jsonb")]
public string Settings { get; set; } = null!;
- [Column("last_message_id", TypeName = "character varying")]
- public string? LastMessageId { get; set; }
+ [Column("last_message_id")]
+ public long? LastMessageId { get; set; }
[Column("joined_by", TypeName = "character varying")]
public string? JoinedBy { get; set; }
@@ -65,13 +65,13 @@ public partial class Member
[Column("communication_disabled_until", TypeName = "timestamp without time zone")]
public DateTime? CommunicationDisabledUntil { get; set; }
- [Column("avatar_decoration_data")]
+ [Column("avatar_decoration_data", TypeName = "jsonb")]
public string? AvatarDecorationData { get; set; }
- [Column("display_name_styles")]
+ [Column("display_name_styles", TypeName = "jsonb")]
public string? DisplayNameStyles { get; set; }
- [Column("collectibles")]
+ [Column("collectibles", TypeName = "jsonb")]
public string? Collectibles { get; set; }
[Column("flags")]
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 b6b30979a..2e8325348 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Message.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Message.cs
@@ -13,26 +13,26 @@ namespace Spacebar.Models.Db.Models;
public partial class Message
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
- [Column("channel_id", TypeName = "character varying")]
- public string? ChannelId { get; set; }
+ [Column("channel_id")]
+ public long? ChannelId { get; set; }
- [Column("guild_id", TypeName = "character varying")]
- public string? GuildId { get; set; }
+ [Column("guild_id")]
+ public long? GuildId { get; set; }
- [Column("author_id", TypeName = "character varying")]
- public string? AuthorId { get; set; }
+ [Column("author_id")]
+ public long? AuthorId { get; set; }
- [Column("member_id", TypeName = "character varying")]
- public string? MemberId { get; set; }
+ [Column("member_id")]
+ public long? MemberId { get; set; }
- [Column("webhook_id", TypeName = "character varying")]
- public string? WebhookId { get; set; }
+ [Column("webhook_id")]
+ public long? WebhookId { get; set; }
- [Column("application_id", TypeName = "character varying")]
- public string? ApplicationId { get; set; }
+ [Column("application_id")]
+ public long? ApplicationId { get; set; }
[Column("content", TypeName = "character varying")]
public string? Content { get; set; }
@@ -49,10 +49,10 @@ public partial class Message
[Column("mention_everyone")]
public bool? MentionEveryone { get; set; }
- [Column("embeds")]
+ [Column("embeds", TypeName = "jsonb")]
public string Embeds { get; set; } = null!;
- [Column("reactions")]
+ [Column("reactions", TypeName = "jsonb")]
public string Reactions { get; set; } = null!;
[Column("nonce")]
@@ -61,25 +61,25 @@ public partial class Message
[Column("type")]
public int Type { get; set; }
- [Column("activity")]
+ [Column("activity", TypeName = "jsonb")]
public string? Activity { get; set; }
- [Column("message_reference")]
+ [Column("message_reference", TypeName = "jsonb")]
public string? MessageReference { get; set; }
- [Column("interaction")]
+ [Column("interaction", TypeName = "jsonb")]
public string? Interaction { get; set; }
- [Column("components")]
+ [Column("components", TypeName = "jsonb")]
public string? Components { get; set; }
- [Column("message_reference_id", TypeName = "character varying")]
- public string? MessageReferenceId { get; set; }
+ [Column("message_reference_id")]
+ public long? MessageReferenceId { get; set; }
[Column("flags")]
public int Flags { get; set; }
- [Column("poll")]
+ [Column("poll", TypeName = "jsonb")]
public string? Poll { get; set; }
[Column("username", TypeName = "character varying")]
@@ -91,14 +91,14 @@ public partial class Message
[Column("pinned_at", TypeName = "timestamp without time zone")]
public DateTime? PinnedAt { get; set; }
- [Column("interaction_metadata")]
+ [Column("interaction_metadata", TypeName = "jsonb")]
public string? InteractionMetadata { get; set; }
- [Column("message_snapshots")]
+ [Column("message_snapshots", TypeName = "jsonb")]
public string MessageSnapshots { get; set; } = null!;
- [Column("thread_id", TypeName = "character varying")]
- public string? ThreadId { get; set; }
+ [Column("thread_id")]
+ public long? ThreadId { get; set; }
[ForeignKey("ApplicationId")]
[InverseProperty("Messages")]
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 c3f591aa1..a1c891e20 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Note.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Note.cs
@@ -11,17 +11,17 @@ namespace Spacebar.Models.Db.Models;
public partial class Note
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
[Column("content", TypeName = "character varying")]
public string Content { get; set; } = null!;
- [Column("owner_id", TypeName = "character varying")]
- public string? OwnerId { get; set; }
+ [Column("owner_id")]
+ public long? OwnerId { get; set; }
- [Column("target_id", TypeName = "character varying")]
- public string? TargetId { get; set; }
+ [Column("target_id")]
+ public long? TargetId { get; set; }
[ForeignKey("OwnerId")]
[InverseProperty("NoteOwners")]
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 21c289f68..25a9cc816 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/RateLimit.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/RateLimit.cs
@@ -10,8 +10,8 @@ namespace Spacebar.Models.Db.Models;
public partial class RateLimit
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
[Column("executor_id", TypeName = "character varying")]
public string ExecutorId { get; set; } = null!;
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 1515ecd1c..e60b5e500 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/ReadState.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/ReadState.cs
@@ -11,17 +11,17 @@ namespace Spacebar.Models.Db.Models;
public partial class ReadState
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
- [Column("channel_id", TypeName = "character varying")]
- public string ChannelId { get; set; } = null!;
+ [Column("channel_id")]
+ public long ChannelId { get; set; }
- [Column("user_id", TypeName = "character varying")]
- public string UserId { get; set; } = null!;
+ [Column("user_id")]
+ public long UserId { get; set; }
- [Column("last_message_id", TypeName = "character varying")]
- public string? LastMessageId { get; set; }
+ [Column("last_message_id")]
+ public long? LastMessageId { get; set; }
[Column("notifications_cursor", TypeName = "character varying")]
public string? NotificationsCursor { get; set; }
@@ -32,8 +32,8 @@ public partial class ReadState
[Column("mention_count")]
public int MentionCount { get; set; }
- [Column("last_acked_id", TypeName = "character varying")]
- public string? LastAckedId { get; set; }
+ [Column("last_acked_id")]
+ public long? LastAckedId { get; set; }
[Column("badge_count")]
public int BadgeCount { get; set; }
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 8a757d73f..979cdb907 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Recipient.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Recipient.cs
@@ -10,14 +10,14 @@ namespace Spacebar.Models.Db.Models;
public partial class Recipient
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
- [Column("channel_id", TypeName = "character varying")]
- public string ChannelId { get; set; } = null!;
+ [Column("channel_id")]
+ public long ChannelId { get; set; }
- [Column("user_id", TypeName = "character varying")]
- public string UserId { get; set; } = null!;
+ [Column("user_id")]
+ public long UserId { get; set; }
[Column("closed")]
public bool Closed { get; set; }
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 b4514d4af..c65646dbc 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Relationship.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Relationship.cs
@@ -11,14 +11,14 @@ namespace Spacebar.Models.Db.Models;
public partial class Relationship
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
- [Column("from_id", TypeName = "character varying")]
- public string FromId { get; set; } = null!;
+ [Column("from_id")]
+ public long FromId { get; set; }
- [Column("to_id", TypeName = "character varying")]
- public string ToId { get; set; } = null!;
+ [Column("to_id")]
+ public long ToId { get; set; }
[Column("nickname", TypeName = "character varying")]
public string? Nickname { get; set; }
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 c5ef4e5d0..96ac74a6a 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Role.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Role.cs
@@ -10,11 +10,11 @@ namespace Spacebar.Models.Db.Models;
public partial class Role
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
- [Column("guild_id", TypeName = "character varying")]
- public string GuildId { get; set; } = null!;
+ [Column("guild_id")]
+ public long GuildId { get; set; }
[Column("color")]
public int Color { get; set; }
@@ -43,13 +43,13 @@ public partial class Role
[Column("unicode_emoji", TypeName = "character varying")]
public string? UnicodeEmoji { get; set; }
- [Column("tags")]
+ [Column("tags", TypeName = "jsonb")]
public string? Tags { get; set; }
[Column("flags")]
public int Flags { get; set; }
- [Column("colors")]
+ [Column("colors", TypeName = "jsonb")]
public string Colors { get; set; } = null!;
[ForeignKey("GuildId")]
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 5017cef05..d7d93bfb4 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/SecurityKey.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/SecurityKey.cs
@@ -10,11 +10,11 @@ namespace Spacebar.Models.Db.Models;
public partial class SecurityKey
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
- [Column("user_id", TypeName = "character varying")]
- public string? UserId { get; set; }
+ [Column("user_id")]
+ public long? UserId { get; set; }
[Column("key_id", TypeName = "character varying")]
public string KeyId { get; set; } = null!;
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 42a66102f..2fb55a964 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/SecuritySetting.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/SecuritySetting.cs
@@ -10,14 +10,14 @@ namespace Spacebar.Models.Db.Models;
public partial class SecuritySetting
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
- [Column("guild_id", TypeName = "character varying")]
- public string? GuildId { get; set; }
+ [Column("guild_id")]
+ public long? GuildId { get; set; }
- [Column("channel_id", TypeName = "character varying")]
- public string? ChannelId { get; set; }
+ [Column("channel_id")]
+ public long? ChannelId { get; set; }
[Column("encryption_permission_mask")]
public int EncryptionPermissionMask { get; set; }
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 a8e12b4b3..fd9ecda50 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Session.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Session.cs
@@ -10,23 +10,23 @@ namespace Spacebar.Models.Db.Models;
[Index("UserId", Name = "IDX_085d540d9f418cfbdc7bd55bb1")]
public partial class Session
{
- [Column("user_id", TypeName = "character varying")]
- public string UserId { get; set; } = null!;
+ [Column("user_id")]
+ public long UserId { get; set; }
[Key]
[Column("session_id", TypeName = "character varying")]
public string SessionId { get; set; } = null!;
- [Column("activities")]
+ [Column("activities", TypeName = "jsonb")]
public string Activities { get; set; } = null!;
- [Column("client_info")]
+ [Column("client_info", TypeName = "jsonb")]
public string ClientInfo { get; set; } = null!;
[Column("status", TypeName = "character varying")]
public string Status { get; set; } = null!;
- [Column("client_status")]
+ [Column("client_status", TypeName = "jsonb")]
public string ClientStatus { get; set; } = null!;
[Column("is_admin_session")]
@@ -44,7 +44,7 @@ public partial class Session
[Column("last_seen_location", TypeName = "character varying")]
public string? LastSeenLocation { get; set; }
- [Column("last_seen_location_info")]
+ [Column("last_seen_location_info", TypeName = "jsonb")]
public string? LastSeenLocationInfo { get; set; }
[Column("session_nickname", TypeName = "character varying")]
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 9bf0b9d3c..33a6abcf4 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Sticker.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Sticker.cs
@@ -10,8 +10,8 @@ namespace Spacebar.Models.Db.Models;
public partial class Sticker
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
[Column("name", TypeName = "character varying")]
public string Name { get; set; } = null!;
@@ -25,14 +25,14 @@ public partial class Sticker
[Column("tags", TypeName = "character varying")]
public string? Tags { get; set; }
- [Column("pack_id", TypeName = "character varying")]
- public string? PackId { get; set; }
+ [Column("pack_id")]
+ public long? PackId { get; set; }
- [Column("guild_id", TypeName = "character varying")]
- public string? GuildId { get; set; }
+ [Column("guild_id")]
+ public long? GuildId { get; set; }
- [Column("user_id", TypeName = "character varying")]
- public string? UserId { get; set; }
+ [Column("user_id")]
+ public long? UserId { get; set; }
[Column("type")]
public int Type { get; set; }
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 476003227..de5a1e3b2 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/StickerPack.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/StickerPack.cs
@@ -10,8 +10,8 @@ namespace Spacebar.Models.Db.Models;
public partial class StickerPack
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
[Column("name", TypeName = "character varying")]
public string Name { get; set; } = null!;
@@ -25,8 +25,8 @@ public partial class StickerPack
[Column("cover_sticker_id", TypeName = "character varying")]
public string? CoverStickerId { get; set; }
- [Column("coverStickerId", TypeName = "character varying")]
- public string? CoverStickerId1 { get; set; }
+ [Column("coverStickerId")]
+ public long? CoverStickerId1 { get; set; }
[ForeignKey("CoverStickerId1")]
[InverseProperty("StickerPacks")]
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 950b9b152..572fce13a 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Stream.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Stream.cs
@@ -10,14 +10,14 @@ namespace Spacebar.Models.Db.Models;
public partial class Stream
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
- [Column("owner_id", TypeName = "character varying")]
- public string OwnerId { get; set; } = null!;
+ [Column("owner_id")]
+ public long OwnerId { get; set; }
- [Column("channel_id", TypeName = "character varying")]
- public string ChannelId { get; set; } = null!;
+ [Column("channel_id")]
+ public long ChannelId { get; set; }
[Column("endpoint", TypeName = "character varying")]
public string Endpoint { get; set; } = null!;
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 71a3d6fd7..77e25ad8a 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/StreamSession.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/StreamSession.cs
@@ -10,14 +10,14 @@ namespace Spacebar.Models.Db.Models;
public partial class StreamSession
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
- [Column("stream_id", TypeName = "character varying")]
- public string StreamId { get; set; } = null!;
+ [Column("stream_id")]
+ public long StreamId { get; set; }
- [Column("user_id", TypeName = "character varying")]
- public string UserId { get; set; } = null!;
+ [Column("user_id")]
+ public long UserId { get; set; }
[Column("token", TypeName = "character varying")]
public string? Token { get; set; }
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/Tag.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/Tag.cs
index e128b4d81..de402366a 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Tag.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Tag.cs
@@ -10,11 +10,11 @@ namespace Spacebar.Models.Db.Models;
public partial class Tag
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
- [Column("channel_id", TypeName = "character varying")]
- public string ChannelId { get; set; } = null!;
+ [Column("channel_id")]
+ public long ChannelId { get; set; }
[Column("name", TypeName = "character varying")]
public string Name { get; set; } = null!;
@@ -22,8 +22,8 @@ public partial class Tag
[Column("moderated")]
public bool Moderated { get; set; }
- [Column("emoji_id", TypeName = "character varying")]
- public string? EmojiId { get; set; }
+ [Column("emoji_id")]
+ public long? EmojiId { get; set; }
[Column("emoji_name", TypeName = "character varying")]
public string? EmojiName { get; set; }
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 edb743525..3d8bde056 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Team.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Team.cs
@@ -10,8 +10,8 @@ namespace Spacebar.Models.Db.Models;
public partial class Team
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
[Column("icon", TypeName = "character varying")]
public string? Icon { get; set; }
@@ -19,8 +19,8 @@ public partial class Team
[Column("name", TypeName = "character varying")]
public string Name { get; set; } = null!;
- [Column("owner_user_id", TypeName = "character varying")]
- public string? OwnerUserId { get; set; }
+ [Column("owner_user_id")]
+ public long? OwnerUserId { get; set; }
[InverseProperty("Team")]
public virtual ICollection Applications { get; set; } = new List();
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 e8fa56864..c626e859b 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/TeamMember.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/TeamMember.cs
@@ -10,8 +10,8 @@ namespace Spacebar.Models.Db.Models;
public partial class TeamMember
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
[Column("membership_state")]
public int MembershipState { get; set; }
@@ -19,11 +19,11 @@ public partial class TeamMember
[Column("permissions")]
public string Permissions { get; set; } = null!;
- [Column("team_id", TypeName = "character varying")]
- public string? TeamId { get; set; }
+ [Column("team_id")]
+ public long? TeamId { get; set; }
- [Column("user_id", TypeName = "character varying")]
- public string? UserId { get; set; }
+ [Column("user_id")]
+ public long? UserId { get; set; }
[Column("role", TypeName = "character varying")]
public string Role { get; set; } = null!;
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 703a75155..e973f8638 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Template.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Template.cs
@@ -11,8 +11,8 @@ namespace Spacebar.Models.Db.Models;
public partial class Template
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
[Column("code", TypeName = "character varying")]
public string Code { get; set; } = null!;
@@ -26,8 +26,8 @@ public partial class Template
[Column("usage_count")]
public int? UsageCount { get; set; }
- [Column("creator_id", TypeName = "character varying")]
- public string? CreatorId { get; set; }
+ [Column("creator_id")]
+ public long? CreatorId { get; set; }
[Column("created_at", TypeName = "timestamp without time zone")]
public DateTime CreatedAt { get; set; }
@@ -35,10 +35,10 @@ public partial class Template
[Column("updated_at", TypeName = "timestamp without time zone")]
public DateTime UpdatedAt { get; set; }
- [Column("source_guild_id", TypeName = "character varying")]
- public string? SourceGuildId { get; set; }
+ [Column("source_guild_id")]
+ public long? SourceGuildId { get; set; }
- [Column("serialized_source_guild")]
+ [Column("serialized_source_guild", TypeName = "jsonb")]
public string SerializedSourceGuild { get; set; } = null!;
[ForeignKey("CreatorId")]
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/Models/ThreadMember.cs b/extra/admin-api/Models/Spacebar.Models.Db/Models/ThreadMember.cs
index 6284db30a..37d19bc2a 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/ThreadMember.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/ThreadMember.cs
@@ -14,8 +14,8 @@ public partial class ThreadMember
[Column("index")]
public int Index { get; set; }
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
[Column("member_idx")]
public int MemberIdx { get; set; }
@@ -26,7 +26,7 @@ public partial class ThreadMember
[Column("muted")]
public bool Muted { get; set; }
- [Column("mute_config")]
+ [Column("mute_config", TypeName = "jsonb")]
public string? MuteConfig { get; set; }
[Column("flags")]
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 f0aa08790..ed0eaccbd 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/User.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/User.cs
@@ -11,8 +11,8 @@ namespace Spacebar.Models.Db.Models;
public partial class User
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
[Column("username", TypeName = "character varying")]
public string Username { get; set; } = null!;
@@ -104,7 +104,7 @@ public partial class User
[Column("rights")]
public ulong Rights { get; set; }
- [Column("data")]
+ [Column("data", TypeName = "jsonb")]
public string Data { get; set; } = null!;
[Column("fingerprints")]
@@ -119,16 +119,16 @@ public partial class User
[Column("badge_ids")]
public string? BadgeIds { get; set; }
- [Column("avatar_decoration_data")]
+ [Column("avatar_decoration_data", TypeName = "jsonb")]
public string? AvatarDecorationData { get; set; }
- [Column("display_name_styles")]
+ [Column("display_name_styles", TypeName = "jsonb")]
public string? DisplayNameStyles { get; set; }
- [Column("collectibles")]
+ [Column("collectibles", TypeName = "jsonb")]
public string? Collectibles { get; set; }
- [Column("primary_guild")]
+ [Column("primary_guild", TypeName = "jsonb")]
public string? PrimaryGuild { get; set; }
[InverseProperty("BotUser")]
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 caf4e2ba0..523955a61 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/UserSetting.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/UserSetting.cs
@@ -31,7 +31,7 @@ public partial class UserSetting
[Column("convert_emoticons")]
public bool? ConvertEmoticons { get; set; }
- [Column("custom_status")]
+ [Column("custom_status", TypeName = "jsonb")]
public string? CustomStatus { get; set; }
[Column("default_guilds_restricted")]
@@ -52,7 +52,7 @@ public partial class UserSetting
[Column("explicit_content_filter")]
public int? ExplicitContentFilter { get; set; }
- [Column("friend_source_flags")]
+ [Column("friend_source_flags", TypeName = "jsonb")]
public string? FriendSourceFlags { get; set; }
[Column("gateway_connected")]
@@ -61,10 +61,10 @@ public partial class UserSetting
[Column("gif_auto_play")]
public bool? GifAutoPlay { get; set; }
- [Column("guild_folders")]
+ [Column("guild_folders", TypeName = "jsonb")]
public string? GuildFolders { get; set; }
- [Column("guild_positions")]
+ [Column("guild_positions", TypeName = "jsonb")]
public string? GuildPositions { get; set; }
[Column("inline_attachment_media")]
@@ -88,7 +88,7 @@ public partial class UserSetting
[Column("render_reactions")]
public bool? RenderReactions { get; set; }
- [Column("restricted_guilds")]
+ [Column("restricted_guilds", TypeName = "jsonb")]
public string? RestrictedGuilds { get; set; }
[Column("show_current_game")]
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 411c967cb..f78eb2852 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/UserSettingsProto.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/UserSettingsProto.cs
@@ -10,8 +10,8 @@ namespace Spacebar.Models.Db.Models;
public partial class UserSettingsProto
{
[Key]
- [Column("user_id", TypeName = "character varying")]
- public string UserId { get; set; } = null!;
+ [Column("user_id")]
+ public long UserId { get; set; }
[Column("userSettings", TypeName = "character varying")]
public string? UserSettings { get; set; }
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 657489997..25605a147 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/VoiceState.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/VoiceState.cs
@@ -10,17 +10,17 @@ namespace Spacebar.Models.Db.Models;
public partial class VoiceState
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
- [Column("guild_id", TypeName = "character varying")]
- public string? GuildId { get; set; }
+ [Column("guild_id")]
+ public long? GuildId { get; set; }
- [Column("channel_id", TypeName = "character varying")]
- public string? ChannelId { get; set; }
+ [Column("channel_id")]
+ public long? ChannelId { get; set; }
- [Column("user_id", TypeName = "character varying")]
- public string? UserId { get; set; }
+ [Column("user_id")]
+ public long? UserId { get; set; }
[Column("session_id", TypeName = "character varying")]
public string SessionId { get; set; } = null!;
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 f7d57a5a5..a0d8af564 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/Models/Webhook.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Db/Models/Webhook.cs
@@ -10,8 +10,8 @@ namespace Spacebar.Models.Db.Models;
public partial class Webhook
{
[Key]
- [Column("id", TypeName = "character varying")]
- public string Id { get; set; } = null!;
+ [Column("id")]
+ public long Id { get; set; }
[Column("type")]
public int Type { get; set; }
@@ -25,23 +25,23 @@ public partial class Webhook
[Column("token", TypeName = "character varying")]
public string? Token { get; set; }
- [Column("guild_id", TypeName = "character varying")]
- public string? GuildId { get; set; }
+ [Column("guild_id")]
+ public long? GuildId { get; set; }
- [Column("channel_id", TypeName = "character varying")]
- public string? ChannelId { get; set; }
+ [Column("channel_id")]
+ public long? ChannelId { get; set; }
- [Column("application_id", TypeName = "character varying")]
- public string? ApplicationId { get; set; }
+ [Column("application_id")]
+ public long? ApplicationId { get; set; }
- [Column("user_id", TypeName = "character varying")]
- public string? UserId { get; set; }
+ [Column("user_id")]
+ public long? UserId { get; set; }
- [Column("source_guild_id", TypeName = "character varying")]
- public string? SourceGuildId { get; set; }
+ [Column("source_guild_id")]
+ public long? SourceGuildId { get; set; }
- [Column("source_channel_id", TypeName = "character varying")]
- public string? SourceChannelId { get; set; }
+ [Column("source_channel_id")]
+ public long? SourceChannelId { get; set; }
[ForeignKey("ApplicationId")]
[InverseProperty("Webhooks")]
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 2d1dcaf5b..34c0eba28 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,8 +7,8 @@
-
-
+
+
diff --git a/extra/admin-api/Models/Spacebar.Models.Db/deps.json b/extra/admin-api/Models/Spacebar.Models.Db/deps.json
index bfeb4cbe0..f6ee1a167 100644
--- a/extra/admin-api/Models/Spacebar.Models.Db/deps.json
+++ b/extra/admin-api/Models/Spacebar.Models.Db/deps.json
@@ -51,8 +51,8 @@
},
{
"pname": "Microsoft.EntityFrameworkCore",
- "version": "10.0.5",
- "hash": "sha256-SR8KBOuIx9e1j/cMwYRCO62WEB+CUrGptexl9MSgp8M="
+ "version": "10.0.6",
+ "hash": "sha256-wEA3ySJvLjAs6O9feF8vZXFM8GgyP+1ufQCaawj20dU="
},
{
"pname": "Microsoft.EntityFrameworkCore.Abstractions",
@@ -61,8 +61,8 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-qMKa7YGJUfaPTRMsAYYPlLxXdhZeyAZLiOSDcNFzDnA="
+ "version": "10.0.6",
+ "hash": "sha256-izcDKxbfeMBNxXmri20mESugr7NHxJEE4Hnvia6hVS4="
},
{
"pname": "Microsoft.EntityFrameworkCore.Analyzers",
@@ -71,13 +71,13 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Analyzers",
- "version": "10.0.5",
- "hash": "sha256-jPTN3RkI1J7vb7O4xiCHjMczMKh//NnKhJAGTuT7v88="
+ "version": "10.0.6",
+ "hash": "sha256-qTZ9ZhnPM7Nqy/ZWjloDTEUO91CymeJ07Yp1SKMJWiY="
},
{
"pname": "Microsoft.EntityFrameworkCore.Design",
- "version": "10.0.5",
- "hash": "sha256-+D17/sNpPhhDaLJJR4fFjSMySFU4yKQzHgzPcAJAdR0="
+ "version": "10.0.6",
+ "hash": "sha256-9WAXxXdAM0rNbGq6j7VGubHslxzmpTYKZ9gFyxh/N74="
},
{
"pname": "Microsoft.EntityFrameworkCore.Relational",
@@ -86,13 +86,13 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Relational",
- "version": "10.0.5",
- "hash": "sha256-5jfkvUKSexKCbCsYZYkBAWd4BIN48dlF5pP6htfDMMQ="
+ "version": "10.0.6",
+ "hash": "sha256-gyA+zXeRaMZl9qs9WXrvc0sEnptZy1nxC6kBux5bTQ0="
},
{
"pname": "Microsoft.Extensions.Caching.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-3rW3DjoyIIgfeJOHvdZJSrtsZ76V3MNxH5RLICRXWv4="
+ "version": "10.0.6",
+ "hash": "sha256-9yCnv7SmbNOq21W0rmnpiT4GkkE2pceU3xA1HE7zAM4="
},
{
"pname": "Microsoft.Extensions.Caching.Memory",
@@ -101,18 +101,18 @@
},
{
"pname": "Microsoft.Extensions.Caching.Memory",
- "version": "10.0.5",
- "hash": "sha256-WP2/64G4k48qdIohuOOgln9p0b2SJzxWzECfPqX6lQk="
+ "version": "10.0.6",
+ "hash": "sha256-3dWBnlBfEbfC50yrB8isuAOCMeYVaVQo/JfuRvpVBlI="
},
{
"pname": "Microsoft.Extensions.Configuration.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-DNK+lL2jeHFYyd43zfgVY32UskEfQ4YsTapztuQbYwo="
+ "version": "10.0.6",
+ "hash": "sha256-jxtne26QF7bASCRmLNwYsKruY3QhsnuzN9Us11WUdSQ="
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
- "version": "10.0.5",
- "hash": "sha256-ofDRirUV9XLSz4oksCqErwBJFtAieHACFfyZukHKFng="
+ "version": "10.0.6",
+ "hash": "sha256-K3ODZC+Bwd3Tze5wF7BQvJJGlNObdf2PNA35F41jHTE="
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
@@ -121,8 +121,8 @@
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-KrP+hE3gk7pATbJYZsJ1LHiXjzLA+ntHW7G/VGgHk2g="
+ "version": "10.0.6",
+ "hash": "sha256-lFiZb81kfBJK7J0b0A2UIpydPRT73Xcs57Gzf/+1xXc="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
@@ -131,8 +131,8 @@
},
{
"pname": "Microsoft.Extensions.DependencyModel",
- "version": "10.0.5",
- "hash": "sha256-UfG98EJ+0JTQA8Kx8yxt9mg19s0RSIOO+pG9JJy8uB0="
+ "version": "10.0.6",
+ "hash": "sha256-WY/CGoll5mwtiG3pBN/jDpt5/g4qcQuBL62LeS8KgmM="
},
{
"pname": "Microsoft.Extensions.Logging",
@@ -141,8 +141,8 @@
},
{
"pname": "Microsoft.Extensions.Logging",
- "version": "10.0.5",
- "hash": "sha256-4gVrKZfo/YHZKgKNsgGZZYqa79XWK9wDUuiVfguUV6U="
+ "version": "10.0.6",
+ "hash": "sha256-tskLj/WXLK35gkuJAWaAhPjMW92N1JKOTzTLupR30pE="
},
{
"pname": "Microsoft.Extensions.Logging",
@@ -156,8 +156,8 @@
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-e3A/l+II+n+D7/OPwjdyQM1IBtKHfHeIdlkJmuRw77w="
+ "version": "10.0.6",
+ "hash": "sha256-4ijpXt4PoTNcmF5dl/rEZkRWBAjukB229lXtBtJhxn4="
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
@@ -166,8 +166,8 @@
},
{
"pname": "Microsoft.Extensions.Options",
- "version": "10.0.5",
- "hash": "sha256-nw+m6VWXjmaBqZ1aH/l9SR9Oy62N9dmiMKloJ78kxv8="
+ "version": "10.0.6",
+ "hash": "sha256-GJCULaUcN2FxCA9fKOLe5EDEtkKLrEuP2Kw0jRqospA="
},
{
"pname": "Microsoft.Extensions.Options",
@@ -176,8 +176,8 @@
},
{
"pname": "Microsoft.Extensions.Primitives",
- "version": "10.0.5",
- "hash": "sha256-uvrur+0dg4zAAQcpLkkhPA77ST0tA3+EpGdDlCckC+E="
+ "version": "10.0.6",
+ "hash": "sha256-/iSFDryQIl8rl+TtrzunT5LcbPsQCeC2V+9CnS1P4Cc="
},
{
"pname": "Microsoft.Extensions.Primitives",
diff --git a/extra/admin-api/Models/Spacebar.Models.Gateway/BulkMessageDeleteResponse.cs b/extra/admin-api/Models/Spacebar.Models.Gateway/BulkMessageDeleteResponse.cs
index f4cb669a5..4e6eb71a7 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 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 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 94737ffe4..ae7830cda 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() : null;
+ public long? GuildId {
+ get => GuildIdRawValue.GetValueKind() == JsonValueKind.String ? GuildIdRawValue.GetValue() : null;
[MemberNotNull] set => GuildIdRawValue = JsonValue.Create(value!);
}
[JsonIgnore]
- public List? GuildIds {
- get => GuildIdRawValue.GetValueKind() == JsonValueKind.Array ? GuildIdRawValue.AsArray().Deserialize>() : null;
+ public List? GuildIds {
+ get => GuildIdRawValue.GetValueKind() == JsonValueKind.Array ? GuildIdRawValue.AsArray().Deserialize>() : 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 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 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 fcd38c106..1b576cf9e 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 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 200dccea6..c144eb727 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>> 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 6281426f0..258b84184 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;
diff --git a/extra/admin-api/Models/Spacebar.Models.Generic/Member.cs b/extra/admin-api/Models/Spacebar.Models.Generic/Member.cs
index a42cfe948..fa217a377 100644
--- a/extra/admin-api/Models/Spacebar.Models.Generic/Member.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Generic/Member.cs
@@ -32,8 +32,8 @@ public class Member {
[JsonPropertyName("bio")]
public string? Bio { get; set; }
- [JsonPropertyName("roles")]
- public List? Roles { get; set; }
+ [JsonPropertyName("roles"), JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public List? Roles { get; set; }
}
// Unsure if this is used anywhere outside of op14...?
diff --git a/extra/admin-api/Models/Spacebar.Models.Generic/PresenceResponse.cs b/extra/admin-api/Models/Spacebar.Models.Generic/PresenceResponse.cs
index 97dcf21c4..0374a2bb1 100644
--- a/extra/admin-api/Models/Spacebar.Models.Generic/PresenceResponse.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Generic/PresenceResponse.cs
@@ -10,7 +10,8 @@ public class Presence {
public required PartialUser User { get; set; }
[JsonPropertyName("guild_id"), JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
- public string? GuildId { get; set; }
+ [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public long? GuildId { get; set; }
[JsonPropertyName("status")]
public string Status { get; set; } = "unknown";
diff --git a/extra/admin-api/Models/Spacebar.Models.Generic/User.cs b/extra/admin-api/Models/Spacebar.Models.Generic/User.cs
index c2a58760a..428794afb 100644
--- a/extra/admin-api/Models/Spacebar.Models.Generic/User.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Generic/User.cs
@@ -5,8 +5,8 @@ namespace Spacebar.Models.Generic;
[DebuggerDisplay("{Id} ({Username}#{Discriminator})")]
public class PartialUser {
- [JsonPropertyName("id")]
- public required string Id { get; set; }
+ [JsonPropertyName("id"), JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+ public required long Id { get; set; }
[JsonPropertyName("username")]
public string Username { get; set; }
diff --git a/extra/admin-api/Spacebar.AdminApi/Controllers/ChannelController.cs b/extra/admin-api/Spacebar.AdminApi/Controllers/ChannelController.cs
index cccc47609..f46443c82 100644
--- a/extra/admin-api/Spacebar.AdminApi/Controllers/ChannelController.cs
+++ b/extra/admin-api/Spacebar.AdminApi/Controllers/ChannelController.cs
@@ -20,7 +20,7 @@ public class ChannelController(
ISpacebarReplication replication
) : ControllerBase {
[HttpDelete("{id}")]
- public async Task DeleteById(string id) {
+ public async Task DeleteById(long id) {
(await auth.GetCurrentUserAsync(Request)).GetRights().AssertHasAllRights(SpacebarRights.Rights.OPERATOR);
// TODO: proper type
await replication.SendAsync(new() {
@@ -35,7 +35,7 @@ public class ChannelController(
private async IAsyncEnumerable DeleteMessagesForChannel(
// context
- string? guildId, string channelId, string authorId,
+ long? guildId, long channelId, long authorId,
// options
int messageDeleteChunkSize = 100
) {
@@ -45,7 +45,7 @@ public class ChannelController(
var messagesInChannel = _db.Messages.AsNoTracking().Count(m => m.AuthorId == authorId && m.ChannelId == channelId && m.GuildId == guildId);
var remaining = messagesInChannel;
while (true) {
- var messageIds = _db.Database.SqlQuery($"""
+ var messageIds = _db.Database.SqlQuery($"""
DELETE FROM messages
WHERE id IN (
SELECT id FROM messages
@@ -67,7 +67,7 @@ public class ChannelController(
ChannelId = channelId,
MessageIds = messageIds,
},
- Origin = "Admin API (GuildController.DeleteUser)",
+ Origin = "Admin API (ChannelController.DeleteMessagesForChannel)",
});
yield return new("BULK_DELETED", new {
diff --git a/extra/admin-api/Spacebar.AdminApi/Controllers/ConfigController.cs b/extra/admin-api/Spacebar.AdminApi/Controllers/ConfigController.cs
index fdd45f159..b9be35a1e 100644
--- a/extra/admin-api/Spacebar.AdminApi/Controllers/ConfigController.cs
+++ b/extra/admin-api/Spacebar.AdminApi/Controllers/ConfigController.cs
@@ -48,7 +48,7 @@ public class ConfigController(ILogger logger, SpacebarDbContex
await Task.WhenAll(tasks);
await replication.SendAsync(new() {
Event = "SB_RELOAD_CONFIG",
- GuildId = "0",
+ GuildId = 0,
Origin = "Admin API (POST /Configuration)",
});
@@ -61,7 +61,7 @@ public class ConfigController(ILogger logger, SpacebarDbContex
await replication.SendAsync(new() {
Event = "SB_RELOAD_CONFIG",
- GuildId = "0",
+ GuildId = 0,
Origin = "Admin API (POST /Configuration/ReloadConfig)",
});
diff --git a/extra/admin-api/Spacebar.AdminApi/Controllers/DiscoveryController.cs b/extra/admin-api/Spacebar.AdminApi/Controllers/DiscoveryController.cs
index b914abefd..acc27c209 100644
--- a/extra/admin-api/Spacebar.AdminApi/Controllers/DiscoveryController.cs
+++ b/extra/admin-api/Spacebar.AdminApi/Controllers/DiscoveryController.cs
@@ -75,7 +75,7 @@ public class GuildDiscoveryController(
}
[HttpGet("{guildId}")]
- public async Task GetDiscoverableGuild(string guildId, bool includeExcluded = false) {
+ public async Task GetDiscoverableGuild(long guildId, bool includeExcluded = false) {
(await auth.GetCurrentUserAsync(Request)).GetRights().AssertHasAllRights(SpacebarRights.Rights.OPERATOR);
var discoverableGuilds = db.Guilds
.AsNoTracking()
@@ -131,7 +131,7 @@ public class GuildDiscoveryController(
}
[HttpPatch("{guildId}")]
- public async Task UpdateDiscoverableGuild(string guildId, [FromBody] DiscoverableGuildUpdateModel guildUpdateModel, bool includeExcluded = false) {
+ public async Task UpdateDiscoverableGuild(long guildId, [FromBody] DiscoverableGuildUpdateModel guildUpdateModel, bool includeExcluded = false) {
(await auth.GetCurrentUserAsync(Request)).GetRights().AssertHasAllRights(SpacebarRights.Rights.OPERATOR);
var guild = await db.Guilds
.AsNoTracking()
diff --git a/extra/admin-api/Spacebar.AdminApi/Controllers/GuildController.cs b/extra/admin-api/Spacebar.AdminApi/Controllers/GuildController.cs
index 38d8b3c2c..3313fc0ed 100644
--- a/extra/admin-api/Spacebar.AdminApi/Controllers/GuildController.cs
+++ b/extra/admin-api/Spacebar.AdminApi/Controllers/GuildController.cs
@@ -80,7 +80,7 @@ public class GuildController(
}
[HttpPost("{id}/force_join")]
- public async Task ForceJoinGuild([FromBody] ForceJoinRequest request, string id) {
+ public async Task ForceJoinGuild([FromBody] ForceJoinRequest request, long id) {
(await auth.GetCurrentUserAsync(Request)).GetRights().AssertHasAllRights(SpacebarRights.Rights.OPERATOR);
var guild = await db.Guilds.FindAsync(id);
@@ -125,7 +125,7 @@ public class GuildController(
var adminRole = roles.FirstOrDefault(r => r.Permissions == "8" || r.Permissions == "9"); // Administrator
if (adminRole == null) {
adminRole = new Role {
- Id = Guid.NewGuid().ToString(),
+ Id = Random.Shared.NextInt64(), // TODO: snowflakes
GuildId = id,
Name = "Instance administrator",
Color = 0,
@@ -152,7 +152,7 @@ public class GuildController(
}
[HttpGet("{id}/delete")]
- public async IAsyncEnumerable DeleteUser(string id, [FromQuery] int messageDeleteChunkSize = 100) {
+ public async IAsyncEnumerable DeleteUser(long id, [FromQuery] int messageDeleteChunkSize = 100) {
(await auth.GetCurrentUserAsync(Request)).GetRights().AssertHasAllRights(SpacebarRights.Rights.OPERATOR);
var user = await db.Users.FindAsync(id);
@@ -182,7 +182,7 @@ public class GuildController(
messages_per_channel = channels.ToDictionary(c => c.ChannelId, c => messages.Count(m => m.ChannelId == c.ChannelId))
});
var results = channels
- .Select(ctx => DeleteMessagesForChannel(ctx.GuildId, ctx.ChannelId!, id, messageDeleteChunkSize))
+ .Select(ctx => DeleteMessagesForChannel(ctx.GuildId, ctx.ChannelId!.Value, id, messageDeleteChunkSize))
.ToList();
var a = AggregateAsyncEnumerablesWithoutOrder(results);
await foreach (var result in a) {
@@ -195,7 +195,7 @@ public class GuildController(
private async IAsyncEnumerable DeleteMessagesForChannel(
// context
- string? guildId, string channelId, string authorId,
+ long? guildId, long channelId, long authorId,
// options
int messageDeleteChunkSize = 100
) {
@@ -205,7 +205,7 @@ public class GuildController(
var messagesInChannel = _db.Messages.AsNoTracking().Count(m => m.AuthorId == authorId && m.ChannelId == channelId && m.GuildId == guildId);
var remaining = messagesInChannel;
while (true) {
- var messageIds = _db.Database.SqlQuery($"""
+ var messageIds = _db.Database.SqlQuery($"""
DELETE FROM messages
WHERE id IN (
SELECT id FROM messages
diff --git a/extra/admin-api/Spacebar.AdminApi/Controllers/Media/UserMediaController.cs b/extra/admin-api/Spacebar.AdminApi/Controllers/Media/UserMediaController.cs
index 01104f9d1..84d2a6a1e 100644
--- a/extra/admin-api/Spacebar.AdminApi/Controllers/Media/UserMediaController.cs
+++ b/extra/admin-api/Spacebar.AdminApi/Controllers/Media/UserMediaController.cs
@@ -12,7 +12,7 @@ namespace Spacebar.AdminApi.Controllers.Media;
[Route("/media/user")]
public class UserMediaController(ILogger logger, SpacebarDbContext db, SpacebarAspNetAuthenticationService auth, IServiceProvider sp) : ControllerBase {
[HttpGet("{userId}/attachments")]
- public async IAsyncEnumerable GetAttachmentsByUser(string userId) {
+ public async IAsyncEnumerable GetAttachmentsByUser(long userId) {
(await auth.GetCurrentUserAsync(Request)).GetRights().AssertHasAllRights(SpacebarRights.Rights.OPERATOR);
var db2 = sp.CreateScope().ServiceProvider.GetService();
diff --git a/extra/admin-api/Spacebar.AdminApi/Controllers/TestControllers/IpcTestController.cs b/extra/admin-api/Spacebar.AdminApi/Controllers/TestControllers/IpcTestController.cs
index 6881e1e34..cd1dae624 100644
--- a/extra/admin-api/Spacebar.AdminApi/Controllers/TestControllers/IpcTestController.cs
+++ b/extra/admin-api/Spacebar.AdminApi/Controllers/TestControllers/IpcTestController.cs
@@ -23,7 +23,7 @@ public class IpcTestController(
public async IAsyncEnumerable Test() {
(await auth.GetCurrentUserAsync(Request)).GetRights().AssertHasAllRights(SpacebarRights.Rights.OPERATOR);
- var guildId = "1006649183970562092";
+ var guildId = 1006649183970562092;
// var roleId = "1006706520514028812"; //Administrator
var roleId = "1391303296148639051"; //Spacebar Maintainer
// int color = 16711680; //Administrator
diff --git a/extra/admin-api/Spacebar.AdminApi/Controllers/UserController.cs b/extra/admin-api/Spacebar.AdminApi/Controllers/UserController.cs
index f1f861d54..5b76c72db 100644
--- a/extra/admin-api/Spacebar.AdminApi/Controllers/UserController.cs
+++ b/extra/admin-api/Spacebar.AdminApi/Controllers/UserController.cs
@@ -85,7 +85,7 @@ public class UserController(
/// User ID
/// User object
[HttpGet("{id}")]
- public async Task GetById(string id) {
+ public async Task GetById(long id) {
(await auth.GetCurrentUserAsync(Request)).GetRights().AssertHasAllRights(SpacebarRights.Rights.OPERATOR);
return await db.Users
@@ -137,7 +137,7 @@ public class UserController(
}
[HttpGet("{id}/delete")]
- public async IAsyncEnumerable DeleteUser(string id, [FromQuery] int messageDeleteChunkSize = 100) {
+ public async IAsyncEnumerable DeleteUser(long id, [FromQuery] int messageDeleteChunkSize = 100) {
(await auth.GetCurrentUserAsync(Request)).GetRights().AssertHasAllRights(SpacebarRights.Rights.OPERATOR);
var user = await db.Users.FindAsync(id);
@@ -170,11 +170,11 @@ public class UserController(
yield return new("STATS",
new {
total_messages = messages.Count(), total_channels = channels.Count,
- messages_per_channel = channels.ToDictionary(c => c.ChannelId, c => messages.Count(m => m.ChannelId == c.ChannelId))
+ messages_per_channel = channels.ToDictionary(c => c.ChannelId!, c => messages.Count(m => m.ChannelId == c.ChannelId))
});
if (messages.Any()) {
var results = channels
- .Select(ctx => DeleteMessagesForChannel(ctx.GuildId, ctx.ChannelId!, id, messageDeleteChunkSize))
+ .Select(ctx => DeleteMessagesForChannel(ctx.GuildId, ctx.ChannelId!.Value, id, messageDeleteChunkSize))
.ToList();
var a = AggregateAsyncEnumerablesWithoutOrder(results);
await foreach (var result in a) {
@@ -195,7 +195,7 @@ public class UserController(
private async IAsyncEnumerable DeleteMessagesForChannel(
// context
- string? guildId, string channelId, string authorId,
+ long? guildId, long channelId, long authorId,
// options
int messageDeleteChunkSize = 100
) {
@@ -205,7 +205,7 @@ public class UserController(
var messagesInChannel = _db.Messages.AsNoTracking().Count(m => m.AuthorId == authorId && m.ChannelId == channelId && m.GuildId == guildId);
var remaining = messagesInChannel;
while (true) {
- var messageIds = _db.Database.SqlQuery($"""
+ var messageIds = _db.Database.SqlQuery($"""
DELETE FROM messages
WHERE id IN (
SELECT id FROM messages
diff --git a/extra/admin-api/Spacebar.AdminApi/Spacebar.AdminApi.csproj b/extra/admin-api/Spacebar.AdminApi/Spacebar.AdminApi.csproj
index 6632d6d32..6bf423e9e 100644
--- a/extra/admin-api/Spacebar.AdminApi/Spacebar.AdminApi.csproj
+++ b/extra/admin-api/Spacebar.AdminApi/Spacebar.AdminApi.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/extra/admin-api/Spacebar.AdminApi/deps.json b/extra/admin-api/Spacebar.AdminApi/deps.json
index 3f6f0a10c..95baa9235 100644
--- a/extra/admin-api/Spacebar.AdminApi/deps.json
+++ b/extra/admin-api/Spacebar.AdminApi/deps.json
@@ -21,8 +21,8 @@
},
{
"pname": "Microsoft.AspNetCore.OpenApi",
- "version": "10.0.5",
- "hash": "sha256-CQXAu6Tm8nOy/rrZksIKGaLW7USEP/N1kwKBMLoh7js="
+ "version": "10.0.6",
+ "hash": "sha256-DCNvcXajwnC+II7NMjK83YIiQDQN6uPvtSnwVUZXQMM="
},
{
"pname": "Microsoft.Build.Framework",
@@ -71,8 +71,8 @@
},
{
"pname": "Microsoft.EntityFrameworkCore",
- "version": "10.0.5",
- "hash": "sha256-SR8KBOuIx9e1j/cMwYRCO62WEB+CUrGptexl9MSgp8M="
+ "version": "10.0.6",
+ "hash": "sha256-wEA3ySJvLjAs6O9feF8vZXFM8GgyP+1ufQCaawj20dU="
},
{
"pname": "Microsoft.EntityFrameworkCore.Abstractions",
@@ -81,8 +81,8 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-qMKa7YGJUfaPTRMsAYYPlLxXdhZeyAZLiOSDcNFzDnA="
+ "version": "10.0.6",
+ "hash": "sha256-izcDKxbfeMBNxXmri20mESugr7NHxJEE4Hnvia6hVS4="
},
{
"pname": "Microsoft.EntityFrameworkCore.Analyzers",
@@ -91,13 +91,13 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Analyzers",
- "version": "10.0.5",
- "hash": "sha256-jPTN3RkI1J7vb7O4xiCHjMczMKh//NnKhJAGTuT7v88="
+ "version": "10.0.6",
+ "hash": "sha256-qTZ9ZhnPM7Nqy/ZWjloDTEUO91CymeJ07Yp1SKMJWiY="
},
{
"pname": "Microsoft.EntityFrameworkCore.Design",
- "version": "10.0.5",
- "hash": "sha256-+D17/sNpPhhDaLJJR4fFjSMySFU4yKQzHgzPcAJAdR0="
+ "version": "10.0.6",
+ "hash": "sha256-9WAXxXdAM0rNbGq6j7VGubHslxzmpTYKZ9gFyxh/N74="
},
{
"pname": "Microsoft.EntityFrameworkCore.Relational",
@@ -106,13 +106,13 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Relational",
- "version": "10.0.5",
- "hash": "sha256-5jfkvUKSexKCbCsYZYkBAWd4BIN48dlF5pP6htfDMMQ="
+ "version": "10.0.6",
+ "hash": "sha256-gyA+zXeRaMZl9qs9WXrvc0sEnptZy1nxC6kBux5bTQ0="
},
{
"pname": "Microsoft.Extensions.DependencyModel",
- "version": "10.0.5",
- "hash": "sha256-UfG98EJ+0JTQA8Kx8yxt9mg19s0RSIOO+pG9JJy8uB0="
+ "version": "10.0.6",
+ "hash": "sha256-WY/CGoll5mwtiG3pBN/jDpt5/g4qcQuBL62LeS8KgmM="
},
{
"pname": "Microsoft.IdentityModel.Abstractions",
diff --git a/extra/admin-api/Spacebar.Cdn.Worker/DiscordImageResizeService.cs b/extra/admin-api/Spacebar.Cdn.Worker/DiscordImageResizeService.cs
index 1295baddf..6509a0b6f 100644
--- a/extra/admin-api/Spacebar.Cdn.Worker/DiscordImageResizeService.cs
+++ b/extra/admin-api/Spacebar.Cdn.Worker/DiscordImageResizeService.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
using System.Runtime.Serialization;
using ImageMagick;
using Microsoft.AspNetCore.Mvc;
@@ -57,6 +58,7 @@ public enum DiscordImageResizeQuality {
public class DiscordImageResizeService {
//(PixelArtDetectionService pads) {
+ [SuppressMessage("ReSharper", "AccessToModifiedClosure")]
public async Task Apply(MagickImageCollection img, DiscordImageResizeParams resizeParams) {
if (resizeParams.Passthrough) return img;
if (img.First().Format == MagickFormat.Gif) {
diff --git a/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16-HDRI.AnyCPU.csproj b/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16-HDRI.AnyCPU.csproj
index 38abbbc9a..296597410 100644
--- a/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16-HDRI.AnyCPU.csproj
+++ b/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16-HDRI.AnyCPU.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16-HDRI.aarch64.csproj b/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16-HDRI.aarch64.csproj
index 688b758e9..1ff4bdcf1 100644
--- a/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16-HDRI.aarch64.csproj
+++ b/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16-HDRI.aarch64.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16-HDRI.x86_64.csproj b/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16-HDRI.x86_64.csproj
index 6c6983873..baed94863 100644
--- a/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16-HDRI.x86_64.csproj
+++ b/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16-HDRI.x86_64.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16.AnyCPU.csproj b/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16.AnyCPU.csproj
index 11f74861a..ab264466b 100644
--- a/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16.AnyCPU.csproj
+++ b/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16.AnyCPU.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16.aarch64.csproj b/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16.aarch64.csproj
index 62423943b..ed4d1045d 100644
--- a/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16.aarch64.csproj
+++ b/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16.aarch64.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16.x86_64.csproj b/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16.x86_64.csproj
index e70da7134..d4d0fdc63 100644
--- a/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16.x86_64.csproj
+++ b/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16.x86_64.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q8.AnyCPU.csproj b/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q8.AnyCPU.csproj
index 2296a3320..c394be925 100644
--- a/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q8.AnyCPU.csproj
+++ b/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q8.AnyCPU.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q8.aarch64.csproj b/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q8.aarch64.csproj
index e7803db98..54236b842 100644
--- a/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q8.aarch64.csproj
+++ b/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q8.aarch64.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q8.x86_64.csproj b/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q8.x86_64.csproj
index 6b38743db..187dcaf5b 100644
--- a/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q8.x86_64.csproj
+++ b/extra/admin-api/Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q8.x86_64.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16-HDRI.AnyCPU.json b/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16-HDRI.AnyCPU.json
index e9ba726cd..4e8655021 100644
--- a/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16-HDRI.AnyCPU.json
+++ b/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16-HDRI.AnyCPU.json
@@ -6,12 +6,12 @@
},
{
"pname": "Magick.NET-Q16-HDRI-AnyCPU",
- "version": "14.11.1",
- "hash": "sha256-WH7GgpQtkk9FpEz3xwcERrVYq6Bz5SrtjakjFRgHuII="
+ "version": "14.12.0",
+ "hash": "sha256-G5tyyWULwIuY70kBhRF0BJZsaHSe7ikNIIv+tZlD/qQ="
},
{
"pname": "Magick.NET.Core",
- "version": "14.11.1",
- "hash": "sha256-984jXKS/y2602DgaXsfDh9TFOhpyAF/gHZG8BGQXljA="
+ "version": "14.12.0",
+ "hash": "sha256-mlOAmFcSL8JzBqwMBpFtWt6+48PIdb1qUc++wPqhBHM="
}
]
diff --git a/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16-HDRI.aarch64.json b/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16-HDRI.aarch64.json
index fca9d5897..a7118bb00 100644
--- a/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16-HDRI.aarch64.json
+++ b/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16-HDRI.aarch64.json
@@ -6,12 +6,12 @@
},
{
"pname": "Magick.NET-Q16-HDRI-OpenMP-arm64",
- "version": "14.11.1",
- "hash": "sha256-kN/hpOiLTOD5jKUaWXz8nCoOTwP4lB9JczdodZZIvyc="
+ "version": "14.12.0",
+ "hash": "sha256-9OJxU7xqFjUz1DeFs9aPPhPtyrzCJQPHveNbqhGGIuU="
},
{
"pname": "Magick.NET.Core",
- "version": "14.11.1",
- "hash": "sha256-984jXKS/y2602DgaXsfDh9TFOhpyAF/gHZG8BGQXljA="
+ "version": "14.12.0",
+ "hash": "sha256-mlOAmFcSL8JzBqwMBpFtWt6+48PIdb1qUc++wPqhBHM="
}
]
diff --git a/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16-HDRI.x86_64.json b/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16-HDRI.x86_64.json
index cb3b08fc8..471b6bc50 100644
--- a/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16-HDRI.x86_64.json
+++ b/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16-HDRI.x86_64.json
@@ -6,12 +6,12 @@
},
{
"pname": "Magick.NET-Q16-HDRI-OpenMP-x64",
- "version": "14.11.1",
- "hash": "sha256-mf/bRfdiQi96AZKDDBvbSMFA2YSQDMdmhcrF0Vlvs/8="
+ "version": "14.12.0",
+ "hash": "sha256-wudO8X5WgKC+5LMfwgc7/yOxEsLFSqM+oRDFH/ZEJSI="
},
{
"pname": "Magick.NET.Core",
- "version": "14.11.1",
- "hash": "sha256-984jXKS/y2602DgaXsfDh9TFOhpyAF/gHZG8BGQXljA="
+ "version": "14.12.0",
+ "hash": "sha256-mlOAmFcSL8JzBqwMBpFtWt6+48PIdb1qUc++wPqhBHM="
}
]
diff --git a/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16.AnyCPU.json b/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16.AnyCPU.json
index 17a219a05..a1c0d9d79 100644
--- a/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16.AnyCPU.json
+++ b/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16.AnyCPU.json
@@ -6,12 +6,12 @@
},
{
"pname": "Magick.NET-Q16-AnyCPU",
- "version": "14.11.1",
- "hash": "sha256-GbCGSCB9iB9YA9Xmht0vPAlfJMY/tgGpNajorQv1fl4="
+ "version": "14.12.0",
+ "hash": "sha256-blo2+70jsCCgKpFfRJU0Z9G2EoGQgGxGBSD8/gE/Z5k="
},
{
"pname": "Magick.NET.Core",
- "version": "14.11.1",
- "hash": "sha256-984jXKS/y2602DgaXsfDh9TFOhpyAF/gHZG8BGQXljA="
+ "version": "14.12.0",
+ "hash": "sha256-mlOAmFcSL8JzBqwMBpFtWt6+48PIdb1qUc++wPqhBHM="
}
]
diff --git a/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16.aarch64.json b/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16.aarch64.json
index 5e07d713e..a22724169 100644
--- a/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16.aarch64.json
+++ b/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16.aarch64.json
@@ -6,12 +6,12 @@
},
{
"pname": "Magick.NET-Q16-OpenMP-arm64",
- "version": "14.11.1",
- "hash": "sha256-T6KmNQhLxiLtb+10A6cpXl5G0+mKhtOiqjyF0T94fs0="
+ "version": "14.12.0",
+ "hash": "sha256-l39ojPSXOXAVyFyA+lWrToQD1+yUbOR7UZbxl6kCKWA="
},
{
"pname": "Magick.NET.Core",
- "version": "14.11.1",
- "hash": "sha256-984jXKS/y2602DgaXsfDh9TFOhpyAF/gHZG8BGQXljA="
+ "version": "14.12.0",
+ "hash": "sha256-mlOAmFcSL8JzBqwMBpFtWt6+48PIdb1qUc++wPqhBHM="
}
]
diff --git a/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16.x86_64.json b/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16.x86_64.json
index f0f7c52f6..d27899c5d 100644
--- a/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16.x86_64.json
+++ b/extra/admin-api/Spacebar.Cdn.Worker/deps.Q16.x86_64.json
@@ -6,12 +6,12 @@
},
{
"pname": "Magick.NET-Q16-OpenMP-x64",
- "version": "14.11.1",
- "hash": "sha256-5VCBrKTGedHkJWJOp8w4B5uiPfT/ZsYlVrC3FYbHHbA="
+ "version": "14.12.0",
+ "hash": "sha256-OK1WU9wwDD0V5Y0DJUEgv1KWO9Mklf3gEuIQCTTatjU="
},
{
"pname": "Magick.NET.Core",
- "version": "14.11.1",
- "hash": "sha256-984jXKS/y2602DgaXsfDh9TFOhpyAF/gHZG8BGQXljA="
+ "version": "14.12.0",
+ "hash": "sha256-mlOAmFcSL8JzBqwMBpFtWt6+48PIdb1qUc++wPqhBHM="
}
]
diff --git a/extra/admin-api/Spacebar.Cdn.Worker/deps.Q8.AnyCPU.json b/extra/admin-api/Spacebar.Cdn.Worker/deps.Q8.AnyCPU.json
index 84191717f..7c9a8d26a 100644
--- a/extra/admin-api/Spacebar.Cdn.Worker/deps.Q8.AnyCPU.json
+++ b/extra/admin-api/Spacebar.Cdn.Worker/deps.Q8.AnyCPU.json
@@ -6,12 +6,12 @@
},
{
"pname": "Magick.NET-Q8-AnyCPU",
- "version": "14.11.1",
- "hash": "sha256-yRecBHZiMcJHR3dkvfGqthvMo9qlvvcxF6hIdXs/wAM="
+ "version": "14.12.0",
+ "hash": "sha256-ATD3Xtu8frOt9sG8IU5AHE7Os1By6I3p+CTd9sFw6FM="
},
{
"pname": "Magick.NET.Core",
- "version": "14.11.1",
- "hash": "sha256-984jXKS/y2602DgaXsfDh9TFOhpyAF/gHZG8BGQXljA="
+ "version": "14.12.0",
+ "hash": "sha256-mlOAmFcSL8JzBqwMBpFtWt6+48PIdb1qUc++wPqhBHM="
}
]
diff --git a/extra/admin-api/Spacebar.Cdn.Worker/deps.Q8.aarch64.json b/extra/admin-api/Spacebar.Cdn.Worker/deps.Q8.aarch64.json
index 4799b2af9..76b0d9a1f 100644
--- a/extra/admin-api/Spacebar.Cdn.Worker/deps.Q8.aarch64.json
+++ b/extra/admin-api/Spacebar.Cdn.Worker/deps.Q8.aarch64.json
@@ -6,12 +6,12 @@
},
{
"pname": "Magick.NET-Q8-OpenMP-arm64",
- "version": "14.11.1",
- "hash": "sha256-Nt9RNaLpx+VYK+TgdB/GaIEYfBstWJKZQas8ixGfmtM="
+ "version": "14.12.0",
+ "hash": "sha256-ZpwmngzU7Qwf4jLXNx7ceZzqlfeicTeuwu1RPm/Fel0="
},
{
"pname": "Magick.NET.Core",
- "version": "14.11.1",
- "hash": "sha256-984jXKS/y2602DgaXsfDh9TFOhpyAF/gHZG8BGQXljA="
+ "version": "14.12.0",
+ "hash": "sha256-mlOAmFcSL8JzBqwMBpFtWt6+48PIdb1qUc++wPqhBHM="
}
]
diff --git a/extra/admin-api/Spacebar.Cdn.Worker/deps.Q8.x86_64.json b/extra/admin-api/Spacebar.Cdn.Worker/deps.Q8.x86_64.json
index 08c7fe689..e88f21abb 100644
--- a/extra/admin-api/Spacebar.Cdn.Worker/deps.Q8.x86_64.json
+++ b/extra/admin-api/Spacebar.Cdn.Worker/deps.Q8.x86_64.json
@@ -6,12 +6,12 @@
},
{
"pname": "Magick.NET-Q8-OpenMP-x64",
- "version": "14.11.1",
- "hash": "sha256-OHuPBwGFCz8nOsPc1NgUHAieCf8FE1ZjdAVpTfAo5X8="
+ "version": "14.12.0",
+ "hash": "sha256-mTL21TQNPHcb7g1mpAaNsvUFeJtBpnLPrPo5Xt9tuIc="
},
{
"pname": "Magick.NET.Core",
- "version": "14.11.1",
- "hash": "sha256-984jXKS/y2602DgaXsfDh9TFOhpyAF/gHZG8BGQXljA="
+ "version": "14.12.0",
+ "hash": "sha256-mlOAmFcSL8JzBqwMBpFtWt6+48PIdb1qUc++wPqhBHM="
}
]
diff --git a/extra/admin-api/Spacebar.Cdn/Spacebar.Cdn.csproj b/extra/admin-api/Spacebar.Cdn/Spacebar.Cdn.csproj
index 3958921a8..b31258121 100644
--- a/extra/admin-api/Spacebar.Cdn/Spacebar.Cdn.csproj
+++ b/extra/admin-api/Spacebar.Cdn/Spacebar.Cdn.csproj
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/extra/admin-api/Spacebar.Cdn/deps.json b/extra/admin-api/Spacebar.Cdn/deps.json
index 711a5a62d..25c2aa57b 100644
--- a/extra/admin-api/Spacebar.Cdn/deps.json
+++ b/extra/admin-api/Spacebar.Cdn/deps.json
@@ -11,18 +11,18 @@
},
{
"pname": "Magick.NET-Q16-HDRI-AnyCPU",
- "version": "14.11.1",
- "hash": "sha256-WH7GgpQtkk9FpEz3xwcERrVYq6Bz5SrtjakjFRgHuII="
+ "version": "14.12.0",
+ "hash": "sha256-G5tyyWULwIuY70kBhRF0BJZsaHSe7ikNIIv+tZlD/qQ="
},
{
"pname": "Magick.NET.Core",
- "version": "14.11.1",
- "hash": "sha256-984jXKS/y2602DgaXsfDh9TFOhpyAF/gHZG8BGQXljA="
+ "version": "14.12.0",
+ "hash": "sha256-mlOAmFcSL8JzBqwMBpFtWt6+48PIdb1qUc++wPqhBHM="
},
{
"pname": "Microsoft.AspNetCore.OpenApi",
- "version": "10.0.5",
- "hash": "sha256-CQXAu6Tm8nOy/rrZksIKGaLW7USEP/N1kwKBMLoh7js="
+ "version": "10.0.6",
+ "hash": "sha256-DCNvcXajwnC+II7NMjK83YIiQDQN6uPvtSnwVUZXQMM="
},
{
"pname": "Microsoft.Build.Framework",
@@ -71,8 +71,8 @@
},
{
"pname": "Microsoft.EntityFrameworkCore",
- "version": "10.0.5",
- "hash": "sha256-SR8KBOuIx9e1j/cMwYRCO62WEB+CUrGptexl9MSgp8M="
+ "version": "10.0.6",
+ "hash": "sha256-wEA3ySJvLjAs6O9feF8vZXFM8GgyP+1ufQCaawj20dU="
},
{
"pname": "Microsoft.EntityFrameworkCore.Abstractions",
@@ -81,8 +81,8 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-qMKa7YGJUfaPTRMsAYYPlLxXdhZeyAZLiOSDcNFzDnA="
+ "version": "10.0.6",
+ "hash": "sha256-izcDKxbfeMBNxXmri20mESugr7NHxJEE4Hnvia6hVS4="
},
{
"pname": "Microsoft.EntityFrameworkCore.Analyzers",
@@ -91,13 +91,13 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Analyzers",
- "version": "10.0.5",
- "hash": "sha256-jPTN3RkI1J7vb7O4xiCHjMczMKh//NnKhJAGTuT7v88="
+ "version": "10.0.6",
+ "hash": "sha256-qTZ9ZhnPM7Nqy/ZWjloDTEUO91CymeJ07Yp1SKMJWiY="
},
{
"pname": "Microsoft.EntityFrameworkCore.Design",
- "version": "10.0.5",
- "hash": "sha256-+D17/sNpPhhDaLJJR4fFjSMySFU4yKQzHgzPcAJAdR0="
+ "version": "10.0.6",
+ "hash": "sha256-9WAXxXdAM0rNbGq6j7VGubHslxzmpTYKZ9gFyxh/N74="
},
{
"pname": "Microsoft.EntityFrameworkCore.Relational",
@@ -106,13 +106,13 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Relational",
- "version": "10.0.5",
- "hash": "sha256-5jfkvUKSexKCbCsYZYkBAWd4BIN48dlF5pP6htfDMMQ="
+ "version": "10.0.6",
+ "hash": "sha256-gyA+zXeRaMZl9qs9WXrvc0sEnptZy1nxC6kBux5bTQ0="
},
{
"pname": "Microsoft.Extensions.DependencyModel",
- "version": "10.0.5",
- "hash": "sha256-UfG98EJ+0JTQA8Kx8yxt9mg19s0RSIOO+pG9JJy8uB0="
+ "version": "10.0.6",
+ "hash": "sha256-WY/CGoll5mwtiG3pBN/jDpt5/g4qcQuBL62LeS8KgmM="
},
{
"pname": "Microsoft.OpenApi",
diff --git a/extra/admin-api/Spacebar.Offload/Controllers/ChannelStatusController.cs b/extra/admin-api/Spacebar.Offload/Controllers/ChannelStatusController.cs
index 0843218ed..ba242680b 100644
--- a/extra/admin-api/Spacebar.Offload/Controllers/ChannelStatusController.cs
+++ b/extra/admin-api/Spacebar.Offload/Controllers/ChannelStatusController.cs
@@ -43,7 +43,7 @@ public class ChannelStatusController(ILogger logger, Sp
// idk, i cant come up with more stuff, maybe suggestions welcome, or actually storing some data?
];
- foreach (var guildId in req.GuildIds ?? [req.GuildId!]) {
+ foreach (var guildId in req.GuildIds ?? [req.GuildId!.Value]) {
var channels = (await db.Channels.Include(x => x.VoiceStates).Where(x => x.Type == 2 && x.GuildId == guildId && x.VoiceStates.Count > 0)
.Select(x => x.Id)
.ToListAsync())
diff --git a/extra/admin-api/Spacebar.Offload/Controllers/Op12Controller.cs b/extra/admin-api/Spacebar.Offload/Controllers/Op12Controller.cs
index 884a9de85..c3d32813f 100644
--- a/extra/admin-api/Spacebar.Offload/Controllers/Op12Controller.cs
+++ b/extra/admin-api/Spacebar.Offload/Controllers/Op12Controller.cs
@@ -20,7 +20,7 @@ namespace Spacebar.GatewayOffload.Controllers;
public class Op12Controller(ILogger logger, SpacebarAspNetAuthenticationService authService, SpacebarDbContext db, IServiceProvider sp) : ControllerBase
{
[HttpPost("")]
- public async IAsyncEnumerable> DoGuildSync(List guildIds)
+ public async IAsyncEnumerable> DoGuildSync(List guildIds)
{
var user = await authService.GetCurrentUserAsync(Request);
guildIds = (await db.Members.AsNoTracking().Where(x => x.Id == user.Id).Select(x => x.GuildId).ToListAsync())
@@ -45,7 +45,7 @@ public class Op12Controller(ILogger logger, SpacebarAspNetAuthen
// TODO: figure out how to abstract this to a function without EFCore complaining about not being translatable...
private static Expression> IsOnline = (Session session) => session.Status != "offline" && session.Status != "invisible" && session.Status != "unknown";
- private async Task GetGuildSyncAsync(string guildId)
+ private async Task GetGuildSyncAsync(long guildId)
{
await using var sc = sp.CreateAsyncScope();
var _db = sc.ServiceProvider.GetRequiredService();
diff --git a/extra/admin-api/Spacebar.Offload/Controllers/Op14Controller.cs b/extra/admin-api/Spacebar.Offload/Controllers/Op14Controller.cs
index 57f1390ce..1102bec2c 100644
--- a/extra/admin-api/Spacebar.Offload/Controllers/Op14Controller.cs
+++ b/extra/admin-api/Spacebar.Offload/Controllers/Op14Controller.cs
@@ -38,7 +38,7 @@ public class Op14Controller(ILogger logger, SpacebarAspNetAuthen
.ToListAsync();
}
- private async Task GetMemberListIdAsync(SpacebarDbContext db, string guildId, string channelId) {
+ private async Task GetMemberListIdAsync(SpacebarDbContext db, long guildId, long channelId) {
var channel = await db.Channels.AsNoTracking().FirstOrDefaultAsync(c => c.Id == channelId && c.GuildId == guildId);
if (channel == null) return null;
diff --git a/extra/admin-api/Spacebar.Offload/Controllers/Op8Controller.cs b/extra/admin-api/Spacebar.Offload/Controllers/Op8Controller.cs
index ac68bb22e..47194bd88 100644
--- a/extra/admin-api/Spacebar.Offload/Controllers/Op8Controller.cs
+++ b/extra/admin-api/Spacebar.Offload/Controllers/Op8Controller.cs
@@ -20,7 +20,7 @@ namespace Spacebar.GatewayOffload.Controllers;
public class Op8Controller(ILogger logger, SpacebarAspNetAuthenticationService authService, SpacebarDbContext db, IServiceProvider sp) : ControllerBase
{
[HttpPost("")]
- public async IAsyncEnumerable> DoGuildSync(List guildIds)
+ public async IAsyncEnumerable> DoGuildSync(List guildIds)
{
var user = await authService.GetCurrentUserAsync(Request);
guildIds = (await db.Members.AsNoTracking().Where(x => x.Id == user.Id).Select(x => x.GuildId).ToListAsync())
@@ -45,7 +45,7 @@ public class Op8Controller(ILogger logger, SpacebarAspNetAuthenti
// TODO: figure out how to abstract this to a function without EFCore complaining about not being translatable...
private static Expression> IsOnline = (Session session) => session.Status != "offline" && session.Status != "invisible" && session.Status != "unknown";
- private async Task GetGuildSyncAsync(string guildId)
+ private async Task GetGuildSyncAsync(long guildId)
{
await using var sc = sp.CreateAsyncScope();
var _db = sc.ServiceProvider.GetRequiredService();
diff --git a/extra/admin-api/Spacebar.Offload/Spacebar.Offload.csproj b/extra/admin-api/Spacebar.Offload/Spacebar.Offload.csproj
index 8923cb36f..bf58e765f 100644
--- a/extra/admin-api/Spacebar.Offload/Spacebar.Offload.csproj
+++ b/extra/admin-api/Spacebar.Offload/Spacebar.Offload.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/extra/admin-api/Spacebar.Offload/deps.json b/extra/admin-api/Spacebar.Offload/deps.json
index 640306e3d..8ad96665c 100644
--- a/extra/admin-api/Spacebar.Offload/deps.json
+++ b/extra/admin-api/Spacebar.Offload/deps.json
@@ -16,8 +16,8 @@
},
{
"pname": "Microsoft.AspNetCore.OpenApi",
- "version": "10.0.5",
- "hash": "sha256-CQXAu6Tm8nOy/rrZksIKGaLW7USEP/N1kwKBMLoh7js="
+ "version": "10.0.6",
+ "hash": "sha256-DCNvcXajwnC+II7NMjK83YIiQDQN6uPvtSnwVUZXQMM="
},
{
"pname": "Microsoft.Build.Framework",
@@ -66,8 +66,8 @@
},
{
"pname": "Microsoft.EntityFrameworkCore",
- "version": "10.0.5",
- "hash": "sha256-SR8KBOuIx9e1j/cMwYRCO62WEB+CUrGptexl9MSgp8M="
+ "version": "10.0.6",
+ "hash": "sha256-wEA3ySJvLjAs6O9feF8vZXFM8GgyP+1ufQCaawj20dU="
},
{
"pname": "Microsoft.EntityFrameworkCore.Abstractions",
@@ -76,8 +76,8 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-qMKa7YGJUfaPTRMsAYYPlLxXdhZeyAZLiOSDcNFzDnA="
+ "version": "10.0.6",
+ "hash": "sha256-izcDKxbfeMBNxXmri20mESugr7NHxJEE4Hnvia6hVS4="
},
{
"pname": "Microsoft.EntityFrameworkCore.Analyzers",
@@ -86,13 +86,13 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Analyzers",
- "version": "10.0.5",
- "hash": "sha256-jPTN3RkI1J7vb7O4xiCHjMczMKh//NnKhJAGTuT7v88="
+ "version": "10.0.6",
+ "hash": "sha256-qTZ9ZhnPM7Nqy/ZWjloDTEUO91CymeJ07Yp1SKMJWiY="
},
{
"pname": "Microsoft.EntityFrameworkCore.Design",
- "version": "10.0.5",
- "hash": "sha256-+D17/sNpPhhDaLJJR4fFjSMySFU4yKQzHgzPcAJAdR0="
+ "version": "10.0.6",
+ "hash": "sha256-9WAXxXdAM0rNbGq6j7VGubHslxzmpTYKZ9gFyxh/N74="
},
{
"pname": "Microsoft.EntityFrameworkCore.Relational",
@@ -101,13 +101,13 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Relational",
- "version": "10.0.5",
- "hash": "sha256-5jfkvUKSexKCbCsYZYkBAWd4BIN48dlF5pP6htfDMMQ="
+ "version": "10.0.6",
+ "hash": "sha256-gyA+zXeRaMZl9qs9WXrvc0sEnptZy1nxC6kBux5bTQ0="
},
{
"pname": "Microsoft.Extensions.DependencyModel",
- "version": "10.0.5",
- "hash": "sha256-UfG98EJ+0JTQA8Kx8yxt9mg19s0RSIOO+pG9JJy8uB0="
+ "version": "10.0.6",
+ "hash": "sha256-WY/CGoll5mwtiG3pBN/jDpt5/g4qcQuBL62LeS8KgmM="
},
{
"pname": "Microsoft.IdentityModel.Abstractions",
diff --git a/extra/admin-api/Spacebar.UApi/Controllers/GuildMembersController.cs b/extra/admin-api/Spacebar.UApi/Controllers/GuildMembersController.cs
index 9f18624ee..1c7ea8ad0 100644
--- a/extra/admin-api/Spacebar.UApi/Controllers/GuildMembersController.cs
+++ b/extra/admin-api/Spacebar.UApi/Controllers/GuildMembersController.cs
@@ -18,7 +18,7 @@ public class GuildMembersController(ILogger logger, Spac
/// The public member projection
/// An error has occured
[HttpGet("{memberId}")]
- public async Task GetMemberAsync(string guildId, string memberId) {
+ public async Task GetMemberAsync(long guildId, long memberId) {
var user = await authService.GetCurrentUserAsync(Request);
var cmember = db.Members.SingleOrDefault(x => x.Id == user.Id && x.GuildId == guildId);
if (cmember is null)
diff --git a/extra/admin-api/Spacebar.UApi/Services/PermissionService.cs b/extra/admin-api/Spacebar.UApi/Services/PermissionService.cs
index 033dbb205..2fb91bb45 100644
--- a/extra/admin-api/Spacebar.UApi/Services/PermissionService.cs
+++ b/extra/admin-api/Spacebar.UApi/Services/PermissionService.cs
@@ -12,7 +12,7 @@ public class PermissionService(SpacebarDbContext db) {
/// Guild ID
/// Member ID
/// Has one or more missing permissions
- public async Task AssertUserHasGuildPermission(Permissions permission, string guildId, string userId) {
+ public async Task AssertUserHasGuildPermission(Permissions permission, long guildId, long userId) {
var member = await db.Members
.Include(x => x.Roles)
.SingleAsync(x => x.Id == userId && x.GuildId == guildId);
diff --git a/extra/admin-api/Spacebar.UApi/Spacebar.UApi.csproj b/extra/admin-api/Spacebar.UApi/Spacebar.UApi.csproj
index 82d19a1c9..67a9ddc21 100644
--- a/extra/admin-api/Spacebar.UApi/Spacebar.UApi.csproj
+++ b/extra/admin-api/Spacebar.UApi/Spacebar.UApi.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/extra/admin-api/Spacebar.UApi/deps.json b/extra/admin-api/Spacebar.UApi/deps.json
index 3f6f0a10c..95baa9235 100644
--- a/extra/admin-api/Spacebar.UApi/deps.json
+++ b/extra/admin-api/Spacebar.UApi/deps.json
@@ -21,8 +21,8 @@
},
{
"pname": "Microsoft.AspNetCore.OpenApi",
- "version": "10.0.5",
- "hash": "sha256-CQXAu6Tm8nOy/rrZksIKGaLW7USEP/N1kwKBMLoh7js="
+ "version": "10.0.6",
+ "hash": "sha256-DCNvcXajwnC+II7NMjK83YIiQDQN6uPvtSnwVUZXQMM="
},
{
"pname": "Microsoft.Build.Framework",
@@ -71,8 +71,8 @@
},
{
"pname": "Microsoft.EntityFrameworkCore",
- "version": "10.0.5",
- "hash": "sha256-SR8KBOuIx9e1j/cMwYRCO62WEB+CUrGptexl9MSgp8M="
+ "version": "10.0.6",
+ "hash": "sha256-wEA3ySJvLjAs6O9feF8vZXFM8GgyP+1ufQCaawj20dU="
},
{
"pname": "Microsoft.EntityFrameworkCore.Abstractions",
@@ -81,8 +81,8 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-qMKa7YGJUfaPTRMsAYYPlLxXdhZeyAZLiOSDcNFzDnA="
+ "version": "10.0.6",
+ "hash": "sha256-izcDKxbfeMBNxXmri20mESugr7NHxJEE4Hnvia6hVS4="
},
{
"pname": "Microsoft.EntityFrameworkCore.Analyzers",
@@ -91,13 +91,13 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Analyzers",
- "version": "10.0.5",
- "hash": "sha256-jPTN3RkI1J7vb7O4xiCHjMczMKh//NnKhJAGTuT7v88="
+ "version": "10.0.6",
+ "hash": "sha256-qTZ9ZhnPM7Nqy/ZWjloDTEUO91CymeJ07Yp1SKMJWiY="
},
{
"pname": "Microsoft.EntityFrameworkCore.Design",
- "version": "10.0.5",
- "hash": "sha256-+D17/sNpPhhDaLJJR4fFjSMySFU4yKQzHgzPcAJAdR0="
+ "version": "10.0.6",
+ "hash": "sha256-9WAXxXdAM0rNbGq6j7VGubHslxzmpTYKZ9gFyxh/N74="
},
{
"pname": "Microsoft.EntityFrameworkCore.Relational",
@@ -106,13 +106,13 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Relational",
- "version": "10.0.5",
- "hash": "sha256-5jfkvUKSexKCbCsYZYkBAWd4BIN48dlF5pP6htfDMMQ="
+ "version": "10.0.6",
+ "hash": "sha256-gyA+zXeRaMZl9qs9WXrvc0sEnptZy1nxC6kBux5bTQ0="
},
{
"pname": "Microsoft.Extensions.DependencyModel",
- "version": "10.0.5",
- "hash": "sha256-UfG98EJ+0JTQA8Kx8yxt9mg19s0RSIOO+pG9JJy8uB0="
+ "version": "10.0.6",
+ "hash": "sha256-WY/CGoll5mwtiG3pBN/jDpt5/g4qcQuBL62LeS8KgmM="
},
{
"pname": "Microsoft.IdentityModel.Abstractions",
diff --git a/extra/admin-api/Utilities/ConfigTest/ConfigTest.csproj b/extra/admin-api/Utilities/ConfigTest/ConfigTest.csproj
index 64543262e..6db5e52b1 100644
--- a/extra/admin-api/Utilities/ConfigTest/ConfigTest.csproj
+++ b/extra/admin-api/Utilities/ConfigTest/ConfigTest.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/extra/admin-api/Utilities/Spacebar.AdminApi.TestClient/Spacebar.AdminApi.TestClient.csproj b/extra/admin-api/Utilities/Spacebar.AdminApi.TestClient/Spacebar.AdminApi.TestClient.csproj
index 205891b6a..a8153a998 100644
--- a/extra/admin-api/Utilities/Spacebar.AdminApi.TestClient/Spacebar.AdminApi.TestClient.csproj
+++ b/extra/admin-api/Utilities/Spacebar.AdminApi.TestClient/Spacebar.AdminApi.TestClient.csproj
@@ -21,11 +21,11 @@
-
-
-
+
+
+
-
+
diff --git a/extra/admin-api/Utilities/Spacebar.Cdn.Fsck/FsckService.cs b/extra/admin-api/Utilities/Spacebar.Cdn.Fsck/FsckService.cs
index add630e5d..e0214f1d5 100644
--- a/extra/admin-api/Utilities/Spacebar.Cdn.Fsck/FsckService.cs
+++ b/extra/admin-api/Utilities/Spacebar.Cdn.Fsck/FsckService.cs
@@ -77,7 +77,7 @@ public class FsckService(ILogger logger, IServiceScopeFactory servi
.OrderBy(x => x.Id)
.Select(x => new FsckItem {
Path = $"/avatars/{x.Id}/{x.Avatar}",
- ItemId = x.Id
+ ItemId = x.Id.ToString()
});
public IQueryable EnumerateUserBannerPathsAsync() =>
@@ -86,7 +86,7 @@ public class FsckService(ILogger logger, IServiceScopeFactory servi
.OrderBy(x => x.Id)
.Select(x => new FsckItem {
Path = $"/banners/{x.Id}/{x.Banner}",
- ItemId = x.Id
+ ItemId = x.Id.ToString()
});
#endregion
@@ -99,7 +99,7 @@ public class FsckService(ILogger logger, IServiceScopeFactory servi
.OrderBy(x => x.Id)
.Select(x => new FsckItem {
Path = $"/icons/{x.Id}/{x.Icon}",
- ItemId = x.Id
+ ItemId = x.Id.ToString()
});
public IQueryable EnumerateRoleIconPathsAsync() =>
@@ -108,7 +108,7 @@ public class FsckService(ILogger logger, IServiceScopeFactory servi
.OrderBy(x => x.Id)
.Select(x => new FsckItem {
Path = $"/role-icons/{x.Id}/{x.Icon}",
- ItemId = x.Id
+ ItemId = x.Id.ToString()
});
public IQueryable EnumerateStickerPathsAsync() =>
@@ -116,7 +116,7 @@ public class FsckService(ILogger logger, IServiceScopeFactory servi
.OrderBy(x => x.Id)
.Select(x => new FsckItem {
Path = $"/stickers/{x.Id}",
- ItemId = x.Id
+ ItemId = x.Id.ToString()
});
public IQueryable EnumerateEmojiPathsAsync() =>
@@ -124,7 +124,7 @@ public class FsckService(ILogger logger, IServiceScopeFactory servi
.OrderBy(x => x.Id)
.Select(x => new FsckItem {
Path = $"/emojis/{x.Id}",
- ItemId = x.Id
+ ItemId = x.Id.ToString()
});
#endregion
diff --git a/extra/admin-api/Utilities/Spacebar.Cdn.Fsck/Spacebar.Cdn.Fsck.csproj b/extra/admin-api/Utilities/Spacebar.Cdn.Fsck/Spacebar.Cdn.Fsck.csproj
index 752c1aeec..a02a3203b 100644
--- a/extra/admin-api/Utilities/Spacebar.Cdn.Fsck/Spacebar.Cdn.Fsck.csproj
+++ b/extra/admin-api/Utilities/Spacebar.Cdn.Fsck/Spacebar.Cdn.Fsck.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/extra/admin-api/Utilities/Spacebar.Cdn.Fsck/deps.json b/extra/admin-api/Utilities/Spacebar.Cdn.Fsck/deps.json
index c9527a870..683b0b03e 100644
--- a/extra/admin-api/Utilities/Spacebar.Cdn.Fsck/deps.json
+++ b/extra/admin-api/Utilities/Spacebar.Cdn.Fsck/deps.json
@@ -56,8 +56,8 @@
},
{
"pname": "Microsoft.EntityFrameworkCore",
- "version": "10.0.5",
- "hash": "sha256-SR8KBOuIx9e1j/cMwYRCO62WEB+CUrGptexl9MSgp8M="
+ "version": "10.0.6",
+ "hash": "sha256-wEA3ySJvLjAs6O9feF8vZXFM8GgyP+1ufQCaawj20dU="
},
{
"pname": "Microsoft.EntityFrameworkCore.Abstractions",
@@ -66,8 +66,8 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-qMKa7YGJUfaPTRMsAYYPlLxXdhZeyAZLiOSDcNFzDnA="
+ "version": "10.0.6",
+ "hash": "sha256-izcDKxbfeMBNxXmri20mESugr7NHxJEE4Hnvia6hVS4="
},
{
"pname": "Microsoft.EntityFrameworkCore.Analyzers",
@@ -76,13 +76,13 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Analyzers",
- "version": "10.0.5",
- "hash": "sha256-jPTN3RkI1J7vb7O4xiCHjMczMKh//NnKhJAGTuT7v88="
+ "version": "10.0.6",
+ "hash": "sha256-qTZ9ZhnPM7Nqy/ZWjloDTEUO91CymeJ07Yp1SKMJWiY="
},
{
"pname": "Microsoft.EntityFrameworkCore.Design",
- "version": "10.0.5",
- "hash": "sha256-+D17/sNpPhhDaLJJR4fFjSMySFU4yKQzHgzPcAJAdR0="
+ "version": "10.0.6",
+ "hash": "sha256-9WAXxXdAM0rNbGq6j7VGubHslxzmpTYKZ9gFyxh/N74="
},
{
"pname": "Microsoft.EntityFrameworkCore.Relational",
@@ -91,13 +91,13 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Relational",
- "version": "10.0.5",
- "hash": "sha256-5jfkvUKSexKCbCsYZYkBAWd4BIN48dlF5pP6htfDMMQ="
+ "version": "10.0.6",
+ "hash": "sha256-gyA+zXeRaMZl9qs9WXrvc0sEnptZy1nxC6kBux5bTQ0="
},
{
"pname": "Microsoft.Extensions.Caching.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-3rW3DjoyIIgfeJOHvdZJSrtsZ76V3MNxH5RLICRXWv4="
+ "version": "10.0.6",
+ "hash": "sha256-9yCnv7SmbNOq21W0rmnpiT4GkkE2pceU3xA1HE7zAM4="
},
{
"pname": "Microsoft.Extensions.Caching.Memory",
@@ -106,53 +106,53 @@
},
{
"pname": "Microsoft.Extensions.Caching.Memory",
- "version": "10.0.5",
- "hash": "sha256-WP2/64G4k48qdIohuOOgln9p0b2SJzxWzECfPqX6lQk="
+ "version": "10.0.6",
+ "hash": "sha256-3dWBnlBfEbfC50yrB8isuAOCMeYVaVQo/JfuRvpVBlI="
},
{
"pname": "Microsoft.Extensions.Configuration",
- "version": "10.0.5",
- "hash": "sha256-6rOmJD7Jzq5MPLDd1aV+7gCQwIM9j4c+iT1pGea/daI="
+ "version": "10.0.6",
+ "hash": "sha256-CSd5RC5pMsmglpnE6Vm3JabMnbmziqtUGrZE5Rg7uF4="
},
{
"pname": "Microsoft.Extensions.Configuration.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-DNK+lL2jeHFYyd43zfgVY32UskEfQ4YsTapztuQbYwo="
+ "version": "10.0.6",
+ "hash": "sha256-jxtne26QF7bASCRmLNwYsKruY3QhsnuzN9Us11WUdSQ="
},
{
"pname": "Microsoft.Extensions.Configuration.Binder",
- "version": "10.0.5",
- "hash": "sha256-cVG2NEW1rgLfeq/Gnh/XXqzDx2Tt8ecvgCAB4uFzcQo="
+ "version": "10.0.6",
+ "hash": "sha256-34blBlrQ3FRS7iCS7/gxPZMa9xgDW0p3iEERqwgXFMA="
},
{
"pname": "Microsoft.Extensions.Configuration.CommandLine",
- "version": "10.0.5",
- "hash": "sha256-q5KS8ZtQTkc4WSjqczVIWbFZzdGNxbannVocNSi+coI="
+ "version": "10.0.6",
+ "hash": "sha256-U31ct2qLllJ+0INS4wsDhFztGpzr+7TdwpeKZsgslAw="
},
{
"pname": "Microsoft.Extensions.Configuration.EnvironmentVariables",
- "version": "10.0.5",
- "hash": "sha256-ngWw/kwYWNmK67ErLFoJDKULd4GOXv6MlD6P+eZ4q6A="
+ "version": "10.0.6",
+ "hash": "sha256-/p9mbkua5XJT8vg/r06aw2ZYydlGv9s+Fk+j98h8PF0="
},
{
"pname": "Microsoft.Extensions.Configuration.FileExtensions",
- "version": "10.0.5",
- "hash": "sha256-PUIRpSxnT41HnF/6ZPMe7oAAAJ8gm6mNGRuPhw5Zy6k="
+ "version": "10.0.6",
+ "hash": "sha256-N2DeLcgzjaQIk7LKvUqd2FO2bTmB65iZxpbTXb2DWz8="
},
{
"pname": "Microsoft.Extensions.Configuration.Json",
- "version": "10.0.5",
- "hash": "sha256-jxcGaQpr8RRQVtCobxvCOyn+8k/U2m5H5/ltFYhdKAk="
+ "version": "10.0.6",
+ "hash": "sha256-gj55DSHQluOlZKiNOVeeHuhsz4GpqVRSlbad6jq+Olk="
},
{
"pname": "Microsoft.Extensions.Configuration.UserSecrets",
- "version": "10.0.5",
- "hash": "sha256-ROkQPXDOFU3hOrKtdwvRNR3so5eFLaJxJDxqhDX8IpU="
+ "version": "10.0.6",
+ "hash": "sha256-NwcoOoEiVrdQJU4GXYcNzdmYJSDefdJ1IflEHhPAQK8="
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
- "version": "10.0.5",
- "hash": "sha256-ofDRirUV9XLSz4oksCqErwBJFtAieHACFfyZukHKFng="
+ "version": "10.0.6",
+ "hash": "sha256-K3ODZC+Bwd3Tze5wF7BQvJJGlNObdf2PNA35F41jHTE="
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
@@ -161,48 +161,48 @@
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-KrP+hE3gk7pATbJYZsJ1LHiXjzLA+ntHW7G/VGgHk2g="
+ "version": "10.0.6",
+ "hash": "sha256-lFiZb81kfBJK7J0b0A2UIpydPRT73Xcs57Gzf/+1xXc="
},
{
"pname": "Microsoft.Extensions.DependencyModel",
- "version": "10.0.5",
- "hash": "sha256-UfG98EJ+0JTQA8Kx8yxt9mg19s0RSIOO+pG9JJy8uB0="
+ "version": "10.0.6",
+ "hash": "sha256-WY/CGoll5mwtiG3pBN/jDpt5/g4qcQuBL62LeS8KgmM="
},
{
"pname": "Microsoft.Extensions.Diagnostics",
- "version": "10.0.5",
- "hash": "sha256-LlFT3ZzFH9QfymvP9DY4NteJKTdT+mqSGpzUDpsLNhM="
+ "version": "10.0.6",
+ "hash": "sha256-TGJjvsztoajNzOe0KeuOvtb2ZuNDbjq2NfPs15zo3kA="
},
{
"pname": "Microsoft.Extensions.Diagnostics.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-pwQltVfaqx0jRpO0d9k/dYtyOpnGixK2MB3aHVVbo0E="
+ "version": "10.0.6",
+ "hash": "sha256-9AbUvHuHhDPjtf6vsci2r6VfSg0BlmkJkMYmIqAQ2QA="
},
{
"pname": "Microsoft.Extensions.FileProviders.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-6RwvzBQTJzbypUQAM9WNRkpn3gON63DLxY3gH0ZcrH4="
+ "version": "10.0.6",
+ "hash": "sha256-CzUYBtxxXV8qn72ptRs0QkP8xmrKwlfq47MojRhM1Tw="
},
{
"pname": "Microsoft.Extensions.FileProviders.Physical",
- "version": "10.0.5",
- "hash": "sha256-36irJIKuzhCmA28CC4U8+3W8EJ5U9PwMMdCSXRCp4J0="
+ "version": "10.0.6",
+ "hash": "sha256-zZAyRMT9DnZYlKTW9A5ZeDAlO8EaHxgX9hHuzWDgjiY="
},
{
"pname": "Microsoft.Extensions.FileSystemGlobbing",
- "version": "10.0.5",
- "hash": "sha256-FdwPwpyNejk8YEw4doaouas0oe+8d7K2m49WH+7k0RE="
+ "version": "10.0.6",
+ "hash": "sha256-hfoFBBqSIwZokoX3Kt+aRacLW06QbJkcecyLOhTd0T0="
},
{
"pname": "Microsoft.Extensions.Hosting",
- "version": "10.0.5",
- "hash": "sha256-NJFH/l2wutMISKLZzMqFZfY1/QuMskSAhgWelo9V6Nc="
+ "version": "10.0.6",
+ "hash": "sha256-qTfHGGLi0OWszbcJRyhStsz3EBBl8MVAzGeqxeNneSM="
},
{
"pname": "Microsoft.Extensions.Hosting.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-mqxu+PvqYP/J/9UWEbLIAfSNnsABhdl6m5wkZFf1DDM="
+ "version": "10.0.6",
+ "hash": "sha256-ZFt1jTnkzMsDNTe+nDJvJB3fbQrLvCjYp4NIyESErvU="
},
{
"pname": "Microsoft.Extensions.Logging",
@@ -211,8 +211,8 @@
},
{
"pname": "Microsoft.Extensions.Logging",
- "version": "10.0.5",
- "hash": "sha256-4gVrKZfo/YHZKgKNsgGZZYqa79XWK9wDUuiVfguUV6U="
+ "version": "10.0.6",
+ "hash": "sha256-tskLj/WXLK35gkuJAWaAhPjMW92N1JKOTzTLupR30pE="
},
{
"pname": "Microsoft.Extensions.Logging",
@@ -226,8 +226,8 @@
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-e3A/l+II+n+D7/OPwjdyQM1IBtKHfHeIdlkJmuRw77w="
+ "version": "10.0.6",
+ "hash": "sha256-4ijpXt4PoTNcmF5dl/rEZkRWBAjukB229lXtBtJhxn4="
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
@@ -236,33 +236,33 @@
},
{
"pname": "Microsoft.Extensions.Logging.Configuration",
- "version": "10.0.5",
- "hash": "sha256-yp0WZcCm+SAkMP9U/B3Dg/v282pFMXbZHVzAp2GLGwA="
+ "version": "10.0.6",
+ "hash": "sha256-/tXp5Q6002eNA4Ff9O8eyBgYNdNcOoJ4b2NrdHh+QcQ="
},
{
"pname": "Microsoft.Extensions.Logging.Console",
- "version": "10.0.5",
- "hash": "sha256-Epf70cMofVjqKQxTTgsmNNRW8YcpHj5c80nX8cJTv40="
+ "version": "10.0.6",
+ "hash": "sha256-hIwQTTJGdbqkfkzSHLG5aueueE15DrlggfmPbBZ6SOk="
},
{
"pname": "Microsoft.Extensions.Logging.Debug",
- "version": "10.0.5",
- "hash": "sha256-g6jXBWDCXXUpmygKkVChZq8vUqJgG7qFTJPI0BD32oo="
+ "version": "10.0.6",
+ "hash": "sha256-ZpIjMzwB0Dugr2aQtIt7HgSGKgDjfH0LXKIXsywJbnw="
},
{
"pname": "Microsoft.Extensions.Logging.EventLog",
- "version": "10.0.5",
- "hash": "sha256-RWePIK3PZcc6ULwQa+zZMx+LCJf3jlVERnyPMVJl1ks="
+ "version": "10.0.6",
+ "hash": "sha256-OrIL6QUhI8dntpTXgkrwJ443YpmJsfYNM08kYB4KQZE="
},
{
"pname": "Microsoft.Extensions.Logging.EventSource",
- "version": "10.0.5",
- "hash": "sha256-YV2ff+tl3fpFkYZ3xOqosugYR5ai4oWKovK/HqDGdTc="
+ "version": "10.0.6",
+ "hash": "sha256-LoMQ0w2MwzKGS8QhqNTv5TgAPmgaS5HCfjkJHJHT818="
},
{
"pname": "Microsoft.Extensions.Options",
- "version": "10.0.5",
- "hash": "sha256-nw+m6VWXjmaBqZ1aH/l9SR9Oy62N9dmiMKloJ78kxv8="
+ "version": "10.0.6",
+ "hash": "sha256-GJCULaUcN2FxCA9fKOLe5EDEtkKLrEuP2Kw0jRqospA="
},
{
"pname": "Microsoft.Extensions.Options",
@@ -271,13 +271,13 @@
},
{
"pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
- "version": "10.0.5",
- "hash": "sha256-VQPPvrvYWY/QpmilerCyTNLVejWeBE9mHtGTMOxXUlg="
+ "version": "10.0.6",
+ "hash": "sha256-T0HNAYrIsm1xzfBD1qLqziI5qwSsGXGmXSDdOgpC5s0="
},
{
"pname": "Microsoft.Extensions.Primitives",
- "version": "10.0.5",
- "hash": "sha256-uvrur+0dg4zAAQcpLkkhPA77ST0tA3+EpGdDlCckC+E="
+ "version": "10.0.6",
+ "hash": "sha256-/iSFDryQIl8rl+TtrzunT5LcbPsQCeC2V+9CnS1P4Cc="
},
{
"pname": "Microsoft.Extensions.Primitives",
@@ -346,7 +346,7 @@
},
{
"pname": "System.Diagnostics.EventLog",
- "version": "10.0.5",
- "hash": "sha256-SwmQif5X/T4cIPPNkVf6QsvA3oBLb85iJXNkb3GT+sU="
+ "version": "10.0.6",
+ "hash": "sha256-MpXUz1TiiFkD1ngApC7HKqW+i37zi5V2ApOmqZwDqiI="
}
]
diff --git a/extra/admin-api/Utilities/Spacebar.Cdn.Migration/FsckService.cs b/extra/admin-api/Utilities/Spacebar.Cdn.Migration/FsckService.cs
index fbfd34782..51e574204 100644
--- a/extra/admin-api/Utilities/Spacebar.Cdn.Migration/FsckService.cs
+++ b/extra/admin-api/Utilities/Spacebar.Cdn.Migration/FsckService.cs
@@ -99,7 +99,7 @@ public class FsckService(ILogger logger, IServiceScopeFactory servi
.OrderBy(x => x.Id)
.Select(x => new FsckItem {
Path = $"/avatars/{x.Id}/{x.Avatar}",
- ItemId = x.Id
+ ItemId = x.Id.ToString()
});
public IQueryable EnumerateUserBannerPathsAsync() =>
@@ -108,7 +108,7 @@ public class FsckService(ILogger logger, IServiceScopeFactory servi
.OrderBy(x => x.Id)
.Select(x => new FsckItem {
Path = $"/banners/{x.Id}/{x.Banner}",
- ItemId = x.Id
+ ItemId = x.Id.ToString()
});
#endregion
@@ -121,7 +121,7 @@ public class FsckService(ILogger logger, IServiceScopeFactory servi
.OrderBy(x => x.Id)
.Select(x => new FsckItem {
Path = $"/icons/{x.Id}/{x.Icon}",
- ItemId = x.Id
+ ItemId = x.Id.ToString()
});
public IQueryable EnumerateRoleIconPathsAsync() =>
@@ -130,7 +130,7 @@ public class FsckService(ILogger logger, IServiceScopeFactory servi
.OrderBy(x => x.Id)
.Select(x => new FsckItem {
Path = $"/role-icons/{x.Id}/{x.Icon}",
- ItemId = x.Id
+ ItemId = x.Id.ToString()
});
public IQueryable EnumerateStickerPathsAsync() =>
@@ -138,7 +138,7 @@ public class FsckService(ILogger logger, IServiceScopeFactory servi
.OrderBy(x => x.Id)
.Select(x => new FsckItem {
Path = $"/stickers/{x.Id}.png",
- ItemId = x.Id
+ ItemId = x.Id.ToString()
});
public IQueryable EnumerateEmojiPathsAsync() =>
@@ -146,7 +146,7 @@ public class FsckService(ILogger logger, IServiceScopeFactory servi
.OrderBy(x => x.Id)
.Select(x => new FsckItem {
Path = $"/emojis/{x.Id}",
- ItemId = x.Id
+ ItemId = x.Id.ToString()
});
#endregion
@@ -159,7 +159,7 @@ public class FsckService(ILogger logger, IServiceScopeFactory servi
.OrderBy(x => x.Id)
.Select(x => new FsckItem {
Path = $"/app-icons/{x.Id}/{x.Icon}",
- ItemId = x.Id
+ ItemId = x.Id.ToString()
});
public IQueryable EnumerateApplicationCoverPathsAsync() =>
@@ -168,7 +168,7 @@ public class FsckService(ILogger logger, IServiceScopeFactory servi
.OrderBy(x => x.Id)
.Select(x => new FsckItem {
Path = $"/app-icons/{x.Id}/{x.CoverImage}",
- ItemId = x.Id
+ ItemId = x.Id.ToString()
});
// TODO: not implemented?
@@ -199,11 +199,11 @@ public class FsckService(ILogger logger, IServiceScopeFactory servi
.OrderBy(x => x.Id)
.Select(x => new FsckItem {
Path = sigService.Sign(new() {
- Path = $"/attachments/{x.Message!.ChannelId}/{x.Id}/{x.Filename}",
+ Path = $"/attachments/{x.ChannelId}/{x.MessageId}/{x.Filename}",
IpAddress = "109.128.185.4"
}).GetSignedPath(),
// Path = $"/attachments/{x.Message!.ChannelId}/{x.Id}/{x.Filename}",
- ItemId = x.Id
+ ItemId = x.Id.ToString()
});
#endregion
diff --git a/extra/admin-api/Utilities/Spacebar.Cdn.Migration/Spacebar.Cdn.Migration.csproj b/extra/admin-api/Utilities/Spacebar.Cdn.Migration/Spacebar.Cdn.Migration.csproj
index e13ece9f2..a87432bfa 100644
--- a/extra/admin-api/Utilities/Spacebar.Cdn.Migration/Spacebar.Cdn.Migration.csproj
+++ b/extra/admin-api/Utilities/Spacebar.Cdn.Migration/Spacebar.Cdn.Migration.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/extra/admin-api/Utilities/Spacebar.CleanSettingsRows/Spacebar.CleanSettingsRows.csproj b/extra/admin-api/Utilities/Spacebar.CleanSettingsRows/Spacebar.CleanSettingsRows.csproj
index f4dfc6037..6a90d5ac0 100644
--- a/extra/admin-api/Utilities/Spacebar.CleanSettingsRows/Spacebar.CleanSettingsRows.csproj
+++ b/extra/admin-api/Utilities/Spacebar.CleanSettingsRows/Spacebar.CleanSettingsRows.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/extra/admin-api/Utilities/Spacebar.CleanSettingsRows/deps.json b/extra/admin-api/Utilities/Spacebar.CleanSettingsRows/deps.json
index ce97cc708..2178b663c 100644
--- a/extra/admin-api/Utilities/Spacebar.CleanSettingsRows/deps.json
+++ b/extra/admin-api/Utilities/Spacebar.CleanSettingsRows/deps.json
@@ -51,8 +51,8 @@
},
{
"pname": "Microsoft.EntityFrameworkCore",
- "version": "10.0.5",
- "hash": "sha256-SR8KBOuIx9e1j/cMwYRCO62WEB+CUrGptexl9MSgp8M="
+ "version": "10.0.6",
+ "hash": "sha256-wEA3ySJvLjAs6O9feF8vZXFM8GgyP+1ufQCaawj20dU="
},
{
"pname": "Microsoft.EntityFrameworkCore.Abstractions",
@@ -61,8 +61,8 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-qMKa7YGJUfaPTRMsAYYPlLxXdhZeyAZLiOSDcNFzDnA="
+ "version": "10.0.6",
+ "hash": "sha256-izcDKxbfeMBNxXmri20mESugr7NHxJEE4Hnvia6hVS4="
},
{
"pname": "Microsoft.EntityFrameworkCore.Analyzers",
@@ -71,13 +71,13 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Analyzers",
- "version": "10.0.5",
- "hash": "sha256-jPTN3RkI1J7vb7O4xiCHjMczMKh//NnKhJAGTuT7v88="
+ "version": "10.0.6",
+ "hash": "sha256-qTZ9ZhnPM7Nqy/ZWjloDTEUO91CymeJ07Yp1SKMJWiY="
},
{
"pname": "Microsoft.EntityFrameworkCore.Design",
- "version": "10.0.5",
- "hash": "sha256-+D17/sNpPhhDaLJJR4fFjSMySFU4yKQzHgzPcAJAdR0="
+ "version": "10.0.6",
+ "hash": "sha256-9WAXxXdAM0rNbGq6j7VGubHslxzmpTYKZ9gFyxh/N74="
},
{
"pname": "Microsoft.EntityFrameworkCore.Relational",
@@ -86,13 +86,13 @@
},
{
"pname": "Microsoft.EntityFrameworkCore.Relational",
- "version": "10.0.5",
- "hash": "sha256-5jfkvUKSexKCbCsYZYkBAWd4BIN48dlF5pP6htfDMMQ="
+ "version": "10.0.6",
+ "hash": "sha256-gyA+zXeRaMZl9qs9WXrvc0sEnptZy1nxC6kBux5bTQ0="
},
{
"pname": "Microsoft.Extensions.Caching.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-3rW3DjoyIIgfeJOHvdZJSrtsZ76V3MNxH5RLICRXWv4="
+ "version": "10.0.6",
+ "hash": "sha256-9yCnv7SmbNOq21W0rmnpiT4GkkE2pceU3xA1HE7zAM4="
},
{
"pname": "Microsoft.Extensions.Caching.Memory",
@@ -101,53 +101,53 @@
},
{
"pname": "Microsoft.Extensions.Caching.Memory",
- "version": "10.0.5",
- "hash": "sha256-WP2/64G4k48qdIohuOOgln9p0b2SJzxWzECfPqX6lQk="
+ "version": "10.0.6",
+ "hash": "sha256-3dWBnlBfEbfC50yrB8isuAOCMeYVaVQo/JfuRvpVBlI="
},
{
"pname": "Microsoft.Extensions.Configuration",
- "version": "10.0.5",
- "hash": "sha256-6rOmJD7Jzq5MPLDd1aV+7gCQwIM9j4c+iT1pGea/daI="
+ "version": "10.0.6",
+ "hash": "sha256-CSd5RC5pMsmglpnE6Vm3JabMnbmziqtUGrZE5Rg7uF4="
},
{
"pname": "Microsoft.Extensions.Configuration.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-DNK+lL2jeHFYyd43zfgVY32UskEfQ4YsTapztuQbYwo="
+ "version": "10.0.6",
+ "hash": "sha256-jxtne26QF7bASCRmLNwYsKruY3QhsnuzN9Us11WUdSQ="
},
{
"pname": "Microsoft.Extensions.Configuration.Binder",
- "version": "10.0.5",
- "hash": "sha256-cVG2NEW1rgLfeq/Gnh/XXqzDx2Tt8ecvgCAB4uFzcQo="
+ "version": "10.0.6",
+ "hash": "sha256-34blBlrQ3FRS7iCS7/gxPZMa9xgDW0p3iEERqwgXFMA="
},
{
"pname": "Microsoft.Extensions.Configuration.CommandLine",
- "version": "10.0.5",
- "hash": "sha256-q5KS8ZtQTkc4WSjqczVIWbFZzdGNxbannVocNSi+coI="
+ "version": "10.0.6",
+ "hash": "sha256-U31ct2qLllJ+0INS4wsDhFztGpzr+7TdwpeKZsgslAw="
},
{
"pname": "Microsoft.Extensions.Configuration.EnvironmentVariables",
- "version": "10.0.5",
- "hash": "sha256-ngWw/kwYWNmK67ErLFoJDKULd4GOXv6MlD6P+eZ4q6A="
+ "version": "10.0.6",
+ "hash": "sha256-/p9mbkua5XJT8vg/r06aw2ZYydlGv9s+Fk+j98h8PF0="
},
{
"pname": "Microsoft.Extensions.Configuration.FileExtensions",
- "version": "10.0.5",
- "hash": "sha256-PUIRpSxnT41HnF/6ZPMe7oAAAJ8gm6mNGRuPhw5Zy6k="
+ "version": "10.0.6",
+ "hash": "sha256-N2DeLcgzjaQIk7LKvUqd2FO2bTmB65iZxpbTXb2DWz8="
},
{
"pname": "Microsoft.Extensions.Configuration.Json",
- "version": "10.0.5",
- "hash": "sha256-jxcGaQpr8RRQVtCobxvCOyn+8k/U2m5H5/ltFYhdKAk="
+ "version": "10.0.6",
+ "hash": "sha256-gj55DSHQluOlZKiNOVeeHuhsz4GpqVRSlbad6jq+Olk="
},
{
"pname": "Microsoft.Extensions.Configuration.UserSecrets",
- "version": "10.0.5",
- "hash": "sha256-ROkQPXDOFU3hOrKtdwvRNR3so5eFLaJxJDxqhDX8IpU="
+ "version": "10.0.6",
+ "hash": "sha256-NwcoOoEiVrdQJU4GXYcNzdmYJSDefdJ1IflEHhPAQK8="
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
- "version": "10.0.5",
- "hash": "sha256-ofDRirUV9XLSz4oksCqErwBJFtAieHACFfyZukHKFng="
+ "version": "10.0.6",
+ "hash": "sha256-K3ODZC+Bwd3Tze5wF7BQvJJGlNObdf2PNA35F41jHTE="
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
@@ -156,48 +156,48 @@
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-KrP+hE3gk7pATbJYZsJ1LHiXjzLA+ntHW7G/VGgHk2g="
+ "version": "10.0.6",
+ "hash": "sha256-lFiZb81kfBJK7J0b0A2UIpydPRT73Xcs57Gzf/+1xXc="
},
{
"pname": "Microsoft.Extensions.DependencyModel",
- "version": "10.0.5",
- "hash": "sha256-UfG98EJ+0JTQA8Kx8yxt9mg19s0RSIOO+pG9JJy8uB0="
+ "version": "10.0.6",
+ "hash": "sha256-WY/CGoll5mwtiG3pBN/jDpt5/g4qcQuBL62LeS8KgmM="
},
{
"pname": "Microsoft.Extensions.Diagnostics",
- "version": "10.0.5",
- "hash": "sha256-LlFT3ZzFH9QfymvP9DY4NteJKTdT+mqSGpzUDpsLNhM="
+ "version": "10.0.6",
+ "hash": "sha256-TGJjvsztoajNzOe0KeuOvtb2ZuNDbjq2NfPs15zo3kA="
},
{
"pname": "Microsoft.Extensions.Diagnostics.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-pwQltVfaqx0jRpO0d9k/dYtyOpnGixK2MB3aHVVbo0E="
+ "version": "10.0.6",
+ "hash": "sha256-9AbUvHuHhDPjtf6vsci2r6VfSg0BlmkJkMYmIqAQ2QA="
},
{
"pname": "Microsoft.Extensions.FileProviders.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-6RwvzBQTJzbypUQAM9WNRkpn3gON63DLxY3gH0ZcrH4="
+ "version": "10.0.6",
+ "hash": "sha256-CzUYBtxxXV8qn72ptRs0QkP8xmrKwlfq47MojRhM1Tw="
},
{
"pname": "Microsoft.Extensions.FileProviders.Physical",
- "version": "10.0.5",
- "hash": "sha256-36irJIKuzhCmA28CC4U8+3W8EJ5U9PwMMdCSXRCp4J0="
+ "version": "10.0.6",
+ "hash": "sha256-zZAyRMT9DnZYlKTW9A5ZeDAlO8EaHxgX9hHuzWDgjiY="
},
{
"pname": "Microsoft.Extensions.FileSystemGlobbing",
- "version": "10.0.5",
- "hash": "sha256-FdwPwpyNejk8YEw4doaouas0oe+8d7K2m49WH+7k0RE="
+ "version": "10.0.6",
+ "hash": "sha256-hfoFBBqSIwZokoX3Kt+aRacLW06QbJkcecyLOhTd0T0="
},
{
"pname": "Microsoft.Extensions.Hosting",
- "version": "10.0.5",
- "hash": "sha256-NJFH/l2wutMISKLZzMqFZfY1/QuMskSAhgWelo9V6Nc="
+ "version": "10.0.6",
+ "hash": "sha256-qTfHGGLi0OWszbcJRyhStsz3EBBl8MVAzGeqxeNneSM="
},
{
"pname": "Microsoft.Extensions.Hosting.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-mqxu+PvqYP/J/9UWEbLIAfSNnsABhdl6m5wkZFf1DDM="
+ "version": "10.0.6",
+ "hash": "sha256-ZFt1jTnkzMsDNTe+nDJvJB3fbQrLvCjYp4NIyESErvU="
},
{
"pname": "Microsoft.Extensions.Logging",
@@ -206,8 +206,8 @@
},
{
"pname": "Microsoft.Extensions.Logging",
- "version": "10.0.5",
- "hash": "sha256-4gVrKZfo/YHZKgKNsgGZZYqa79XWK9wDUuiVfguUV6U="
+ "version": "10.0.6",
+ "hash": "sha256-tskLj/WXLK35gkuJAWaAhPjMW92N1JKOTzTLupR30pE="
},
{
"pname": "Microsoft.Extensions.Logging",
@@ -221,8 +221,8 @@
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
- "version": "10.0.5",
- "hash": "sha256-e3A/l+II+n+D7/OPwjdyQM1IBtKHfHeIdlkJmuRw77w="
+ "version": "10.0.6",
+ "hash": "sha256-4ijpXt4PoTNcmF5dl/rEZkRWBAjukB229lXtBtJhxn4="
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
@@ -231,33 +231,33 @@
},
{
"pname": "Microsoft.Extensions.Logging.Configuration",
- "version": "10.0.5",
- "hash": "sha256-yp0WZcCm+SAkMP9U/B3Dg/v282pFMXbZHVzAp2GLGwA="
+ "version": "10.0.6",
+ "hash": "sha256-/tXp5Q6002eNA4Ff9O8eyBgYNdNcOoJ4b2NrdHh+QcQ="
},
{
"pname": "Microsoft.Extensions.Logging.Console",
- "version": "10.0.5",
- "hash": "sha256-Epf70cMofVjqKQxTTgsmNNRW8YcpHj5c80nX8cJTv40="
+ "version": "10.0.6",
+ "hash": "sha256-hIwQTTJGdbqkfkzSHLG5aueueE15DrlggfmPbBZ6SOk="
},
{
"pname": "Microsoft.Extensions.Logging.Debug",
- "version": "10.0.5",
- "hash": "sha256-g6jXBWDCXXUpmygKkVChZq8vUqJgG7qFTJPI0BD32oo="
+ "version": "10.0.6",
+ "hash": "sha256-ZpIjMzwB0Dugr2aQtIt7HgSGKgDjfH0LXKIXsywJbnw="
},
{
"pname": "Microsoft.Extensions.Logging.EventLog",
- "version": "10.0.5",
- "hash": "sha256-RWePIK3PZcc6ULwQa+zZMx+LCJf3jlVERnyPMVJl1ks="
+ "version": "10.0.6",
+ "hash": "sha256-OrIL6QUhI8dntpTXgkrwJ443YpmJsfYNM08kYB4KQZE="
},
{
"pname": "Microsoft.Extensions.Logging.EventSource",
- "version": "10.0.5",
- "hash": "sha256-YV2ff+tl3fpFkYZ3xOqosugYR5ai4oWKovK/HqDGdTc="
+ "version": "10.0.6",
+ "hash": "sha256-LoMQ0w2MwzKGS8QhqNTv5TgAPmgaS5HCfjkJHJHT818="
},
{
"pname": "Microsoft.Extensions.Options",
- "version": "10.0.5",
- "hash": "sha256-nw+m6VWXjmaBqZ1aH/l9SR9Oy62N9dmiMKloJ78kxv8="
+ "version": "10.0.6",
+ "hash": "sha256-GJCULaUcN2FxCA9fKOLe5EDEtkKLrEuP2Kw0jRqospA="
},
{
"pname": "Microsoft.Extensions.Options",
@@ -266,13 +266,13 @@
},
{
"pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
- "version": "10.0.5",
- "hash": "sha256-VQPPvrvYWY/QpmilerCyTNLVejWeBE9mHtGTMOxXUlg="
+ "version": "10.0.6",
+ "hash": "sha256-T0HNAYrIsm1xzfBD1qLqziI5qwSsGXGmXSDdOgpC5s0="
},
{
"pname": "Microsoft.Extensions.Primitives",
- "version": "10.0.5",
- "hash": "sha256-uvrur+0dg4zAAQcpLkkhPA77ST0tA3+EpGdDlCckC+E="
+ "version": "10.0.6",
+ "hash": "sha256-/iSFDryQIl8rl+TtrzunT5LcbPsQCeC2V+9CnS1P4Cc="
},
{
"pname": "Microsoft.Extensions.Primitives",
@@ -341,7 +341,7 @@
},
{
"pname": "System.Diagnostics.EventLog",
- "version": "10.0.5",
- "hash": "sha256-SwmQif5X/T4cIPPNkVf6QsvA3oBLb85iJXNkb3GT+sU="
+ "version": "10.0.6",
+ "hash": "sha256-MpXUz1TiiFkD1ngApC7HKqW+i37zi5V2ApOmqZwDqiI="
}
]
diff --git a/extra/admin-api/flake.lock b/extra/admin-api/flake.lock
index 5a9df8191..4cee253d4 100644
Binary files a/extra/admin-api/flake.lock and b/extra/admin-api/flake.lock differ
diff --git a/extra/admin-api/update-deps.cs b/extra/admin-api/update-deps.cs
index 9fe5f9cda..45954a8f2 100755
--- a/extra/admin-api/update-deps.cs
+++ b/extra/admin-api/update-deps.cs
@@ -48,7 +48,13 @@ var tasks = outs.Select(outp => Task.Run(async () => {
Console.Write(ConsoleUtils.ColoredString($" ==> Getting project root directory... ", 0x80, 0xff, 0xff));
var rootDir = JsonSerializer.Deserialize(Util.GetCommandOutputSync("nix", $"eval --json .#packages.x86_64-linux.{outp}.srcRoot", silent: true, stderr: false))
.Split("/extra/admin-api/", 2)[1];
- var depsFileStorePath = JsonSerializer.Deserialize(Util.GetCommandOutputSync("nix", $"eval --json .#packages.x86_64-linux.{outp}.__nugetDeps", silent: true, stderr: false));
+ var depsFileStorePath =
+ JsonSerializer.Deserialize(Util.GetCommandOutputSync("nix", $"eval --json .#packages.x86_64-linux.{outp}.__nugetDeps", silent: true, stderr: false));
+ if (depsFileStorePath is null) {
+ Console.WriteLine(ConsoleUtils.ColoredString($" ==> No __nugetDeps attribute, skipping!", 0xff, 0x80, 0x80));
+ return;
+ }
+
var depsFileName = new FileInfo(depsFileStorePath).Name;
Console.Write(ConsoleUtils.ColoredString($"{rootDir}", 0x80, 0xff, 0xff));
Console.Write(" - ");
@@ -77,7 +83,7 @@ var tasks = outs.Select(outp => Task.Run(async () => {
var deps = JsonSerializer.Deserialize(await File.ReadAllTextAsync(nugetDepsFilePath));
Console.WriteLine(ConsoleUtils.ColoredString($" ==> Locked {deps.Length} dependencies for {outp}...", (byte)(deps.Length == 0 ? 0xff : 0x80),
(byte)(deps.Length == 0 ? 0x80 : 0xff), 0x80));
- // File.Delete(fname);
+ File.Delete(fname);
// await Task.Delay(250);
}
finally {
@@ -89,5 +95,5 @@ await Task.WhenAll(tasks);
static void RunCommandSync(string command, string args = "", bool silent = false) {
Console.WriteLine($"Executing command (silent: {silent}): {command} {args}");
- Util.RunCommandSync(command, args,silent);
+ Util.RunCommandSync(command, args, silent);
}
\ No newline at end of file