From 08f5483df2c01eba7c764cdaec94fca71e4976b8 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Thu, 30 May 2024 09:31:29 +0000
Subject: Clarify LegacyEvent types

---
 LibMatrix/Helpers/MessageBuilder.cs                     | 2 +-
 LibMatrix/Helpers/MessageFormatter.cs                   | 2 +-
 LibMatrix/Homeservers/AuthenticatedHomeserverGeneric.cs | 2 +-
 LibMatrix/LegacyMatrixEvent.cs                          | 2 +-
 LibMatrix/LibMatrix.csproj                              | 6 ++++--
 LibMatrix/Responses/CreateRoomRequest.cs                | 4 ++--
 LibMatrix/RoomTypes/GenericRoom.cs                      | 8 ++++----
 LibMatrix/Utilities/CommonSyncFilters.cs                | 6 +++---
 8 files changed, 17 insertions(+), 15 deletions(-)

(limited to 'LibMatrix')

diff --git a/LibMatrix/Helpers/MessageBuilder.cs b/LibMatrix/Helpers/MessageBuilder.cs
index d897078..54de7ad 100644
--- a/LibMatrix/Helpers/MessageBuilder.cs
+++ b/LibMatrix/Helpers/MessageBuilder.cs
@@ -1,4 +1,4 @@
-using LibMatrix.EventTypes.Spec;
+using LibMatrix.LegacyEvents.EventTypes.Spec;
 
 namespace LibMatrix.Helpers;
 
diff --git a/LibMatrix/Helpers/MessageFormatter.cs b/LibMatrix/Helpers/MessageFormatter.cs
index 1b9b4f3..f234d8f 100644
--- a/LibMatrix/Helpers/MessageFormatter.cs
+++ b/LibMatrix/Helpers/MessageFormatter.cs
@@ -1,5 +1,5 @@
 using ArcaneLibs.Extensions;
-using LibMatrix.EventTypes.Spec;
+using LibMatrix.LegacyEvents.EventTypes.Spec;
 
 namespace LibMatrix.Helpers;
 
diff --git a/LibMatrix/Homeservers/AuthenticatedHomeserverGeneric.cs b/LibMatrix/Homeservers/AuthenticatedHomeserverGeneric.cs
index c729a44..86977ec 100644
--- a/LibMatrix/Homeservers/AuthenticatedHomeserverGeneric.cs
+++ b/LibMatrix/Homeservers/AuthenticatedHomeserverGeneric.cs
@@ -5,7 +5,7 @@ using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 using System.Web;
 using ArcaneLibs.Extensions;
-using LibMatrix.EventTypes.Spec.State;
+using LibMatrix.LegacyEvents.EventTypes.Spec.State;
 using LibMatrix.Extensions;
 using LibMatrix.Filters;
 using LibMatrix.Helpers;
diff --git a/LibMatrix/LegacyMatrixEvent.cs b/LibMatrix/LegacyMatrixEvent.cs
index 1cfc879..1c1ebf3 100644
--- a/LibMatrix/LegacyMatrixEvent.cs
+++ b/LibMatrix/LegacyMatrixEvent.cs
@@ -7,7 +7,7 @@ using System.Text.Json.Serialization;
 using ArcaneLibs;
 using ArcaneLibs.Attributes;
 using ArcaneLibs.Extensions;
-using LibMatrix.EventTypes;
+using LibMatrix.LegacyEvents.EventTypes;
 using LibMatrix.Extensions;
 
 namespace LibMatrix;
diff --git a/LibMatrix/LibMatrix.csproj b/LibMatrix/LibMatrix.csproj
index b85df52..42ef17d 100644
--- a/LibMatrix/LibMatrix.csproj
+++ b/LibMatrix/LibMatrix.csproj
@@ -23,9 +23,11 @@
                 If you want to use a time-appropriate version of the library, recursively clone https://cgit.rory.gay/matrix/MatrixUtils.git
                 instead, since this will be locked by the MatrixUtils project, which contains both LibMatrix and ArcaneLibs as a submodule. -->
         <PackageReference Condition="!Exists('..\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj')" Include="ArcaneLibs" Version="*-preview*"/>
-        <ProjectReference Include="..\LibMatrix.EventTypes\LibMatrix.EventTypes.csproj"/>
     </ItemGroup>
-
+    
+    <ItemGroup Condition="!$(DefineConstants.Contains('DISABLE_LEGACY_EVENTS'))">
+        <ProjectReference Include="..\LibMatrix.LegacyEvents.EventTypes\LibMatrix.LegacyEvents.EventTypes.csproj" />
+    </ItemGroup>
     <Target Name="ArcaneLibsNugetWarning" AfterTargets="AfterBuild">
         <Warning Text="ArcaneLibs is being referenced from NuGet, which is dangerous. Please read the warning in LibMatrix.csproj!" Condition="!Exists('..\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj')"/>
     </Target>
diff --git a/LibMatrix/Responses/CreateRoomRequest.cs b/LibMatrix/Responses/CreateRoomRequest.cs
index f5218b9..6919b84 100644
--- a/LibMatrix/Responses/CreateRoomRequest.cs
+++ b/LibMatrix/Responses/CreateRoomRequest.cs
@@ -2,8 +2,8 @@ using System.Reflection;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 using System.Text.RegularExpressions;
-using LibMatrix.EventTypes;
-using LibMatrix.EventTypes.Spec.State;
+using LibMatrix.LegacyEvents.EventTypes;
+using LibMatrix.LegacyEvents.EventTypes.Spec.State;
 using LibMatrix.Homeservers;
 
 namespace LibMatrix.Responses;
diff --git a/LibMatrix/RoomTypes/GenericRoom.cs b/LibMatrix/RoomTypes/GenericRoom.cs
index 5d85abd..3ef2395 100644
--- a/LibMatrix/RoomTypes/GenericRoom.cs
+++ b/LibMatrix/RoomTypes/GenericRoom.cs
@@ -6,10 +6,10 @@ using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 using System.Web;
 using ArcaneLibs.Extensions;
-using LibMatrix.EventTypes;
-using LibMatrix.EventTypes.Spec;
-using LibMatrix.EventTypes.Spec.State;
-using LibMatrix.EventTypes.Spec.State.RoomInfo;
+using LibMatrix.LegacyEvents.EventTypes;
+using LibMatrix.LegacyEvents.EventTypes.Spec;
+using LibMatrix.LegacyEvents.EventTypes.Spec.State;
+using LibMatrix.LegacyEvents.EventTypes.Spec.State.RoomInfo;
 using LibMatrix.Filters;
 using LibMatrix.Helpers;
 using LibMatrix.Homeservers;
diff --git a/LibMatrix/Utilities/CommonSyncFilters.cs b/LibMatrix/Utilities/CommonSyncFilters.cs
index bf8b987..401850c 100644
--- a/LibMatrix/Utilities/CommonSyncFilters.cs
+++ b/LibMatrix/Utilities/CommonSyncFilters.cs
@@ -1,7 +1,7 @@
 using System.Collections.Frozen;
-using LibMatrix.EventTypes.Common;
-using LibMatrix.EventTypes.Spec.State;
-using LibMatrix.EventTypes.Spec.State.RoomInfo;
+using LibMatrix.LegacyEvents.EventTypes.Common;
+using LibMatrix.LegacyEvents.EventTypes.Spec.State;
+using LibMatrix.LegacyEvents.EventTypes.Spec.State.RoomInfo;
 using LibMatrix.Filters;
 
 namespace LibMatrix.Utilities;
-- 
cgit 1.4.1