From abd62cab0d944b983c8db42840ef76c4a16d43f4 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Thu, 21 Jan 2021 18:19:50 +0100 Subject: [PATCH 1/2] Update ruma to rev 8c109d3c0a7ec66b352dc82677d30db7cb0723eb Signed-off-by: Tilo Spannagel --- matrix_sdk_common/Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/matrix_sdk_common/Cargo.toml b/matrix_sdk_common/Cargo.toml index ca66ef11..cbc53e1e 100644 --- a/matrix_sdk_common/Cargo.toml +++ b/matrix_sdk_common/Cargo.toml @@ -19,6 +19,8 @@ async-trait = "0.1.42" [dependencies.ruma] version = "0.0.2" +git = "https://github.com/ruma/ruma" +rev = "8c109d3c0a7ec66b352dc82677d30db7cb0723eb" features = ["client-api", "unstable-pre-spec"] [target.'cfg(not(target_arch = "wasm32"))'.dependencies] From 7b8d2b5319bebcd95eee2c10b1e59641dea46e8e Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Thu, 21 Jan 2021 18:21:00 +0100 Subject: [PATCH 2/2] Add support for ruma feature flag `markdown` Signed-off-by: Tilo Spannagel --- matrix_sdk/Cargo.toml | 1 + matrix_sdk/src/lib.rs | 1 + matrix_sdk_base/Cargo.toml | 1 + matrix_sdk_base/src/lib.rs | 1 + matrix_sdk_common/Cargo.toml | 1 + 5 files changed, 5 insertions(+) diff --git a/matrix_sdk/Cargo.toml b/matrix_sdk/Cargo.toml index 4eff3d68..2d6f1ad2 100644 --- a/matrix_sdk/Cargo.toml +++ b/matrix_sdk/Cargo.toml @@ -21,6 +21,7 @@ messages = ["matrix-sdk-base/messages"] encryption = ["matrix-sdk-base/encryption", "dashmap"] sqlite_cryptostore = ["matrix-sdk-base/sqlite_cryptostore"] unstable-synapse-quirks = ["matrix-sdk-base/unstable-synapse-quirks"] +markdown = ["matrix-sdk-base/markdown"] native-tls = ["reqwest/native-tls"] rustls-tls = ["reqwest/rustls-tls"] socks = ["reqwest/socks"] diff --git a/matrix_sdk/src/lib.rs b/matrix_sdk/src/lib.rs index 3cb65f27..32caeabb 100644 --- a/matrix_sdk/src/lib.rs +++ b/matrix_sdk/src/lib.rs @@ -43,6 +43,7 @@ //! destroyed. //! * `unstable-synapse-quirks`: Enables support to deal with inconsistencies //! of Synapse in compliance with the Matrix API specification. +//! * `markdown`: Support for sending markdown formatted messages. //! * `socks`: Enables SOCKS support in reqwest, the default HTTP client. #![deny( diff --git a/matrix_sdk_base/Cargo.toml b/matrix_sdk_base/Cargo.toml index 97ea7082..789536df 100644 --- a/matrix_sdk_base/Cargo.toml +++ b/matrix_sdk_base/Cargo.toml @@ -20,6 +20,7 @@ messages = [] encryption = ["matrix-sdk-crypto"] sqlite_cryptostore = ["matrix-sdk-crypto/sqlite_cryptostore"] unstable-synapse-quirks = ["matrix-sdk-common/unstable-synapse-quirks"] +markdown = ["matrix-sdk-common/markdown"] docs = ["encryption", "sqlite_cryptostore", "messages"] diff --git a/matrix_sdk_base/src/lib.rs b/matrix_sdk_base/src/lib.rs index 6f4377b4..bd69c6de 100644 --- a/matrix_sdk_base/src/lib.rs +++ b/matrix_sdk_base/src/lib.rs @@ -26,6 +26,7 @@ //! destroyed. //! * `unstable-synapse-quirks`: Enables support to deal with inconsistencies //! of Synapse in compliance with the Matrix API specification. +//! * `markdown`: Support for sending markdown formatted messages. #![deny( missing_debug_implementations, dead_code, diff --git a/matrix_sdk_common/Cargo.toml b/matrix_sdk_common/Cargo.toml index cbc53e1e..dabeff9c 100644 --- a/matrix_sdk_common/Cargo.toml +++ b/matrix_sdk_common/Cargo.toml @@ -12,6 +12,7 @@ version = "0.2.0" [features] unstable-synapse-quirks = ["ruma/unstable-synapse-quirks"] +markdown = ["ruma/markdown"] [dependencies] instant = { version = "0.1.9", features = ["wasm-bindgen", "now"] }