From a005dfea72478eba6dfd033be6db15430fc30ae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Tue, 11 Feb 2025 12:18:14 +0100 Subject: [PATCH] chore: Upgrade matrix-sdk --- Cargo.lock | 239 +++++++++++-------- Cargo.toml | 12 +- src/session/model/room/timeline/event/mod.rs | 2 +- 3 files changed, 142 insertions(+), 111 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4072a56e..74dc2957 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -59,7 +59,7 @@ dependencies = [ "cfg-if", "once_cell", "version_check", - "zerocopy", + "zerocopy 0.7.35", ] [[package]] @@ -164,13 +164,13 @@ dependencies = [ "enumflags2", "futures-channel", "futures-util", - "rand", + "rand 0.8.5", "serde", "serde_repr", "tokio", "tracing", "url", - "zbus 5.3.1", + "zbus 5.5.0", ] [[package]] @@ -443,7 +443,7 @@ dependencies = [ "getrandom 0.2.15", "instant", "pin-project-lite", - "rand", + "rand 0.8.5", "tokio", ] @@ -580,9 +580,9 @@ checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9" [[package]] name = "bytesize" -version = "1.3.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" +checksum = "2d2c12f985c78475a6b8d629afd0c360260ef34cfef52efccdcfd31972f81c2e" [[package]] name = "cairo-rs" @@ -618,9 +618,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.12" +version = "1.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "755717a7de9ec452bf7f3f1a3099085deabd7f2962b861dae91ecd7a365903d2" +checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda" dependencies = [ "jobserver", "libc", @@ -772,7 +772,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core", + "rand_core 0.6.4", "typenum", ] @@ -1035,7 +1035,7 @@ checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek", "ed25519", - "rand_core", + "rand_core 0.6.4", "serde", "sha2", "subtle", @@ -1144,8 +1144,7 @@ dependencies = [ [[package]] name = "eyeball" version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93bd0ebf93d61d6332d3c09a96e97975968a44e19a64c947bde06e6baff383f" +source = "git+https://github.com/jplatte/eyeball?branch=main#b4ca8997db0ee3767bbc08a2aec788cac05c55ac" dependencies = [ "futures-core", "readlock", @@ -1158,8 +1157,7 @@ dependencies = [ [[package]] name = "eyeball-im" version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad276eb017655257443d34f27455f60e8b02b839c6ebcaa8d6f06cc498784e8f" +source = "git+https://github.com/jplatte/eyeball?branch=main#b4ca8997db0ee3767bbc08a2aec788cac05c55ac" dependencies = [ "futures-core", "imbl", @@ -1170,8 +1168,7 @@ dependencies = [ [[package]] name = "eyeball-im-util" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac7f06ce388e4f64876ad3836b275d0972ab64ae8bd8456862d5ebdb7bec4f5" +source = "git+https://github.com/jplatte/eyeball?branch=main#b4ca8997db0ee3767bbc08a2aec788cac05c55ac" dependencies = [ "arrayvec", "eyeball-im", @@ -1333,7 +1330,7 @@ dependencies = [ "oo7", "pulldown-cmark", "qrcode", - "rand", + "rand 0.8.5", "regex", "rmp-serde", "ruma", @@ -2542,7 +2539,7 @@ checksum = "5ae128b3bc67ed43ec0a7bb1c337a9f026717628b3c4033f07ded1da3e854951" dependencies = [ "bitmaps", "imbl-sized-chunks", - "rand_core", + "rand_core 0.6.4", "rand_xoshiro", "serde", "version_check", @@ -3066,8 +3063,7 @@ dependencies = [ [[package]] name = "matrix-sdk" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27119e566a60f5681eb8d05f51ef10862dd9af611ac6c6e0dc9aa9bf3bcc493" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=69588d52660dc71d18e5b17fa2fab429ead6e00f#69588d52660dc71d18e5b17fa2fab429ead6e00f" dependencies = [ "anymap2", "aquamarine", @@ -3099,7 +3095,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rand", + "rand 0.8.5", "reqwest", "ruma", "serde", @@ -3121,8 +3117,7 @@ dependencies = [ [[package]] name = "matrix-sdk-base" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58884b338e0c2eb4aa09d63ba2a5937fb5bd691525884f09935900137fc6b908" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=69588d52660dc71d18e5b17fa2fab429ead6e00f#69588d52660dc71d18e5b17fa2fab429ead6e00f" dependencies = [ "as_variant", "async-trait", @@ -3149,8 +3144,7 @@ dependencies = [ [[package]] name = "matrix-sdk-common" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "072d77e461933834e12810d63906409f37a039acad31a16dda62b63e1f4c31cf" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=69588d52660dc71d18e5b17fa2fab429ead6e00f#69588d52660dc71d18e5b17fa2fab429ead6e00f" dependencies = [ "async-trait", "eyeball-im", @@ -3173,8 +3167,7 @@ dependencies = [ [[package]] name = "matrix-sdk-crypto" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed1ec9d645eb86630b2ed71e5890565ca023f569d9d0ebdcb25bfca8a088c2f3" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=69588d52660dc71d18e5b17fa2fab429ead6e00f#69588d52660dc71d18e5b17fa2fab429ead6e00f" dependencies = [ "aes", "aquamarine", @@ -3194,7 +3187,7 @@ dependencies = [ "matrix-sdk-common", "matrix-sdk-qrcode", "pbkdf2", - "rand", + "rand 0.8.5", "rmp-serde", "ruma", "serde", @@ -3215,8 +3208,7 @@ dependencies = [ [[package]] name = "matrix-sdk-indexeddb" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da30f51dbfcd03297a04f49f92c365a41cb2b012ad3338c0fc5d4efafcbff88b" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=69588d52660dc71d18e5b17fa2fab429ead6e00f#69588d52660dc71d18e5b17fa2fab429ead6e00f" dependencies = [ "anyhow", "async-trait", @@ -3244,8 +3236,7 @@ dependencies = [ [[package]] name = "matrix-sdk-qrcode" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8f4e04831155ac4cbc85413b3b729509ff82c472c98c586ce0dfb58f2486adf" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=69588d52660dc71d18e5b17fa2fab429ead6e00f#69588d52660dc71d18e5b17fa2fab429ead6e00f" dependencies = [ "byteorder", "qrcode", @@ -3257,8 +3248,7 @@ dependencies = [ [[package]] name = "matrix-sdk-sqlite" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d07fb4e87c6ace1d05a87a91404acc3fd0b480ba9de75c08685ed18f1ea79f" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=69588d52660dc71d18e5b17fa2fab429ead6e00f#69588d52660dc71d18e5b17fa2fab429ead6e00f" dependencies = [ "async-trait", "deadpool-sqlite", @@ -3280,15 +3270,14 @@ dependencies = [ [[package]] name = "matrix-sdk-store-encryption" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc8b6650757f953664e5f906988690cef05c09d83081946adce446c45810a2d" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=69588d52660dc71d18e5b17fa2fab429ead6e00f#69588d52660dc71d18e5b17fa2fab429ead6e00f" dependencies = [ "base64", "blake3", "chacha20poly1305", "hmac", "pbkdf2", - "rand", + "rand 0.8.5", "rmp-serde", "serde", "serde_json", @@ -3300,8 +3289,7 @@ dependencies = [ [[package]] name = "matrix-sdk-ui" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd920b17166568db6391b09d86333e80c4ea4b24e8911a9ad57a473326175b6" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=69588d52660dc71d18e5b17fa2fab429ead6e00f#69588d52660dc71d18e5b17fa2fab429ead6e00f" dependencies = [ "as_variant", "async-once-cell", @@ -3499,7 +3487,7 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand", + "rand 0.8.5", "serde", "smallvec", "zeroize", @@ -3610,9 +3598,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.2" +version = "1.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" [[package]] name = "oo7" @@ -3625,7 +3613,7 @@ dependencies = [ "num", "num-bigint-dig", "openssl", - "rand", + "rand 0.8.5", "serde", "tokio", "tracing", @@ -3811,7 +3799,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" dependencies = [ "phf_shared", - "rand", + "rand 0.8.5", ] [[package]] @@ -3913,7 +3901,7 @@ version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" dependencies = [ - "zerocopy", + "zerocopy 0.7.35", ] [[package]] @@ -4025,8 +4013,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", - "rand_core", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.0", + "zerocopy 0.8.17", ] [[package]] @@ -4036,7 +4035,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.0", ] [[package]] @@ -4048,13 +4057,23 @@ dependencies = [ "getrandom 0.2.15", ] +[[package]] +name = "rand_core" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b08f3c9802962f7e1b25113931d94f43ed9725bebc59db9d0c3e9a23b67e15ff" +dependencies = [ + "getrandom 0.3.1", + "zerocopy 0.8.17", +] + [[package]] name = "rand_xoshiro" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" dependencies = [ - "rand_core", + "rand_core 0.6.4", ] [[package]] @@ -4276,7 +4295,7 @@ dependencies = [ "js_int", "konst", "percent-encoding", - "rand", + "rand 0.8.5", "regex", "ruma-identifiers-validation", "ruma-macros", @@ -4678,7 +4697,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ - "rand_core", + "rand_core 0.6.4", ] [[package]] @@ -5119,9 +5138,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" dependencies = [ "serde", "serde_spanned", @@ -5140,15 +5159,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.23" +version = "0.22.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee" +checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.7.1", + "winnow", ] [[package]] @@ -5281,11 +5300,11 @@ dependencies = [ [[package]] name = "ulid" -version = "1.1.4" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f294bff79170ed1c5633812aff1e565c35d993a36e757f9bc0accf5eec4e6045" +checksum = "ab82fc73182c29b02e2926a6df32f2241dbadb5cfc111fd595515b3598f46bb3" dependencies = [ - "rand", + "rand 0.9.0", "web-time", ] @@ -5376,11 +5395,12 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "uuid" -version = "1.12.1" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3758f5e68192bb96cc8f9b7e2c2cfdabb435499a28499a42f8f984092adad4b" +checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.3.1", + "js-sys", "wasm-bindgen", ] @@ -5427,7 +5447,7 @@ dependencies = [ "hmac", "matrix-pickle", "prost", - "rand", + "rand 0.8.5", "serde", "serde_bytes", "serde_json", @@ -5726,18 +5746,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e90edd2ac1aa278a5c4599b1d89cf03074b610800f866d4026dc199d7929a28" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86e376c75f4f43f44db463cf729e0d3acbf954d13e22c51e26e4c264b4ab545f" +checksum = "59690dea168f2198d1a3b0cac23b8063efcd11012f10ae4698f284808c8ef603" dependencies = [ "memchr", ] @@ -5770,7 +5781,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek", - "rand_core", + "rand_core 0.6.4", "serde", "zeroize", ] @@ -5844,7 +5855,7 @@ dependencies = [ "hex", "nix", "ordered-stream", - "rand", + "rand 0.8.5", "serde", "serde_repr", "sha1", @@ -5861,9 +5872,9 @@ dependencies = [ [[package]] name = "zbus" -version = "5.3.1" +version = "5.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2494e4b3f44d8363eef79a8a75fc0649efb710eef65a66b5e688a5eb4afe678a" +checksum = "59c333f648ea1b647bc95dc1d34807c8e25ed7a6feff3394034dc4776054b236" dependencies = [ "async-broadcast", "async-recursion", @@ -5871,7 +5882,7 @@ dependencies = [ "enumflags2", "event-listener", "futures-core", - "futures-util", + "futures-lite", "hex", "nix", "ordered-stream", @@ -5882,11 +5893,11 @@ dependencies = [ "tracing", "uds_windows", "windows-sys 0.59.0", - "winnow 0.6.26", + "winnow", "xdg-home", - "zbus_macros 5.3.1", - "zbus_names 4.1.1", - "zvariant 5.2.0", + "zbus_macros 5.5.0", + "zbus_names 4.2.0", + "zvariant 5.4.0", ] [[package]] @@ -5904,17 +5915,17 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "5.3.1" +version = "5.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445efc01929302aee95e2b25bbb62a301ea8a6369466e4278e58e7d1dfb23631" +checksum = "f325ad10eb0d0a3eb060203494c3b7ec3162a01a59db75d2deee100339709fc0" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", "syn", - "zbus_names 4.1.1", - "zvariant 5.2.0", - "zvariant_utils 3.1.0", + "zbus_names 4.2.0", + "zvariant 5.4.0", + "zvariant_utils 3.2.0", ] [[package]] @@ -5930,14 +5941,14 @@ dependencies = [ [[package]] name = "zbus_names" -version = "4.1.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "519629a3f80976d89c575895b05677cbc45eaf9f70d62a364d819ba646409cc8" +checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97" dependencies = [ "serde", "static_assertions", - "winnow 0.6.26", - "zvariant 5.2.0", + "winnow", + "zvariant 5.4.0", ] [[package]] @@ -5947,7 +5958,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "byteorder", - "zerocopy-derive", + "zerocopy-derive 0.7.35", +] + +[[package]] +name = "zerocopy" +version = "0.8.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa91407dacce3a68c56de03abe2760159582b846c6a4acd2f456618087f12713" +dependencies = [ + "zerocopy-derive 0.8.17", ] [[package]] @@ -5961,6 +5981,17 @@ dependencies = [ "syn", ] +[[package]] +name = "zerocopy-derive" +version = "0.8.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06718a168365cad3d5ff0bb133aad346959a2074bd4a85c121255a11304a8626" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "zerofrom" version = "0.1.5" @@ -6039,18 +6070,18 @@ dependencies = [ [[package]] name = "zvariant" -version = "5.2.0" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55e6b9b5f1361de2d5e7d9fd1ee5f6f7fcb6060618a1f82f3472f58f2b8d4be9" +checksum = "b2df9ee044893fcffbdc25de30546edef3e32341466811ca18421e3cd6c5a3ac" dependencies = [ "endi", "enumflags2", "serde", "static_assertions", "url", - "winnow 0.6.26", - "zvariant_derive 5.2.0", - "zvariant_utils 3.1.0", + "winnow", + "zvariant_derive 5.4.0", + "zvariant_utils 3.2.0", ] [[package]] @@ -6068,15 +6099,15 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "5.2.0" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573a8dd76961957108b10f7a45bac6ab1ea3e9b7fe01aff88325dc57bb8f5c8b" +checksum = "74170caa85b8b84cc4935f2d56a57c7a15ea6185ccdd7eadb57e6edd90f94b2f" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", "syn", - "zvariant_utils 3.1.0", + "zvariant_utils 3.2.0", ] [[package]] @@ -6092,14 +6123,14 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd46446ea2a1f353bfda53e35f17633afa79f4fe290a611c94645c69fe96a50" +checksum = "e16edfee43e5d7b553b77872d99bc36afdda75c223ca7ad5e3fbecd82ca5fc34" dependencies = [ "proc-macro2", "quote", "serde", "static_assertions", "syn", - "winnow 0.6.26", + "winnow", ] diff --git a/Cargo.toml b/Cargo.toml index d614a94d..c404e4d6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -65,9 +65,9 @@ shumate = { package = "libshumate", version = "0.6" } sourceview = { package = "sourceview5", version = "0.9" } [dependencies.matrix-sdk] -version = "0.10" -# git = "https://github.com/matrix-org/matrix-rust-sdk.git" -# rev = "66ffc3448ee17e263311c3d4747d779cc79a904d" +# version = "0.10" +git = "https://github.com/matrix-org/matrix-rust-sdk.git" +rev = "69588d52660dc71d18e5b17fa2fab429ead6e00f" features = [ "socks", "sso-login", @@ -76,9 +76,9 @@ features = [ ] [dependencies.matrix-sdk-ui] -version = "0.10" -# git = "https://github.com/matrix-org/matrix-rust-sdk.git" -# rev = "66ffc3448ee17e263311c3d4747d779cc79a904d" +# version = "0.10" +git = "https://github.com/matrix-org/matrix-rust-sdk.git" +rev = "69588d52660dc71d18e5b17fa2fab429ead6e00f" [dependencies.ruma] version = "0.12.1" diff --git a/src/session/model/room/timeline/event/mod.rs b/src/session/model/room/timeline/event/mod.rs index 4d8c2bfd..4e4409e9 100644 --- a/src/session/model/room/timeline/event/mod.rs +++ b/src/session/model/room/timeline/event/mod.rs @@ -205,7 +205,7 @@ mod imp { let item = Arc::new(item); let prev_item = self.item.replace(Some(item.clone())); - self.reactions.update(item.reactions()); + self.reactions.update(&item.content().reactions()); self.update_read_receipts(item.read_receipts()); let prev_source = prev_item.as_ref().and_then(|i| i.original_json());