diff --git a/MareSynchronosServer/MareSynchronosAuthService/MareSynchronosAuthService.csproj b/MareSynchronosServer/MareSynchronosAuthService/MareSynchronosAuthService.csproj
index fcb62be..dd81407 100644
--- a/MareSynchronosServer/MareSynchronosAuthService/MareSynchronosAuthService.csproj
+++ b/MareSynchronosServer/MareSynchronosAuthService/MareSynchronosAuthService.csproj
@@ -19,16 +19,16 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
diff --git a/MareSynchronosServer/MareSynchronosServer.sln b/MareSynchronosServer/MareSynchronosServer.sln
index 7b4cf7f..b855693 100644
--- a/MareSynchronosServer/MareSynchronosServer.sln
+++ b/MareSynchronosServer/MareSynchronosServer.sln
@@ -5,8 +5,6 @@ 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", "..\UmbraAPI\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}"
@@ -20,6 +18,8 @@ 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
@@ -42,18 +42,6 @@ Global
{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}.Debug|x64.ActiveCfg = Debug|Any CPU
- {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Debug|x64.Build.0 = Debug|Any CPU
- {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Debug|x86.ActiveCfg = Debug|Any CPU
- {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Debug|x86.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
- {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Release|x64.ActiveCfg = Release|Any CPU
- {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Release|x64.Build.0 = Release|Any CPU
- {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Release|x86.ActiveCfg = Release|Any CPU
- {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Release|x86.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
@@ -102,6 +90,18 @@ Global
{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/Hubs/MareHub.Groups.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs
index 7ddf67d..c59d218 100644
--- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs
@@ -213,11 +213,11 @@ public partial class MareHub
}
var gid = StringUtils.GenerateRandomString(9);
- while (await DbContext.Groups.AnyAsync(g => g.GID == "LSS-" + gid).ConfigureAwait(false))
+ while (await DbContext.Groups.AnyAsync(g => g.GID == "UMB-" + gid).ConfigureAwait(false))
{
gid = StringUtils.GenerateRandomString(9);
}
- gid = "LSS-" + gid;
+ gid = "UMB-" + gid;
var passwd = StringUtils.GenerateRandomString(16);
var sha = SHA256.Create();
diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs
index 2ce5931..d6f5159 100644
--- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs
@@ -80,7 +80,7 @@ public partial class MareHub : Hub, IMareHub
dbUser.LastLoggedIn = DateTime.UtcNow;
await DbContext.SaveChangesAsync().ConfigureAwait(false);
- await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Information, "Welcome to Umbra, Current Online Users: " + _systemInfoService.SystemInfoDto.OnlineUsers).ConfigureAwait(false);
+ await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Information, "Welcome to Umbra! Current Online Users: " + _systemInfoService.SystemInfoDto.OnlineUsers).ConfigureAwait(false);
return new ConnectionDto(new UserData(dbUser.UID, string.IsNullOrWhiteSpace(dbUser.Alias) ? null : dbUser.Alias))
{
diff --git a/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj b/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj
index c415308..20e1fb5 100644
--- a/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj
+++ b/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj
@@ -21,16 +21,16 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
diff --git a/MareSynchronosServer/MareSynchronosServices/MareSynchronosServices.csproj b/MareSynchronosServer/MareSynchronosServices/MareSynchronosServices.csproj
index c72009c..c3b94c5 100644
--- a/MareSynchronosServer/MareSynchronosServices/MareSynchronosServices.csproj
+++ b/MareSynchronosServer/MareSynchronosServices/MareSynchronosServices.csproj
@@ -21,13 +21,13 @@
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
diff --git a/MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj b/MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj
index b0a3a1c..0442eac 100644
--- a/MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj
+++ b/MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj
@@ -16,40 +16,40 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
+
+
+
-
+
-
-
+
+
diff --git a/MareSynchronosServer/MareSynchronosShared/Utils/ClientMessage.cs b/MareSynchronosServer/MareSynchronosShared/Utils/ClientMessage.cs
index 0e2d5af..cc7e294 100644
--- a/MareSynchronosServer/MareSynchronosShared/Utils/ClientMessage.cs
+++ b/MareSynchronosServer/MareSynchronosShared/Utils/ClientMessage.cs
@@ -1,11 +1,4 @@
using MareSynchronos.API.Data.Enum;
namespace MareSynchronosShared.Utils;
-
-public readonly record struct ClientMessage(
- MessageSeverity Severity,
- string Message,
- string Title = "",
- int TimeMs = 5000,
- string UID = ""
-);
\ No newline at end of file
+public record ClientMessage(MessageSeverity Severity, string Message, string UID);
diff --git a/MareSynchronosServer/MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj b/MareSynchronosServer/MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj
index 29f0f6d..bab499d 100644
--- a/MareSynchronosServer/MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj
+++ b/MareSynchronosServer/MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj
@@ -18,16 +18,16 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+