1 files changed, 18 insertions, 1 deletions
diff --git a/LibMatrix/StateEvent.cs b/LibMatrix/StateEvent.cs
index e2ac87e..8455098 100644
--- a/LibMatrix/StateEvent.cs
+++ b/LibMatrix/StateEvent.cs
@@ -1,4 +1,5 @@
 using System.Collections.Frozen;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using System.Text.Json;
@@ -121,13 +122,28 @@ public class StateEvent {
     public string InternalContentTypeName => TypedContent?.GetType().Name ?? "null";
 
     public static bool TypeKeyPairMatches(StateEventResponse x, StateEventResponse y) => x.Type == y.Type && x.StateKey == y.StateKey;
-    public static bool Equals(StateEventResponse x, StateEventResponse y) => x.Type == y.Type && x.StateKey == y.StateKey && x.RawContent.Equals(y.RawContent);
+    public static bool Equals(StateEventResponse x, StateEventResponse y) => x.Type == y.Type && x.StateKey == y.StateKey && x.EventId == y.EventId;
+
+    /// <summary>
+    ///     Compares two state events for deep equality, including type, state key, and raw content.
+    ///     If you trust the server, use Equals instead, as that compares by event ID instead of raw content.
+    /// </summary>
+    /// <param name="x"></param>
+    /// <param name="y"></param>
+    /// <returns></returns>
+    public static bool DeepEquals(StateEventResponse x, StateEventResponse y) => x.Type == y.Type && x.StateKey == y.StateKey && JsonNode.DeepEquals(x.RawContent, y.RawContent);
 }
 
 public class StateEventResponse : StateEvent {
     [JsonPropertyName("origin_server_ts")]
     public long? OriginServerTs { get; set; }
 
+    [JsonIgnore]
+    public DateTime? OriginServerTimestamp {
+        get => OriginServerTs.HasValue ? DateTimeOffset.FromUnixTimeMilliseconds(OriginServerTs.Value).UtcDateTime : DateTime.MinValue;
+        set => OriginServerTs = value is null ? null : new DateTimeOffset(value.Value).ToUnixTimeMilliseconds();
+    }
+
     [JsonPropertyName("room_id")]
     public string? RoomId { get; set; }
 
@@ -165,6 +181,7 @@ public class StateEventResponse : StateEvent {
 [JsonSerializable(typeof(ChunkedStateEventResponse))]
 internal partial class ChunkedStateEventResponseSerializerContext : JsonSerializerContext;
 
+[DebuggerDisplay("{Events.Count} events")]
 public class EventList {
     public EventList() { }