From d10b85a05d906ee1c8b845c491fdfe34d2435150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 22 Jan 2021 18:14:08 +0100
Subject: [PATCH] matrix-sdk: Fix our wasm command bot example

---
 .../examples/wasm_command_bot/Cargo.toml      |  7 +++++-
 .../examples/wasm_command_bot/src/lib.rs      | 23 ++++++++-----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/matrix_sdk/examples/wasm_command_bot/Cargo.toml b/matrix_sdk/examples/wasm_command_bot/Cargo.toml
index 7affe0c0..9735e0e7 100644
--- a/matrix_sdk/examples/wasm_command_bot/Cargo.toml
+++ b/matrix_sdk/examples/wasm_command_bot/Cargo.toml
@@ -10,10 +10,15 @@ edition = "2018"
 crate-type = ["cdylib"]
 
 [dependencies]
-matrix-sdk = { path = "../..", default-features = false, features = ["native-tls"] }
 url = "2.1.1"
 wasm-bindgen = { version = "0.2.62", features = ["serde-serialize"] }
 wasm-bindgen-futures = "0.4.12"
+console_error_panic_hook = "*"
 web-sys = { version = "0.3.39", features = ["console"] }
 
+[dependencies.matrix-sdk]
+path = "../.."
+default-features = false
+features = ["native-tls"]
+
 [workspace]
diff --git a/matrix_sdk/examples/wasm_command_bot/src/lib.rs b/matrix_sdk/examples/wasm_command_bot/src/lib.rs
index 500736cf..097cbb8e 100644
--- a/matrix_sdk/examples/wasm_command_bot/src/lib.rs
+++ b/matrix_sdk/examples/wasm_command_bot/src/lib.rs
@@ -1,13 +1,11 @@
-#![type_length_limit = "1702124"]
-
 use matrix_sdk::{
-    api::r0::sync::sync_events::Response as SyncResponse,
+    deserialized_responses::SyncResponse,
     events::{
         room::message::{MessageEventContent, TextMessageEventContent},
         AnyMessageEventContent, AnySyncMessageEvent, AnySyncRoomEvent, SyncMessageEvent,
     },
     identifiers::RoomId,
-    Client, ClientConfig, LoopCtrl, SyncSettings,
+    Client, LoopCtrl, SyncSettings,
 };
 use url::Url;
 use wasm_bindgen::prelude::*;
@@ -46,10 +44,8 @@ impl WasmBot {
 
         for (room_id, room) in response.rooms.join {
             for event in room.timeline.events {
-                if let Ok(event) = event.deserialize() {
-                    if let AnySyncRoomEvent::Message(AnySyncMessageEvent::RoomMessage(ev)) = event {
-                        self.on_room_message(&room_id, ev).await
-                    }
+                if let AnySyncRoomEvent::Message(AnySyncMessageEvent::RoomMessage(ev)) = event {
+                    self.on_room_message(&room_id, ev).await
                 }
             }
         }
@@ -60,13 +56,14 @@ impl WasmBot {
 
 #[wasm_bindgen]
 pub async fn run() -> Result<JsValue, JsValue> {
-    let homeserver_url = "http://localhost:8008";
-    let username = "user";
-    let password = "password";
+    console_error_panic_hook::set_once();
+
+    let homeserver_url = "http://localhost:8008";
+    let username = "example";
+    let password = "wordpass";
 
-    let client_config = ClientConfig::new();
     let homeserver_url = Url::parse(&homeserver_url).unwrap();
-    let client = Client::new_with_config(homeserver_url, client_config).unwrap();
+    let client = Client::new(homeserver_url).unwrap();
 
     client
         .login(username, password, None, Some("rust-sdk-wasm"))