From deea39d62177c1effba28d36f3aa9045261ea378 Mon Sep 17 00:00:00 2001 From: CakeAndBanana Date: Wed, 17 Sep 2025 02:38:20 +0200 Subject: [PATCH] Added get of group profile, removed group from model. redone group data. --- .../LightlessSyncServer/Hubs/MareHub.Groups.cs | 12 ++++++++++++ .../LightlessSyncServer/Utils/Extensions.cs | 2 +- .../LightlessSyncShared/Models/Group.cs | 1 - 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/LightlessSyncServer/LightlessSyncServer/Hubs/MareHub.Groups.cs b/LightlessSyncServer/LightlessSyncServer/Hubs/MareHub.Groups.cs index f0468dd..5241b0c 100644 --- a/LightlessSyncServer/LightlessSyncServer/Hubs/MareHub.Groups.cs +++ b/LightlessSyncServer/LightlessSyncServer/Hubs/MareHub.Groups.cs @@ -1,6 +1,7 @@ using LightlessSync.API.Data.Enum; using LightlessSync.API.Data.Extensions; using LightlessSync.API.Dto.Group; +using LightlessSync.API.Dto.User; using LightlessSyncServer.Utils; using LightlessSyncShared.Models; using LightlessSyncShared.Utils; @@ -604,6 +605,17 @@ public partial class LightlessHub } } + [Authorize(Policy = "Identified")] + public async Task GroupGetProfile(GroupDto dto) + { + _logger.LogCallInfo(LightlessHubLogger.Args(dto)); + + var data = await DbContext.GroupProfiles.SingleOrDefaultAsync(g => g.GroupGID == dto.Group.GID, cancellationToken: _contextAccessor.HttpContext.RequestAborted).ConfigureAwait(false); + if (data == null) return new GroupProfileDto(dto.Group, null, null, null); + + return new GroupProfileDto(dto.Group, data.Description, data.Tags, data.Base64GroupProfileImage); + } + [Authorize(Policy = "Identified")] public async Task GroupSetProfile(GroupProfileDto dto) { diff --git a/LightlessSyncServer/LightlessSyncServer/Utils/Extensions.cs b/LightlessSyncServer/LightlessSyncServer/Utils/Extensions.cs index 59d30ba..34bedac 100644 --- a/LightlessSyncServer/LightlessSyncServer/Utils/Extensions.cs +++ b/LightlessSyncServer/LightlessSyncServer/Utils/Extensions.cs @@ -10,7 +10,7 @@ public static class Extensions { public static GroupData ToGroupData(this Group group) { - return new GroupData(group.GID, group.Alias, group.CreatedDate, group.Profile.Description, group.Profile.Tags, group.Profile.Base64GroupProfileImage); + return new GroupData(group.GID, group.Alias, group.CreatedDate); } public static UserData ToUserData(this GroupPair pair) diff --git a/LightlessSyncServer/LightlessSyncShared/Models/Group.cs b/LightlessSyncServer/LightlessSyncShared/Models/Group.cs index 4d6e26e..2188a5b 100644 --- a/LightlessSyncServer/LightlessSyncShared/Models/Group.cs +++ b/LightlessSyncServer/LightlessSyncShared/Models/Group.cs @@ -9,7 +9,6 @@ public class Group public string GID { get; set; } public string OwnerUID { get; set; } public User Owner { get; set; } - public GroupProfile? Profile { get; set; } [MaxLength(50)] public string Alias { get; set; } public bool InvitesEnabled { get; set; }