Merge pull request #3 from Penumbra-Sync/groups
API update for Syncshells
This commit is contained in:
		| @@ -2,7 +2,7 @@ | |||||||
| { | { | ||||||
|     public class Api |     public class Api | ||||||
|     { |     { | ||||||
|         public const int Version = 14; |         public const int Version = 15; | ||||||
|         public const string Path = "/mare"; |         public const string Path = "/mare"; | ||||||
|  |  | ||||||
|         public const string SendFileAbortUpload = "AbortUpload"; |         public const string SendFileAbortUpload = "AbortUpload"; | ||||||
| @@ -11,6 +11,7 @@ | |||||||
|         public const string SendFileUploadFileStreamAsync = "UploadFileStreamAsync"; |         public const string SendFileUploadFileStreamAsync = "UploadFileStreamAsync"; | ||||||
|         public const string InvokeGetFilesSizes = "GetFilesSizes"; |         public const string InvokeGetFilesSizes = "GetFilesSizes"; | ||||||
|         public const string SendFileDeleteAllFiles = "DeleteAllFiles"; |         public const string SendFileDeleteAllFiles = "DeleteAllFiles"; | ||||||
|  |         public const string InvokeCheckClientHealth = "CheckClientHealth"; | ||||||
|  |  | ||||||
|         public const string InvokeHeartbeat = "Heartbeat"; |         public const string InvokeHeartbeat = "Heartbeat"; | ||||||
|         public const string OnUpdateSystemInfo = "OnUpdateSystemInfo"; |         public const string OnUpdateSystemInfo = "OnUpdateSystemInfo"; | ||||||
| @@ -42,5 +43,22 @@ | |||||||
|         public const string OnUserReceiveCharacterData = "ReceiveCharacterData"; |         public const string OnUserReceiveCharacterData = "ReceiveCharacterData"; | ||||||
|         public const string OnUserRemoveOnlinePairedPlayer = "RemoveOnlinePairedPlayer"; |         public const string OnUserRemoveOnlinePairedPlayer = "RemoveOnlinePairedPlayer"; | ||||||
|         public const string OnUserAddOnlinePairedPlayer = "AddOnlinePairedPlayer"; |         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 InvokeGroupJoin = "JoinGroup"; | ||||||
|  |         public const string SendGroupLeave = "LeaveGroup"; | ||||||
|  |         public const string SendGroupPause = "PauseGroup"; | ||||||
|  |         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"; | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -6,5 +6,14 @@ | |||||||
|         public bool IsAdmin { get; set; } |         public bool IsAdmin { get; set; } | ||||||
|         public bool IsModerator { get; set; } |         public bool IsModerator { get; set; } | ||||||
|         public string UID { 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; } | ||||||
|  |         public int MaxGroupsJoinedByUser { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										8
									
								
								MareSynchronosAPI/GroupCreatedDto.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								MareSynchronosAPI/GroupCreatedDto.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,8 @@ | |||||||
|  | namespace MareSynchronos.API | ||||||
|  | { | ||||||
|  |     public record GroupCreatedDto | ||||||
|  |     { | ||||||
|  |         public string GID { get; set; } | ||||||
|  |         public string Password { get; set; } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										12
									
								
								MareSynchronosAPI/GroupDto.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								MareSynchronosAPI/GroupDto.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -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; } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										12
									
								
								MareSynchronosAPI/GroupPairDto.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								MareSynchronosAPI/GroupPairDto.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,12 @@ | |||||||
|  | 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; } | ||||||
|  |         public bool? IsPinned { get; set; } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -2,12 +2,6 @@ | |||||||
| { | { | ||||||
|     public record SystemInfoDto |     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 int OnlineUsers { get; set; } | ||||||
|         public long RAMUsage { get; set; } |  | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 rootdarkarchon
					rootdarkarchon