First set of Sock Chat specific splitouts.

SharpChat.SockChat/S2CPacket.cs

@@ -1,4 +1,4 @@
-namespace SharpChat {
+namespace SharpChat.SockChat {
     public interface S2CPacket {
         string Pack();
     }

SharpChat.SockChat/S2CPackets/AuthFailS2CPacket.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace SharpChat.S2CPackets {
+namespace SharpChat.SockChat.S2CPackets {
     public class AuthFailS2CPacket(
         AuthFailS2CPacket.Reason reason,
         DateTimeOffset? expiresAt = null

SharpChat.SockChat/S2CPackets/AuthSuccessS2CPacket.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace SharpChat.S2CPackets {
+namespace SharpChat.SockChat.S2CPackets {
     public class AuthSuccessS2CPacket(
         string userId,
         string userName,

SharpChat.SockChat/S2CPackets/BanListS2CPacket.cs

@@ -1,7 +1,7 @@
 using SharpChat.Bans;
 using System.Text;
 
-namespace SharpChat.S2CPackets {
+namespace SharpChat.SockChat.S2CPackets {
     public class BanListS2CPacket(
         long msgId,
         IEnumerable<BanListS2CPacket.Entry> entries

SharpChat.SockChat/S2CPackets/ChannelCreateS2CPacket.cs

@@ -1,6 +1,6 @@
-using System.Text;
+using System.Text;
 
-namespace SharpChat.S2CPackets {
+namespace SharpChat.SockChat.S2CPackets {
     public class ChannelCreateS2CPacket(
         string name,
         bool hasPassword,

SharpChat.SockChat/S2CPackets/ChannelDeleteS2CPacket.cs

@@ -1,6 +1,6 @@
-using System.Text;
+using System.Text;
 
-namespace SharpChat.S2CPackets {
+namespace SharpChat.SockChat.S2CPackets {
     public class ChannelDeleteS2CPacket(
         string channelName
     ) : S2CPacket {

SharpChat.SockChat/S2CPackets/ChannelUpdateS2CPacket.cs

@@ -1,6 +1,6 @@
-using System.Text;
+using System.Text;
 
-namespace SharpChat.S2CPackets {
+namespace SharpChat.SockChat.S2CPackets {
     public class ChannelUpdateS2CPacket(
         string previousName,
         string newName,

SharpChat.SockChat/S2CPackets/ChatMessageAddS2CPacket.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace SharpChat.S2CPackets {
+namespace SharpChat.SockChat.S2CPackets {
     public class ChatMessageAddS2CPacket(
         long msgId,
         DateTimeOffset created,

SharpChat.SockChat/S2CPackets/ChatMessageDeleteS2CPacket.cs

@@ -1,6 +1,6 @@
-using System.Text;
+using System.Text;
 
-namespace SharpChat.S2CPackets {
+namespace SharpChat.SockChat.S2CPackets {
     public class ChatMessageDeleteS2CPacket(long eventId) : S2CPacket {
         public string Pack() {
             StringBuilder sb = new();

SharpChat.SockChat/S2CPackets/CommandResponseS2CPacket.cs

@@ -1,6 +1,6 @@
-using System.Text;
+using System.Text;
 
-namespace SharpChat.S2CPackets {
+namespace SharpChat.SockChat.S2CPackets {
     public class CommandResponseS2CPacket(
         long msgId,
         string stringId,

SharpChat.SockChat/S2CPackets/ContextChannelsS2CPacket.cs

@@ -1,6 +1,6 @@
-using System.Text;
+using System.Text;
 
-namespace SharpChat.S2CPackets {
+namespace SharpChat.SockChat.S2CPackets {
     public class ContextChannelsS2CPacket(IEnumerable<ContextChannelsS2CPacket.Entry> entries) : S2CPacket {
         public record Entry(string name, bool hasPassword, bool isTemporary);
 

SharpChat.SockChat/S2CPackets/ContextClearS2CPacket.cs

@@ -1,6 +1,6 @@
-using System.Text;
+using System.Text;
 
-namespace SharpChat.S2CPackets {
+namespace SharpChat.SockChat.S2CPackets {
     public class ContextClearS2CPacket(ContextClearS2CPacket.Mode mode) : S2CPacket {
         public enum Mode {
             Messages = 0,

SharpChat.SockChat/S2CPackets/ContextUsersS2CPacket.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace SharpChat.S2CPackets {
+namespace SharpChat.SockChat.S2CPackets {
     public class ContextUsersS2CPacket(IEnumerable<ContextUsersS2CPacket.Entry> entries) : S2CPacket {
         public record Entry(string id, string name, ColourInheritable colour, int rank, UserPermissions perms, bool visible);
 

SharpChat.SockChat/S2CPackets/ForceDisconnectS2CPacket.cs

@@ -1,6 +1,6 @@
-using System.Text;
+using System.Text;
 
-namespace SharpChat.S2CPackets {
+namespace SharpChat.SockChat.S2CPackets {
     public class ForceDisconnectS2CPacket(DateTimeOffset? expires = null) : S2CPacket {
         public string Pack() {
             StringBuilder sb = new();

SharpChat.SockChat/S2CPackets/PongS2CPacket.cs

@@ -1,4 +1,4 @@
-namespace SharpChat.S2CPackets {
+namespace SharpChat.SockChat.S2CPackets {
     public class PongS2CPacket : S2CPacket {
         public string Pack() {
             return "0\tpong";

SharpChat.SockChat/S2CPackets/UserChannelForceJoinS2CPacket.cs

@@ -1,6 +1,6 @@
-using System.Text;
+using System.Text;
 
-namespace SharpChat.S2CPackets {
+namespace SharpChat.SockChat.S2CPackets {
     public class UserChannelForceJoinS2CPacket(string channelName) : S2CPacket {
         public string Pack() {
             StringBuilder sb = new();

SharpChat.SockChat/S2CPackets/UserChannelJoinS2CPacket.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace SharpChat.S2CPackets {
+namespace SharpChat.SockChat.S2CPackets {
     public class UserChannelJoinS2CPacket(
         long msgId,
         string userId,

SharpChat.SockChat/S2CPackets/UserChannelLeaveS2CPacket.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace SharpChat.S2CPackets {
+namespace SharpChat.SockChat.S2CPackets {
     public class UserChannelLeaveS2CPacket(long msgId, string userId) : S2CPacket {
         public string Pack() {
             StringBuilder sb = new();

SharpChat.SockChat/S2CPackets/UserConnectS2CPacket.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace SharpChat.S2CPackets {
+namespace SharpChat.SockChat.S2CPackets {
     public class UserConnectS2CPacket(
         long msgId,
         DateTimeOffset joined,

SharpChat.SockChat/S2CPackets/UserDisconnectS2CPacket.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace SharpChat.S2CPackets {
+namespace SharpChat.SockChat.S2CPackets {
     public class UserDisconnectS2CPacket(
         long msgId,
         DateTimeOffset disconnected,

SharpChat.SockChat/S2CPackets/UserUpdateS2CPacket.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace SharpChat.S2CPackets {
+namespace SharpChat.SockChat.S2CPackets {
     public class UserUpdateS2CPacket(
         string userId,
         string userName,

SharpChat.SockChat/SharpChat.SockChat.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SharpChatCommon\SharpChatCommon.csproj" />
+  </ItemGroup>
+
+</Project>

SharpChat.sln

@@ -19,6 +19,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpChatCommon", "SharpCha
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpChat.Flashii", "SharpChat.Flashii\SharpChat.Flashii.csproj", "{A9B0B652-C20F-4C62-A96A-EF7ACD2079E9}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpChat.SockChat", "SharpChat.SockChat\SharpChat.SockChat.csproj", "{FEDDC565-B784-4D6F-BEF5-121C383D7AB2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Protos", "Protos", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Providers", "Providers", "{5BB7CDAA-06BB-4746-BA07-7EF9090774D8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -37,10 +43,18 @@ Global
 		{A9B0B652-C20F-4C62-A96A-EF7ACD2079E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A9B0B652-C20F-4C62-A96A-EF7ACD2079E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A9B0B652-C20F-4C62-A96A-EF7ACD2079E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FEDDC565-B784-4D6F-BEF5-121C383D7AB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FEDDC565-B784-4D6F-BEF5-121C383D7AB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FEDDC565-B784-4D6F-BEF5-121C383D7AB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FEDDC565-B784-4D6F-BEF5-121C383D7AB2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{A9B0B652-C20F-4C62-A96A-EF7ACD2079E9} = {5BB7CDAA-06BB-4746-BA07-7EF9090774D8}
+		{FEDDC565-B784-4D6F-BEF5-121C383D7AB2} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {42279FE1-5980-440A-87F8-25338DFE54CF}
 	EndGlobalSection

SharpChat/C2SPacketHandlers/AuthC2SPacketHandler.cs

@@ -1,7 +1,7 @@
 using SharpChat.Auth;
 using SharpChat.Bans;
 using SharpChat.Configuration;
-using SharpChat.S2CPackets;
+using SharpChat.SockChat.S2CPackets;
 
 namespace SharpChat.C2SPacketHandlers {
     public class AuthC2SPacketHandler(

SharpChat/C2SPacketHandlers/PingC2SPacketHandler.cs

@@ -1,5 +1,5 @@
 using SharpChat.Auth;
-using SharpChat.S2CPackets;
+using SharpChat.SockChat.S2CPackets;
 using System.Net;
 
 namespace SharpChat.C2SPacketHandlers {

SharpChat/ClientCommands/BanListClientCommand.cs

@@ -1,5 +1,5 @@
 using SharpChat.Bans;
-using SharpChat.S2CPackets;
+using SharpChat.SockChat.S2CPackets;
 
 namespace SharpChat.ClientCommands {
     public class BanListClientCommand(BansClient bansClient) : ClientCommand {

SharpChat/ClientCommands/BroadcastClientCommand.cs

@@ -1,5 +1,5 @@
 using SharpChat.Events;
-using SharpChat.S2CPackets;
+using SharpChat.SockChat.S2CPackets;
 
 namespace SharpChat.ClientCommands {
     public class BroadcastClientCommand : ClientCommand {

SharpChat/ClientCommands/CreateChannelClientCommand.cs

@@ -1,4 +1,4 @@
-using SharpChat.S2CPackets;
+using SharpChat.SockChat.S2CPackets;
 
 namespace SharpChat.ClientCommands {
     public class CreateChannelClientCommand : ClientCommand {

SharpChat/ClientCommands/DeleteChannelClientCommand.cs

@@ -1,4 +1,4 @@
-using SharpChat.S2CPackets;
+using SharpChat.SockChat.S2CPackets;
 
 namespace SharpChat.ClientCommands {
     public class DeleteChannelClientCommand : ClientCommand {

SharpChat/ClientCommands/DeleteMessageClientCommand.cs

@@ -1,5 +1,5 @@
 using SharpChat.EventStorage;
-using SharpChat.S2CPackets;
+using SharpChat.SockChat.S2CPackets;
 
 namespace SharpChat.ClientCommands
 {

SharpChat/ClientCommands/JoinChannelClientCommand.cs

@@ -1,4 +1,4 @@
-using SharpChat.S2CPackets;
+using SharpChat.SockChat.S2CPackets;
 
 namespace SharpChat.ClientCommands {
     public class JoinChannelClientCommand : ClientCommand {

SharpChat/ClientCommands/KickBanClientCommand.cs

@@ -1,5 +1,5 @@
 using SharpChat.Bans;
-using SharpChat.S2CPackets;
+using SharpChat.SockChat.S2CPackets;
 using System.Net;
 
 namespace SharpChat.ClientCommands {

SharpChat/ClientCommands/NickClientCommand.cs

@@ -1,4 +1,4 @@
-using SharpChat.S2CPackets;
+using SharpChat.SockChat.S2CPackets;
 using System.Globalization;
 using System.Text;
 

SharpChat/ClientCommands/PardonAddressClientCommand.cs

@@ -1,5 +1,5 @@
 using SharpChat.Bans;
-using SharpChat.S2CPackets;
+using SharpChat.SockChat.S2CPackets;
 using System.Net;
 
 namespace SharpChat.ClientCommands {

SharpChat/ClientCommands/PardonUserClientCommand.cs

@@ -1,5 +1,5 @@
 using SharpChat.Bans;
-using SharpChat.S2CPackets;
+using SharpChat.SockChat.S2CPackets;
 
 namespace SharpChat.ClientCommands {
     public class PardonUserClientCommand(BansClient bansClient) : ClientCommand {

SharpChat/ClientCommands/PasswordChannelClientCommand.cs

@@ -1,4 +1,4 @@
-using SharpChat.S2CPackets;
+using SharpChat.SockChat.S2CPackets;
 
 namespace SharpChat.ClientCommands {
     public class PasswordChannelClientCommand : ClientCommand {

SharpChat/ClientCommands/RankChannelClientCommand.cs

@@ -1,4 +1,4 @@
-using SharpChat.S2CPackets;
+using SharpChat.SockChat.S2CPackets;
 
 namespace SharpChat.ClientCommands {
     public class RankChannelClientCommand : ClientCommand {

SharpChat/ClientCommands/RemoteAddressClientCommand.cs

@@ -1,4 +1,4 @@
-using SharpChat.S2CPackets;
+using SharpChat.SockChat.S2CPackets;
 using System.Net;
 
 namespace SharpChat.ClientCommands {

SharpChat/ClientCommands/ShutdownRestartClientCommand.cs

@@ -1,4 +1,4 @@
-using SharpChat.S2CPackets;
+using SharpChat.SockChat.S2CPackets;
 
 namespace SharpChat.ClientCommands {
     public class ShutdownRestartClientCommand(ManualResetEvent waitHandle, Func<bool> shutdownCheck) : ClientCommand {

SharpChat/ClientCommands/WhisperClientCommand.cs

@@ -1,5 +1,5 @@
 using SharpChat.Events;
-using SharpChat.S2CPackets;
+using SharpChat.SockChat.S2CPackets;
 
 namespace SharpChat.ClientCommands {
     public class WhisperClientCommand : ClientCommand {

SharpChat/ClientCommands/WhoClientCommand.cs

@@ -1,4 +1,4 @@
-using SharpChat.S2CPackets;
+using SharpChat.SockChat.S2CPackets;
 using System.Text;
 
 namespace SharpChat.ClientCommands {

SharpChat/Connection.cs

@@ -1,4 +1,5 @@
 using Fleck;
+using SharpChat.SockChat;
 using System.Net;
 
 namespace SharpChat {

SharpChat/Context.cs

@@ -1,7 +1,8 @@
 using SharpChat.Events;
 using SharpChat.EventStorage;
-using SharpChat.S2CPackets;
 using SharpChat.Snowflake;
+using SharpChat.SockChat;
+using SharpChat.SockChat.S2CPackets;
 using System.Net;
 
 namespace SharpChat {

SharpChat/SharpChat.csproj

@@ -34,6 +34,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\SharpChat.Flashii\SharpChat.Flashii.csproj" />
+    <ProjectReference Include="..\SharpChat.SockChat\SharpChat.SockChat.csproj" />
     <ProjectReference Include="..\SharpChatCommon\SharpChatCommon.csproj" />
   </ItemGroup>
 

SharpChat/SockChat/S2CPackets/ContextMessageS2CPacket.cs

@@ -1,8 +1,7 @@
-using SharpChat.EventStorage;
+using SharpChat.EventStorage;
 using System.Text;
 
-namespace SharpChat.S2CPackets
-{
+namespace SharpChat.SockChat.S2CPackets {
     public class ContextMessageS2CPacket(StoredEventInfo evt, bool notify = false) : S2CPacket {
         public StoredEventInfo Event { get; private set; } = evt ?? throw new ArgumentNullException(nameof(evt));
 

SharpChat/SockChatServer.cs

@@ -4,7 +4,7 @@ using SharpChat.Bans;
 using SharpChat.C2SPacketHandlers;
 using SharpChat.ClientCommands;
 using SharpChat.Configuration;
-using SharpChat.S2CPackets;
+using SharpChat.SockChat.S2CPackets;
 using System.Net;
 
 namespace SharpChat {