Code cleanup
2 files changed, 9 insertions, 10 deletions
diff --git a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor b/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor
index c04df3f..381ecd1 100644
--- a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor
+++ b/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor
@@ -38,13 +38,11 @@
private List<RoomInfo> rooms => Category.Value;
private int RoomVersionDangerLevel(RoomInfo room) {
- var roomVersion = room.StateEvents.FirstOrDefault(x=>x.Type == "m.room.create");
+ var roomVersion = room.StateEvents.FirstOrDefault(x => x.Type == "m.room.create");
if (roomVersion is null) return 0;
- var roomVersionContent = roomVersion.TypedContent as RoomCreateEventData;
- if (roomVersionContent is null) return 0;
- if (RoomConstants.DangerousRoomVersions.Contains(roomVersionContent.RoomVersion)) return 2;
- if (roomVersionContent.RoomVersion != RoomConstants.RecommendedRoomVersion) return 1;
- return 0;
+ return roomVersion.TypedContent is not RoomCreateEventData roomVersionContent ? 0
+ : RoomConstants.DangerousRoomVersions.Contains(roomVersionContent.RoomVersion) ? 2
+ : roomVersionContent.RoomVersion != RoomConstants.RecommendedRoomVersion ? 1 : 0;
}
}
diff --git a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListSpace.razor b/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListSpace.razor
index a113f0b..0867b48 100644
--- a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListSpace.razor
+++ b/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListSpace.razor
@@ -33,9 +33,9 @@
var rooms = Space.Room.AsSpace.GetRoomsAsync();
await foreach (var room in rooms) {
if (Breadcrumbs.Contains(room.RoomId)) continue;
- RoomInfo roomInfo = KnownRooms.FirstOrDefault(x => x.Room.RoomId == room.RoomId);
+ var roomInfo = KnownRooms.FirstOrDefault(x => x.Room.RoomId == room.RoomId);
if (roomInfo is null) {
- roomInfo = new() {
+ roomInfo = new RoomInfo {
Room = room
};
KnownRooms.Add(roomInfo);
@@ -48,10 +48,11 @@
private bool _shouldRenderChildren = false;
private string? _breadcrumbs;
- private async Task SpaceChildrenOpened() {
- if (_shouldRenderChildren) return;
+ private Task SpaceChildrenOpened() {
+ if (_shouldRenderChildren) return Task.CompletedTask;
_shouldRenderChildren = true;
Console.WriteLine($"[RoomList] Rendering children of {Space.Room.RoomId}");
+ return Task.CompletedTask;
}
}
|