Reformatted typing code

Moonlight/App/Services/Support/SupportAdminService.cs

@@ -52,6 +52,8 @@ public class SupportAdminService
             });
     }
     
+    #region Typing
+    
     private void HandleTyping(User user)
     {
         var name = $"{user.FirstName} {user.LastName}";
@@ -85,6 +87,18 @@ public class SupportAdminService
         }
     }
     
+    public Task TriggerTyping()
+    {
+        Task.Run(async () =>
+        {
+            await MessageService.Emit($"support.{Recipient.Id}.admintyping", Self);
+        });
+
+        return Task.CompletedTask;
+    }
+    
+    #endregion
+
     public async Task<SupportMessage[]> GetMessages()
     {
         return await SupportServerService.GetMessages(Recipient);
@@ -110,16 +124,6 @@ public class SupportAdminService
         await SupportServerService.Close(Recipient);
     }
 
-    public Task TriggerTyping()
-    {
-        Task.Run(async () =>
-        {
-            await MessageService.Emit($"support.{Recipient.Id}.admintyping", Self);
-        });
-
-        return Task.CompletedTask;
-    }
-
     public void Dispose()
     {
         MessageService.Unsubscribe($"support.{Recipient.Id}.message", this);

Moonlight/App/Services/Support/SupportClientService.cs

@@ -50,6 +50,8 @@ public class SupportClientService : IDisposable
             });
     }
     
+    #region Typing
+
     private void HandleTyping(User user)
     {
         var name = $"{user.FirstName} {user.LastName}";
@@ -83,6 +85,18 @@ public class SupportClientService : IDisposable
         }
     }
     
+    public Task TriggerTyping()
+    {
+        Task.Run(async () =>
+        {
+            await MessageService.Emit($"support.{Self.Id}.typing", Self);
+        });
+
+        return Task.CompletedTask;
+    }
+
+    #endregion
+    
     public async Task<SupportMessage[]> GetMessages()
     {
         return await SupportServerService.GetMessages(Self);
@@ -102,16 +116,6 @@ public class SupportClientService : IDisposable
         );
     }
 
-    public Task TriggerTyping()
-    {
-        Task.Run(async () =>
-        {
-            await MessageService.Emit($"support.{Self.Id}.typing", Self);
-        });
-
-        return Task.CompletedTask;
-    }
-
     public void Dispose()
     {
         MessageService.Unsubscribe($"support.{Self.Id}.message", this);

Moonlight/Shared/Views/Admin/Support/View.razor

@@ -199,10 +199,7 @@
         }
     }
     
-    private async void OnUpdateTyping(object? sender, EventArgs e)
+    #region Message handling
-    {
-        await InvokeAsync(StateHasChanged);
-    }
 
     private async void OnNewMessage(object? sender, SupportMessage e)
     {
@@ -215,6 +212,8 @@
         Messages = (await SupportAdminService.GetMessages()).Reverse().ToArray();
     }
     
+    #endregion
+
     private async Task Send()
     {
         await SupportAdminService.SendMessage(Content);
@@ -226,6 +225,8 @@
         await SupportAdminService.Close();
     }
     
+    #region Typing
+
     private async Task OnTyping()
     {
         if ((DateTime.UtcNow - LastTypingTimestamp).TotalSeconds > 5)
@@ -235,4 +236,11 @@
             await SupportAdminService.TriggerTyping();
         }
     }
+    
+    private async void OnUpdateTyping(object? sender, EventArgs e)
+    {
+        await InvokeAsync(StateHasChanged);
+    }
+    
+    #endregion
 }

Moonlight/Shared/Views/Support.razor

@@ -6,7 +6,6 @@
 @using Moonlight.App.Services.Support
 
 @inject ResourceService ResourceService
-@inject IdentityService IdentityService
 @inject SupportClientService SupportClientService
 @inject SmartTranslateService SmartTranslateService
 
@@ -143,8 +142,6 @@
 
 @code
 {
-    private User User;
-
     private SupportMessage[] Messages;
     private string Content = "";
     
@@ -152,8 +149,6 @@
 
     private async Task Load(LazyLoader lazyLoader)
     {
-        User = (await IdentityService.Get())!;
-
         await lazyLoader.SetText("Starting chat client");
 
         SupportClientService.OnNewMessage += OnNewMessage;
@@ -162,17 +157,6 @@
         await SupportClientService.Start();
     }
 
-    private async void OnUpdateTyping(object? sender, EventArgs e)
-    {
-        await InvokeAsync(StateHasChanged);
-    }
-
-    private async void OnNewMessage(object? sender, SupportMessage e)
-    {
-        Messages = (await SupportClientService.GetMessages()).Reverse().ToArray();
-        await InvokeAsync(StateHasChanged);
-    }
-
     private async Task Send()
     {
         await SupportClientService.SendMessage(Content);
@@ -180,11 +164,28 @@
         await InvokeAsync(StateHasChanged);
     }
     
+    #region Message handling
+    
+    private async void OnNewMessage(object? sender, SupportMessage e)
+    {
+        Messages = (await SupportClientService.GetMessages()).Reverse().ToArray();
+        await InvokeAsync(StateHasChanged);
+    }
+
     private async Task LoadMessages(LazyLoader arg)
     {
         Messages = (await SupportClientService.GetMessages()).Reverse().ToArray();
     }
     
+    #endregion
+    
+    #region Typing
+    
+    private async void OnUpdateTyping(object? sender, EventArgs e)
+    {
+        await InvokeAsync(StateHasChanged);
+    }
+
     private async void OnTyping()
     {
         if ((DateTime.UtcNow - LastTypingTimestamp).TotalSeconds > 5)
@@ -194,4 +195,6 @@
             await SupportClientService.TriggerTyping();
         }
     }
+    
+    #endregion
 }