From 46df5b8e335754f1582fc4d41d9546808ed8ee66 Mon Sep 17 00:00:00 2001 From: TheArcaneBrony Date: Fri, 29 Sep 2023 19:38:00 +0200 Subject: Unit tests, small refactors --- LibMatrix/EventTypes/Spec/RoomMessageEventData.cs | 2 ++ LibMatrix/EventTypes/Spec/State/RoomCreateEventData.cs | 4 ++++ .../EventTypes/Spec/State/RoomPowerLevelEventData.cs | 16 ++++++++-------- LibMatrix/EventTypes/Spec/State/SpaceChildEventData.cs | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) (limited to 'LibMatrix/EventTypes') diff --git a/LibMatrix/EventTypes/Spec/RoomMessageEventData.cs b/LibMatrix/EventTypes/Spec/RoomMessageEventData.cs index b76b176..f8ee58b 100644 --- a/LibMatrix/EventTypes/Spec/RoomMessageEventData.cs +++ b/LibMatrix/EventTypes/Spec/RoomMessageEventData.cs @@ -28,4 +28,6 @@ public class RoomMessageEventContent : EventContent { /// [JsonPropertyName("url")] public string? Url { get; set; } + + public string? FileName { get; set; } } diff --git a/LibMatrix/EventTypes/Spec/State/RoomCreateEventData.cs b/LibMatrix/EventTypes/Spec/State/RoomCreateEventData.cs index e409f3a..c5bf14e 100644 --- a/LibMatrix/EventTypes/Spec/State/RoomCreateEventData.cs +++ b/LibMatrix/EventTypes/Spec/State/RoomCreateEventData.cs @@ -8,12 +8,16 @@ namespace LibMatrix.EventTypes.Spec.State; public class RoomCreateEventContent : EventContent { [JsonPropertyName("room_version")] public string? RoomVersion { get; set; } + [JsonPropertyName("creator")] public string? Creator { get; set; } + [JsonPropertyName("m.federate")] public bool? Federate { get; set; } + [JsonPropertyName("predecessor")] public RoomCreatePredecessor? Predecessor { get; set; } + [JsonPropertyName("type")] public string? Type { get; set; } diff --git a/LibMatrix/EventTypes/Spec/State/RoomPowerLevelEventData.cs b/LibMatrix/EventTypes/Spec/State/RoomPowerLevelEventData.cs index 1a5d5f5..2ae9593 100644 --- a/LibMatrix/EventTypes/Spec/State/RoomPowerLevelEventData.cs +++ b/LibMatrix/EventTypes/Spec/State/RoomPowerLevelEventData.cs @@ -7,34 +7,34 @@ namespace LibMatrix.EventTypes.Spec.State; [MatrixEvent(EventName = "m.room.power_levels")] public class RoomPowerLevelEventContent : EventContent { [JsonPropertyName("ban")] - public long? Ban { get; set; } // = 50; + public long? Ban { get; set; } = 50; [JsonPropertyName("events_default")] - public long EventsDefault { get; set; } // = 0; + public long EventsDefault { get; set; } = 0; [JsonPropertyName("events")] public Dictionary? Events { get; set; } // = null!; [JsonPropertyName("invite")] - public long? Invite { get; set; } // = 50; + public long? Invite { get; set; } = 0; [JsonPropertyName("kick")] - public long? Kick { get; set; } // = 50; + public long? Kick { get; set; } = 50; [JsonPropertyName("notifications")] public NotificationsPL? NotificationsPl { get; set; } // = null!; [JsonPropertyName("redact")] - public long? Redact { get; set; } // = 50; + public long? Redact { get; set; } = 50; [JsonPropertyName("state_default")] - public long? StateDefault { get; set; } // = 50; + public long? StateDefault { get; set; } = 50; [JsonPropertyName("users")] public Dictionary? Users { get; set; } // = null!; [JsonPropertyName("users_default")] - public long? UsersDefault { get; set; } // = 0; + public long? UsersDefault { get; set; } = 0; [Obsolete("Historical was a key related to MSC2716, a spec change on backfill that was dropped!", true)] [JsonIgnore] @@ -47,7 +47,7 @@ public class RoomPowerLevelEventContent : EventContent { } public bool IsUserAdmin(string userId) { - return Users.TryGetValue(userId, out var level) && level >= Events.Max(x=>x.Value); + return Users.TryGetValue(userId, out var level) && level >= Events.Max(x => x.Value); } public bool UserHasPermission(string userId, string eventType) { diff --git a/LibMatrix/EventTypes/Spec/State/SpaceChildEventData.cs b/LibMatrix/EventTypes/Spec/State/SpaceChildEventData.cs index a13ba2e..0a897dc 100644 --- a/LibMatrix/EventTypes/Spec/State/SpaceChildEventData.cs +++ b/LibMatrix/EventTypes/Spec/State/SpaceChildEventData.cs @@ -9,7 +9,7 @@ public class SpaceChildEventContent : EventContent { [JsonPropertyName("auto_join")] public bool? AutoJoin { get; set; } [JsonPropertyName("via")] - public string[]? Via { get; set; } + public List? Via { get; set; } [JsonPropertyName("suggested")] public bool? Suggested { get; set; } } -- cgit 1.4.1