diff --git a/.gitignore b/.gitignore
index fba66db..7e72167 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@ appsettings.Local*.json
appservice.yaml
appservice.json
Tests/LibMatrix.Tests/appsettings.json
+**/BenchmarkDotNet.Artifacts/
+Utilities/LibMatrix.EventTypes.Benchmark/*.json
diff --git a/ArcaneLibs b/ArcaneLibs
-Subproject 65d6fa98cc05ed3c37e71797145e8eb7f2c072a
+Subproject 805f3b7941536bb09970c577dd532ba4686b971
diff --git a/ConsoleApp1/ConsoleApp1.csproj b/ConsoleApp1/ConsoleApp1.csproj
deleted file mode 100644
index f30d408..0000000
--- a/ConsoleApp1/ConsoleApp1.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <OutputType>Exe</OutputType>
- <TargetFramework>net8.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\LibMatrix.EventTypes\LibMatrix.EventTypes.csproj" />
- </ItemGroup>
-
-</Project>
diff --git a/ConsoleApp1/Program.cs b/ConsoleApp1/Program.cs
deleted file mode 100644
index 7831ce8..0000000
--- a/ConsoleApp1/Program.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// See https://aka.ms/new-console-template for more information
-
-using LibMatrix.EventTypes;
-using LibMatrix.EventTypes.Events;
-
-Console.WriteLine("Hello, World!");
-
-MatrixEventCollection collection = new();
-collection.Add(new MatrixEvent<RoomMembershipEventContent>() {
- Content = new RoomMembershipEventContent() {
- Membership = "yes"
- }
-});
-
-List<MatrixEvent<MatrixEventContent>> collection2 = new();
-collection2.Add(new MatrixEvent<RoomMembershipEventContent>() {
- Content = new RoomMembershipEventContent() {
- Membership = "yes"
- }
-});
-
-List<MatrixEventContent> collection3 = new();
-collection3.Add(new RoomMembershipEventContent() {
- Membership = "yes"
-});
\ No newline at end of file
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
diff --git a/LibMatrix.sln b/LibMatrix.sln
index 396c5a0..2293a8d 100644
--- a/LibMatrix.sln
+++ b/LibMatrix.sln
@@ -37,10 +37,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibMatrix.LegacyEvents.Even
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibMatrix.HomeserverEmulator", "Tests\LibMatrix.HomeserverEmulator\LibMatrix.HomeserverEmulator.csproj", "{D44DB78D-9BAD-4AB6-A054-839ECA9D68D2}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibMatrix.EventTypes", "LibMatrix.EventTypes\LibMatrix.EventTypes.csproj", "{E9E9567D-58F4-4E17-BBC1-D4746C2526DB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp1", "ConsoleApp1\ConsoleApp1.csproj", "{6254A2BA-279F-49F7-B3F3-675397F0F644}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArcaneLibs.Blazor.Components", "ArcaneLibs\ArcaneLibs.Blazor.Components\ArcaneLibs.Blazor.Components.csproj", "{C40726FB-C8D5-4D18-836E-9F7D394E2E0C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArcaneLibs.Legacy", "ArcaneLibs\ArcaneLibs.Legacy\ArcaneLibs.Legacy.csproj", "{2FF8C08A-9DC8-40A2-B9C8-A43615005B32}"
@@ -63,6 +59,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibMatrix.DevTestBot", "Uti
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibMatrix.EventTypes.BasicTests", "Utilities\LibMatrix.EventTypes.BasicTests\LibMatrix.EventTypes.BasicTests.csproj", "{B14F6ED1-2222-454E-8632-D6CB25B7A66B}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibMatrix.EventTypes.Benchmark", "Utilities\LibMatrix.EventTypes.Benchmark\LibMatrix.EventTypes.Benchmark.csproj", "{3583DD22-BECD-4CDF-B600-24AE95F2E950}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibMatrix.EventTypes.Abstractions.Tests", "Tests\LibMatrix.EventTypes.Abstractions.Tests\LibMatrix.EventTypes.Abstractions.Tests.csproj", "{F362550F-74F1-425A-9943-CEB30B7541DD}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -124,14 +124,6 @@ Global
{D44DB78D-9BAD-4AB6-A054-839ECA9D68D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D44DB78D-9BAD-4AB6-A054-839ECA9D68D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D44DB78D-9BAD-4AB6-A054-839ECA9D68D2}.Release|Any CPU.Build.0 = Release|Any CPU
- {E9E9567D-58F4-4E17-BBC1-D4746C2526DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E9E9567D-58F4-4E17-BBC1-D4746C2526DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E9E9567D-58F4-4E17-BBC1-D4746C2526DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E9E9567D-58F4-4E17-BBC1-D4746C2526DB}.Release|Any CPU.Build.0 = Release|Any CPU
- {6254A2BA-279F-49F7-B3F3-675397F0F644}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6254A2BA-279F-49F7-B3F3-675397F0F644}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6254A2BA-279F-49F7-B3F3-675397F0F644}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6254A2BA-279F-49F7-B3F3-675397F0F644}.Release|Any CPU.Build.0 = Release|Any CPU
{C40726FB-C8D5-4D18-836E-9F7D394E2E0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C40726FB-C8D5-4D18-836E-9F7D394E2E0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C40726FB-C8D5-4D18-836E-9F7D394E2E0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -176,6 +168,14 @@ Global
{B14F6ED1-2222-454E-8632-D6CB25B7A66B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B14F6ED1-2222-454E-8632-D6CB25B7A66B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B14F6ED1-2222-454E-8632-D6CB25B7A66B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3583DD22-BECD-4CDF-B600-24AE95F2E950}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3583DD22-BECD-4CDF-B600-24AE95F2E950}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3583DD22-BECD-4CDF-B600-24AE95F2E950}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3583DD22-BECD-4CDF-B600-24AE95F2E950}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F362550F-74F1-425A-9943-CEB30B7541DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F362550F-74F1-425A-9943-CEB30B7541DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F362550F-74F1-425A-9943-CEB30B7541DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F362550F-74F1-425A-9943-CEB30B7541DD}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{1B1B2197-61FB-416F-B6C8-845F2E5A0442} = {840309F0-435B-43A7-8471-8C2BE643889D}
@@ -197,5 +197,7 @@ Global
{93CED166-06E0-42E7-90C9-D18AA5286999} = {01A126FE-9D50-40F2-817B-E55F4065EA76}
{5C588D95-79A9-49DD-9EDD-C9D6434434E5} = {A6345ECE-4C5E-400F-9130-886E343BF314}
{B14F6ED1-2222-454E-8632-D6CB25B7A66B} = {A6345ECE-4C5E-400F-9130-886E343BF314}
+ {3583DD22-BECD-4CDF-B600-24AE95F2E950} = {A6345ECE-4C5E-400F-9130-886E343BF314}
+ {F362550F-74F1-425A-9943-CEB30B7541DD} = {BFE16D8E-EFC5-49F6-9854-DB001309B3B4}
EndGlobalSection
EndGlobal
diff --git a/LibMatrix.sln.DotSettings.user b/LibMatrix.sln.DotSettings.user
index c5570e2..c724579 100644
--- a/LibMatrix.sln.DotSettings.user
+++ b/LibMatrix.sln.DotSettings.user
@@ -4,8 +4,13 @@
<s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue"><AssemblyExplorer>
<Assembly Path="/home/root@Rory/.cache/NuGetPackages/microsoft.extensions.hosting.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Hosting.Abstractions.dll" />
</AssemblyExplorer></s:String>
+ <s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=349cfde3_002D4ded_002D46ac_002Dbd2c_002Da2222a27e852/@EntryIndexedValue"><SessionState ContinuousTestingMode="0" IsActive="True" Name="All tests from &lt;Tests&gt;" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session">
+ <Project Location="/home/Rory/git/matrix/MatrixRoomUtils/LibMatrix" Presentation="&lt;Tests&gt;" />
+</SessionState></s:String>
+
<s:Boolean x:Key="/Default/UnloadedProject/UnloadedProjects/=1b1b2197_002D61fb_002D416f_002Db6c8_002D845f2e5a0442_0023LibMatrix_002EExampleBot/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UnloadedProject/UnloadedProjects/=345934ff_002Dca81_002D4a4b_002Db137_002D9f198102c65f_0023LibMatrix_002ETests/@EntryIndexedValue">True</s:Boolean>
+
<s:Boolean x:Key="/Default/UnloadedProject/UnloadedProjects/=35df9a1a_002Dd988_002D4225_002Dafa3_002D06bb8edeb559_0023LibMatrix_002EDebugDataValidationApi/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UnloadedProject/UnloadedProjects/=8f0a820e_002Df6ae_002D45a2_002D970e_002D7a3759693919_0023ModerationBot/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UnloadedProject/UnloadedProjects/=d44db78d_002D9bad_002D4ab6_002Da054_002D839eca9d68d2_0023LibMatrix_002EHomeserverEmulator/@EntryIndexedValue">True</s:Boolean>
diff --git a/LibMatrix/LibMatrix.csproj b/LibMatrix/LibMatrix.csproj
index d6c9155..0478699 100644
--- a/LibMatrix/LibMatrix.csproj
+++ b/LibMatrix/LibMatrix.csproj
@@ -15,8 +15,8 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0"/>
- <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0"/>
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
+ <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
</ItemGroup>
<ItemGroup>
diff --git a/Tests/LibMatrix.EventTypes.Abstractions.Tests/LibMatrix.EventTypes.Abstractions.Tests.csproj b/Tests/LibMatrix.EventTypes.Abstractions.Tests/LibMatrix.EventTypes.Abstractions.Tests.csproj
new file mode 100644
index 0000000..d4a45e0
--- /dev/null
+++ b/Tests/LibMatrix.EventTypes.Abstractions.Tests/LibMatrix.EventTypes.Abstractions.Tests.csproj
@@ -0,0 +1,43 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>net8.0</TargetFramework>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+
+ <IsPackable>false</IsPackable>
+ <IsTestProject>true</IsTestProject>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0"/>
+ <PackageReference Include="coverlet.collector" Version="6.0.2">
+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+ <PrivateAssets>all</PrivateAssets>
+ </PackageReference>
+ <PackageReference Include="xunit" Version="2.8.1"/>
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+ <PrivateAssets>all</PrivateAssets>
+ </PackageReference>
+ </ItemGroup>
+
+ <ItemGroup>
+ <Using Include="Xunit"/>
+ </ItemGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\..\LibMatrix.EventTypes.Abstractions\LibMatrix.EventTypes.Abstractions.csproj"/>
+ <ProjectReference Include="..\..\LibMatrix.EventTypes.Spec\LibMatrix.EventTypes.Spec.csproj" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Content Include="appsettings*.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="TestData\**\*.*">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ </ItemGroup>
+
+</Project>
diff --git a/Tests/LibMatrix.EventTypes.Abstractions.Tests/SerialisationTests.cs b/Tests/LibMatrix.EventTypes.Abstractions.Tests/SerialisationTests.cs
new file mode 100644
index 0000000..fe1a575
--- /dev/null
+++ b/Tests/LibMatrix.EventTypes.Abstractions.Tests/SerialisationTests.cs
@@ -0,0 +1,122 @@
+using System.Text.Json;
+using ArcaneLibs.Extensions;
+using LibMatrix.EventTypes.Spec;
+
+namespace LibMatrix.EventTypes.Abstractions.Tests;
+
+public class SerialisationTests {
+ private static readonly Dictionary<string, string> TestData = Directory.GetFiles("TestData").Where(x=>x.EndsWith(".json")).ToDictionary(Path.GetFileNameWithoutExtension, File.ReadAllText);
+ [Fact]
+ public void DeserializeEvent() {
+ var evt = JsonSerializer.Deserialize<MatrixEvent<RoomMembershipEventContent>>(TestData["RoomMembershipEvent"]);
+ Assert.NotNull(evt);
+ Assert.NotNull(evt.Content);
+ Assert.NotNull(evt.Content.Membership);
+ }
+
+ [Fact]
+ public void DeserialiseEventContent() {
+ var evt = JsonSerializer.Deserialize<RoomMembershipEventContent>(TestData["RoomMembershipEventContent"]);
+ Assert.NotNull(evt);
+ Assert.NotNull(evt.Membership);
+ }
+
+ [Fact]
+ public void DeserializeUnknownEvent() {
+ var evt = JsonSerializer.Deserialize<MatrixEvent<BaseMatrixEventContent>>(TestData["RoomMembershipEvent"]);
+ Assert.NotNull(evt);
+ Assert.NotNull(evt.Content);
+ Assert.NotNull(evt.Content["membership"]);
+ }
+
+ [Fact]
+ public void DeserializeUnknownEventContent() {
+ var evt = JsonSerializer.Deserialize<BaseMatrixEventContent>(TestData["RoomMembershipEventContent"]);
+ Assert.NotNull(evt);
+ Assert.NotNull(evt["membership"]);
+ }
+
+ [Fact]
+ public void SerializeEvent() {
+ var evt = JsonSerializer.Deserialize<MatrixEvent<RoomMembershipEventContent>>(TestData["RoomMembershipEvent"]);
+ var json = evt.ToJson();
+ Assert.NotNull(json);
+ Assert.Contains("membership", json);
+ }
+
+ [Fact]
+ public void SerializeEventContent() {
+ var evt = JsonSerializer.Deserialize<RoomMembershipEventContent>(TestData["RoomMembershipEventContent"]);
+ Assert.NotNull(evt);
+ var json = evt.ToJson();
+ Assert.NotNull(json);
+ Assert.Contains("membership", json);
+ }
+
+ [Fact]
+ public void SerializeUnknownEvent() {
+ var evt = JsonSerializer.Deserialize<MatrixEvent<BaseMatrixEventContent>>(TestData["RoomMembershipEvent"]);
+ var json = evt.ToJson();
+ Assert.NotNull(json);
+ Assert.Contains("membership", json);
+ }
+
+ [Fact]
+ public void SerializeUnknownEventContent() {
+ var evt = JsonSerializer.Deserialize<BaseMatrixEventContent>(TestData["RoomMembershipEventContent"]);
+ Assert.NotNull(evt);
+ var json = evt.ToJson();
+ Assert.NotNull(json);
+ Assert.Contains("membership", json);
+ }
+
+ [Fact]
+ public void ModifyEvent() {
+ var evt = JsonSerializer.Deserialize<MatrixEvent<RoomMembershipEventContent>>(TestData["RoomMembershipEvent"]);
+ Assert.NotNull(evt);
+ Assert.NotNull(evt.Content);
+ evt.Content.Membership = "meow";
+ var json = evt.ToJson();
+ Assert.NotNull(json);
+ Assert.Contains("meow", json);
+ }
+
+ [Fact]
+ public void ModifyEventContent() {
+ var evt = JsonSerializer.Deserialize<RoomMembershipEventContent>(TestData["RoomMembershipEventContent"]);
+ Assert.NotNull(evt);
+ evt.Membership = "meow";
+ var json = evt.ToJson();
+ Assert.NotNull(json);
+ Assert.Contains("meow", json);
+ }
+
+ [Fact]
+ public void ModifyUnknownEvent() {
+ var evt = JsonSerializer.Deserialize<MatrixEvent<BaseMatrixEventContent>>(TestData["RoomMembershipEvent"]);
+ Assert.NotNull(evt);
+ evt.Content["membership"] = "meow";
+ var json = evt.ToJson();
+ Assert.NotNull(json);
+ Assert.Contains("meow", json);
+ }
+
+ [Fact]
+ public void ModifyUnknownEventContent() {
+ var evt = JsonSerializer.Deserialize<BaseMatrixEventContent>(TestData["RoomMembershipEventContent"]);
+ Assert.NotNull(evt);
+ evt["membership"] = "meow";
+ var json = evt.ToJson();
+ Assert.NotNull(json);
+ Assert.Contains("meow", json);
+ }
+
+ [Fact]
+ public void SerializeEventWithUnknownContent() {
+ var evt = JsonSerializer.Deserialize<MatrixEvent<BaseMatrixEventContent>>(TestData["RoomMembershipEvent"]);
+ Assert.NotNull(evt);
+ var json = evt.ToJson();
+ Assert.NotNull(json);
+ Assert.Contains("membership", json);
+ }
+}
\ No newline at end of file
diff --git a/Tests/LibMatrix.EventTypes.Abstractions.Tests/TestData/RoomMembershipEvent.json b/Tests/LibMatrix.EventTypes.Abstractions.Tests/TestData/RoomMembershipEvent.json
new file mode 100644
index 0000000..1134a58
--- /dev/null
+++ b/Tests/LibMatrix.EventTypes.Abstractions.Tests/TestData/RoomMembershipEvent.json
@@ -0,0 +1,17 @@
+{
+ "content": {
+ "avatar_url": "mxc://server1/abcdefgh",
+ "displayname": "User 1",
+ "is_direct": false,
+ "membership": "join"
+ },
+ "event_id": "$DLgeeol91D36xqZQvEwRJrOoBKttZ_S66hco8Ci-qb0",
+ "origin_server_ts": 1717146801732,
+ "sender": "@user1:server1",
+ "state_key": "@user1:server1",
+ "type": "m.room.member",
+ "unsigned": {
+ "prev_sender": "@user1:server1",
+ "replaces_state": "$4QptWS_8YzaZfROeFzOdhoV2wzYPEzQDx0Q6u2UOt8c"
+ }
+}
\ No newline at end of file
diff --git a/Tests/LibMatrix.EventTypes.Abstractions.Tests/TestData/RoomMembershipEventContent.json b/Tests/LibMatrix.EventTypes.Abstractions.Tests/TestData/RoomMembershipEventContent.json
new file mode 100644
index 0000000..ca328d4
--- /dev/null
+++ b/Tests/LibMatrix.EventTypes.Abstractions.Tests/TestData/RoomMembershipEventContent.json
@@ -0,0 +1,6 @@
+{
+ "avatar_url": "mxc://server1/abcdefgh",
+ "displayname": "User 1",
+ "is_direct": false,
+ "membership": "join"
+}
\ No newline at end of file
diff --git a/Tests/LibMatrix.EventTypes.Abstractions.Tests/TestData/RoomMessageEvent.json b/Tests/LibMatrix.EventTypes.Abstractions.Tests/TestData/RoomMessageEvent.json
new file mode 100644
index 0000000..3072114
--- /dev/null
+++ b/Tests/LibMatrix.EventTypes.Abstractions.Tests/TestData/RoomMessageEvent.json
@@ -0,0 +1,18 @@
+{
+ "content": {
+ "body": "This is a test message",
+ "format": "org.matrix.custom.html",
+ "formatted_body": "This is a test message <b>with HTML!</b>",
+ "m.mentions": {
+ "user_ids": [
+ "@emma:rory.gay"
+ ]
+ },
+ "msgtype": "m.text"
+ },
+ "event_id": "$qBmS2SyNAA-ODcOZpAd_RRfApzXuMmy0VHsCqnMebzI",
+ "origin_server_ts": 1717100265714,
+ "sender": "@user:example.xyz",
+ "type": "m.room.message",
+ "unsigned": null
+}
diff --git a/Tests/LibMatrix.EventTypes.Abstractions.Tests/TestData/RoomMessageEventContent.json b/Tests/LibMatrix.EventTypes.Abstractions.Tests/TestData/RoomMessageEventContent.json
new file mode 100644
index 0000000..d9c7024
--- /dev/null
+++ b/Tests/LibMatrix.EventTypes.Abstractions.Tests/TestData/RoomMessageEventContent.json
@@ -0,0 +1,11 @@
+{
+ "body": "This is a test message",
+ "format": "org.matrix.custom.html",
+ "formatted_body": "This is a test message <b>with HTML!</b>",
+ "m.mentions": {
+ "user_ids": [
+ "@emma:rory.gay"
+ ]
+ },
+ "msgtype": "m.text"
+}
\ No newline at end of file
diff --git a/Tests/LibMatrix.Tests/GlobalUsings.cs b/Tests/LibMatrix.Tests/GlobalUsings.cs
deleted file mode 100644
index 8c927eb..0000000
--- a/Tests/LibMatrix.Tests/GlobalUsings.cs
+++ /dev/null
@@ -1 +0,0 @@
-global using Xunit;
\ No newline at end of file
diff --git a/Tests/LibMatrix.Tests/LibMatrix.Tests.csproj b/Tests/LibMatrix.Tests/LibMatrix.Tests.csproj
index d833d8b..085816f 100644
--- a/Tests/LibMatrix.Tests/LibMatrix.Tests.csproj
+++ b/Tests/LibMatrix.Tests/LibMatrix.Tests.csproj
@@ -10,23 +10,26 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0"/>
-
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0-preview-23531-01"/>
- <PackageReference Include="xunit" Version="2.6.1"/>
- <PackageReference Include="Xunit.Microsoft.DependencyInjection" Version="7.0.10"/>
- <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0"/>
+ <PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
- <PackageReference Include="coverlet.collector" Version="3.2.0">
+ <PackageReference Include="xunit" Version="2.8.1"/>
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
+ <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0"/>
+ <PackageReference Include="Xunit.Microsoft.DependencyInjection" Version="8.1.0"/>
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13"/>
</ItemGroup>
<ItemGroup>
+ <Using Include="Xunit"/>
+ </ItemGroup>
+
+ <ItemGroup>
<ProjectReference Include="..\..\LibMatrix\LibMatrix.csproj"/>
</ItemGroup>
diff --git a/Utilities/LibMatrix.EventTypes.BasicTests/LibMatrix.EventTypes.BasicTests.csproj b/Utilities/LibMatrix.EventTypes.BasicTests/LibMatrix.EventTypes.BasicTests.csproj
index b769cb7..e13103f 100644
--- a/Utilities/LibMatrix.EventTypes.BasicTests/LibMatrix.EventTypes.BasicTests.csproj
+++ b/Utilities/LibMatrix.EventTypes.BasicTests/LibMatrix.EventTypes.BasicTests.csproj
@@ -13,10 +13,6 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
- </ItemGroup>
-
- <ItemGroup>
<Content Include="*.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
diff --git a/Utilities/LibMatrix.EventTypes.BasicTests/Program.cs b/Utilities/LibMatrix.EventTypes.BasicTests/Program.cs
index 8c1e15a..d694c76 100644
--- a/Utilities/LibMatrix.EventTypes.BasicTests/Program.cs
+++ b/Utilities/LibMatrix.EventTypes.BasicTests/Program.cs
@@ -1,37 +1,50 @@
-using System.Text.Json;
+// See https://aka.ms/new-console-template for more information
+
+using System.Text.Json;
using ArcaneLibs.Extensions;
-using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Jobs;
-using BenchmarkDotNet.Running;
using LibMatrix.EventTypes;
-using LibMatrix.EventTypes.Events;
-
-BenchmarkRunner.Run<Tests>();
-
-[ShortRunJob]
-[MemoryDiagnoser]
-public class Tests {
- // public MatrixEventCollection<MatrixEventContent> Members = [
- // new MatrixEvent<RoomMembershipEventContent>() {
- // Content = new() {
- // Membership = "join"
- // }
- // }
- // ];
-
- private static string eventJson = File.ReadAllText("test-event.json");
- private static MatrixEvent<RoomMembershipEventContent> evt2 = JsonSerializer.Deserialize<MatrixEvent<RoomMembershipEventContent>>(eventJson);
- [Benchmark]
- public void Deserialise() {
- JsonSerializer.Deserialize<MatrixEvent<RoomMembershipEventContent>>(eventJson);
+using LibMatrix.EventTypes.Abstractions;
+using LibMatrix.EventTypes.Spec;
+
+Console.WriteLine("Hello, World!");
+
+MatrixEventCollection Members = [
+ new MatrixEvent<RoomMembershipEventContent>() {
+ Content = new() {
+ Membership = "join"
+ }
+ }
+];
+
+string eventJson = File.ReadAllText("test-event.json");
+MatrixEvent<RoomMembershipEventContent> evt2 = JsonSerializer.Deserialize<MatrixEvent<RoomMembershipEventContent>>(eventJson);
+
+JsonSerializer.Deserialize<MatrixEvent<RoomMembershipEventContent>>(eventJson);
+
+evt2.ToJson();
+evt2.Content.Membership = "meow";
+
+MatrixEventCollection collection = new();
+collection.Add(new MatrixEvent<RoomMembershipEventContent>() {
+ Content = new RoomMembershipEventContent() {
+ Membership = "yes"
}
- [Benchmark]
- public void Serialise() {
- evt2.ToJson();
+});
+MatrixEventCollection<RoomMembershipEventContent> collection4 = new();
+collection4.Add(new MatrixEvent<RoomMembershipEventContent>() {
+ Content = new RoomMembershipEventContent() {
+ Membership = "yes"
}
-
- [Benchmark]
- public void Modify() {
- evt2.Content.Membership = "meow";
+});
+
+List<MatrixEvent<BaseMatrixEventContent>> collection2 = new();
+collection2.Add(new MatrixEvent<RoomMembershipEventContent>() {
+ Content = new RoomMembershipEventContent() {
+ Membership = "yes"
}
-}
\ No newline at end of file
+});
+
+List<BaseMatrixEventContent> collection3 = new();
+collection3.Add(new RoomMembershipEventContent() {
+ Membership = "yes"
+});
\ No newline at end of file
diff --git a/Utilities/LibMatrix.EventTypes.Benchmark/LibMatrix.EventTypes.Benchmark.csproj b/Utilities/LibMatrix.EventTypes.Benchmark/LibMatrix.EventTypes.Benchmark.csproj
new file mode 100644
index 0000000..b769cb7
--- /dev/null
+++ b/Utilities/LibMatrix.EventTypes.Benchmark/LibMatrix.EventTypes.Benchmark.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <OutputType>Exe</OutputType>
+ <TargetFramework>net8.0</TargetFramework>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\..\LibMatrix.EventTypes.Abstractions\LibMatrix.EventTypes.Abstractions.csproj" />
+ <ProjectReference Include="..\..\LibMatrix.EventTypes.Spec\LibMatrix.EventTypes.Spec.csproj" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Content Include="*.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ </ItemGroup>
+</Project>
diff --git a/Utilities/LibMatrix.EventTypes.Benchmark/Program.cs b/Utilities/LibMatrix.EventTypes.Benchmark/Program.cs
new file mode 100644
index 0000000..512c066
--- /dev/null
+++ b/Utilities/LibMatrix.EventTypes.Benchmark/Program.cs
@@ -0,0 +1,37 @@
+using System.Text.Json;
+using ArcaneLibs.Extensions;
+using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Jobs;
+using BenchmarkDotNet.Running;
+using LibMatrix.EventTypes;
+using LibMatrix.EventTypes.Spec;
+
+BenchmarkRunner.Run<Tests>();
+
+[ShortRunJob]
+[MemoryDiagnoser]
+public class Tests {
+ // public MatrixEventCollection<MatrixEventContent> Members = [
+ // new MatrixEvent<RoomMembershipEventContent>() {
+ // Content = new() {
+ // Membership = "join"
+ // }
+ // }
+ // ];
+
+ private static string eventJson = File.ReadAllText("test-event.json");
+ private static MatrixEvent<RoomMembershipEventContent> evt2 = JsonSerializer.Deserialize<MatrixEvent<RoomMembershipEventContent>>(eventJson);
+ [Benchmark]
+ public void Deserialise() {
+ JsonSerializer.Deserialize<MatrixEvent<RoomMembershipEventContent>>(eventJson);
+ }
+ [Benchmark]
+ public void Serialise() {
+ evt2.ToJson();
+ }
+
+ [Benchmark]
+ public void Modify() {
+ evt2.Content.Membership = "meow";
+ }
+}
\ No newline at end of file
diff --git a/Utilities/LibMatrix.Utilities.Bot/LibMatrix.Utilities.Bot.csproj b/Utilities/LibMatrix.Utilities.Bot/LibMatrix.Utilities.Bot.csproj
index 89ea5af..6e67373 100644
--- a/Utilities/LibMatrix.Utilities.Bot/LibMatrix.Utilities.Bot.csproj
+++ b/Utilities/LibMatrix.Utilities.Bot/LibMatrix.Utilities.Bot.csproj
@@ -12,9 +12,9 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0"/>
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0"/>
- <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0"/>
+ <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
</ItemGroup>
|
