From 7590102dad0584a4424b92cc0acc35efa1704bf2 Mon Sep 17 00:00:00 2001 From: rootdarkarchon Date: Thu, 6 Oct 2022 16:08:11 +0200 Subject: [PATCH] get ismoderator from getgroups --- MareAPI | 2 +- .../MareSynchronosServer/Hubs/MareHub.Groups.cs | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/MareAPI b/MareAPI index c2d740d..1c3327f 160000 --- a/MareAPI +++ b/MareAPI @@ -1 +1 @@ -Subproject commit c2d740def246955b7b9001781e48ed80560db11f +Subproject commit 1c3327f9bc9e42d2d75886a01f72655c2c6fb0f3 diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs index 9fd7ae2..7b6b022 100644 --- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs +++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs @@ -93,7 +93,8 @@ public partial class MareHub Alias = g.Group.Alias, InvitesEnabled = g.Group.InvitesEnabled, OwnedBy = string.IsNullOrEmpty(g.Group.Owner.Alias) ? g.Group.Owner.UID : g.Group.Owner.Alias, - IsPaused = g.IsPaused + IsPaused = g.IsPaused, + IsModerator = g.IsModerator, }).ToList(); } @@ -172,7 +173,7 @@ public partial class MareHub { _logger.LogCallInfo(Api.InvokeGroupJoin, gid); - var group = await _dbContext.Groups.SingleOrDefaultAsync(g => g.GID == gid || g.Alias == gid).ConfigureAwait(false); + var group = await _dbContext.Groups.Include(g => g.Owner).SingleOrDefaultAsync(g => g.GID == gid || g.Alias == gid).ConfigureAwait(false); var existingPair = await _dbContext.GroupPairs.SingleOrDefaultAsync(g => g.GroupGID == gid && g.GroupUserUID == AuthenticatedUserId).ConfigureAwait(false); var hashedPw = StringUtils.Sha256String(password); var existingUserCount = await _dbContext.GroupPairs.CountAsync(g => g.GroupGID == gid).ConfigureAwait(false); @@ -202,7 +203,7 @@ public partial class MareHub await Clients.User(AuthenticatedUserId).SendAsync(Api.OnGroupChange, new GroupDto() { GID = group.GID, - OwnedBy = group.OwnerUID, + OwnedBy = string.IsNullOrEmpty(group.Owner.Alias) ? group.Owner.UID : group.Owner.Alias, IsDeleted = false, IsPaused = false, Alias = group.Alias,