Event serialisation fix

2 files changed, 61 insertions, 2 deletions

diff --git a/LibMatrix.EventTypes/Events/RoomMembershipEventContent.cs b/LibMatrix.EventTypes/Events/RoomMembershipEventContent.cs

index dac7094..fe50a2e 100644
--- a/LibMatrix.EventTypes/Events/RoomMembershipEventContent.cs
+++ b/LibMatrix.EventTypes/Events/RoomMembershipEventContent.cs
@@ -2,9 +2,11 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.EventTypes.Events;
 
+[MatrixEvent("m.room.member")]
+[JsonConverter(typeof(MatrixEventContentConverter<RoomMembershipEventContent>))]
 public class RoomMembershipEventContent : MatrixEventContent {
     public string Membership {
-        get => _json["membership"]!.GetValue<string>();
-        set => Console.WriteLine(value);
+        get => InternalJson["membership"]!.GetValue<string>();
+        set => InternalJson["membership"] = value;
     }
 }
\ No newline at end of file
diff --git a/LibMatrix.EventTypes/Events/RoomMessageEventContent.cs b/LibMatrix.EventTypes/Events/RoomMessageEventContent.cs
new file mode 100644

index 0000000..55c2b6c
--- /dev/null
+++ b/LibMatrix.EventTypes/Events/RoomMessageEventContent.cs
@@ -0,0 +1,57 @@
+using System.Text.Json.Serialization;
+using LibMatrix.EventTypes;
+
+namespace LibMatrix.LegacyEvents.EventTypes.Spec;
+
+[MatrixEvent(EventId)]
+public class RoomMessageEventContent : MatrixEventContent {
+    public const string EventId = "m.room.message";
+
+    public RoomMessageEventContent(string messageType = "m.notice", string? body = null) {
+        MessageType = messageType;
+        Body = body ?? "";
+    }
+
+    [JsonPropertyName("body")]
+    public string Body { get; set; }
+
+    [JsonPropertyName("msgtype")]
+    public string MessageType { get; set; } = "m.notice";
+
+    [JsonPropertyName("formatted_body")]
+    public string? FormattedBody { get; set; }
+
+    [JsonPropertyName("format")]
+    public string? Format { get; set; }
+
+    /// <summary>
+    /// Media URI for this message, if any
+    /// </summary>
+    [JsonPropertyName("url")]
+    public string? Url { get; set; }
+
+    public string? FileName { get; set; }
+
+    [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 class FileInfoStruct {
+        [JsonPropertyName("mimetype")]
+        public string? MimeType { get; set; }
+
+        [JsonPropertyName("size")]
+        public long Size { get; set; }
+
+        [JsonPropertyName("thumbnail_url")]
+        public string? ThumbnailUrl { get; set; }
+        
+        [JsonPropertyName("w")]
+        public int? Width { get; set; }
+        
+        [JsonPropertyName("h")]
+        public int? Height { get; set; }
+    }
+}
\ No newline at end of file