From 83029c478f411bcadd3be53ac4dc53d88b3c8462 Mon Sep 17 00:00:00 2001
From: "Emma@Rory&" <root@rory.gay>
Date: Mon, 14 Aug 2023 19:46:33 +0200
Subject: Code cleanup

---
 .../TimelineComponents/TimelineMemberItem.razor    | 44 +++++++++++-----------
 .../TimelineComponents/TimelineMessageItem.razor   |  2 +-
 .../TimelineRoomCreateItem.razor                   |  2 +-
 3 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'MatrixRoomUtils.Web/Shared/TimelineComponents')

diff --git a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor
index 8239367..d67fdab 100644
--- a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor
+++ b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor
@@ -4,31 +4,31 @@
 @inherits BaseTimelineItem
 
 @if (roomMemberData is not null) {
-    @if (roomMemberData.Membership == "ban") {
-        <i>@Event.StateKey was banned</i>
-    }
-    else if (roomMemberData.Membership == "invite") {
-        <i>@Event.StateKey was invited</i>
-    }
-    else if (roomMemberData.Membership == "join") {
-        @if (Event.ReplacesState is not null) {
+    @switch (roomMemberData.Membership) {
+        case "ban":
+            <i>@Event.StateKey was banned</i>
+            break;
+        case "invite":
+            <i>@Event.StateKey was invited</i>
+            break;
+        case "join" when Event.ReplacesState is not null:
             <i>@Event.StateKey changed their display name to @(roomMemberData.Displayname ?? Event.Sender)</i>
-        }
-        else {
-            <i><InlineUserItem User="new ProfileResponseEventData()" HomeServer="HomeServer" UserId="@Event.StateKey"></InlineUserItem> joined</i>
-        }
-    }
-    else if (roomMemberData.Membership == "leave") {
-        <i>@Event.StateKey left</i>
-    }
-    else if (roomMemberData.Membership == "knock") {
-        <i>@Event.StateKey knocked</i>
-    }
-    else {
-        <i>@Event.StateKey has an unknown state:</i>
-        <pre>
+            break;
+        case "join":
+            <i><InlineUserItem User="@(new ProfileResponseEventData())" HomeServer="@HomeServer" UserId="@Event.StateKey"></InlineUserItem> joined</i>
+            break;
+        case "leave":
+            <i>@Event.StateKey left</i>
+            break;
+        case "knock":
+            <i>@Event.StateKey knocked</i>
+            break;
+        default:
+            <i>@Event.StateKey has an unknown state:</i>
+            <pre>
         @Event.ToJson()
     </pre>
+            break;
     }
 }
 else {
diff --git a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor
index 411b750..13cce88 100644
--- a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor
+++ b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor
@@ -2,7 +2,7 @@
 @inherits BaseTimelineItem
 
 <pre>
-    @ObjectExtensions.ToJson(Event.RawContent, indent: false)
+    @Event.RawContent?.ToJson(indent: false)
 </pre>
 
 @code {
diff --git a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomCreateItem.razor b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomCreateItem.razor
index b20cc1a..8053a47 100644
--- a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomCreateItem.razor
+++ b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomCreateItem.razor
@@ -8,7 +8,7 @@
     This room is of type @(CreationEventContent.Type ?? "Untyped room (usually a chat room)")
 </p>
 <pre>
-    @ObjectExtensions.ToJson(Event.RawContent, indent: false)
+    @Event.RawContent?.ToJson(indent: false)
 </pre>
 
 @code {
-- 
cgit 1.5.1