From b2352514eee4f0a1486c23d78ad2f3d1382bbf28 Mon Sep 17 00:00:00 2001 From: SirConstance Date: Fri, 5 Sep 2025 12:03:15 +0200 Subject: [PATCH] Replace UmbraAPI with submodule, remove old refs, upgrade to .NET 9 and apply patches --- .gitignore | 8 +- UmbraAPI/LICENSE => LICENSE_MIT | 0 .../MareSynchronosAuthService.csproj | 14 +- .../appsettings.Development.json | 8 - MareSynchronosServer/MareSynchronosServer.sln | 64 +--- .../MareSynchronosServer.csproj | 4 +- .../MareSynchronosServices.csproj | 4 +- .../MareSynchronosShared.csproj | 4 +- .../MareSynchronosStaticFilesServer.csproj | 4 +- README.md | 7 + UmbraAPI/.gitignore | 350 ------------------ .../MareSynchronosAPI/Data/CharacterData.cs | 36 -- .../MareSynchronosAPI/Data/ChatMessage.cs | 11 - .../Data/Comparer/GroupDataComparer.cs | 19 - .../Data/Comparer/GroupDtoComparer.cs | 23 -- .../Data/Comparer/GroupPairDtoComparer.cs | 20 - .../Data/Comparer/UserDataComparer.cs | 20 - .../Data/Comparer/UserDtoComparer.cs | 20 - .../Data/Enum/GroupPermissions.cs | 11 - .../Data/Enum/GroupUserInfo.cs | 9 - .../Data/Enum/GroupUserPermissions.cs | 11 - .../Data/Enum/MessageSeverity.cs | 8 - .../MareSynchronosAPI/Data/Enum/ObjectKind.cs | 9 - .../Data/Enum/UserPermissions.cs | 12 - .../Extensions/GroupPermissionsExtensions.cs | 50 --- .../Extensions/GroupUserInfoExtensions.cs | 28 -- .../GroupUserPermissionsExtensions.cs | 50 --- .../Extensions/UserPermissionsExtensions.cs | 61 --- .../Data/FileReplacementData.cs | 30 -- UmbraAPI/MareSynchronosAPI/Data/GroupData.cs | 10 - .../Data/SignedChatMessage.cs | 14 - UmbraAPI/MareSynchronosAPI/Data/UserData.cs | 10 - .../Dto/Account/RegisterReplyDto.cs | 12 - .../Dto/Account/RegisterReplyV2Dto.cs | 11 - .../MareSynchronosAPI/Dto/AuthReplyDto.cs | 11 - .../Dto/CharaData/AccessTypeDto.cs | 9 - .../Dto/CharaData/CharaDataDownloadDto.cs | 14 - .../Dto/CharaData/CharaDataDto.cs | 9 - .../Dto/CharaData/CharaDataFullDto.cs | 88 ----- .../Dto/CharaData/CharaDataMetaInfoDto.cs | 11 - .../Dto/CharaData/CharaDataUpdateDto.cs | 20 - .../Dto/CharaData/ShareTypeDto.cs | 7 - .../Dto/Chat/GroupChatMsgDto.cs | 13 - .../Dto/Chat/UserChatMsgDto.cs | 11 - .../MareSynchronosAPI/Dto/ConnectionDto.cs | 25 -- .../Dto/Files/DownloadFileDto.cs | 14 - .../Dto/Files/FilesSendDto.cs | 13 - .../Dto/Files/ITransferFileDto.cs | 8 - .../Dto/Files/UploadFileDto.cs | 11 - .../Dto/Group/BannedGroupUserDto.cs | 19 - .../MareSynchronosAPI/Dto/Group/GroupDto.cs | 13 - .../Dto/Group/GroupFullInfoDto.cs | 12 - .../Dto/Group/GroupInfoDto.cs | 16 - .../Dto/Group/GroupPairDto.cs | 12 - .../Dto/Group/GroupPairFullInfoDto.cs | 12 - .../Dto/Group/GroupPairUserInfoDto.cs | 8 - .../Dto/Group/GroupPairUserPermissionDto.cs | 8 - .../Dto/Group/GroupPasswordDto.cs | 7 - .../Dto/Group/GroupPermissionDto.cs | 8 - .../MareSynchronosAPI/Dto/SystemInfoDto.cs | 9 - .../Dto/User/OnlineUserCharaDataDto.cs | 7 - .../Dto/User/OnlineUserIdentDto.cs | 7 - .../Dto/User/UserCharaDataMessageDto.cs | 7 - .../MareSynchronosAPI/Dto/User/UserDto.cs | 7 - .../MareSynchronosAPI/Dto/User/UserPairDto.cs | 12 - .../Dto/User/UserPermissionsDto.cs | 8 - .../Dto/User/UserProfileDto.cs | 7 - .../Dto/User/UserProfileReportDto.cs | 7 - .../MareSynchronos.API.csproj | 13 - .../MareSynchronosAPI/MareSynchronosAPI.sln | 25 -- UmbraAPI/MareSynchronosAPI/Routes/MareAuth.cs | 14 - .../MareSynchronosAPI/Routes/MareFiles.cs | 45 --- .../MareSynchronosAPI/SignalR/IMareHub.cs | 144 ------- .../SignalR/IMareHubClient.cs | 62 ---- 74 files changed, 39 insertions(+), 1666 deletions(-) rename UmbraAPI/LICENSE => LICENSE_MIT (100%) delete mode 100644 MareSynchronosServer/MareSynchronosAuthService/appsettings.Development.json delete mode 100644 UmbraAPI/.gitignore delete mode 100644 UmbraAPI/MareSynchronosAPI/Data/CharacterData.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Data/ChatMessage.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Data/Comparer/GroupDataComparer.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Data/Comparer/GroupDtoComparer.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Data/Comparer/GroupPairDtoComparer.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Data/Comparer/UserDataComparer.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Data/Comparer/UserDtoComparer.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Data/Enum/GroupPermissions.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Data/Enum/GroupUserInfo.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Data/Enum/GroupUserPermissions.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Data/Enum/MessageSeverity.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Data/Enum/ObjectKind.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Data/Enum/UserPermissions.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Data/Extensions/GroupPermissionsExtensions.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Data/Extensions/GroupUserInfoExtensions.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Data/Extensions/GroupUserPermissionsExtensions.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Data/Extensions/UserPermissionsExtensions.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Data/FileReplacementData.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Data/GroupData.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Data/SignedChatMessage.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Data/UserData.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/Account/RegisterReplyDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/Account/RegisterReplyV2Dto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/AuthReplyDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/CharaData/AccessTypeDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/CharaData/CharaDataDownloadDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/CharaData/CharaDataDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/CharaData/CharaDataFullDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/CharaData/CharaDataMetaInfoDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/CharaData/CharaDataUpdateDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/CharaData/ShareTypeDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/Chat/GroupChatMsgDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/Chat/UserChatMsgDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/ConnectionDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/Files/DownloadFileDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/Files/FilesSendDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/Files/ITransferFileDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/Files/UploadFileDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/Group/BannedGroupUserDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/Group/GroupDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/Group/GroupFullInfoDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/Group/GroupInfoDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPairDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPairFullInfoDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPairUserInfoDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPairUserPermissionDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPasswordDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPermissionDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/SystemInfoDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/User/OnlineUserCharaDataDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/User/OnlineUserIdentDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/User/UserCharaDataMessageDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/User/UserDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/User/UserPairDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/User/UserPermissionsDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/User/UserProfileDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Dto/User/UserProfileReportDto.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/MareSynchronos.API.csproj delete mode 100644 UmbraAPI/MareSynchronosAPI/MareSynchronosAPI.sln delete mode 100644 UmbraAPI/MareSynchronosAPI/Routes/MareAuth.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/Routes/MareFiles.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/SignalR/IMareHub.cs delete mode 100644 UmbraAPI/MareSynchronosAPI/SignalR/IMareHubClient.cs diff --git a/.gitignore b/.gitignore index 9d90bd7..e2f5b7d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,8 +9,6 @@ *.user *.userosscache *.sln.docstates - -# Mac .DS_Store # User-specific files (MonoDevelop/Xamarin Studio) @@ -353,4 +351,8 @@ MigrationBackup/ .ionide/ # docker run data -Docker/run/data/ \ No newline at end of file +Docker/run/data/ + +**/obj/ +**/bin/ +**/.idea/ \ No newline at end of file diff --git a/UmbraAPI/LICENSE b/LICENSE_MIT similarity index 100% rename from UmbraAPI/LICENSE rename to LICENSE_MIT diff --git a/MareSynchronosServer/MareSynchronosAuthService/MareSynchronosAuthService.csproj b/MareSynchronosServer/MareSynchronosAuthService/MareSynchronosAuthService.csproj index dd81407..184a178 100644 --- a/MareSynchronosServer/MareSynchronosAuthService/MareSynchronosAuthService.csproj +++ b/MareSynchronosServer/MareSynchronosAuthService/MareSynchronosAuthService.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 enable enable @@ -18,6 +18,18 @@ + + + + + + + + + Never + + + all diff --git a/MareSynchronosServer/MareSynchronosAuthService/appsettings.Development.json b/MareSynchronosServer/MareSynchronosAuthService/appsettings.Development.json deleted file mode 100644 index 0c208ae..0000000 --- a/MareSynchronosServer/MareSynchronosAuthService/appsettings.Development.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - } -} diff --git a/MareSynchronosServer/MareSynchronosServer.sln b/MareSynchronosServer/MareSynchronosServer.sln index b855693..84f8d6f 100644 --- a/MareSynchronosServer/MareSynchronosServer.sln +++ b/MareSynchronosServer/MareSynchronosServer.sln @@ -5,6 +5,8 @@ VisualStudioVersion = 17.2.32602.215 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MareSynchronosServer", "MareSynchronosServer\MareSynchronosServer.csproj", "{029CA97F-E0BA-4172-A191-EA21FB61AD0F}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MareSynchronos.API", "..\MareAPI\MareSynchronosAPI\MareSynchronos.API.csproj", "{326BFB1B-5571-47A6-8513-1FFDB32D53B0}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MareSynchronosShared", "MareSynchronosShared\MareSynchronosShared.csproj", "{67B1461D-E215-4BA8-A64D-E1836724D5E6}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MareSynchronosStaticFilesServer", "MareSynchronosStaticFilesServer\MareSynchronosStaticFilesServer.csproj", "{3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}" @@ -18,90 +20,36 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MareSynchronosAuthService", "MareSynchronosAuthService\MareSynchronosAuthService.csproj", "{D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MareSynchronos.API", "..\UmbraAPI\MareSynchronosAPI\MareSynchronos.API.csproj", "{FA97F4D1-8F15-4002-A2C1-70EF1367B879}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Debug|x64.ActiveCfg = Debug|Any CPU - {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Debug|x64.Build.0 = Debug|Any CPU - {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Debug|x86.ActiveCfg = Debug|Any CPU - {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Debug|x86.Build.0 = Debug|Any CPU {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Release|Any CPU.ActiveCfg = Release|Any CPU {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Release|Any CPU.Build.0 = Release|Any CPU - {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Release|x64.ActiveCfg = Release|Any CPU - {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Release|x64.Build.0 = Release|Any CPU - {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Release|x86.ActiveCfg = Release|Any CPU - {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Release|x86.Build.0 = Release|Any CPU + {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Release|Any CPU.Build.0 = Release|Any CPU {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Debug|x64.ActiveCfg = Debug|Any CPU - {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Debug|x64.Build.0 = Debug|Any CPU - {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Debug|x86.ActiveCfg = Debug|Any CPU - {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Debug|x86.Build.0 = Debug|Any CPU {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Release|Any CPU.ActiveCfg = Release|Any CPU {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Release|Any CPU.Build.0 = Release|Any CPU - {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Release|x64.ActiveCfg = Release|Any CPU - {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Release|x64.Build.0 = Release|Any CPU - {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Release|x86.ActiveCfg = Release|Any CPU - {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Release|x86.Build.0 = Release|Any CPU {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Debug|x64.ActiveCfg = Debug|Any CPU - {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Debug|x64.Build.0 = Debug|Any CPU - {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Debug|x86.ActiveCfg = Debug|Any CPU - {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Debug|x86.Build.0 = Debug|Any CPU {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Release|Any CPU.ActiveCfg = Release|Any CPU {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Release|Any CPU.Build.0 = Release|Any CPU - {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Release|x64.ActiveCfg = Release|Any CPU - {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Release|x64.Build.0 = Release|Any CPU - {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Release|x86.ActiveCfg = Release|Any CPU - {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Release|x86.Build.0 = Release|Any CPU {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Debug|x64.ActiveCfg = Debug|Any CPU - {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Debug|x64.Build.0 = Debug|Any CPU - {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Debug|x86.ActiveCfg = Debug|Any CPU - {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Debug|x86.Build.0 = Debug|Any CPU {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Release|Any CPU.ActiveCfg = Release|Any CPU {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Release|Any CPU.Build.0 = Release|Any CPU - {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Release|x64.ActiveCfg = Release|Any CPU - {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Release|x64.Build.0 = Release|Any CPU - {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Release|x86.ActiveCfg = Release|Any CPU - {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Release|x86.Build.0 = Release|Any CPU {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Debug|x64.ActiveCfg = Debug|Any CPU - {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Debug|x64.Build.0 = Debug|Any CPU - {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Debug|x86.ActiveCfg = Debug|Any CPU - {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Debug|x86.Build.0 = Debug|Any CPU {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Release|Any CPU.ActiveCfg = Release|Any CPU {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Release|Any CPU.Build.0 = Release|Any CPU - {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Release|x64.ActiveCfg = Release|Any CPU - {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Release|x64.Build.0 = Release|Any CPU - {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Release|x86.ActiveCfg = Release|Any CPU - {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Release|x86.Build.0 = Release|Any CPU - {FA97F4D1-8F15-4002-A2C1-70EF1367B879}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA97F4D1-8F15-4002-A2C1-70EF1367B879}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA97F4D1-8F15-4002-A2C1-70EF1367B879}.Debug|x64.ActiveCfg = Debug|Any CPU - {FA97F4D1-8F15-4002-A2C1-70EF1367B879}.Debug|x64.Build.0 = Debug|Any CPU - {FA97F4D1-8F15-4002-A2C1-70EF1367B879}.Debug|x86.ActiveCfg = Debug|Any CPU - {FA97F4D1-8F15-4002-A2C1-70EF1367B879}.Debug|x86.Build.0 = Debug|Any CPU - {FA97F4D1-8F15-4002-A2C1-70EF1367B879}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA97F4D1-8F15-4002-A2C1-70EF1367B879}.Release|Any CPU.Build.0 = Release|Any CPU - {FA97F4D1-8F15-4002-A2C1-70EF1367B879}.Release|x64.ActiveCfg = Release|Any CPU - {FA97F4D1-8F15-4002-A2C1-70EF1367B879}.Release|x64.Build.0 = Release|Any CPU - {FA97F4D1-8F15-4002-A2C1-70EF1367B879}.Release|x86.ActiveCfg = Release|Any CPU - {FA97F4D1-8F15-4002-A2C1-70EF1367B879}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj b/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj index 20e1fb5..cec9aac 100644 --- a/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj +++ b/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 aspnet-MareSynchronosServer-BA82A12A-0B30-463C-801D-B7E81318CD50 1.1.0.0 enable @@ -35,7 +35,7 @@ - + diff --git a/MareSynchronosServer/MareSynchronosServices/MareSynchronosServices.csproj b/MareSynchronosServer/MareSynchronosServices/MareSynchronosServices.csproj index c3b94c5..79b9226 100644 --- a/MareSynchronosServer/MareSynchronosServices/MareSynchronosServices.csproj +++ b/MareSynchronosServer/MareSynchronosServices/MareSynchronosServices.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable @@ -31,7 +31,7 @@ - + diff --git a/MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj b/MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj index 0442eac..352d5c9 100644 --- a/MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj +++ b/MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable @@ -53,7 +53,7 @@ - + diff --git a/MareSynchronosServer/MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj b/MareSynchronosServer/MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj index bab499d..c1c0fd0 100644 --- a/MareSynchronosServer/MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj +++ b/MareSynchronosServer/MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable @@ -31,7 +31,7 @@ - + diff --git a/README.md b/README.md index d611309..9fec877 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,9 @@ # UmbraServer +🇫🇷 +Ce projet est basé sur Mare Synchronos de DarkArchon. Le code original est sous licence MIT ; voir le fichier +LICENSE_MIT pour plus de détails. À partir de ce commit, le code est sous licence AGPL. + +🇬🇧 +This project is based on Mare Synchronos by DarkArchon. Original code is licensed under the MIT License; see the +LICENSE_MIT file for details. From this commit onwards, the code is licensed under AGPL. \ No newline at end of file diff --git a/UmbraAPI/.gitignore b/UmbraAPI/.gitignore deleted file mode 100644 index dfcfd56..0000000 --- a/UmbraAPI/.gitignore +++ /dev/null @@ -1,350 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - -# User-specific files -*.rsuser -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Mono auto generated files -mono_crash.* - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ -[Ll]ogs/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUnit -*.VisualState.xml -TestResult.xml -nunit-*.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*_wpftmp.csproj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# NuGet Symbol Packages -*.snupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx -*.appxbundle -*.appxupload - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# BeatPulse healthcheck temp database -healthchecksdb - -# Backup folder for Package Reference Convert tool in Visual Studio 2017 -MigrationBackup/ - -# Ionide (cross platform F# VS Code tools) working folder -.ionide/ diff --git a/UmbraAPI/MareSynchronosAPI/Data/CharacterData.cs b/UmbraAPI/MareSynchronosAPI/Data/CharacterData.cs deleted file mode 100644 index da155a3..0000000 --- a/UmbraAPI/MareSynchronosAPI/Data/CharacterData.cs +++ /dev/null @@ -1,36 +0,0 @@ -using MareSynchronos.API.Data.Enum; -using MessagePack; -using System.Text.Json.Serialization; -using System.Text.Json; -using System.Text; -using System.Security.Cryptography; - -namespace MareSynchronos.API.Data; - -[MessagePackObject(keyAsPropertyName: true)] -public class CharacterData -{ - public CharacterData() - { - DataHash = new(() => - { - var json = JsonSerializer.Serialize(this); -#pragma warning disable SYSLIB0021 // Type or member is obsolete - using SHA256CryptoServiceProvider cryptoProvider = new(); -#pragma warning restore SYSLIB0021 // Type or member is obsolete - return BitConverter.ToString(cryptoProvider.ComputeHash(Encoding.UTF8.GetBytes(json))).Replace("-", "", StringComparison.Ordinal); - }); - } - - public Dictionary CustomizePlusData { get; set; } = new(); - [JsonIgnore] - public Lazy DataHash { get; } - - public Dictionary> FileReplacements { get; set; } = new(); - public Dictionary GlamourerData { get; set; } = new(); - public string HeelsData { get; set; } = string.Empty; - public string HonorificData { get; set; } = string.Empty; - public string ManipulationData { get; set; } = string.Empty; - public string MoodlesData { get; set; } = string.Empty; - public string PetNamesData { get; set; } = string.Empty; -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Data/ChatMessage.cs b/UmbraAPI/MareSynchronosAPI/Data/ChatMessage.cs deleted file mode 100644 index 55224a5..0000000 --- a/UmbraAPI/MareSynchronosAPI/Data/ChatMessage.cs +++ /dev/null @@ -1,11 +0,0 @@ -using MessagePack; - -namespace MareSynchronos.API.Data; - -[MessagePackObject(keyAsPropertyName: true)] -public record ChatMessage -{ - public string SenderName { get; set; } = string.Empty; - public uint SenderHomeWorldId { get; set; } = 0; - public byte[] PayloadContent { get; set; } = []; -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Data/Comparer/GroupDataComparer.cs b/UmbraAPI/MareSynchronosAPI/Data/Comparer/GroupDataComparer.cs deleted file mode 100644 index dfd0456..0000000 --- a/UmbraAPI/MareSynchronosAPI/Data/Comparer/GroupDataComparer.cs +++ /dev/null @@ -1,19 +0,0 @@ -namespace MareSynchronos.API.Data.Comparer; - -public class GroupDataComparer : IEqualityComparer -{ - public static GroupDataComparer Instance => _instance; - private static GroupDataComparer _instance = new GroupDataComparer(); - - private GroupDataComparer() { } - public bool Equals(GroupData? x, GroupData? y) - { - if (x == null || y == null) return false; - return x.GID.Equals(y.GID, StringComparison.Ordinal); - } - - public int GetHashCode(GroupData obj) - { - return obj.GID.GetHashCode(); - } -} diff --git a/UmbraAPI/MareSynchronosAPI/Data/Comparer/GroupDtoComparer.cs b/UmbraAPI/MareSynchronosAPI/Data/Comparer/GroupDtoComparer.cs deleted file mode 100644 index 3814c6f..0000000 --- a/UmbraAPI/MareSynchronosAPI/Data/Comparer/GroupDtoComparer.cs +++ /dev/null @@ -1,23 +0,0 @@ -using MareSynchronos.API.Dto.Group; - -namespace MareSynchronos.API.Data.Comparer; - - -public class GroupDtoComparer : IEqualityComparer -{ - public static GroupDtoComparer Instance => _instance; - private static GroupDtoComparer _instance = new GroupDtoComparer(); - - private GroupDtoComparer() { } - - public bool Equals(GroupDto? x, GroupDto? y) - { - if (x == null || y == null) return false; - return x.GID.Equals(y.GID, StringComparison.Ordinal); - } - - public int GetHashCode(GroupDto obj) - { - return obj.Group.GID.GetHashCode(); - } -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Data/Comparer/GroupPairDtoComparer.cs b/UmbraAPI/MareSynchronosAPI/Data/Comparer/GroupPairDtoComparer.cs deleted file mode 100644 index c1dde50..0000000 --- a/UmbraAPI/MareSynchronosAPI/Data/Comparer/GroupPairDtoComparer.cs +++ /dev/null @@ -1,20 +0,0 @@ -using MareSynchronos.API.Dto.Group; - -namespace MareSynchronos.API.Data.Comparer; - -public class GroupPairDtoComparer : IEqualityComparer -{ - public static GroupPairDtoComparer Instance => _instance; - private static GroupPairDtoComparer _instance = new(); - private GroupPairDtoComparer() { } - public bool Equals(GroupPairDto? x, GroupPairDto? y) - { - if (x == null || y == null) return false; - return x.GID.Equals(y.GID, StringComparison.Ordinal) && x.UID.Equals(y.UID, StringComparison.Ordinal); - } - - public int GetHashCode(GroupPairDto obj) - { - return HashCode.Combine(obj.Group.GID.GetHashCode(), obj.User.UID.GetHashCode()); - } -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Data/Comparer/UserDataComparer.cs b/UmbraAPI/MareSynchronosAPI/Data/Comparer/UserDataComparer.cs deleted file mode 100644 index 68aa227..0000000 --- a/UmbraAPI/MareSynchronosAPI/Data/Comparer/UserDataComparer.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace MareSynchronos.API.Data.Comparer; - -public class UserDataComparer : IEqualityComparer -{ - public static UserDataComparer Instance => _instance; - private static UserDataComparer _instance = new(); - - private UserDataComparer() { } - - public bool Equals(UserData? x, UserData? y) - { - if (x == null || y == null) return false; - return x.UID.Equals(y.UID, StringComparison.Ordinal); - } - - public int GetHashCode(UserData obj) - { - return obj.UID.GetHashCode(); - } -} diff --git a/UmbraAPI/MareSynchronosAPI/Data/Comparer/UserDtoComparer.cs b/UmbraAPI/MareSynchronosAPI/Data/Comparer/UserDtoComparer.cs deleted file mode 100644 index 9c8451c..0000000 --- a/UmbraAPI/MareSynchronosAPI/Data/Comparer/UserDtoComparer.cs +++ /dev/null @@ -1,20 +0,0 @@ -using MareSynchronos.API.Dto.User; - -namespace MareSynchronos.API.Data.Comparer; - -public class UserDtoComparer : IEqualityComparer -{ - public static UserDtoComparer Instance => _instance; - private static UserDtoComparer _instance = new(); - private UserDtoComparer() { } - public bool Equals(UserDto? x, UserDto? y) - { - if (x == null || y == null) return false; - return x.User.UID.Equals(y.User.UID, StringComparison.Ordinal); - } - - public int GetHashCode(UserDto obj) - { - return obj.User.UID.GetHashCode(); - } -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Data/Enum/GroupPermissions.cs b/UmbraAPI/MareSynchronosAPI/Data/Enum/GroupPermissions.cs deleted file mode 100644 index cccc712..0000000 --- a/UmbraAPI/MareSynchronosAPI/Data/Enum/GroupPermissions.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace MareSynchronos.API.Data.Enum; - -[Flags] -public enum GroupPermissions -{ - NoneSet = 0x0, - DisableAnimations = 0x1, - DisableSounds = 0x2, - DisableInvites = 0x4, - DisableVFX = 0x8, -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Data/Enum/GroupUserInfo.cs b/UmbraAPI/MareSynchronosAPI/Data/Enum/GroupUserInfo.cs deleted file mode 100644 index ed1b3bb..0000000 --- a/UmbraAPI/MareSynchronosAPI/Data/Enum/GroupUserInfo.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace MareSynchronos.API.Data.Enum; - -[Flags] -public enum GroupUserInfo -{ - None = 0x0, - IsModerator = 0x2, - IsPinned = 0x4 -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Data/Enum/GroupUserPermissions.cs b/UmbraAPI/MareSynchronosAPI/Data/Enum/GroupUserPermissions.cs deleted file mode 100644 index efa3bfd..0000000 --- a/UmbraAPI/MareSynchronosAPI/Data/Enum/GroupUserPermissions.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace MareSynchronos.API.Data.Enum; - -[Flags] -public enum GroupUserPermissions -{ - NoneSet = 0x0, - Paused = 0x1, - DisableAnimations = 0x2, - DisableSounds = 0x4, - DisableVFX = 0x8, -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Data/Enum/MessageSeverity.cs b/UmbraAPI/MareSynchronosAPI/Data/Enum/MessageSeverity.cs deleted file mode 100644 index b0ace02..0000000 --- a/UmbraAPI/MareSynchronosAPI/Data/Enum/MessageSeverity.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace MareSynchronos.API.Data.Enum; - -public enum MessageSeverity -{ - Information, - Warning, - Error -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Data/Enum/ObjectKind.cs b/UmbraAPI/MareSynchronosAPI/Data/Enum/ObjectKind.cs deleted file mode 100644 index 47396c4..0000000 --- a/UmbraAPI/MareSynchronosAPI/Data/Enum/ObjectKind.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace MareSynchronos.API.Data.Enum; - -public enum ObjectKind -{ - Player = 0, - MinionOrMount = 1, - Companion = 2, - Pet = 3, -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Data/Enum/UserPermissions.cs b/UmbraAPI/MareSynchronosAPI/Data/Enum/UserPermissions.cs deleted file mode 100644 index 8cc472b..0000000 --- a/UmbraAPI/MareSynchronosAPI/Data/Enum/UserPermissions.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace MareSynchronos.API.Data.Enum; - -[Flags] -public enum UserPermissions -{ - NoneSet = 0, - Paired = 1, - Paused = 2, - DisableAnimations = 4, - DisableSounds = 8, - DisableVFX = 16, -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Data/Extensions/GroupPermissionsExtensions.cs b/UmbraAPI/MareSynchronosAPI/Data/Extensions/GroupPermissionsExtensions.cs deleted file mode 100644 index ca2236d..0000000 --- a/UmbraAPI/MareSynchronosAPI/Data/Extensions/GroupPermissionsExtensions.cs +++ /dev/null @@ -1,50 +0,0 @@ -using MareSynchronos.API.Data.Enum; - -namespace MareSynchronos.API.Data.Extensions; - -public static class GroupPermissionsExtensions -{ - public static bool IsDisableAnimations(this GroupPermissions perm) - { - return perm.HasFlag(GroupPermissions.DisableAnimations); - } - - public static bool IsDisableSounds(this GroupPermissions perm) - { - return perm.HasFlag(GroupPermissions.DisableSounds); - } - - public static bool IsDisableInvites(this GroupPermissions perm) - { - return perm.HasFlag(GroupPermissions.DisableInvites); - } - - public static bool IsDisableVFX(this GroupPermissions perm) - { - return perm.HasFlag(GroupPermissions.DisableVFX); - } - - public static void SetDisableAnimations(this ref GroupPermissions perm, bool set) - { - if (set) perm |= GroupPermissions.DisableAnimations; - else perm &= ~GroupPermissions.DisableAnimations; - } - - public static void SetDisableSounds(this ref GroupPermissions perm, bool set) - { - if (set) perm |= GroupPermissions.DisableSounds; - else perm &= ~GroupPermissions.DisableSounds; - } - - public static void SetDisableInvites(this ref GroupPermissions perm, bool set) - { - if (set) perm |= GroupPermissions.DisableInvites; - else perm &= ~GroupPermissions.DisableInvites; - } - - public static void SetDisableVFX(this ref GroupPermissions perm, bool set) - { - if (set) perm |= GroupPermissions.DisableVFX; - else perm &= ~GroupPermissions.DisableVFX; - } -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Data/Extensions/GroupUserInfoExtensions.cs b/UmbraAPI/MareSynchronosAPI/Data/Extensions/GroupUserInfoExtensions.cs deleted file mode 100644 index a4608e8..0000000 --- a/UmbraAPI/MareSynchronosAPI/Data/Extensions/GroupUserInfoExtensions.cs +++ /dev/null @@ -1,28 +0,0 @@ -using MareSynchronos.API.Data.Enum; - -namespace MareSynchronos.API.Data.Extensions; - -public static class GroupUserInfoExtensions -{ - public static bool IsModerator(this GroupUserInfo info) - { - return info.HasFlag(GroupUserInfo.IsModerator); - } - - public static bool IsPinned(this GroupUserInfo info) - { - return info.HasFlag(GroupUserInfo.IsPinned); - } - - public static void SetModerator(this ref GroupUserInfo info, bool isModerator) - { - if (isModerator) info |= GroupUserInfo.IsModerator; - else info &= ~GroupUserInfo.IsModerator; - } - - public static void SetPinned(this ref GroupUserInfo info, bool isPinned) - { - if (isPinned) info |= GroupUserInfo.IsPinned; - else info &= ~GroupUserInfo.IsPinned; - } -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Data/Extensions/GroupUserPermissionsExtensions.cs b/UmbraAPI/MareSynchronosAPI/Data/Extensions/GroupUserPermissionsExtensions.cs deleted file mode 100644 index b8b2702..0000000 --- a/UmbraAPI/MareSynchronosAPI/Data/Extensions/GroupUserPermissionsExtensions.cs +++ /dev/null @@ -1,50 +0,0 @@ -using MareSynchronos.API.Data.Enum; - -namespace MareSynchronos.API.Data.Extensions; - -public static class GroupUserPermissionsExtensions -{ - public static bool IsDisableAnimations(this GroupUserPermissions perm) - { - return perm.HasFlag(GroupUserPermissions.DisableAnimations); - } - - public static bool IsDisableSounds(this GroupUserPermissions perm) - { - return perm.HasFlag(GroupUserPermissions.DisableSounds); - } - - public static bool IsPaused(this GroupUserPermissions perm) - { - return perm.HasFlag(GroupUserPermissions.Paused); - } - - public static bool IsDisableVFX(this GroupUserPermissions perm) - { - return perm.HasFlag(GroupUserPermissions.DisableVFX); - } - - public static void SetDisableAnimations(this ref GroupUserPermissions perm, bool set) - { - if (set) perm |= GroupUserPermissions.DisableAnimations; - else perm &= ~GroupUserPermissions.DisableAnimations; - } - - public static void SetDisableSounds(this ref GroupUserPermissions perm, bool set) - { - if (set) perm |= GroupUserPermissions.DisableSounds; - else perm &= ~GroupUserPermissions.DisableSounds; - } - - public static void SetPaused(this ref GroupUserPermissions perm, bool set) - { - if (set) perm |= GroupUserPermissions.Paused; - else perm &= ~GroupUserPermissions.Paused; - } - - public static void SetDisableVFX(this ref GroupUserPermissions perm, bool set) - { - if (set) perm |= GroupUserPermissions.DisableVFX; - else perm &= ~GroupUserPermissions.DisableVFX; - } -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Data/Extensions/UserPermissionsExtensions.cs b/UmbraAPI/MareSynchronosAPI/Data/Extensions/UserPermissionsExtensions.cs deleted file mode 100644 index 2b80601..0000000 --- a/UmbraAPI/MareSynchronosAPI/Data/Extensions/UserPermissionsExtensions.cs +++ /dev/null @@ -1,61 +0,0 @@ -using MareSynchronos.API.Data.Enum; - -namespace MareSynchronos.API.Data.Extensions; - -public static class UserPermissionsExtensions -{ - public static bool IsPaired(this UserPermissions perm) - { - return perm.HasFlag(UserPermissions.Paired); - } - - public static bool IsPaused(this UserPermissions perm) - { - return perm.HasFlag(UserPermissions.Paused); - } - - public static bool IsDisableAnimations(this UserPermissions perm) - { - return perm.HasFlag(UserPermissions.DisableAnimations); - } - - public static bool IsDisableSounds(this UserPermissions perm) - { - return perm.HasFlag(UserPermissions.DisableSounds); - } - - public static bool IsDisableVFX(this UserPermissions perm) - { - return perm.HasFlag(UserPermissions.DisableVFX); - } - - public static void SetPaired(this ref UserPermissions perm, bool paired) - { - if (paired) perm |= UserPermissions.Paired; - else perm &= ~UserPermissions.Paired; - } - - public static void SetPaused(this ref UserPermissions perm, bool paused) - { - if (paused) perm |= UserPermissions.Paused; - else perm &= ~UserPermissions.Paused; - } - - public static void SetDisableAnimations(this ref UserPermissions perm, bool set) - { - if (set) perm |= UserPermissions.DisableAnimations; - else perm &= ~UserPermissions.DisableAnimations; - } - - public static void SetDisableSounds(this ref UserPermissions perm, bool set) - { - if (set) perm |= UserPermissions.DisableSounds; - else perm &= ~UserPermissions.DisableSounds; - } - - public static void SetDisableVFX(this ref UserPermissions perm, bool set) - { - if (set) perm |= UserPermissions.DisableVFX; - else perm &= ~UserPermissions.DisableVFX; - } -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Data/FileReplacementData.cs b/UmbraAPI/MareSynchronosAPI/Data/FileReplacementData.cs deleted file mode 100644 index 82161a5..0000000 --- a/UmbraAPI/MareSynchronosAPI/Data/FileReplacementData.cs +++ /dev/null @@ -1,30 +0,0 @@ -using MessagePack; -using System.Text.Json.Serialization; -using System.Text.Json; -using System.Text; -using System.Security.Cryptography; - - -namespace MareSynchronos.API.Data; - -[MessagePackObject(keyAsPropertyName: true)] -public class FileReplacementData -{ - public FileReplacementData() - { - DataHash = new(() => - { - var json = JsonSerializer.Serialize(this); -#pragma warning disable SYSLIB0021 // Type or member is obsolete - using SHA256CryptoServiceProvider cryptoProvider = new(); -#pragma warning restore SYSLIB0021 // Type or member is obsolete - return BitConverter.ToString(cryptoProvider.ComputeHash(Encoding.UTF8.GetBytes(json))).Replace("-", "", StringComparison.Ordinal); - }); - } - - [JsonIgnore] - public Lazy DataHash { get; } - public string[] GamePaths { get; set; } = Array.Empty(); - public string Hash { get; set; } = string.Empty; - public string FileSwapPath { get; set; } = string.Empty; -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Data/GroupData.cs b/UmbraAPI/MareSynchronosAPI/Data/GroupData.cs deleted file mode 100644 index 877bb44..0000000 --- a/UmbraAPI/MareSynchronosAPI/Data/GroupData.cs +++ /dev/null @@ -1,10 +0,0 @@ -using MessagePack; - -namespace MareSynchronos.API.Data; - -[MessagePackObject(keyAsPropertyName: true)] -public record GroupData(string GID, string? Alias = null) -{ - [IgnoreMember] - public string AliasOrGID => string.IsNullOrWhiteSpace(Alias) ? GID : Alias; -} diff --git a/UmbraAPI/MareSynchronosAPI/Data/SignedChatMessage.cs b/UmbraAPI/MareSynchronosAPI/Data/SignedChatMessage.cs deleted file mode 100644 index edfd8cc..0000000 --- a/UmbraAPI/MareSynchronosAPI/Data/SignedChatMessage.cs +++ /dev/null @@ -1,14 +0,0 @@ -using MessagePack; - -namespace MareSynchronos.API.Data; - -[MessagePackObject(keyAsPropertyName: true)] -public record SignedChatMessage(ChatMessage Message, UserData Sender) : ChatMessage(Message) -{ - // Sender and timestamp are set by the server - public UserData Sender { get; set; } = Sender; - public long Timestamp { get; set; } = 0; - // Signature is generated by the server as SHA256(Sender.UID | Timestamp | Destination | Message) - // Where Destination is either the receiver's UID, or the group GID - public string Signature { get; set; } = string.Empty; -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Data/UserData.cs b/UmbraAPI/MareSynchronosAPI/Data/UserData.cs deleted file mode 100644 index 3bc74cf..0000000 --- a/UmbraAPI/MareSynchronosAPI/Data/UserData.cs +++ /dev/null @@ -1,10 +0,0 @@ -using MessagePack; - -namespace MareSynchronos.API.Data; - -[MessagePackObject(keyAsPropertyName: true)] -public record UserData(string UID, string? Alias = null) -{ - [IgnoreMember] - public string AliasOrUID => string.IsNullOrWhiteSpace(Alias) ? UID : Alias; -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/Account/RegisterReplyDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/Account/RegisterReplyDto.cs deleted file mode 100644 index ce3f741..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/Account/RegisterReplyDto.cs +++ /dev/null @@ -1,12 +0,0 @@ -using MessagePack; - -namespace MareSynchronos.API.Dto.Account; - -[MessagePackObject(keyAsPropertyName: true)] -public record RegisterReplyDto -{ - public bool Success { get; set; } = false; - public string ErrorMessage { get; set; } = string.Empty; - public string UID { get; set; } = string.Empty; - public string SecretKey { get; set; } = string.Empty; -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/Account/RegisterReplyV2Dto.cs b/UmbraAPI/MareSynchronosAPI/Dto/Account/RegisterReplyV2Dto.cs deleted file mode 100644 index 59f7fe5..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/Account/RegisterReplyV2Dto.cs +++ /dev/null @@ -1,11 +0,0 @@ -using MessagePack; - -namespace MareSynchronos.API.Dto.Account; - -[MessagePackObject(keyAsPropertyName: true)] -public record RegisterReplyV2Dto -{ - public bool Success { get; set; } = false; - public string ErrorMessage { get; set; } = string.Empty; - public string UID { get; set; } = string.Empty; -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/AuthReplyDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/AuthReplyDto.cs deleted file mode 100644 index d3033fd..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/AuthReplyDto.cs +++ /dev/null @@ -1,11 +0,0 @@ -using MareSynchronos.API.Data; -using MessagePack; - -namespace MareSynchronos.API.Dto; - -[MessagePackObject(keyAsPropertyName: true)] -public record AuthReplyDto -{ - public string Token { get; set; } = string.Empty; - public string? WellKnown { get; set; } -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/CharaData/AccessTypeDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/CharaData/AccessTypeDto.cs deleted file mode 100644 index 9c53eaa..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/CharaData/AccessTypeDto.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace MareSynchronos.API.Dto.CharaData; - -public enum AccessTypeDto -{ - Individuals, - ClosePairs, - AllPairs, - Public -} diff --git a/UmbraAPI/MareSynchronosAPI/Dto/CharaData/CharaDataDownloadDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/CharaData/CharaDataDownloadDto.cs deleted file mode 100644 index 5d450b8..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/CharaData/CharaDataDownloadDto.cs +++ /dev/null @@ -1,14 +0,0 @@ -using MareSynchronos.API.Data; -using MessagePack; - -namespace MareSynchronos.API.Dto.CharaData; - -[MessagePackObject(keyAsPropertyName: true)] -public record CharaDataDownloadDto(string Id, UserData Uploader) : CharaDataDto(Id, Uploader) -{ - public string GlamourerData { get; init; } = string.Empty; - public string CustomizeData { get; init; } = string.Empty; - public string ManipulationData { get; set; } = string.Empty; - public List FileGamePaths { get; init; } = []; - public List FileSwaps { get; init; } = []; -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/CharaData/CharaDataDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/CharaData/CharaDataDto.cs deleted file mode 100644 index dbf4a26..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/CharaData/CharaDataDto.cs +++ /dev/null @@ -1,9 +0,0 @@ -using MareSynchronos.API.Data; - -namespace MareSynchronos.API.Dto.CharaData; - -public record CharaDataDto(string Id, UserData Uploader) -{ - public string Description { get; init; } = string.Empty; - public DateTime UpdatedDate { get; init; } -} diff --git a/UmbraAPI/MareSynchronosAPI/Dto/CharaData/CharaDataFullDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/CharaData/CharaDataFullDto.cs deleted file mode 100644 index d8b4016..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/CharaData/CharaDataFullDto.cs +++ /dev/null @@ -1,88 +0,0 @@ -using MareSynchronos.API.Data; -using MessagePack; - -namespace MareSynchronos.API.Dto.CharaData; - -[MessagePackObject(keyAsPropertyName: true)] -public record CharaDataFullDto(string Id, UserData Uploader) : CharaDataDto(Id, Uploader) -{ - public DateTime CreatedDate { get; init; } - public DateTime ExpiryDate { get; set; } - public string GlamourerData { get; set; } = string.Empty; - public string CustomizeData { get; set; } = string.Empty; - public string ManipulationData { get; set; } = string.Empty; - public int DownloadCount { get; set; } = 0; - public List AllowedUsers { get; set; } = []; - public List AllowedGroups { get; set; } = []; - public List FileGamePaths { get; set; } = []; - public List FileSwaps { get; set; } = []; - public List OriginalFiles { get; set; } = []; - public AccessTypeDto AccessType { get; set; } - public ShareTypeDto ShareType { get; set; } - public List PoseData { get; set; } = []; -} - -[MessagePackObject(keyAsPropertyName: true)] -public record GamePathEntry(string HashOrFileSwap, string GamePath); - -[MessagePackObject(keyAsPropertyName: true)] -public record PoseEntry(long? Id) -{ - public string? Description { get; set; } = string.Empty; - public string? PoseData { get; set; } = string.Empty; - public WorldData? WorldData { get; set; } -} - -[MessagePackObject] -public record struct WorldData -{ - [Key(0)] public LocationInfo LocationInfo { get; set; } - [Key(1)] public float PositionX { get; set; } - [Key(2)] public float PositionY { get; set; } - [Key(3)] public float PositionZ { get; set; } - [Key(4)] public float RotationX { get; set; } - [Key(5)] public float RotationY { get; set; } - [Key(6)] public float RotationZ { get; set; } - [Key(7)] public float RotationW { get; set; } - [Key(8)] public float ScaleX { get; set; } - [Key(9)] public float ScaleY { get; set; } - [Key(10)] public float ScaleZ { get; set; } -} - -[MessagePackObject] -public record struct LocationInfo -{ - [Key(0)] public uint ServerId { get; set; } - [Key(1)] public uint MapId { get; set; } - [Key(2)] public uint TerritoryId { get; set; } - [Key(3)] public uint DivisionId { get; set; } - [Key(4)] public uint WardId { get; set; } - [Key(5)] public uint HouseId { get; set; } - [Key(6)] public uint RoomId { get; set; } -} - -[MessagePackObject] -public record struct PoseData -{ - [Key(0)] public bool IsDelta { get; set; } - [Key(1)] public Dictionary Bones { get; set; } - [Key(2)] public Dictionary MainHand { get; set; } - [Key(3)] public Dictionary OffHand { get; set; } - [Key(4)] public BoneData ModelDifference { get; set; } -} - -[MessagePackObject] -public record struct BoneData -{ - [Key(0)] public bool Exists { get; set; } - [Key(1)] public float PositionX { get; set; } - [Key(2)] public float PositionY { get; set; } - [Key(3)] public float PositionZ { get; set; } - [Key(4)] public float RotationX { get; set; } - [Key(5)] public float RotationY { get; set; } - [Key(6)] public float RotationZ { get; set; } - [Key(7)] public float RotationW { get; set; } - [Key(8)] public float ScaleX { get; set; } - [Key(9)] public float ScaleY { get; set; } - [Key(10)] public float ScaleZ { get; set; } -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/CharaData/CharaDataMetaInfoDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/CharaData/CharaDataMetaInfoDto.cs deleted file mode 100644 index 7afb6b2..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/CharaData/CharaDataMetaInfoDto.cs +++ /dev/null @@ -1,11 +0,0 @@ -using MareSynchronos.API.Data; -using MessagePack; - -namespace MareSynchronos.API.Dto.CharaData; - -[MessagePackObject(keyAsPropertyName: true)] -public record CharaDataMetaInfoDto(string Id, UserData Uploader) : CharaDataDto(Id, Uploader) -{ - public bool CanBeDownloaded { get; init; } - public List PoseData { get; set; } = []; -} diff --git a/UmbraAPI/MareSynchronosAPI/Dto/CharaData/CharaDataUpdateDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/CharaData/CharaDataUpdateDto.cs deleted file mode 100644 index 30d1348..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/CharaData/CharaDataUpdateDto.cs +++ /dev/null @@ -1,20 +0,0 @@ -using MessagePack; - -namespace MareSynchronos.API.Dto.CharaData; - -[MessagePackObject(keyAsPropertyName: true)] -public record CharaDataUpdateDto(string Id) -{ - public string? Description { get; set; } - public DateTime? ExpiryDate { get; set; } - public string? GlamourerData { get; set; } - public string? CustomizeData { get; set; } - public string? ManipulationData { get; set; } - public List? AllowedUsers { get; set; } - public List? AllowedGroups { get; set; } - public List? FileGamePaths { get; set; } - public List? FileSwaps { get; set; } - public AccessTypeDto? AccessType { get; set; } - public ShareTypeDto? ShareType { get; set; } - public List? Poses { get; set; } -} diff --git a/UmbraAPI/MareSynchronosAPI/Dto/CharaData/ShareTypeDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/CharaData/ShareTypeDto.cs deleted file mode 100644 index ed55f94..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/CharaData/ShareTypeDto.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace MareSynchronos.API.Dto.CharaData; - -public enum ShareTypeDto -{ - Private, - Shared -} diff --git a/UmbraAPI/MareSynchronosAPI/Dto/Chat/GroupChatMsgDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/Chat/GroupChatMsgDto.cs deleted file mode 100644 index c946c00..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/Chat/GroupChatMsgDto.cs +++ /dev/null @@ -1,13 +0,0 @@ -using MareSynchronos.API.Data; -using MareSynchronos.API.Dto.Group; -using MareSynchronos.API.Dto.User; -using MessagePack; - -namespace MareSynchronos.API.Dto.Chat; - -[MessagePackObject(keyAsPropertyName: true)] -public record GroupChatMsgDto(GroupDto Group, SignedChatMessage Message) -{ - public GroupDto Group = Group; - public SignedChatMessage Message = Message; -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/Chat/UserChatMsgDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/Chat/UserChatMsgDto.cs deleted file mode 100644 index d82855b..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/Chat/UserChatMsgDto.cs +++ /dev/null @@ -1,11 +0,0 @@ -using MareSynchronos.API.Data; -using MareSynchronos.API.Dto.User; -using MessagePack; - -namespace MareSynchronos.API.Dto.Chat; - -[MessagePackObject(keyAsPropertyName: true)] -public record UserChatMsgDto(SignedChatMessage Message) -{ - public SignedChatMessage Message = Message; -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/ConnectionDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/ConnectionDto.cs deleted file mode 100644 index 04c818e..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/ConnectionDto.cs +++ /dev/null @@ -1,25 +0,0 @@ -using MareSynchronos.API.Data; -using MessagePack; - -namespace MareSynchronos.API.Dto; - -[MessagePackObject(keyAsPropertyName: true)] -public record ConnectionDto(UserData User) -{ - public Version CurrentClientVersion { get; set; } = new(0, 0, 0); - public int ServerVersion { get; set; } - public bool IsAdmin { get; set; } - public bool IsModerator { get; set; } - public ServerInfo ServerInfo { get; set; } = new(); -} - -[MessagePackObject(keyAsPropertyName: true)] -public record ServerInfo -{ - public string ShardName { get; set; } = string.Empty; - public int MaxGroupUserCount { get; set; } - public int MaxGroupsCreatedByUser { get; set; } - public int MaxGroupsJoinedByUser { get; set; } - public Uri FileServerAddress { get; set; } = new Uri("http://nonemptyuri"); - public int MaxCharaData { get; set; } -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/Files/DownloadFileDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/Files/DownloadFileDto.cs deleted file mode 100644 index d2ffe05..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/Files/DownloadFileDto.cs +++ /dev/null @@ -1,14 +0,0 @@ -using MessagePack; - -namespace MareSynchronos.API.Dto.Files; - -[MessagePackObject(keyAsPropertyName: true)] -public record DownloadFileDto : ITransferFileDto -{ - public bool FileExists { get; set; } = true; - public string Hash { get; set; } = string.Empty; - public string Url { get; set; } = string.Empty; - public long Size { get; set; } = 0; - public bool IsForbidden { get; set; } = false; - public string ForbiddenBy { get; set; } = string.Empty; -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/Files/FilesSendDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/Files/FilesSendDto.cs deleted file mode 100644 index b7a6735..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/Files/FilesSendDto.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MareSynchronos.API.Dto.Files; - -public class FilesSendDto -{ - public List FileHashes { get; set; } = new(); - public List UIDs { get; set; } = new(); -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/Files/ITransferFileDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/Files/ITransferFileDto.cs deleted file mode 100644 index fb20e5a..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/Files/ITransferFileDto.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace MareSynchronos.API.Dto.Files; - -public interface ITransferFileDto -{ - string Hash { get; set; } - bool IsForbidden { get; set; } - string ForbiddenBy { get; set; } -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/Files/UploadFileDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/Files/UploadFileDto.cs deleted file mode 100644 index f10b27d..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/Files/UploadFileDto.cs +++ /dev/null @@ -1,11 +0,0 @@ -using MessagePack; - -namespace MareSynchronos.API.Dto.Files; - -[MessagePackObject(keyAsPropertyName: true)] -public record UploadFileDto : ITransferFileDto -{ - public string Hash { get; set; } = string.Empty; - public bool IsForbidden { get; set; } = false; - public string ForbiddenBy { get; set; } = string.Empty; -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/Group/BannedGroupUserDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/Group/BannedGroupUserDto.cs deleted file mode 100644 index 36ed1f9..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/Group/BannedGroupUserDto.cs +++ /dev/null @@ -1,19 +0,0 @@ -using MareSynchronos.API.Data; -using MessagePack; - -namespace MareSynchronos.API.Dto.Group; - -[MessagePackObject(keyAsPropertyName: true)] -public record BannedGroupUserDto : GroupPairDto -{ - public BannedGroupUserDto(GroupData group, UserData user, string reason, DateTime bannedOn, string bannedBy) : base(group, user) - { - Reason = reason; - BannedOn = bannedOn; - BannedBy = bannedBy; - } - - public string Reason { get; set; } - public DateTime BannedOn { get; set; } - public string BannedBy { get; set; } -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupDto.cs deleted file mode 100644 index 5b5b71a..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupDto.cs +++ /dev/null @@ -1,13 +0,0 @@ -using MareSynchronos.API.Data; -using MessagePack; - -namespace MareSynchronos.API.Dto.Group; - -[MessagePackObject(keyAsPropertyName: true)] -public record GroupDto(GroupData Group) -{ - public GroupData Group { get; set; } = Group; - public string GID => Group.GID; - public string? GroupAlias => Group.Alias; - public string GroupAliasOrGID => Group.AliasOrGID; -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupFullInfoDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupFullInfoDto.cs deleted file mode 100644 index 0591293..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupFullInfoDto.cs +++ /dev/null @@ -1,12 +0,0 @@ -using MareSynchronos.API.Data; -using MareSynchronos.API.Data.Enum; -using MessagePack; - -namespace MareSynchronos.API.Dto.Group; - -[MessagePackObject(keyAsPropertyName: true)] -public record GroupFullInfoDto(GroupData Group, UserData Owner, GroupPermissions GroupPermissions, GroupUserPermissions GroupUserPermissions, GroupUserInfo GroupUserInfo) : GroupInfoDto(Group, Owner, GroupPermissions) -{ - public GroupUserPermissions GroupUserPermissions { get; set; } = GroupUserPermissions; - public GroupUserInfo GroupUserInfo { get; set; } = GroupUserInfo; -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupInfoDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupInfoDto.cs deleted file mode 100644 index 193072b..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupInfoDto.cs +++ /dev/null @@ -1,16 +0,0 @@ -using MareSynchronos.API.Data; -using MareSynchronos.API.Data.Enum; -using MessagePack; - -namespace MareSynchronos.API.Dto.Group; - -[MessagePackObject(keyAsPropertyName: true)] -public record GroupInfoDto(GroupData Group, UserData Owner, GroupPermissions GroupPermissions) : GroupDto(Group) -{ - public GroupPermissions GroupPermissions { get; set; } = GroupPermissions; - public UserData Owner { get; set; } = Owner; - - public string OwnerUID => Owner.UID; - public string? OwnerAlias => Owner.Alias; - public string OwnerAliasOrUID => Owner.AliasOrUID; -} diff --git a/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPairDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPairDto.cs deleted file mode 100644 index c2e748d..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPairDto.cs +++ /dev/null @@ -1,12 +0,0 @@ -using MareSynchronos.API.Data; -using MessagePack; - -namespace MareSynchronos.API.Dto.Group; - -[MessagePackObject(keyAsPropertyName: true)] -public record GroupPairDto(GroupData Group, UserData User) : GroupDto(Group) -{ - public string UID => User.UID; - public string? UserAlias => User.Alias; - public string UserAliasOrUID => User.AliasOrUID; -} diff --git a/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPairFullInfoDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPairFullInfoDto.cs deleted file mode 100644 index 5a594df..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPairFullInfoDto.cs +++ /dev/null @@ -1,12 +0,0 @@ -using MareSynchronos.API.Data; -using MareSynchronos.API.Data.Enum; -using MessagePack; - -namespace MareSynchronos.API.Dto.Group; - -[MessagePackObject(keyAsPropertyName: true)] -public record GroupPairFullInfoDto(GroupData Group, UserData User, GroupUserInfo GroupPairStatusInfo, GroupUserPermissions GroupUserPermissions) : GroupPairDto(Group, User) -{ - public GroupUserInfo GroupPairStatusInfo { get; set; } = GroupPairStatusInfo; - public GroupUserPermissions GroupUserPermissions { get; set; } = GroupUserPermissions; -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPairUserInfoDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPairUserInfoDto.cs deleted file mode 100644 index 8a37f68..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPairUserInfoDto.cs +++ /dev/null @@ -1,8 +0,0 @@ -using MareSynchronos.API.Data; -using MareSynchronos.API.Data.Enum; -using MessagePack; - -namespace MareSynchronos.API.Dto.Group; - -[MessagePackObject(keyAsPropertyName: true)] -public record GroupPairUserInfoDto(GroupData Group, UserData User, GroupUserInfo GroupUserInfo) : GroupPairDto(Group, User); diff --git a/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPairUserPermissionDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPairUserPermissionDto.cs deleted file mode 100644 index d1f152f..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPairUserPermissionDto.cs +++ /dev/null @@ -1,8 +0,0 @@ -using MareSynchronos.API.Data; -using MareSynchronos.API.Data.Enum; -using MessagePack; - -namespace MareSynchronos.API.Dto.Group; - -[MessagePackObject(keyAsPropertyName: true)] -public record GroupPairUserPermissionDto(GroupData Group, UserData User, GroupUserPermissions GroupPairPermissions) : GroupPairDto(Group, User); diff --git a/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPasswordDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPasswordDto.cs deleted file mode 100644 index bcc31f0..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPasswordDto.cs +++ /dev/null @@ -1,7 +0,0 @@ -using MareSynchronos.API.Data; -using MessagePack; - -namespace MareSynchronos.API.Dto.Group; - -[MessagePackObject(keyAsPropertyName: true)] -public record GroupPasswordDto(GroupData Group, string Password) : GroupDto(Group); diff --git a/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPermissionDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPermissionDto.cs deleted file mode 100644 index 70dbf80..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/Group/GroupPermissionDto.cs +++ /dev/null @@ -1,8 +0,0 @@ -using MareSynchronos.API.Data; -using MareSynchronos.API.Data.Enum; -using MessagePack; - -namespace MareSynchronos.API.Dto.Group; - -[MessagePackObject(keyAsPropertyName: true)] -public record GroupPermissionDto(GroupData Group, GroupPermissions Permissions) : GroupDto(Group); diff --git a/UmbraAPI/MareSynchronosAPI/Dto/SystemInfoDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/SystemInfoDto.cs deleted file mode 100644 index eb84f1a..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/SystemInfoDto.cs +++ /dev/null @@ -1,9 +0,0 @@ -using MessagePack; - -namespace MareSynchronos.API.Dto; - -[MessagePackObject(keyAsPropertyName: true)] -public record SystemInfoDto -{ - public int OnlineUsers { get; set; } -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/User/OnlineUserCharaDataDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/User/OnlineUserCharaDataDto.cs deleted file mode 100644 index a4233d5..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/User/OnlineUserCharaDataDto.cs +++ /dev/null @@ -1,7 +0,0 @@ -using MareSynchronos.API.Data; -using MessagePack; - -namespace MareSynchronos.API.Dto.User; - -[MessagePackObject(keyAsPropertyName: true)] -public record OnlineUserCharaDataDto(UserData User, CharacterData CharaData) : UserDto(User); \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/User/OnlineUserIdentDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/User/OnlineUserIdentDto.cs deleted file mode 100644 index dbc7129..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/User/OnlineUserIdentDto.cs +++ /dev/null @@ -1,7 +0,0 @@ -using MareSynchronos.API.Data; -using MessagePack; - -namespace MareSynchronos.API.Dto.User; - -[MessagePackObject(keyAsPropertyName: true)] -public record OnlineUserIdentDto(UserData User, string Ident) : UserDto(User); \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/User/UserCharaDataMessageDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/User/UserCharaDataMessageDto.cs deleted file mode 100644 index 1b33590..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/User/UserCharaDataMessageDto.cs +++ /dev/null @@ -1,7 +0,0 @@ -using MareSynchronos.API.Data; -using MessagePack; - -namespace MareSynchronos.API.Dto.User; - -[MessagePackObject(keyAsPropertyName: true)] -public record UserCharaDataMessageDto(List Recipients, CharacterData CharaData); \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/User/UserDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/User/UserDto.cs deleted file mode 100644 index ce105bf..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/User/UserDto.cs +++ /dev/null @@ -1,7 +0,0 @@ -using MareSynchronos.API.Data; -using MessagePack; - -namespace MareSynchronos.API.Dto.User; - -[MessagePackObject(keyAsPropertyName: true)] -public record UserDto(UserData User); \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/User/UserPairDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/User/UserPairDto.cs deleted file mode 100644 index 3d92ad6..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/User/UserPairDto.cs +++ /dev/null @@ -1,12 +0,0 @@ -using MareSynchronos.API.Data; -using MareSynchronos.API.Data.Enum; -using MessagePack; - -namespace MareSynchronos.API.Dto.User; - -[MessagePackObject(keyAsPropertyName: true)] -public record UserPairDto(UserData User, UserPermissions OwnPermissions, UserPermissions OtherPermissions) : UserDto(User) -{ - public UserPermissions OwnPermissions { get; set; } = OwnPermissions; - public UserPermissions OtherPermissions { get; set; } = OtherPermissions; -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/User/UserPermissionsDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/User/UserPermissionsDto.cs deleted file mode 100644 index 772040b..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/User/UserPermissionsDto.cs +++ /dev/null @@ -1,8 +0,0 @@ -using MareSynchronos.API.Data; -using MareSynchronos.API.Data.Enum; -using MessagePack; - -namespace MareSynchronos.API.Dto.User; - -[MessagePackObject(keyAsPropertyName: true)] -public record UserPermissionsDto(UserData User, UserPermissions Permissions) : UserDto(User); \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/User/UserProfileDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/User/UserProfileDto.cs deleted file mode 100644 index 0b103e5..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/User/UserProfileDto.cs +++ /dev/null @@ -1,7 +0,0 @@ -using MareSynchronos.API.Data; -using MessagePack; - -namespace MareSynchronos.API.Dto.User; - -[MessagePackObject(keyAsPropertyName: true)] -public record UserProfileDto(UserData User, bool Disabled, bool? IsNSFW, string? ProfilePictureBase64, string? Description) : UserDto(User); \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Dto/User/UserProfileReportDto.cs b/UmbraAPI/MareSynchronosAPI/Dto/User/UserProfileReportDto.cs deleted file mode 100644 index 02ed9ef..0000000 --- a/UmbraAPI/MareSynchronosAPI/Dto/User/UserProfileReportDto.cs +++ /dev/null @@ -1,7 +0,0 @@ -using MareSynchronos.API.Data; -using MessagePack; - -namespace MareSynchronos.API.Dto.User; - -[MessagePackObject(keyAsPropertyName: true)] -public record UserProfileReportDto(UserData User, string ProfileReport) : UserDto(User); \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/MareSynchronos.API.csproj b/UmbraAPI/MareSynchronosAPI/MareSynchronos.API.csproj deleted file mode 100644 index 348a17a..0000000 --- a/UmbraAPI/MareSynchronosAPI/MareSynchronos.API.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - net8.0 - enable - enable - - - - - - - diff --git a/UmbraAPI/MareSynchronosAPI/MareSynchronosAPI.sln b/UmbraAPI/MareSynchronosAPI/MareSynchronosAPI.sln deleted file mode 100644 index ffde134..0000000 --- a/UmbraAPI/MareSynchronosAPI/MareSynchronosAPI.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.2.32602.215 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MareSynchronos.API", "MareSynchronos.API.csproj", "{CD05EE19-802F-4490-AAD8-CAD4BF1D630D}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CD05EE19-802F-4490-AAD8-CAD4BF1D630D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CD05EE19-802F-4490-AAD8-CAD4BF1D630D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CD05EE19-802F-4490-AAD8-CAD4BF1D630D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CD05EE19-802F-4490-AAD8-CAD4BF1D630D}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {DFB70C71-AB27-468D-A08B-218CA79BF69D} - EndGlobalSection -EndGlobal diff --git a/UmbraAPI/MareSynchronosAPI/Routes/MareAuth.cs b/UmbraAPI/MareSynchronosAPI/Routes/MareAuth.cs deleted file mode 100644 index 2bef31e..0000000 --- a/UmbraAPI/MareSynchronosAPI/Routes/MareAuth.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace MareSynchronos.API.Routes; - -public class MareAuth -{ - public const string Auth = "/auth"; - public const string Auth_CreateIdent = "createWithIdent"; - public const string Auth_CreateIdentV2 = "createWithIdentV2"; - public const string Auth_Register = "registerNewKey"; - public const string Auth_RegisterV2 = "registerNewKeyV2"; - public static Uri AuthFullPath(Uri baseUri) => new Uri(baseUri, Auth + "/" + Auth_CreateIdent); - public static Uri AuthV2FullPath(Uri baseUri) => new Uri(baseUri, Auth + "/" + Auth_CreateIdentV2); - public static Uri AuthRegisterFullPath(Uri baseUri) => new Uri(baseUri, Auth + "/" + Auth_Register); - public static Uri AuthRegisterV2FullPath(Uri baseUri) => new Uri(baseUri, Auth + "/" + Auth_RegisterV2); -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/Routes/MareFiles.cs b/UmbraAPI/MareSynchronosAPI/Routes/MareFiles.cs deleted file mode 100644 index a4e5f5d..0000000 --- a/UmbraAPI/MareSynchronosAPI/Routes/MareFiles.cs +++ /dev/null @@ -1,45 +0,0 @@ -namespace MareSynchronos.API.Routes; - -public class MareFiles -{ - public const string Cache = "/cache"; - public const string Cache_Get = "get"; - - public const string Request = "/request"; - public const string Request_Cancel = "cancel"; - public const string Request_Check = "check"; - public const string Request_Enqueue = "enqueue"; - public const string Request_RequestFile = "file"; - - public const string ServerFiles = "/files"; - public const string ServerFiles_DeleteAll = "deleteAll"; - public const string ServerFiles_FilesSend = "filesSend"; - public const string ServerFiles_GetSizes = "getFileSizes"; - public const string ServerFiles_Upload = "upload"; - public const string ServerFiles_UploadRaw = "uploadRaw"; - public const string ServerFiles_UploadMunged = "uploadMunged"; - - public const string Distribution = "/dist"; - public const string Distribution_Get = "get"; - - public const string Main = "/main"; - public const string Main_SendReady = "sendReady"; - - public static Uri CacheGetFullPath(Uri baseUri, Guid requestId) => new(baseUri, Cache + "/" + Cache_Get + "?requestId=" + requestId.ToString()); - - public static Uri RequestCancelFullPath(Uri baseUri, Guid guid) => new Uri(baseUri, Request + "/" + Request_Cancel + "?requestId=" + guid.ToString()); - public static Uri RequestCheckQueueFullPath(Uri baseUri, Guid guid) => new Uri(baseUri, Request + "/" + Request_Check + "?requestId=" + guid.ToString()); - public static Uri RequestEnqueueFullPath(Uri baseUri) => new(baseUri, Request + "/" + Request_Enqueue); - public static Uri RequestRequestFileFullPath(Uri baseUri, string hash) => new(baseUri, Request + "/" + Request_RequestFile + "?file=" + hash); - - public static Uri ServerFilesDeleteAllFullPath(Uri baseUri) => new(baseUri, ServerFiles + "/" + ServerFiles_DeleteAll); - public static Uri ServerFilesFilesSendFullPath(Uri baseUri) => new(baseUri, ServerFiles + "/" + ServerFiles_FilesSend); - public static Uri ServerFilesGetSizesFullPath(Uri baseUri) => new(baseUri, ServerFiles + "/" + ServerFiles_GetSizes); - public static Uri ServerFilesUploadFullPath(Uri baseUri, string hash) => new(baseUri, ServerFiles + "/" + ServerFiles_Upload + "/" + hash); - public static Uri ServerFilesUploadRawFullPath(Uri baseUri, string hash) => new(baseUri, ServerFiles + "/" + ServerFiles_UploadRaw + "/" + hash); - public static Uri ServerFilesUploadMunged(Uri baseUri, string hash) => new(baseUri, ServerFiles + "/" + ServerFiles_UploadMunged + "/" + hash); - - public static Uri DistributionGetFullPath(Uri baseUri, string hash) => new(baseUri, Distribution + "/" + Distribution_Get + "?file=" + hash); - - public static Uri MainSendReadyFullPath(Uri baseUri, string uid, Guid request) => new(baseUri, Main + "/" + Main_SendReady + "/" + "?uid=" + uid + "&requestId=" + request.ToString()); -} \ No newline at end of file diff --git a/UmbraAPI/MareSynchronosAPI/SignalR/IMareHub.cs b/UmbraAPI/MareSynchronosAPI/SignalR/IMareHub.cs deleted file mode 100644 index 7475116..0000000 --- a/UmbraAPI/MareSynchronosAPI/SignalR/IMareHub.cs +++ /dev/null @@ -1,144 +0,0 @@ -using MareSynchronos.API.Data; -using MareSynchronos.API.Data.Enum; -using MareSynchronos.API.Dto; -using MareSynchronos.API.Dto.CharaData; -using MareSynchronos.API.Dto.Chat; -using MareSynchronos.API.Dto.Group; -using MareSynchronos.API.Dto.User; - -namespace MareSynchronos.API.SignalR; - -public interface IMareHub -{ - const int ApiVersion = 1026; - const string Path = "/mare"; - - Task CheckClientHealth(); - - Task Client_DownloadReady(Guid requestId); - - Task Client_GroupChangePermissions(GroupPermissionDto groupPermission); - - Task Client_GroupChatMsg(GroupChatMsgDto groupChatMsgDto); - - Task Client_GroupDelete(GroupDto groupDto); - - Task Client_GroupPairChangePermissions(GroupPairUserPermissionDto permissionDto); - - Task Client_GroupPairChangeUserInfo(GroupPairUserInfoDto userInfo); - - Task Client_GroupPairJoined(GroupPairFullInfoDto groupPairInfoDto); - - Task Client_GroupPairLeft(GroupPairDto groupPairDto); - - Task Client_GroupSendFullInfo(GroupFullInfoDto groupInfo); - - Task Client_GroupSendInfo(GroupInfoDto groupInfo); - - Task Client_ReceiveServerMessage(MessageSeverity messageSeverity, string message); - - Task Client_UpdateSystemInfo(SystemInfoDto systemInfo); - - Task Client_UserAddClientPair(UserPairDto dto); - - Task Client_UserChatMsg(UserChatMsgDto chatMsgDto); - - Task Client_UserReceiveCharacterData(OnlineUserCharaDataDto dataDto); - - Task Client_UserReceiveUploadStatus(UserDto dto); - - Task Client_UserRemoveClientPair(UserDto dto); - - Task Client_UserSendOffline(UserDto dto); - - Task Client_UserSendOnline(OnlineUserIdentDto dto); - - Task Client_UserUpdateOtherPairPermissions(UserPermissionsDto dto); - - Task Client_UserUpdateProfile(UserDto dto); - - Task Client_UserUpdateSelfPairPermissions(UserPermissionsDto dto); - - Task Client_GposeLobbyJoin(UserData userData); - Task Client_GposeLobbyLeave(UserData userData); - Task Client_GposeLobbyPushCharacterData(CharaDataDownloadDto charaDownloadDto); - Task Client_GposeLobbyPushPoseData(UserData userData, PoseData poseData); - Task Client_GposeLobbyPushWorldData(UserData userData, WorldData worldData); - - Task GetConnectionDto(); - - Task GroupBanUser(GroupPairDto dto, string reason); - - Task GroupChangeGroupPermissionState(GroupPermissionDto dto); - - Task GroupChangeIndividualPermissionState(GroupPairUserPermissionDto dto); - - Task GroupChangeOwnership(GroupPairDto groupPair); - - Task GroupChangePassword(GroupPasswordDto groupPassword); - - Task GroupChatSendMsg(GroupDto group, ChatMessage message); - - Task GroupClear(GroupDto group); - - Task GroupCreate(); - - Task> GroupCreateTempInvite(GroupDto group, int amount); - - Task GroupDelete(GroupDto group); - - Task> GroupGetBannedUsers(GroupDto group); - - Task GroupJoin(GroupPasswordDto passwordedGroup); - - Task GroupLeave(GroupDto group); - - Task GroupRemoveUser(GroupPairDto groupPair); - - Task GroupSetUserInfo(GroupPairUserInfoDto groupPair); - - Task> GroupsGetAll(); - - Task> GroupsGetUsersInGroup(GroupDto group); - - Task GroupUnbanUser(GroupPairDto groupPair); - Task GroupPrune(GroupDto group, int days, bool execute); - - Task UserAddPair(UserDto user); - - Task UserChatSendMsg(UserDto user, ChatMessage message); - - Task UserDelete(); - - Task> UserGetOnlinePairs(); - - Task> UserGetPairedClients(); - - Task UserGetProfile(UserDto dto); - - Task UserPushData(UserCharaDataMessageDto dto); - - Task UserRemovePair(UserDto userDto); - - Task UserReportProfile(UserProfileReportDto userDto); - - Task UserSetPairPermissions(UserPermissionsDto userPermissions); - - Task UserSetProfile(UserProfileDto userDescription); - - Task CharaDataCreate(); - Task CharaDataUpdate(CharaDataUpdateDto updateDto); - Task CharaDataDelete(string id); - Task CharaDataGetMetainfo(string id); - Task CharaDataDownload(string id); - Task> CharaDataGetOwn(); - Task> CharaDataGetShared(); - Task CharaDataAttemptRestore(string id); - - Task GposeLobbyCreate(); - Task> GposeLobbyJoin(string lobbyId); - Task GposeLobbyLeave(); - Task GposeLobbyPushCharacterData(CharaDataDownloadDto charaDownloadDto); - Task GposeLobbyPushPoseData(PoseData poseData); - Task GposeLobbyPushWorldData(WorldData worldData); -} diff --git a/UmbraAPI/MareSynchronosAPI/SignalR/IMareHubClient.cs b/UmbraAPI/MareSynchronosAPI/SignalR/IMareHubClient.cs deleted file mode 100644 index d13cbaa..0000000 --- a/UmbraAPI/MareSynchronosAPI/SignalR/IMareHubClient.cs +++ /dev/null @@ -1,62 +0,0 @@ -using MareSynchronos.API.Data; -using MareSynchronos.API.Data.Enum; -using MareSynchronos.API.Dto; -using MareSynchronos.API.Dto.CharaData; -using MareSynchronos.API.Dto.Chat; -using MareSynchronos.API.Dto.Group; -using MareSynchronos.API.Dto.User; - -namespace MareSynchronos.API.SignalR; - -public interface IMareHubClient : IMareHub -{ - void OnDownloadReady(Action act); - - void OnGroupChangePermissions(Action act); - - void OnGroupChatMsg(Action groupChatMsgDto); - - void OnGroupDelete(Action act); - - void OnGroupPairChangePermissions(Action act); - - void OnGroupPairChangeUserInfo(Action act); - - void OnGroupPairJoined(Action act); - - void OnGroupPairLeft(Action act); - - void OnGroupSendFullInfo(Action act); - - void OnGroupSendInfo(Action act); - - void OnReceiveServerMessage(Action act); - - void OnUpdateSystemInfo(Action act); - - void OnUserAddClientPair(Action act); - - void OnUserChatMsg(Action chatMsgDto); - - void OnUserReceiveCharacterData(Action act); - - void OnUserReceiveUploadStatus(Action act); - - void OnUserRemoveClientPair(Action act); - - void OnUserSendOffline(Action act); - - void OnUserSendOnline(Action act); - - void OnUserUpdateOtherPairPermissions(Action act); - - void OnUserUpdateProfile(Action act); - - void OnUserUpdateSelfPairPermissions(Action act); - - void OnGposeLobbyJoin(Action act); - void OnGposeLobbyLeave(Action act); - void OnGposeLobbyPushCharacterData(Action act); - void OnGposeLobbyPushPoseData(Action act); - void OnGposeLobbyPushWorldData(Action act); -} \ No newline at end of file