Do not throw error when event is not registered

Somfic · Oct 13, 2023 · 138e8e5 · 138e8e5
1 parent 2ef07e3
commit 138e8e5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/EliteAPI.Abstractions/Events/IEvents.cs b/EliteAPI.Abstractions/Events/IEvents.cs
@@ -141,7 +141,7 @@ public interface IEvents
     /// <summary>Converts the JSON to a registered event type and invokes the registered event handlers.</summary>
     /// <param name="json">The event JSON</param>
     /// <param name="context">The context of the event</param>
-    IEvent Invoke(string json, EventContext context);
+    IEvent? Invoke(string json, EventContext context);
 
     /// <summary>Discovers and registers all the events in the specified assembly.</summary>
     /// <param name="assembly">The assembly the events are defined in</param>

diff --git a/EliteAPI.Tests/JournalManual.cs b/EliteAPI.Tests/JournalManual.cs
@@ -69,7 +69,7 @@ public void Json(string json)
 
         var invokedEvent = _events.Invoke(json, new EventContext());
 
-        Assert.That(invokedEvent, Is.Not.Null, $"Event is null");
+        Assert.That(invokedEvent, Is.Not.Null, $"Event is not registered: {json}");
 
         // Check if the event is the correct type
         var eventType = invokedEvent.GetType();

diff --git a/EliteAPI/Events/Events.cs b/EliteAPI/Events/Events.cs
@@ -206,7 +206,7 @@ public IEvent Invoke<TEvent>(TEvent @event, EventContext context) where TEvent :
     }
 
     /// <inheritdoc />
-    public IEvent Invoke(string json, EventContext context)
+    public IEvent? Invoke(string json, EventContext context)
     {
         try
         {
@@ -241,7 +241,7 @@ public IEvent Invoke(string json, EventContext context)
             InvokeAnyHandlers(eventType, json, context);
 
             if (eventType == null)
-                throw new Exception($"The {eventName} event is not registered"); // todo: better exception type
+                return null;
 
             var parsedEvent = _eventParser.FromJson(eventType, json);