From 57a7ab82625ca350bce0442c60f457e5e5e172c3 Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Thu, 29 Sep 2022 15:33:46 +0200 Subject: [PATCH 01/11] update api for groups --- MareSynchronosAPI/API.cs | 17 ++++++++++++++++- MareSynchronosAPI/GroupCreatedDto.cs | 8 ++++++++ MareSynchronosAPI/GroupDto.cs | 12 ++++++++++++ MareSynchronosAPI/GroupPairDto.cs | 11 +++++++++++ 4 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 MareSynchronosAPI/GroupCreatedDto.cs create mode 100644 MareSynchronosAPI/GroupDto.cs create mode 100644 MareSynchronosAPI/GroupPairDto.cs diff --git a/MareSynchronosAPI/API.cs b/MareSynchronosAPI/API.cs index 9162756..4637c64 100644 --- a/MareSynchronosAPI/API.cs +++ b/MareSynchronosAPI/API.cs @@ -2,7 +2,7 @@ { public class Api { - public const int Version = 14; + public const int Version = 15; public const string Path = "/mare"; public const string SendFileAbortUpload = "AbortUpload"; @@ -42,5 +42,20 @@ public const string OnUserReceiveCharacterData = "ReceiveCharacterData"; public const string OnUserRemoveOnlinePairedPlayer = "RemoveOnlinePairedPlayer"; public const string OnUserAddOnlinePairedPlayer = "AddOnlinePairedPlayer"; + + public const string InvokeGroupChangePassword = "GroupChangePassword"; + public const string InvokeGroupCreate = "CreateGroup"; + public const string InvokeGroupGetGroups = "GetGroups"; + public const string InvokeGroupGetUsersInGroup = "GetUsersInGroup"; + public const string SendGroupChangeInviteState = "GroupChangeInviteState"; + public const string SendGroupDelete = "DeleteGroup"; + public const string SendGroupJoin = "JoinGroup"; + public const string SendGroupLeave = "LeaveGroup"; + public const string SendGroupPause = "PauseGroup"; + public const string SendGroupRemoveUser = "RemoveUserFromGroup"; + public const string SendGroupChangeOwner = "ChangeOwnerOfGroup"; + + public const string OnGroupChange = "OnGroupPushChange"; + public const string OnGroupUserChange = "OnGroupUserChange"; } } diff --git a/MareSynchronosAPI/GroupCreatedDto.cs b/MareSynchronosAPI/GroupCreatedDto.cs new file mode 100644 index 0000000..d67373e --- /dev/null +++ b/MareSynchronosAPI/GroupCreatedDto.cs @@ -0,0 +1,8 @@ +namespace MareSynchronos.API +{ + public record GroupCreatedDto + { + public string GID { get; set; } + public string Password { get; set; } + } +} diff --git a/MareSynchronosAPI/GroupDto.cs b/MareSynchronosAPI/GroupDto.cs new file mode 100644 index 0000000..967a29f --- /dev/null +++ b/MareSynchronosAPI/GroupDto.cs @@ -0,0 +1,12 @@ +namespace MareSynchronos.API +{ + public record GroupDto + { + public string GID { get; set; } + public string OwnedBy { get; set; } + public bool InvitesEnabled { get; set; } + public bool IsPaused { get; set; } + public bool IsDeleted { get; set; } + public string Alias { get; set; } + } +} diff --git a/MareSynchronosAPI/GroupPairDto.cs b/MareSynchronosAPI/GroupPairDto.cs new file mode 100644 index 0000000..632d545 --- /dev/null +++ b/MareSynchronosAPI/GroupPairDto.cs @@ -0,0 +1,11 @@ +namespace MareSynchronos.API +{ + public record GroupPairDto + { + public string GroupGID { get; set; } + public string UserUID { get; set; } + public string UserAlias { get; set; } + public bool IsPaused { get; set; } + public bool IsRemoved { get; set; } + } +} \ No newline at end of file From 008f88674347b5230b860366017eb3ec157b2090 Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Thu, 29 Sep 2022 15:57:16 +0200 Subject: [PATCH 02/11] update api --- MareSynchronosAPI/GroupDto.cs | 10 +++++----- MareSynchronosAPI/GroupPairDto.cs | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MareSynchronosAPI/GroupDto.cs b/MareSynchronosAPI/GroupDto.cs index 967a29f..c5733e6 100644 --- a/MareSynchronosAPI/GroupDto.cs +++ b/MareSynchronosAPI/GroupDto.cs @@ -3,10 +3,10 @@ public record GroupDto { public string GID { get; set; } - public string OwnedBy { get; set; } - public bool InvitesEnabled { get; set; } - public bool IsPaused { get; set; } - public bool IsDeleted { get; set; } - public string Alias { get; set; } + public string? OwnedBy { get; set; } + public bool? InvitesEnabled { get; set; } + public bool? IsPaused { get; set; } + public bool? IsDeleted { get; set; } + public string? Alias { get; set; } } } diff --git a/MareSynchronosAPI/GroupPairDto.cs b/MareSynchronosAPI/GroupPairDto.cs index 632d545..1c832c4 100644 --- a/MareSynchronosAPI/GroupPairDto.cs +++ b/MareSynchronosAPI/GroupPairDto.cs @@ -4,8 +4,8 @@ { public string GroupGID { get; set; } public string UserUID { get; set; } - public string UserAlias { get; set; } - public bool IsPaused { get; set; } - public bool IsRemoved { get; set; } + public string? UserAlias { get; set; } + public bool? IsPaused { get; set; } + public bool? IsRemoved { get; set; } } } \ No newline at end of file From 94dc07d1c53a5f9c16de91e9b39cc56bb6ec90a6 Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Thu, 29 Sep 2022 20:55:12 +0200 Subject: [PATCH 03/11] add alias to dto --- MareSynchronosAPI/ConnectionDto.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/MareSynchronosAPI/ConnectionDto.cs b/MareSynchronosAPI/ConnectionDto.cs index 0c8b15c..b9d3f38 100644 --- a/MareSynchronosAPI/ConnectionDto.cs +++ b/MareSynchronosAPI/ConnectionDto.cs @@ -5,6 +5,7 @@ public int ServerVersion { get; set; } public bool IsAdmin { get; set; } public bool IsModerator { get; set; } + public string Alias { get; set; } public string UID { get; set; } } } From cfd0ba4c234b89667b11b5eefa83c9fc55baca10 Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Thu, 29 Sep 2022 22:42:57 +0200 Subject: [PATCH 04/11] change to invoke group join --- MareSynchronosAPI/API.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MareSynchronosAPI/API.cs b/MareSynchronosAPI/API.cs index 4637c64..900381f 100644 --- a/MareSynchronosAPI/API.cs +++ b/MareSynchronosAPI/API.cs @@ -49,7 +49,7 @@ public const string InvokeGroupGetUsersInGroup = "GetUsersInGroup"; public const string SendGroupChangeInviteState = "GroupChangeInviteState"; public const string SendGroupDelete = "DeleteGroup"; - public const string SendGroupJoin = "JoinGroup"; + public const string InvokeGroupJoin = "JoinGroup"; public const string SendGroupLeave = "LeaveGroup"; public const string SendGroupPause = "PauseGroup"; public const string SendGroupRemoveUser = "RemoveUserFromGroup"; From 90bb5be8997e37183510ef46932984caac266e70 Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Sun, 2 Oct 2022 13:01:09 +0200 Subject: [PATCH 05/11] add pinned to api --- MareSynchronosAPI/API.cs | 1 + MareSynchronosAPI/GroupPairDto.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/MareSynchronosAPI/API.cs b/MareSynchronosAPI/API.cs index 900381f..c9b3956 100644 --- a/MareSynchronosAPI/API.cs +++ b/MareSynchronosAPI/API.cs @@ -54,6 +54,7 @@ public const string SendGroupPause = "PauseGroup"; public const string SendGroupRemoveUser = "RemoveUserFromGroup"; public const string SendGroupChangeOwner = "ChangeOwnerOfGroup"; + public const string SendGroupChangePinned = "ChangedPinnedUserInGroup"; public const string OnGroupChange = "OnGroupPushChange"; public const string OnGroupUserChange = "OnGroupUserChange"; diff --git a/MareSynchronosAPI/GroupPairDto.cs b/MareSynchronosAPI/GroupPairDto.cs index 1c832c4..d412ba8 100644 --- a/MareSynchronosAPI/GroupPairDto.cs +++ b/MareSynchronosAPI/GroupPairDto.cs @@ -7,5 +7,6 @@ public string? UserAlias { get; set; } public bool? IsPaused { get; set; } public bool? IsRemoved { get; set; } + public bool? IsPinned { get; set; } } } \ No newline at end of file From bab758f1736e266a392a7a93a47357b03b7b3e01 Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Sun, 2 Oct 2022 13:05:57 +0200 Subject: [PATCH 06/11] add clear group to api --- MareSynchronosAPI/API.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/MareSynchronosAPI/API.cs b/MareSynchronosAPI/API.cs index c9b3956..ab23717 100644 --- a/MareSynchronosAPI/API.cs +++ b/MareSynchronosAPI/API.cs @@ -55,6 +55,7 @@ public const string SendGroupRemoveUser = "RemoveUserFromGroup"; public const string SendGroupChangeOwner = "ChangeOwnerOfGroup"; public const string SendGroupChangePinned = "ChangedPinnedUserInGroup"; + public const string SendGroupClear = "ClearGroup"; public const string OnGroupChange = "OnGroupPushChange"; public const string OnGroupUserChange = "OnGroupUserChange"; From a2a4d07c046e0dc5ea5a871dda551f866760d5f6 Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Sun, 2 Oct 2022 23:30:51 +0200 Subject: [PATCH 07/11] remote alias again from connectiondto --- MareSynchronosAPI/ConnectionDto.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/MareSynchronosAPI/ConnectionDto.cs b/MareSynchronosAPI/ConnectionDto.cs index b9d3f38..0c8b15c 100644 --- a/MareSynchronosAPI/ConnectionDto.cs +++ b/MareSynchronosAPI/ConnectionDto.cs @@ -5,7 +5,6 @@ public int ServerVersion { get; set; } public bool IsAdmin { get; set; } public bool IsModerator { get; set; } - public string Alias { get; set; } public string UID { get; set; } } } From 5869ccac093a9ee0013a4d47b62e202daed66a94 Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Mon, 3 Oct 2022 10:10:28 +0200 Subject: [PATCH 08/11] add shard name to ui --- MareSynchronosAPI/ConnectionDto.cs | 1 + MareSynchronosAPI/SystemInfoDto.cs | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/MareSynchronosAPI/ConnectionDto.cs b/MareSynchronosAPI/ConnectionDto.cs index 0c8b15c..d4a3e40 100644 --- a/MareSynchronosAPI/ConnectionDto.cs +++ b/MareSynchronosAPI/ConnectionDto.cs @@ -6,5 +6,6 @@ public bool IsAdmin { get; set; } public bool IsModerator { get; set; } public string UID { get; set; } + public string ShardName { get; set; } } } diff --git a/MareSynchronosAPI/SystemInfoDto.cs b/MareSynchronosAPI/SystemInfoDto.cs index 37f1298..de10f6c 100644 --- a/MareSynchronosAPI/SystemInfoDto.cs +++ b/MareSynchronosAPI/SystemInfoDto.cs @@ -2,12 +2,6 @@ { public record SystemInfoDto { - public double CpuUsage { get; set; } - public long CacheUsage { get; set; } - public int UploadedFiles { get; set; } - public double NetworkIn { get; set; } - public double NetworkOut { get; set; } public int OnlineUsers { get; set; } - public long RAMUsage { get; set; } } } From 6745203568301d6fd3ab7ca06fb51eb6649d58e0 Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Mon, 3 Oct 2022 10:53:02 +0200 Subject: [PATCH 09/11] add groups info capabilities to connection dto --- MareSynchronosAPI/ConnectionDto.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MareSynchronosAPI/ConnectionDto.cs b/MareSynchronosAPI/ConnectionDto.cs index d4a3e40..3b5a1c1 100644 --- a/MareSynchronosAPI/ConnectionDto.cs +++ b/MareSynchronosAPI/ConnectionDto.cs @@ -7,5 +7,8 @@ public bool IsModerator { get; set; } public string UID { get; set; } public string ShardName { get; set; } + public int MaxGroupUserCount { get; set; } + public int MaxGroupsCreatedByUser { get; set; } + public int MaxGroupsJoinedByUser { get; set; } } } From a0937f76374f9dadbe1b031be719f7f7fa0a4afa Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Mon, 3 Oct 2022 10:53:12 +0200 Subject: [PATCH 10/11] actually add the stuff --- MareSynchronosAPI/ConnectionDto.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MareSynchronosAPI/ConnectionDto.cs b/MareSynchronosAPI/ConnectionDto.cs index 3b5a1c1..bb5459e 100644 --- a/MareSynchronosAPI/ConnectionDto.cs +++ b/MareSynchronosAPI/ConnectionDto.cs @@ -6,6 +6,11 @@ public bool IsAdmin { get; set; } public bool IsModerator { get; set; } public string UID { get; set; } + public ServerInfoDto ServerInfo { get; set; } + } + + public record ServerInfoDto + { public string ShardName { get; set; } public int MaxGroupUserCount { get; set; } public int MaxGroupsCreatedByUser { get; set; } From 2d5d9d9d1cc87eebcf89cddc182e2c47fe31a8b4 Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Mon, 3 Oct 2022 14:51:36 +0200 Subject: [PATCH 11/11] add client health check api --- MareSynchronosAPI/API.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/MareSynchronosAPI/API.cs b/MareSynchronosAPI/API.cs index ab23717..9b34b33 100644 --- a/MareSynchronosAPI/API.cs +++ b/MareSynchronosAPI/API.cs @@ -11,6 +11,7 @@ public const string SendFileUploadFileStreamAsync = "UploadFileStreamAsync"; public const string InvokeGetFilesSizes = "GetFilesSizes"; public const string SendFileDeleteAllFiles = "DeleteAllFiles"; + public const string InvokeCheckClientHealth = "CheckClientHealth"; public const string InvokeHeartbeat = "Heartbeat"; public const string OnUpdateSystemInfo = "OnUpdateSystemInfo";