1 files changed, 50 insertions, 4 deletions
diff --git a/LibMatrix.EventTypes/Spec/RoomMessageEventContent.cs b/LibMatrix.EventTypes/Spec/RoomMessageEventContent.cs
index 9602bf3..ccb5d42 100644
--- a/LibMatrix.EventTypes/Spec/RoomMessageEventContent.cs
+++ b/LibMatrix.EventTypes/Spec/RoomMessageEventContent.cs
@@ -11,6 +11,9 @@ public class RoomMessageEventContent : TimelineEventContent {
         Body = body ?? "";
     }
 
+    // TODO: https://spec.matrix.org/v1.16/client-server-api/#mimage
+    // TODO: add `file` for e2ee files
+
     [JsonPropertyName("body")]
     public string Body { get; set; }
 
@@ -34,9 +37,29 @@ public class RoomMessageEventContent : TimelineEventContent {
 
     [JsonPropertyName("info")]
     public FileInfoStruct? FileInfo { get; set; }
-    
+
     [JsonIgnore]
-    public string BodyWithoutReplyFallback => Body.Split('\n').SkipWhile(x => x.StartsWith(">")).SkipWhile(x=>x.Trim().Length == 0).Aggregate((x, y) => $"{x}\n{y}");
+    public string BodyWithoutReplyFallback {
+        get {
+            var parts = Body
+                .Split('\n')
+                .SkipWhile(x => x.StartsWith(">"))
+                .SkipWhile(x => x.Trim().Length == 0)
+                .ToList();
+            return parts.Count > 0 ? parts.Aggregate((x, y) => $"{x}\n{y}") : Body;
+        }
+    }
+
+    [JsonPropertyName("m.mentions")]
+    public MentionsStruct? Mentions { get; set; }
+
+    public class MentionsStruct {
+        [JsonPropertyName("user_ids")]
+        public List<string>? Users { get; set; }
+
+        [JsonPropertyName("room")]
+        public bool? Room { get; set; }
+    }
 
     public class FileInfoStruct {
         [JsonPropertyName("mimetype")]
@@ -47,11 +70,34 @@ public class RoomMessageEventContent : TimelineEventContent {
 
         [JsonPropertyName("thumbnail_url")]
         public string? ThumbnailUrl { get; set; }
-        
+
+        [JsonPropertyName("thumbnail_info")]
+        public ThumbnailInfoStruct? ThumbnailInfo { get; set; }
+
         [JsonPropertyName("w")]
         public int? Width { get; set; }
-        
+
         [JsonPropertyName("h")]
         public int? Height { get; set; }
+
+        /// <summary>
+        ///     Duration of the audio/video in milliseconds, if applicable
+        /// </summary>
+        [JsonPropertyName("duration")]
+        public long? Duration { get; set; }
+
+        public class ThumbnailInfoStruct {
+            [JsonPropertyName("w")]
+            public int? Width { get; set; }
+
+            [JsonPropertyName("h")]
+            public int? Height { get; set; }
+
+            [JsonPropertyName("mimetype")]
+            public string? MimeType { get; set; }
+
+            [JsonPropertyName("size")]
+            public long? Size { get; set; }
+        }
     }
 }
\ No newline at end of file