From 3558ba25896876b0c546f4c2decbb0671187745b Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Fri, 14 Nov 2025 10:48:26 +0100
Subject: StateEvent -> MatrixEvent

---
 LibMatrix/Extensions/EnumerableExtensions.cs  | 12 ++++++------
 LibMatrix/Extensions/JsonElementExtensions.cs |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'LibMatrix/Extensions')

diff --git a/LibMatrix/Extensions/EnumerableExtensions.cs b/LibMatrix/Extensions/EnumerableExtensions.cs
index 4dcf26e..88e79f0 100644
--- a/LibMatrix/Extensions/EnumerableExtensions.cs
+++ b/LibMatrix/Extensions/EnumerableExtensions.cs
@@ -4,7 +4,7 @@ using System.Collections.Immutable;
 namespace LibMatrix.Extensions;
 
 public static class EnumerableExtensions {
-    public static void MergeStateEventLists(this IList<StateEvent> oldState, IList<StateEvent> newState) {
+    public static void MergeStateEventLists(this IList<MatrixEvent> oldState, IList<MatrixEvent> newState) {
         // foreach (var stateEvent in newState) {
         //     var old = oldState.FirstOrDefault(x => x.Type == stateEvent.Type && x.StateKey == stateEvent.StateKey);
         //     if (old is null) {
@@ -27,7 +27,7 @@ public static class EnumerableExtensions {
             }
         }
 
-        int FindIndex(StateEvent needle) {
+        int FindIndex(MatrixEvent needle) {
             for (int i = 0; i < oldState.Count; i++) {
                 var old = oldState[i];
                 if (old.Type == needle.Type && old.StateKey == needle.StateKey)
@@ -38,7 +38,7 @@ public static class EnumerableExtensions {
         }
     }
 
-    public static void MergeStateEventLists(this IList<StateEventResponse> oldState, IList<StateEventResponse> newState) {
+    public static void MergeStateEventLists(this IList<MatrixEventResponse> oldState, IList<MatrixEventResponse> newState) {
         foreach (var e in newState) {
             switch (FindIndex(e)) {
                 case -1:
@@ -50,7 +50,7 @@ public static class EnumerableExtensions {
             }
         }
 
-        int FindIndex(StateEventResponse needle) {
+        int FindIndex(MatrixEventResponse needle) {
             for (int i = 0; i < oldState.Count; i++) {
                 var old = oldState[i];
                 if (old.Type == needle.Type && old.StateKey == needle.StateKey)
@@ -61,7 +61,7 @@ public static class EnumerableExtensions {
         }
     }
 
-    public static void MergeStateEventLists(this List<StateEventResponse> oldState, List<StateEventResponse> newState) {
+    public static void MergeStateEventLists(this List<MatrixEventResponse> oldState, List<MatrixEventResponse> newState) {
         foreach (var e in newState) {
             switch (FindIndex(e)) {
                 case -1:
@@ -73,7 +73,7 @@ public static class EnumerableExtensions {
             }
         }
 
-        int FindIndex(StateEventResponse needle) {
+        int FindIndex(MatrixEventResponse needle) {
             for (int i = 0; i < oldState.Count; i++) {
                 var old = oldState[i];
                 if (old.Type == needle.Type && old.StateKey == needle.StateKey)
diff --git a/LibMatrix/Extensions/JsonElementExtensions.cs b/LibMatrix/Extensions/JsonElementExtensions.cs
index dfec95b..9225f58 100644
--- a/LibMatrix/Extensions/JsonElementExtensions.cs
+++ b/LibMatrix/Extensions/JsonElementExtensions.cs
@@ -8,7 +8,7 @@ namespace LibMatrix.Extensions;
 public static class JsonElementExtensions {
     public static bool FindExtraJsonElementFields(this JsonElement obj, Type objectType, string objectPropertyName) {
         if (objectPropertyName == "content" && objectType == typeof(JsonObject))
-            objectType = typeof(StateEventResponse);
+            objectType = typeof(MatrixEventResponse);
         // if (t == typeof(JsonNode))
         //     return false;
 
@@ -35,9 +35,9 @@ public static class JsonElementExtensions {
                     continue;
                 }
 
-                if (field.Name == "content" && (objectType == typeof(StateEventResponse) || objectType == typeof(StateEvent))) {
+                if (field.Name == "content" && (objectType == typeof(MatrixEventResponse) || objectType == typeof(MatrixEvent))) {
                     unknownPropertyFound |= field.FindExtraJsonPropertyFieldsByValueKind(
-                        StateEvent.GetStateEventType(obj.GetProperty("type").GetString()!), // We expect type to always be present
+                        MatrixEvent.GetEventType(obj.GetProperty("type").GetString()!), // We expect type to always be present
                         mappedProperty.PropertyType);
                     continue;
                 }
-- 
cgit 1.5.1