t0w0bi/ClubPenguinServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get ismoderator from getgroups

Browse Source
This commit is contained in:
rootdarkarchon
2022-10-06 16:08:11 +02:00
parent a45a923260
commit 7590102dad
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MareAPI

Submodule MareAPI updated: c2d740def2...1c3327f9bc

7
MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs
View File

@@ -93,7 +93,8 @@ public partial class MareHub
Alias = g.Group.Alias, Alias = g.Group.Alias,
InvitesEnabled = g.Group.InvitesEnabled, InvitesEnabled = g.Group.InvitesEnabled,
OwnedBy = string.IsNullOrEmpty(g.Group.Owner.Alias) ? g.Group.Owner.UID : g.Group.Owner.Alias, 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(); }).ToList();
} }
@@ -172,7 +173,7 @@ public partial class MareHub
{ {
_logger.LogCallInfo(Api.InvokeGroupJoin, gid); _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 existingPair = await _dbContext.GroupPairs.SingleOrDefaultAsync(g => g.GroupGID == gid && g.GroupUserUID == AuthenticatedUserId).ConfigureAwait(false);
var hashedPw = StringUtils.Sha256String(password); var hashedPw = StringUtils.Sha256String(password);
var existingUserCount = await _dbContext.GroupPairs.CountAsync(g => g.GroupGID == gid).ConfigureAwait(false); 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() await Clients.User(AuthenticatedUserId).SendAsync(Api.OnGroupChange, new GroupDto()
{ {
GID = group.GID, GID = group.GID,
OwnedBy = group.OwnerUID, OwnedBy = string.IsNullOrEmpty(group.Owner.Alias) ? group.Owner.UID : group.Owner.Alias,
IsDeleted = false, IsDeleted = false,
IsPaused = false, IsPaused = false,
Alias = group.Alias, Alias = group.Alias,