From eb70ce0ccb4c1af74f3eb6d3e2fda95ac925a5f4 Mon Sep 17 00:00:00 2001 From: notfire Date: Sun, 30 Mar 2025 18:15:20 -0400 Subject: [PATCH] probably did this wrong --- .../Mastodon/Renderers/UserRenderer.cs | 8 ++- .../Schemas/Entities/AccountEntity.cs | 50 +++++++++---------- .../Core/Database/Tables/User.cs | 2 +- 3 files changed, 33 insertions(+), 27 deletions(-) diff --git a/Iceshrimp.Backend/Controllers/Mastodon/Renderers/UserRenderer.cs b/Iceshrimp.Backend/Controllers/Mastodon/Renderers/UserRenderer.cs index af49d21e..48968931 100644 --- a/Iceshrimp.Backend/Controllers/Mastodon/Renderers/UserRenderer.cs +++ b/Iceshrimp.Backend/Controllers/Mastodon/Renderers/UserRenderer.cs @@ -1,4 +1,5 @@ using Iceshrimp.Backend.Controllers.Mastodon.Schemas.Entities; +using Iceshrimp.Backend.Controllers.Pleroma.Schemas.Entities; using Iceshrimp.Backend.Core.Configuration; using Iceshrimp.Backend.Core.Database; using Iceshrimp.Backend.Core.Database.Tables; @@ -77,7 +78,12 @@ public class UserRenderer( IsDiscoverable = user.IsExplorable, Fields = fields?.ToList() ?? [], Emoji = profileEmoji, - Pleroma = flags.IsPleroma.Value ? user.Pleroma : null + Pleroma = flags.IsPleroma.Value + ? new PleromaUserExtensions() + { + IsAdmin = user.IsAdmin, + IsModerator = user.IsModerator + } : null }; if (localUser is null && security.Value.PublicPreview == Enums.PublicPreview.RestrictedNoMedia) //TODO diff --git a/Iceshrimp.Backend/Controllers/Mastodon/Schemas/Entities/AccountEntity.cs b/Iceshrimp.Backend/Controllers/Mastodon/Schemas/Entities/AccountEntity.cs index abcc9f54..96716808 100644 --- a/Iceshrimp.Backend/Controllers/Mastodon/Schemas/Entities/AccountEntity.cs +++ b/Iceshrimp.Backend/Controllers/Mastodon/Schemas/Entities/AccountEntity.cs @@ -6,31 +6,31 @@ namespace Iceshrimp.Backend.Controllers.Mastodon.Schemas.Entities; public class AccountEntity : IIdentifiable { - [J("username")] public required string Username { get; set; } - [J("acct")] public required string Acct { get; set; } - [J("fqn")] public required string FullyQualifiedName { get; set; } - [J("display_name")] public required string DisplayName { get; set; } - [J("locked")] public required bool IsLocked { get; set; } - [J("created_at")] public required string CreatedAt { get; set; } - [J("followers_count")] public required long FollowersCount { get; set; } - [J("following_count")] public required long FollowingCount { get; set; } - [J("statuses_count")] public required long StatusesCount { get; set; } - [J("note")] public required string Note { get; set; } - [J("url")] public required string Url { get; set; } - [J("uri")] public required string Uri { get; set; } - [J("avatar")] public required string AvatarUrl { get; set; } - [J("avatar_static")] public required string AvatarStaticUrl { get; set; } - [J("header")] public required string HeaderUrl { get; set; } - [J("header_static")] public required string HeaderStaticUrl { get; set; } - [J("moved")] public required AccountEntity? MovedToAccount { get; set; } - [J("bot")] public required bool IsBot { get; set; } - [J("discoverable")] public required bool IsDiscoverable { get; set; } - [J("fields")] public required List Fields { get; set; } - [J("source")] public AccountSource? Source { get; set; } - [J("emojis")] public required List Emoji { get; set; } - [J("id")] public required string Id { get; set; } - [J("last_status_at")] public string? LastStatusAt { get; set; } - [J("pleroma")] public required PleromaStatusExtensions? Pleroma { get; set; } + [J("username")] public required string Username { get; set; } + [J("acct")] public required string Acct { get; set; } + [J("fqn")] public required string FullyQualifiedName { get; set; } + [J("display_name")] public required string DisplayName { get; set; } + [J("locked")] public required bool IsLocked { get; set; } + [J("created_at")] public required string CreatedAt { get; set; } + [J("followers_count")] public required long FollowersCount { get; set; } + [J("following_count")] public required long FollowingCount { get; set; } + [J("statuses_count")] public required long StatusesCount { get; set; } + [J("note")] public required string Note { get; set; } + [J("url")] public required string Url { get; set; } + [J("uri")] public required string Uri { get; set; } + [J("avatar")] public required string AvatarUrl { get; set; } + [J("avatar_static")] public required string AvatarStaticUrl { get; set; } + [J("header")] public required string HeaderUrl { get; set; } + [J("header_static")] public required string HeaderStaticUrl { get; set; } + [J("moved")] public required AccountEntity? MovedToAccount { get; set; } + [J("bot")] public required bool IsBot { get; set; } + [J("discoverable")] public required bool IsDiscoverable { get; set; } + [J("fields")] public required List Fields { get; set; } + [J("source")] public AccountSource? Source { get; set; } + [J("emojis")] public required List Emoji { get; set; } + [J("id")] public required string Id { get; set; } + [J("last_status_at")] public string? LastStatusAt { get; set; } + [J("pleroma")] public required PleromaUserExtensions? Pleroma { get; set; } [J("avatar_description")] public required string AvatarDescription { get; set; } [J("header_description")] public required string HeaderDescription { get; set; } diff --git a/Iceshrimp.Backend/Core/Database/Tables/User.cs b/Iceshrimp.Backend/Core/Database/Tables/User.cs index 8c4e6299..6ced38c7 100644 --- a/Iceshrimp.Backend/Core/Database/Tables/User.cs +++ b/Iceshrimp.Backend/Core/Database/Tables/User.cs @@ -628,7 +628,7 @@ public class User : IIdentifiable : throw new Exception("Cannot access PublicUrl for remote user"); [Projectable] public string PublicUrlPath => $"/@{Username}"; - public PleromaStatusExtensions? Pleroma { get; set; } + public PleromaUserExtensions? Pleroma { get; set; } public string GetIdenticonUrl(string webDomain) => $"https://{webDomain}{IdenticonUrlPath}";