From fc3d89ad7422dedb8763783c6ebb5d70fcc2c536 Mon Sep 17 00:00:00 2001
From: "Emma [it/its]@Rory&" <root@rory.gay>
Date: Fri, 22 Mar 2024 17:45:19 +0100
Subject: Fix merge conficts between machines

---
 ArcaneLibs                                                              | 2 +-
 ExampleBots/ModerationBot                                               | 2 +-
 ExampleBots/PluralContactBotPoC                                         | 2 +-
 .../Controllers/Rooms/RoomStateController.cs                            | 2 +-
 Tests/TestDataGenerator/Program.cs                                      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ArcaneLibs b/ArcaneLibs
index 409890c..7c6627c 160000
--- a/ArcaneLibs
+++ b/ArcaneLibs
@@ -1 +1 @@
-Subproject commit 409890ccfedf3ad3dd0ffd9866a19b730f613ea4
+Subproject commit 7c6627c1311dbaea9a6f488334c71c10990ab3dd
diff --git a/ExampleBots/ModerationBot b/ExampleBots/ModerationBot
index 8579db2..c137f94 160000
--- a/ExampleBots/ModerationBot
+++ b/ExampleBots/ModerationBot
@@ -1 +1 @@
-Subproject commit 8579db2c9099630b6a268015d586db73435032f0
+Subproject commit c137f94aeb122c636629fb9361dd73626594f690
diff --git a/ExampleBots/PluralContactBotPoC b/ExampleBots/PluralContactBotPoC
index 7ef0970..4072e59 160000
--- a/ExampleBots/PluralContactBotPoC
+++ b/ExampleBots/PluralContactBotPoC
@@ -1 +1 @@
-Subproject commit 7ef0970090c1525a60063c0ba7c0a4bd9fd8cc22
+Subproject commit 4072e5922b671c9d93dbf9727123046054ca6dae
diff --git a/Tests/LibMatrix.HomeserverEmulator/Controllers/Rooms/RoomStateController.cs b/Tests/LibMatrix.HomeserverEmulator/Controllers/Rooms/RoomStateController.cs
index 46c3062..cb5f213 100644
--- a/Tests/LibMatrix.HomeserverEmulator/Controllers/Rooms/RoomStateController.cs
+++ b/Tests/LibMatrix.HomeserverEmulator/Controllers/Rooms/RoomStateController.cs
@@ -102,7 +102,7 @@ public class RoomStateController(ILogger<RoomStateController> logger, TokenServi
         evt.Type = eventType;
         evt.StateKey = stateKey;
         return new EventIdResponse(){
-            EventId = evt.EventId
+            EventId = evt.EventId ?? throw new InvalidOperationException("EventId is null")
         };
     }
 }
\ No newline at end of file
diff --git a/Tests/TestDataGenerator/Program.cs b/Tests/TestDataGenerator/Program.cs
index 5c20958..2583817 100644
--- a/Tests/TestDataGenerator/Program.cs
+++ b/Tests/TestDataGenerator/Program.cs
@@ -19,7 +19,7 @@ var host = Host.CreateDefaultBuilder(args).ConfigureServices((_, services) => {
     services.AddSingleton<AppServiceConfiguration>();
 
     services.AddRoryLibMatrixServices();
-    services.AddBot(false);
+    services.AddMatrixBot();//.AddCommandHandler().AddCommands([typeof()]);
 
     services.AddHostedService<DataFetcher>();
 }).UseConsoleLifetime().Build();
-- 
cgit 1.4.1