From ec22b607e83dc0f0506b394782b30bcb8679a6f9 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Mon, 7 Aug 2023 06:04:43 -0700 Subject: [PATCH] Remove CircuitEvent class. --- Server/Hubs/CircuitConnection.cs | 4 ++-- Server/Models/CircuitEvent.cs | 20 -------------------- Server/Models/CircuitEventName.cs | 21 --------------------- 3 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 Server/Models/CircuitEvent.cs delete mode 100644 Server/Models/CircuitEventName.cs diff --git a/Server/Hubs/CircuitConnection.cs b/Server/Hubs/CircuitConnection.cs index c3853188..5c00c4f7 100644 --- a/Server/Hubs/CircuitConnection.cs +++ b/Server/Hubs/CircuitConnection.cs @@ -451,8 +451,8 @@ public class CircuitConnection : CircuitHandler, ICircuitConnection { if (tags.Length > 200) { - var message = new CircuitEvent(CircuitEventName.DisplayMessage, - $"Tag must be 200 characters or less. Supplied length is {tags.Length}.", + var message = new DisplayNotificationMessage( + $"Tag must be 200 characters or less. Supplied length is {tags.Length}.", "Tag must be under 200 characters.", "bg-warning"); diff --git a/Server/Models/CircuitEvent.cs b/Server/Models/CircuitEvent.cs deleted file mode 100644 index 385f0b58..00000000 --- a/Server/Models/CircuitEvent.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace Remotely.Server.Models; - -public class CircuitEvent -{ - public CircuitEvent(CircuitEventName eventName, params object[] args) - { - EventName = eventName; - Params = args; - } - - public CircuitEventName EventName { get; set; } - - // TODO: This is a bad shortcut. Make events for each type. - public object[] Params { get; set; } -} diff --git a/Server/Models/CircuitEventName.cs b/Server/Models/CircuitEventName.cs deleted file mode 100644 index d6d6bcd8..00000000 --- a/Server/Models/CircuitEventName.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace Remotely.Server.Models; - -public enum CircuitEventName -{ - DisplayMessage, - ChatReceived, - CommandResult, - DeviceUpdate, - DownloadFile, - DownloadFileProgress, - DeviceWentOffline, - ScriptResult, - TransferCompleted, - PowerShellCompletions, - RemoteLogsReceived, -}