Merge remote-tracking branch 'origin/main'
# Conflicts: # RelayClient/MainPage.xaml.cs # RelayClient/Services/RelaySocketClient.cs # RelayServer/Services/Chat/ChatSocketBehavior.cs # RelayServer/Services/Chat/ConnectedClientService.cs # RelayShared/Services/WsControlMessage.cs
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
using System.Collections.Concurrent;
|
using System.Collections.Concurrent;
|
||||||
|
|
||||||
namespace RelayServer.Services.Chat;
|
namespace RelayServer.Services.Chat;
|
||||||
|
|
||||||
@@ -60,4 +60,4 @@ public static class ConnectedClientService
|
|||||||
UsernameToSessions.TryRemove(username, out _);
|
UsernameToSessions.TryRemove(username, out _);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -39,4 +39,4 @@ public sealed class WsEventMessage
|
|||||||
{
|
{
|
||||||
public WsEvent Event { get; set; }
|
public WsEvent Event { get; set; }
|
||||||
public string? Detail { get; set; }
|
public string? Detail { get; set; }
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user