This reverts commit 351c0c8756, reversing
changes made to 7c7128adc8.

@@ -6,1 +6,4 @@
 [dependencies]
+serde = { version = "1.0", features = ["derive", "rc"] }
+serde_json = "1.0"
+either = "1.15.0"

@@ -0,0 +1,379 @@
+use dioxus::prelude::*;
+use serde;

@@ -0,0 +56,4 @@
+    fn new(s: String) -> Result<Self, &'static str> {
+        // Empty check.
+        if s.is_empty() {
+            return Err::<T, &str>("Missing room id");

@@ -0,0 +61,4 @@
+        // Prefix check for SPECIFIED type.
+        let (index, id_or_alias) = T::validate_prefix(&s);
+        if index == None {
+            if (|| id_or_alias == MxRoomEnum::MxRoomId as usize)() {

@@ -0,0 +63,4 @@
+        if index == None {
+            if (|| id_or_alias == MxRoomEnum::MxRoomId as usize)() {
+                return Err::<T, &str>("Invalid room id, '!' missing.");
+            } else if (|| id_or_alias == MxRoomEnum::MxRoomAlias as usize)() {

@@ -0,0 +68,4 @@
+            }
+        }
+        // Check that SLD has been listed.
+        let n_index = index.unwrap_or_else(|| 0);

@@ -0,0 +74,4 @@
+            return Err::<T, &str>("Invalid room, ':' missing.");
+        }
+        // Check that TLD has been listed.
+        let n_index = index.unwrap_or_else(|| 0);

@@ -0,0 +81,4 @@
+        }
+        // Check legal chars for SPECIFIED type.
+        let mut t = String::with_capacity(s.len());
+        if (|| id_or_alias == MxRoomEnum::MxRoomId as usize)() {

@@ -0,0 +83,4 @@
+        let mut t = String::with_capacity(s.len());
+        if (|| id_or_alias == MxRoomEnum::MxRoomId as usize)() {
+            t.push_str(&s.replace(&['!', ':', '.'][..], ""));
+        } else if (|| id_or_alias == MxRoomEnum::MxRoomAlias as usize)() {

@@ -0,0 +87,4 @@
+            t.push_str(&s.replace(&['#', ':', '.'][..], ""));
+        }
+        if !(t.chars().all(char::is_alphanumeric)) {
+            Err::<T, &str>("Invalid room, illegal char(s).")

@@ -0,0 +96,4 @@
+
+impl std::fmt::Display for MxRoomId {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{:?}", self.0)

@@ -0,0 +121,4 @@
+impl MxRoomAddressFactory for MxRoomId {
+    fn validate_prefix(s: &str) -> (Option<usize>, usize) {
+        let index: Option<usize> = s.find('!');
+        if index == Some(0) && s[index.unwrap_or_else(|| 0) + 1..].find('!') == None {

@@ -0,0 +191,4 @@
+
+impl std::fmt::Display for AvailableRoom {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{:?} @ {:?}", self.name, self.room_id.0)

@@ -0,0 +201,4 @@
+}
+
+// This is only needed for testing, we only expect to receive valid JSON objects making queries to the matrix API.
+impl ParseError for AvailableRoomsList {

@@ -0,0 +227,4 @@
+    // use_server_future not preferred as manual refresh expected. Make mutable on room addition.
+    let joined_rooms_monitor = use_resource(move || async move {
+        serde_json::from_str::<JoinedRoomsList>(&joined_rooms_from_api.read())
+            .unwrap_or_else(|_| JoinedRoomsList::default_parse_error()) // Can do assertion-like unwrap() if known conforming JSON.

@@ -0,0 +301,4 @@
+    }
+}
+
+macro_rules! test_block {