diff --git a/LibMatrix.EventTypes.Abstractions/BaseMatrixEventContent.cs b/LibMatrix.EventTypes.Abstractions/BaseMatrixEventContent.cs
index eba50a5..0906e30 100644
--- a/LibMatrix.EventTypes.Abstractions/BaseMatrixEventContent.cs
+++ b/LibMatrix.EventTypes.Abstractions/BaseMatrixEventContent.cs
@@ -6,15 +6,19 @@ using ArcaneLibs.Extensions;
namespace LibMatrix.EventTypes;
+public interface IMatrixEvent {
+
+}
+
// <T> : MatrixEventContent where T : MatrixEventContent<T>, new() {
/// <summary>
/// Extensible Event Content, aims to provide an API similar to JsonNode/JsonObject
/// <seealso cref="System.Text.Json.Nodes.JsonNode"/>
/// <seealso cref="System.Text.Json.Nodes.JsonObject"/>
/// </summary>
-[JsonConverter(typeof(MatrixEventContentConverter<BaseMatrixEventContent>))]
+// [JsonConverter(typeof(BaseMatrixEventContent.MatrixEventContentConverter<BaseMatrixEventContent>))]
// [JsonSerializable(typeof(MatrixEventContent))]
-public class BaseMatrixEventContent {
+public abstract class BaseMatrixEventContent {
public JsonObject InternalJson { get; set; } = new();
public BaseMatrixEventContent() { }
@@ -23,7 +27,7 @@ public class BaseMatrixEventContent {
InternalJson = json.AsObject();
}
- public static implicit operator BaseMatrixEventContent(JsonNode json) => new(json);
+ // public static implicit operator BaseMatrixEventContent(JsonNode json) => new(json);
// public static implicit operator JsonNode(MatrixEventContent content) => content.InternalJson;
@@ -33,7 +37,10 @@ public class BaseMatrixEventContent {
[JsonIgnore]
public string EventType => EventTypes.First();
- public JsonNode? this[string key] => InternalJson[key];
+ public JsonNode? this[string key] {
+ get => InternalJson[key];
+ set => InternalJson[key] = value;
+ }
public string ToJson() => InternalJson.ToJson();
diff --git a/LibMatrix.EventTypes.Abstractions/MatrixEvent.cs b/LibMatrix.EventTypes.Abstractions/MatrixEvent.cs
index 0e548c6..46e7757 100644
--- a/LibMatrix.EventTypes.Abstractions/MatrixEvent.cs
+++ b/LibMatrix.EventTypes.Abstractions/MatrixEvent.cs
@@ -2,7 +2,10 @@ using System.Text.Json.Serialization;
namespace LibMatrix.EventTypes;
-public interface IMatrixEvent<out T> where T : BaseMatrixEventContent;
+public interface IBaseMatrixEvent {
+
+}
+public partial interface IMatrixEvent<out T> : IBaseMatrixEvent where T : BaseMatrixEventContent;
public class MatrixEvent<T> : IMatrixEvent<T> where T : BaseMatrixEventContent {
[JsonPropertyName("content")]
public T? Content { get; set; }
diff --git a/LibMatrix.EventTypes.Abstractions/MatrixEventCollection.cs b/LibMatrix.EventTypes.Abstractions/MatrixEventCollection.cs
index 78886d9..f789588 100644
--- a/LibMatrix.EventTypes.Abstractions/MatrixEventCollection.cs
+++ b/LibMatrix.EventTypes.Abstractions/MatrixEventCollection.cs
@@ -1,71 +1,75 @@
-// using System.Collections;
-//
-// namespace LibMatrix.EventTypes;
-//
-// public interface IMatrixEventCollection<out T> : IEnumerable<IMatrixEvent<T>> where T : MatrixEventContent {
-//
-// }
-// public class MatrixEventCollection : IMatrixEventCollection<MatrixEventContent>, IList<MatrixEvent<MatrixEventContent> {
-// private IList<MatrixEvent<MatrixEventContent>> _listImplementation;
-// public IEnumerator<MatrixEvent<MatrixEventContent>> GetEnumerator() => _listImplementation.GetEnumerator();
-//
-// IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable)_listImplementation).GetEnumerator();
-//
-// public void Add(MatrixEvent<MatrixEventContent> item) => _listImplementation.Add(item);
-//
-// public void Clear() => _listImplementation.Clear();
-//
-// public bool Contains(MatrixEvent<MatrixEventContent> item) => _listImplementation.Contains(item);
-//
-// public void CopyTo(MatrixEvent<MatrixEventContent>[] array, int arrayIndex) => _listImplementation.CopyTo(array, arrayIndex);
-//
-// public bool Remove(MatrixEvent<MatrixEventContent> item) => _listImplementation.Remove(item);
-//
-// public int Count => _listImplementation.Count;
-//
-// public bool IsReadOnly => _listImplementation.IsReadOnly;
-//
-// public int IndexOf(MatrixEvent<MatrixEventContent> item) => _listImplementation.IndexOf(item);
-//
-// public void Insert(int index, MatrixEvent<MatrixEventContent> item) => _listImplementation.Insert(index, item);
-//
-// public void RemoveAt(int index) => _listImplementation.RemoveAt(index);
-//
-// public MatrixEvent<MatrixEventContent> this[int index] {
-// get => _listImplementation[index];
-// set => _listImplementation[index] = value;
-// }
-// }
-// public class MatrixEventCollection<T> : IMatrixEventCollection<T>, IList<MatrixEvent<T>> where T : MatrixEventContent {
-// //TODO: implement
-//
-// private IList<MatrixEvent<T>> _listImplementation = new List<MatrixEvent<T>>();
-// public IEnumerator<MatrixEvent<T>> GetEnumerator() => _listImplementation.GetEnumerator();
-//
-// IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable)_listImplementation).GetEnumerator();
-//
-// public void Add(MatrixEvent<T> item) => _listImplementation.Add(item);
-//
-// public void Clear() => _listImplementation.Clear();
-//
-// public bool Contains(MatrixEvent<T> item) => _listImplementation.Contains(item);
-//
-// public void CopyTo(MatrixEvent<T>[] array, int arrayIndex) => _listImplementation.CopyTo(array, arrayIndex);
-//
-// public bool Remove(MatrixEvent<T> item) => _listImplementation.Remove(item);
-//
-// public int Count => _listImplementation.Count;
-//
-// public bool IsReadOnly => _listImplementation.IsReadOnly;
-//
-// public int IndexOf(MatrixEvent<T> item) => _listImplementation.IndexOf(item);
-//
-// public void Insert(int index, MatrixEvent<T> item) => _listImplementation.Insert(index, item);
-//
-// public void RemoveAt(int index) => _listImplementation.RemoveAt(index);
-//
-// public MatrixEvent<T> this[int index] {
-// get => _listImplementation[index];
-// set => _listImplementation[index] = value;
-// }
-// }a
\ No newline at end of file
+using System.Collections;
+
+namespace LibMatrix.EventTypes.Abstractions;
+
+public interface IMatrixEventCollection<out T> : IEnumerable<IMatrixEvent<T>> where T : BaseMatrixEventContent {
+
+}
+public class MatrixEventCollection : IMatrixEventCollection<BaseMatrixEventContent>, IList<MatrixEvent<BaseMatrixEventContent>> {
+ private IList<MatrixEvent<BaseMatrixEventContent>> _listImplementation;
+ IEnumerator<IMatrixEvent<BaseMatrixEventContent>> IEnumerable<IMatrixEvent<BaseMatrixEventContent>>.GetEnumerator() => GetEnumerator();
+
+ public IEnumerator<MatrixEvent<BaseMatrixEventContent>> GetEnumerator() => _listImplementation.GetEnumerator();
+
+ IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable)_listImplementation).GetEnumerator();
+
+ public void Add(MatrixEvent<BaseMatrixEventContent> item) => _listImplementation.Add(item);
+
+ public void Clear() => _listImplementation.Clear();
+
+ public bool Contains(MatrixEvent<BaseMatrixEventContent> item) => _listImplementation.Contains(item);
+
+ public void CopyTo(MatrixEvent<BaseMatrixEventContent>[] array, int arrayIndex) => _listImplementation.CopyTo(array, arrayIndex);
+
+ public bool Remove(MatrixEvent<BaseMatrixEventContent> item) => _listImplementation.Remove(item);
+
+ public int Count => _listImplementation.Count;
+
+ public bool IsReadOnly => _listImplementation.IsReadOnly;
+
+ public int IndexOf(MatrixEvent<BaseMatrixEventContent> item) => _listImplementation.IndexOf(item);
+
+ public void Insert(int index, MatrixEvent<BaseMatrixEventContent> item) => _listImplementation.Insert(index, item);
+
+ public void RemoveAt(int index) => _listImplementation.RemoveAt(index);
+
+ public MatrixEvent<BaseMatrixEventContent> this[int index] {
+ get => _listImplementation[index];
+ set => _listImplementation[index] = value;
+ }
+}
+public class MatrixEventCollection<T> : IMatrixEventCollection<T>, IList<MatrixEvent<T>> where T : BaseMatrixEventContent {
+ //TODO: implement
+
+ private IList<MatrixEvent<T>> _listImplementation = new List<MatrixEvent<T>>();
+ IEnumerator<IMatrixEvent<T>> IEnumerable<IMatrixEvent<T>>.GetEnumerator() => GetEnumerator();
+
+ public IEnumerator<MatrixEvent<T>> GetEnumerator() => _listImplementation.GetEnumerator();
+
+ IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable)_listImplementation).GetEnumerator();
+
+ public void Add(MatrixEvent<T> item) => _listImplementation.Add(item);
+
+ public void Clear() => _listImplementation.Clear();
+
+ public bool Contains(MatrixEvent<T> item) => _listImplementation.Contains(item);
+
+ public void CopyTo(MatrixEvent<T>[] array, int arrayIndex) => _listImplementation.CopyTo(array, arrayIndex);
+
+ public bool Remove(MatrixEvent<T> item) => _listImplementation.Remove(item);
+
+ public int Count => _listImplementation.Count;
+
+ public bool IsReadOnly => _listImplementation.IsReadOnly;
+
+ public int IndexOf(MatrixEvent<T> item) => _listImplementation.IndexOf(item);
+
+ public void Insert(int index, MatrixEvent<T> item) => _listImplementation.Insert(index, item);
+
+ public void RemoveAt(int index) => _listImplementation.RemoveAt(index);
+
+ public MatrixEvent<T> this[int index] {
+ get => _listImplementation[index];
+ set => _listImplementation[index] = value;
+ }
+}
\ No newline at end of file
diff --git a/LibMatrix.EventTypes.Spec/RoomMembershipEventContent.cs b/LibMatrix.EventTypes.Spec/RoomMembershipEventContent.cs
index 370a192..5070ee4 100644
--- a/LibMatrix.EventTypes.Spec/RoomMembershipEventContent.cs
+++ b/LibMatrix.EventTypes.Spec/RoomMembershipEventContent.cs
@@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
-namespace LibMatrix.EventTypes.Events;
+namespace LibMatrix.EventTypes.Spec;
[MatrixEvent("m.room.member")]
[JsonConverter(typeof(MatrixEventContentConverter<RoomMembershipEventContent>))]
@@ -9,6 +9,4 @@ public class RoomMembershipEventContent : BaseMatrixEventContent {
get => InternalJson["membership"]!.GetValue<string>();
set => InternalJson["membership"] = value;
}
-
- public string? Something { get; set; }
}
\ No newline at end of file
diff --git a/LibMatrix.EventTypes.Spec/RoomMessageEventContent.cs b/LibMatrix.EventTypes.Spec/RoomMessageEventContent.cs
index f2a5483..3ff4486 100644
--- a/LibMatrix.EventTypes.Spec/RoomMessageEventContent.cs
+++ b/LibMatrix.EventTypes.Spec/RoomMessageEventContent.cs
@@ -1,57 +1,56 @@
-// 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
+using System.Text.Json.Serialization;
+
+namespace LibMatrix.EventTypes.Spec;
+
+[MatrixEvent(EventId)]
+public class RoomMessageEventContent : BaseMatrixEventContent {
+ 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
|
