mirror
/
fractal
mirror of https://gitlab.gnome.org/World/fractal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

chore: Upgrade matrix-sdk, ruma and rqrr

fractal-9
Kévin Commaille 1 year ago
parent
f3d8673913
commit
f751d58ec5
No known key found for this signature in database
GPG Key ID: C971D9DBC9D678D
4 changed files with 135 additions and 163 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 275
      Cargo.lock
  2. 8
      Cargo.toml
  3. 4
      src/session/model/room/mod.rs
  4. 11
      src/session/view/content/room_details/history_viewer/event.rs

275
Cargo.lock generated
Unescape View File

@ -11,7 +11,7 @@ dependencies = [
"macroific", "macroific",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -116,16 +116,16 @@ checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c"
[[package]] [[package]]
name = "aquamarine" name = "aquamarine"
version = "0.5.0" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21cc1548309245035eb18aa7f0967da6bc65587005170c56e6ef2788a4cf3f4e" checksum = "0f50776554130342de4836ba542aa85a4ddb361690d7e8df13774d7284c3d5c2"
dependencies = [ dependencies = [
"include_dir", "include_dir",
"itertools 0.10.5", "itertools 0.10.5",
"proc-macro-error", "proc-macro-error2",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -151,9 +151,9 @@ checksum = "f38fa22307249f86fb7fad906fcae77f2564caeb56d7209103c551cd1cf4798f"
[[package]] [[package]]
name = "ashpd" name = "ashpd"
version = "0.9.1" version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" checksum = "4d43c03d9e36dd40cab48435be0b09646da362c278223ca535493877b2c1dee9"
dependencies = [ dependencies = [
"enumflags2", "enumflags2",
"futures-channel", "futures-channel",
@ -200,9 +200,9 @@ dependencies = [
[[package]] [[package]]
name = "async-compression" name = "async-compression"
version = "0.4.13" version = "0.4.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429" checksum = "e26a9844c659a2a293d239c7910b752f8487fe122c6c8bd1659bf85a6507c302"
dependencies = [ dependencies = [
"flate2", "flate2",
"futures-core", "futures-core",
@ -274,7 +274,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -324,7 +324,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -341,7 +341,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -466,9 +466,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
[[package]] [[package]]
name = "bindgen" name = "bindgen"
version = "0.69.4" version = "0.69.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
dependencies = [ dependencies = [
"annotate-snippets", "annotate-snippets",
"bitflags 2.6.0", "bitflags 2.6.0",
@ -482,7 +482,7 @@ dependencies = [
"regex", "regex",
"rustc-hash", "rustc-hash",
"shlex", "shlex",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -573,9 +573,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
[[package]] [[package]]
name = "bytemuck" name = "bytemuck"
version = "1.18.0" version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
[[package]] [[package]]
name = "byteorder" name = "byteorder"
@ -635,9 +635,9 @@ dependencies = [
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.1.28" version = "1.1.30"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945"
dependencies = [ dependencies = [
"jobserver", "jobserver",
"libc", "libc",
@ -894,7 +894,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -918,7 +918,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"strsim", "strsim",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -929,7 +929,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [ dependencies = [
"darling_core", "darling_core",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -987,7 +987,7 @@ dependencies = [
"macroific", "macroific",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -1011,33 +1011,33 @@ dependencies = [
[[package]] [[package]]
name = "derive_builder" name = "derive_builder"
version = "0.20.1" version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947"
dependencies = [ dependencies = [
"derive_builder_macro", "derive_builder_macro",
] ]
[[package]] [[package]]
name = "derive_builder_core" name = "derive_builder_core"
version = "0.20.1" version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
name = "derive_builder_macro" name = "derive_builder_macro"
version = "0.20.1" version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
dependencies = [ dependencies = [
"derive_builder_core", "derive_builder_core",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -1128,7 +1128,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -1247,7 +1247,7 @@ dependencies = [
"macroific", "macroific",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -1288,6 +1288,12 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "foldhash"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
[[package]] [[package]]
name = "foreign-types" name = "foreign-types"
version = "0.3.2" version = "0.3.2"
@ -1315,7 +1321,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -1470,7 +1476,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -1521,7 +1527,7 @@ dependencies = [
"g2poly", "g2poly",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -1666,9 +1672,9 @@ dependencies = [
[[package]] [[package]]
name = "gettext-rs" name = "gettext-rs"
version = "0.7.1" version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a6716b8a0db461a2720b850ba1623e5b69e4b1aa0224cf5e1fb23a0fe49e65c" checksum = "a44e92f7dc08430aca7ed55de161253a22276dfd69c5526e5c5e95d1f7cf338a"
dependencies = [ dependencies = [
"gettext-sys", "gettext-sys",
"locale_config", "locale_config",
@ -1676,9 +1682,9 @@ dependencies = [
[[package]] [[package]]
name = "gettext-sys" name = "gettext-sys"
version = "0.21.4" version = "0.22.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7b8797f28f2dabfbe2caadb6db4f7fd739e251b5ede0a2ba49e506071edcf67" checksum = "bb45773f5b8945f12aecd04558f545964f943dacda1b1155b3d738f5469ef661"
dependencies = [ dependencies = [
"cc", "cc",
"temp-dir", "temp-dir",
@ -1751,7 +1757,7 @@ dependencies = [
"proc-macro-crate", "proc-macro-crate",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -2220,7 +2226,7 @@ dependencies = [
"proc-macro-crate", "proc-macro-crate",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -2271,7 +2277,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
dependencies = [ dependencies = [
"ahash", "ahash",
"allocator-api2",
] ]
[[package]] [[package]]
@ -2279,6 +2284,11 @@ name = "hashbrown"
version = "0.15.0" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
dependencies = [
"allocator-api2",
"equivalent",
"foldhash",
]
[[package]] [[package]]
name = "hashlink" name = "hashlink"
@ -2342,7 +2352,7 @@ dependencies = [
"markup5ever", "markup5ever",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -2642,9 +2652,9 @@ dependencies = [
[[package]] [[package]]
name = "js-sys" name = "js-sys"
version = "0.3.70" version = "0.3.72"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
dependencies = [ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
@ -2921,11 +2931,11 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
[[package]] [[package]]
name = "lru" name = "lru"
version = "0.12.4" version = "0.12.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
dependencies = [ dependencies = [
"hashbrown 0.14.5", "hashbrown 0.15.0",
] ]
[[package]] [[package]]
@ -2954,7 +2964,7 @@ dependencies = [
"cfg-if", "cfg-if",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -2965,7 +2975,7 @@ checksum = "13198c120864097a565ccb3ff947672d969932b7975ebd4085732c9f09435e55"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -2978,7 +2988,7 @@ dependencies = [
"macroific_core", "macroific_core",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -3045,13 +3055,13 @@ dependencies = [
"proc-macro-error2", "proc-macro-error2",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
name = "matrix-sdk" name = "matrix-sdk"
version = "0.7.1" version = "0.7.1"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a12a46b77706bf9ff4f034c50668b06d079dd296#a12a46b77706bf9ff4f034c50668b06d079dd296" source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=ee4ef2eb539f25d69ea3582a80646e467adceafd#ee4ef2eb539f25d69ea3582a80646e467adceafd"
dependencies = [ dependencies = [
"anymap2", "anymap2",
"aquamarine", "aquamarine",
@ -3101,7 +3111,7 @@ dependencies = [
[[package]] [[package]]
name = "matrix-sdk-base" name = "matrix-sdk-base"
version = "0.7.0" version = "0.7.0"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a12a46b77706bf9ff4f034c50668b06d079dd296#a12a46b77706bf9ff4f034c50668b06d079dd296" source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=ee4ef2eb539f25d69ea3582a80646e467adceafd#ee4ef2eb539f25d69ea3582a80646e467adceafd"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"async-trait", "async-trait",
@ -3125,7 +3135,7 @@ dependencies = [
[[package]] [[package]]
name = "matrix-sdk-common" name = "matrix-sdk-common"
version = "0.7.0" version = "0.7.0"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a12a46b77706bf9ff4f034c50668b06d079dd296#a12a46b77706bf9ff4f034c50668b06d079dd296" source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=ee4ef2eb539f25d69ea3582a80646e467adceafd#ee4ef2eb539f25d69ea3582a80646e467adceafd"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"futures-core", "futures-core",
@ -3146,14 +3156,13 @@ dependencies = [
[[package]] [[package]]
name = "matrix-sdk-crypto" name = "matrix-sdk-crypto"
version = "0.7.2" version = "0.7.2"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a12a46b77706bf9ff4f034c50668b06d079dd296#a12a46b77706bf9ff4f034c50668b06d079dd296" source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=ee4ef2eb539f25d69ea3582a80646e467adceafd#ee4ef2eb539f25d69ea3582a80646e467adceafd"
dependencies = [ dependencies = [
"aes", "aes",
"as_variant", "as_variant",
"async-trait", "async-trait",
"bs58", "bs58",
"byteorder", "byteorder",
"cbc",
"cfg-if", "cfg-if",
"ctr", "ctr",
"eyeball", "eyeball",
@ -3187,7 +3196,7 @@ dependencies = [
[[package]] [[package]]
name = "matrix-sdk-indexeddb" name = "matrix-sdk-indexeddb"
version = "0.7.0" version = "0.7.0"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a12a46b77706bf9ff4f034c50668b06d079dd296#a12a46b77706bf9ff4f034c50668b06d079dd296" source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=ee4ef2eb539f25d69ea3582a80646e467adceafd#ee4ef2eb539f25d69ea3582a80646e467adceafd"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -3215,7 +3224,7 @@ dependencies = [
[[package]] [[package]]
name = "matrix-sdk-qrcode" name = "matrix-sdk-qrcode"
version = "0.7.1" version = "0.7.1"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a12a46b77706bf9ff4f034c50668b06d079dd296#a12a46b77706bf9ff4f034c50668b06d079dd296" source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=ee4ef2eb539f25d69ea3582a80646e467adceafd#ee4ef2eb539f25d69ea3582a80646e467adceafd"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"qrcode", "qrcode",
@ -3227,7 +3236,7 @@ dependencies = [
[[package]] [[package]]
name = "matrix-sdk-sqlite" name = "matrix-sdk-sqlite"
version = "0.7.1" version = "0.7.1"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a12a46b77706bf9ff4f034c50668b06d079dd296#a12a46b77706bf9ff4f034c50668b06d079dd296" source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=ee4ef2eb539f25d69ea3582a80646e467adceafd#ee4ef2eb539f25d69ea3582a80646e467adceafd"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"deadpool-sqlite", "deadpool-sqlite",
@ -3249,7 +3258,7 @@ dependencies = [
[[package]] [[package]]
name = "matrix-sdk-store-encryption" name = "matrix-sdk-store-encryption"
version = "0.7.0" version = "0.7.0"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a12a46b77706bf9ff4f034c50668b06d079dd296#a12a46b77706bf9ff4f034c50668b06d079dd296" source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=ee4ef2eb539f25d69ea3582a80646e467adceafd#ee4ef2eb539f25d69ea3582a80646e467adceafd"
dependencies = [ dependencies = [
"base64", "base64",
"blake3", "blake3",
@ -3268,7 +3277,7 @@ dependencies = [
[[package]] [[package]]
name = "matrix-sdk-ui" name = "matrix-sdk-ui"
version = "0.7.0" version = "0.7.0"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=a12a46b77706bf9ff4f034c50668b06d079dd296#a12a46b77706bf9ff4f034c50668b06d079dd296" source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=ee4ef2eb539f25d69ea3582a80646e467adceafd#ee4ef2eb539f25d69ea3582a80646e467adceafd"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"async-once-cell", "async-once-cell",
@ -3656,7 +3665,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -3827,7 +3836,7 @@ dependencies = [
"phf_shared 0.11.2", "phf_shared 0.11.2",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -3865,7 +3874,7 @@ checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -3991,30 +4000,6 @@ dependencies = [
"toml_edit", "toml_edit",
] ]
[[package]]
name = "proc-macro-error"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote",
"syn 1.0.109",
"version_check",
]
[[package]]
name = "proc-macro-error-attr"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
"proc-macro2",
"quote",
"version_check",
]
[[package]] [[package]]
name = "proc-macro-error-attr2" name = "proc-macro-error-attr2"
version = "2.0.0" version = "2.0.0"
@ -4038,9 +4023,9 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.86" version = "1.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@ -4065,7 +4050,7 @@ dependencies = [
"itertools 0.13.0", "itertools 0.13.0",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -4290,9 +4275,9 @@ dependencies = [
[[package]] [[package]]
name = "rqrr" name = "rqrr"
version = "0.7.1" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad0cd0432e6beb2f86aa4c8af1bb5edcf3c9bcb9d4836facc048664205458575" checksum = "48eaf9c75f2a8f231b09036c115a45a9845313f7faa6a39fa45a2a2bd06a27c7"
dependencies = [ dependencies = [
"g2p", "g2p",
"image", "image",
@ -4302,7 +4287,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma" name = "ruma"
version = "0.10.1" version = "0.10.1"
source = "git+https://github.com/ruma/ruma.git?rev=b1c9a32f26f7aa76e20f96dbbb113250ed979112#b1c9a32f26f7aa76e20f96dbbb113250ed979112" source = "git+https://github.com/ruma/ruma.git?rev=26165b23fc2ae9928c5497a21db3d31f4b44cc2a#26165b23fc2ae9928c5497a21db3d31f4b44cc2a"
dependencies = [ dependencies = [
"assign", "assign",
"js_int", "js_int",
@ -4319,7 +4304,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-client-api" name = "ruma-client-api"
version = "0.18.0" version = "0.18.0"
source = "git+https://github.com/ruma/ruma.git?rev=b1c9a32f26f7aa76e20f96dbbb113250ed979112#b1c9a32f26f7aa76e20f96dbbb113250ed979112" source = "git+https://github.com/ruma/ruma.git?rev=26165b23fc2ae9928c5497a21db3d31f4b44cc2a#26165b23fc2ae9928c5497a21db3d31f4b44cc2a"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"assign", "assign",
@ -4342,7 +4327,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-common" name = "ruma-common"
version = "0.13.0" version = "0.13.0"
source = "git+https://github.com/ruma/ruma.git?rev=b1c9a32f26f7aa76e20f96dbbb113250ed979112#b1c9a32f26f7aa76e20f96dbbb113250ed979112" source = "git+https://github.com/ruma/ruma.git?rev=26165b23fc2ae9928c5497a21db3d31f4b44cc2a#26165b23fc2ae9928c5497a21db3d31f4b44cc2a"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"base64", "base64",
@ -4374,7 +4359,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-events" name = "ruma-events"
version = "0.28.1" version = "0.28.1"
source = "git+https://github.com/ruma/ruma.git?rev=b1c9a32f26f7aa76e20f96dbbb113250ed979112#b1c9a32f26f7aa76e20f96dbbb113250ed979112" source = "git+https://github.com/ruma/ruma.git?rev=26165b23fc2ae9928c5497a21db3d31f4b44cc2a#26165b23fc2ae9928c5497a21db3d31f4b44cc2a"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"indexmap", "indexmap",
@ -4399,7 +4384,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-federation-api" name = "ruma-federation-api"
version = "0.9.0" version = "0.9.0"
source = "git+https://github.com/ruma/ruma.git?rev=b1c9a32f26f7aa76e20f96dbbb113250ed979112#b1c9a32f26f7aa76e20f96dbbb113250ed979112" source = "git+https://github.com/ruma/ruma.git?rev=26165b23fc2ae9928c5497a21db3d31f4b44cc2a#26165b23fc2ae9928c5497a21db3d31f4b44cc2a"
dependencies = [ dependencies = [
"http", "http",
"js_int", "js_int",
@ -4413,7 +4398,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-html" name = "ruma-html"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/ruma/ruma.git?rev=b1c9a32f26f7aa76e20f96dbbb113250ed979112#b1c9a32f26f7aa76e20f96dbbb113250ed979112" source = "git+https://github.com/ruma/ruma.git?rev=26165b23fc2ae9928c5497a21db3d31f4b44cc2a#26165b23fc2ae9928c5497a21db3d31f4b44cc2a"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"html5ever", "html5ever",
@ -4426,7 +4411,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-identifiers-validation" name = "ruma-identifiers-validation"
version = "0.9.5" version = "0.9.5"
source = "git+https://github.com/ruma/ruma.git?rev=b1c9a32f26f7aa76e20f96dbbb113250ed979112#b1c9a32f26f7aa76e20f96dbbb113250ed979112" source = "git+https://github.com/ruma/ruma.git?rev=26165b23fc2ae9928c5497a21db3d31f4b44cc2a#26165b23fc2ae9928c5497a21db3d31f4b44cc2a"
dependencies = [ dependencies = [
"js_int", "js_int",
"thiserror", "thiserror",
@ -4435,7 +4420,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-macros" name = "ruma-macros"
version = "0.13.0" version = "0.13.0"
source = "git+https://github.com/ruma/ruma.git?rev=b1c9a32f26f7aa76e20f96dbbb113250ed979112#b1c9a32f26f7aa76e20f96dbbb113250ed979112" source = "git+https://github.com/ruma/ruma.git?rev=26165b23fc2ae9928c5497a21db3d31f4b44cc2a#26165b23fc2ae9928c5497a21db3d31f4b44cc2a"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"once_cell", "once_cell",
@ -4444,14 +4429,14 @@ dependencies = [
"quote", "quote",
"ruma-identifiers-validation", "ruma-identifiers-validation",
"serde", "serde",
"syn 2.0.79", "syn",
"toml", "toml",
] ]
[[package]] [[package]]
name = "ruma-push-gateway-api" name = "ruma-push-gateway-api"
version = "0.9.0" version = "0.9.0"
source = "git+https://github.com/ruma/ruma.git?rev=b1c9a32f26f7aa76e20f96dbbb113250ed979112#b1c9a32f26f7aa76e20f96dbbb113250ed979112" source = "git+https://github.com/ruma/ruma.git?rev=26165b23fc2ae9928c5497a21db3d31f4b44cc2a#26165b23fc2ae9928c5497a21db3d31f4b44cc2a"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@ -4519,15 +4504,15 @@ dependencies = [
[[package]] [[package]]
name = "rustls-pki-types" name = "rustls-pki-types"
version = "1.9.0" version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
[[package]] [[package]]
name = "rustversion" name = "rustversion"
version = "1.0.17" version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
[[package]] [[package]]
name = "ryu" name = "ryu"
@ -4625,7 +4610,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -4671,7 +4656,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -4783,9 +4768,9 @@ dependencies = [
[[package]] [[package]]
name = "sourceview5" name = "sourceview5"
version = "0.9.0" version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "905c83b38d4aff1800a12adba65b083deba61b4d948f62fc2ff7ad7d77656d05" checksum = "f0e07d99b15f12767aa1c84870c45667f42bf24fd6a989dc70088e32854ef56e"
dependencies = [ dependencies = [
"futures-channel", "futures-channel",
"futures-core", "futures-core",
@ -4889,7 +4874,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"rustversion", "rustversion",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -4898,16 +4883,6 @@ version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "syn"
version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
"proc-macro2",
"unicode-ident",
]
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.79" version = "2.0.79"
@ -5007,7 +4982,7 @@ checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -5102,7 +5077,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -5234,7 +5209,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -5437,9 +5412,9 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]] [[package]]
name = "vodozemac" name = "vodozemac"
version = "0.8.0" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd7761890811f1dfe2ebef5e630add0a98597682ebf4e4477d98fb8d2e9172ac" checksum = "dd4b56780b7827dd72c3c6398c3048752bebf8d1d84ec19b606b15dbc3c850b8"
dependencies = [ dependencies = [
"aes", "aes",
"arrayvec", "arrayvec",
@ -5482,9 +5457,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]] [[package]]
name = "wasm-bindgen" name = "wasm-bindgen"
version = "0.2.93" version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"once_cell", "once_cell",
@ -5493,24 +5468,24 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-backend" name = "wasm-bindgen-backend"
version = "0.2.93" version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"log", "log",
"once_cell", "once_cell",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
[[package]] [[package]]
name = "wasm-bindgen-futures" name = "wasm-bindgen-futures"
version = "0.4.43" version = "0.4.45"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"js-sys", "js-sys",
@ -5520,9 +5495,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-macro" name = "wasm-bindgen-macro"
version = "0.2.93" version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
dependencies = [ dependencies = [
"quote", "quote",
"wasm-bindgen-macro-support", "wasm-bindgen-macro-support",
@ -5530,22 +5505,22 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-macro-support" name = "wasm-bindgen-macro-support"
version = "0.2.93" version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
"wasm-bindgen-backend", "wasm-bindgen-backend",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
[[package]] [[package]]
name = "wasm-bindgen-shared" name = "wasm-bindgen-shared"
version = "0.2.93" version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
[[package]] [[package]]
name = "wasm-streams" name = "wasm-streams"
@ -5562,9 +5537,9 @@ dependencies = [
[[package]] [[package]]
name = "web-sys" name = "web-sys"
version = "0.3.70" version = "0.3.72"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
dependencies = [ dependencies = [
"js-sys", "js-sys",
"wasm-bindgen", "wasm-bindgen",
@ -5838,7 +5813,7 @@ dependencies = [
"proc-macro-crate", "proc-macro-crate",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
"zvariant_utils", "zvariant_utils",
] ]
@ -5871,7 +5846,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -5891,7 +5866,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]
[[package]] [[package]]
@ -5917,7 +5892,7 @@ dependencies = [
"proc-macro-crate", "proc-macro-crate",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
"zvariant_utils", "zvariant_utils",
] ]
@ -5929,5 +5904,5 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn",
] ]

8
Cargo.toml
Unescape View File

@ -37,7 +37,7 @@ qrcode = "0.14"
rand = "0.8" rand = "0.8"
regex = "1" regex = "1"
rmp-serde = "1" rmp-serde = "1"
rqrr = "0.7" rqrr = "0.8"
secular = { version = "1", features = ["bmp", "normalization"] } secular = { version = "1", features = ["bmp", "normalization"] }
serde = "1" serde = "1"
serde_json = "1" serde_json = "1"
@ -67,7 +67,7 @@ sourceview = { package = "sourceview5", version = "0.9" }
[dependencies.matrix-sdk] [dependencies.matrix-sdk]
git = "https://github.com/matrix-org/matrix-rust-sdk.git" git = "https://github.com/matrix-org/matrix-rust-sdk.git"
rev = "a12a46b77706bf9ff4f034c50668b06d079dd296" rev = "ee4ef2eb539f25d69ea3582a80646e467adceafd"
features = [ features = [
"socks", "socks",
"sso-login", "sso-login",
@ -77,12 +77,12 @@ features = [
[dependencies.matrix-sdk-ui] [dependencies.matrix-sdk-ui]
git = "https://github.com/matrix-org/matrix-rust-sdk.git" git = "https://github.com/matrix-org/matrix-rust-sdk.git"
rev = "a12a46b77706bf9ff4f034c50668b06d079dd296" rev = "ee4ef2eb539f25d69ea3582a80646e467adceafd"
[dependencies.ruma] [dependencies.ruma]
# version = "0.10" # version = "0.10"
git = "https://github.com/ruma/ruma.git" git = "https://github.com/ruma/ruma.git"
rev = "b1c9a32f26f7aa76e20f96dbbb113250ed979112" rev = "26165b23fc2ae9928c5497a21db3d31f4b44cc2a"
features = [ features = [
"unstable-unspecified", "unstable-unspecified",
"client-api-c", "client-api-c",

4
src/session/model/room/mod.rs
Unescape View File

@ -550,7 +550,7 @@ mod imp {
self.set_up_typing(); self.set_up_typing();
} }
RoomState::Left => {} RoomState::Left | RoomState::Knocked => {}
RoomState::Invited => { RoomState::Invited => {
spawn!( spawn!(
glib::Priority::DEFAULT_IDLE, glib::Priority::DEFAULT_IDLE,
@ -598,7 +598,7 @@ mod imp {
} }
} }
RoomState::Invited => RoomCategory::Invited, RoomState::Invited => RoomCategory::Invited,
RoomState::Left => RoomCategory::Left, RoomState::Left | RoomState::Knocked => RoomCategory::Left,
}; };
self.set_category(category); self.set_category(category);

11
src/session/view/content/room_details/history_viewer/event.rs
Unescape View File

@ -5,7 +5,7 @@ use matrix_sdk::deserialized_responses::TimelineEvent;
use ruma::{ use ruma::{
events::{ events::{
room::message::{MessageType, OriginalSyncRoomMessageEvent, Relation}, room::message::{MessageType, OriginalSyncRoomMessageEvent, Relation},
AnySyncMessageLikeEvent, AnyTimelineEvent, SyncMessageLikeEvent, AnySyncMessageLikeEvent, AnySyncTimelineEvent, SyncMessageLikeEvent,
}, },
OwnedEventId, OwnedEventId,
}; };
@ -89,12 +89,9 @@ impl HistoryViewerEvent {
/// Constructs a new `HistoryViewerEvent` with the given event, if it is /// Constructs a new `HistoryViewerEvent` with the given event, if it is
/// viewable in one of the history viewers. /// viewable in one of the history viewers.
pub fn try_new(room: &Room, event: TimelineEvent) -> Option<Self> { pub fn try_new(room: &Room, event: TimelineEvent) -> Option<Self> {
let Ok(AnyTimelineEvent::MessageLike(message_like_event)) = event.event.deserialize() let Ok(AnySyncTimelineEvent::MessageLike(AnySyncMessageLikeEvent::RoomMessage(
else { SyncMessageLikeEvent::Original(mut message_event),
return None; ))) = event.raw().deserialize()
};
let AnySyncMessageLikeEvent::RoomMessage(SyncMessageLikeEvent::Original(mut message_event)) =
message_like_event.into()
else { else {
return None; return None;
}; };

Write Preview
Loading…
Cancel
Save