diff --git a/extra/admin-api/Spacebar.AdminAPI/Controllers/UserController.cs b/extra/admin-api/Spacebar.AdminAPI/Controllers/UserController.cs index 62290991..a8501baf 100644 --- a/extra/admin-api/Spacebar.AdminAPI/Controllers/UserController.cs +++ b/extra/admin-api/Spacebar.AdminAPI/Controllers/UserController.cs @@ -1,16 +1,8 @@ -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; -using System.Text.Json.Serialization; -using System.Threading; -using System.Threading.Tasks; using ArcaneLibs; using ArcaneLibs.Extensions; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; using RabbitMQ.Client; using Spacebar.AdminApi.Models; using Spacebar.AdminAPI.Services; @@ -53,10 +45,10 @@ public class UserController(ILogger logger, Configuration config Disabled = x.Disabled, Deleted = x.Deleted, Email = x.Email, - Flags = x.Flags, + Flags = ulong.Parse(x.Flags), PublicFlags = x.PublicFlags, Rights = x.Rights, - ApplicationBotUser = x.ApplicationBotUser == null ? null : new() { }, + ApplicationBotUser = x.ApplicationBotUser == null ? null : new(), ConnectedAccounts = new List(), MessageCount = x.MessageAuthors.Count, // This property is weirdly named due to scaffolding, might patch later SessionCount = x.Sessions.Count, @@ -272,7 +264,7 @@ public class UserController(ILogger logger, Configuration config Embeds = msg.Embeds, Reactions = msg.Reactions, Nonce = msg.Nonce, - Pinned = msg.Pinned, + PinnedAt = msg.PinnedAt, Type = msg.Type, }; db.Messages.Add(newMsg); @@ -313,7 +305,7 @@ public class UserController(ILogger logger, Configuration config Embeds = msg.Embeds, Reactions = msg.Reactions, Nonce = msg.Nonce, - Pinned = msg.Pinned, + PinnedAt = msg.PinnedAt, Type = msg.Type, }; db.Messages.Add(newMsg); @@ -350,7 +342,7 @@ public class UserController(ILogger logger, Configuration config await using var _db = scope.ServiceProvider.GetRequiredService(); // set timeout _db.Database.SetCommandTimeout(6000); - await _db.Database.ExecuteSqlRawAsync($""" + await _db.Database.ExecuteSqlAsync($""" DELETE FROM messages WHERE channel_id = '{channelId}' AND guild_id = '{guildId}' diff --git a/extra/admin-api/Spacebar.Db/Contexts/SpacebarDbContext.cs b/extra/admin-api/Spacebar.Db/Contexts/SpacebarDbContext.cs index 8e7dd0d5..51699513 100644 --- a/extra/admin-api/Spacebar.Db/Contexts/SpacebarDbContext.cs +++ b/extra/admin-api/Spacebar.Db/Contexts/SpacebarDbContext.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using Microsoft.EntityFrameworkCore; using Spacebar.Db.Models; +using Stream = Spacebar.Db.Models.Stream; namespace Spacebar.Db.Contexts; diff --git a/extra/admin-api/Spacebar.Db/Models/User.cs b/extra/admin-api/Spacebar.Db/Models/User.cs index 5f3ab36a..b16d3bae 100644 --- a/extra/admin-api/Spacebar.Db/Models/User.cs +++ b/extra/admin-api/Spacebar.Db/Models/User.cs @@ -96,7 +96,7 @@ public partial class User public string Flags { get; set; } [Column("public_flags")] - public int PublicFlags { get; set; } + public ulong PublicFlags { get; set; } [Column("purchased_flags")] public int PurchasedFlags { get; set; } @@ -105,7 +105,7 @@ public partial class User public int PremiumUsageFlags { get; set; } [Column("rights")] - public long Rights { get; set; } + public ulong Rights { get; set; } [Column("data")] public string Data { get; set; } = null!;