Browse Source

Upgrade matrix-sdk

And run cargo update.
fractal-12
Kévin Commaille 9 months ago committed by Kévin Commaille
parent
commit
591026c65c
  1. 216
      Cargo.lock
  2. 24
      Cargo.toml
  3. 8
      src/session/model/room/join_rule.rs
  4. 6
      src/session/view/content/room_history/message_toolbar/composer_state.rs

216
Cargo.lock generated

@ -205,9 +205,9 @@ dependencies = [
[[package]]
name = "async-compression"
version = "0.4.24"
version = "0.4.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d615619615a650c571269c00dca41db04b9210037fa76ed8239f70404ab56985"
checksum = "40f6024f3f856663b45fd0c9b6f2024034a702f453549449e0d84a305900dad4"
dependencies = [
"flate2",
"futures-core",
@ -290,9 +290,9 @@ checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c"
[[package]]
name = "autocfg"
version = "1.4.0"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
[[package]]
name = "axum"
@ -478,9 +478,9 @@ dependencies = [
[[package]]
name = "bumpalo"
version = "3.18.1"
version = "3.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee"
checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
[[package]]
name = "bytemuck"
@ -508,9 +508,9 @@ checksum = "a3c8f83209414aacf0eeae3cf730b18d6981697fba62f200fcfb92b9f082acba"
[[package]]
name = "cairo-rs"
version = "0.20.10"
version = "0.20.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b58e62a27cd02fb3f63f82bb31fdda7e6c43141497cbe97e8816d7c914043f55"
checksum = "91e3bd0f4e25afa9cabc157908d14eeef9067d6448c49414d17b3fb55f0eadd0"
dependencies = [
"bitflags 2.9.1",
"cairo-sys-rs",
@ -540,9 +540,9 @@ dependencies = [
[[package]]
name = "cc"
version = "1.2.26"
version = "1.2.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "956a5e21988b87f372569b66183b78babf23ebc2e744b733e4350a752c4dafac"
checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc"
dependencies = [
"jobserver",
"libc",
@ -1044,12 +1044,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
[[package]]
name = "errno"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
dependencies = [
"libc",
"windows-sys 0.59.0",
"windows-sys 0.60.2",
]
[[package]]
@ -1517,7 +1517,7 @@ dependencies = [
"cfg-if",
"js-sys",
"libc",
"wasi 0.11.0+wasi-snapshot-preview1",
"wasi 0.11.1+wasi-snapshot-preview1",
"wasm-bindgen",
]
@ -1561,9 +1561,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
[[package]]
name = "gio"
version = "0.20.11"
version = "0.20.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2a5c3829f5794cb15120db87707b2ec03720edff7ad09eb7b711b532e3fe747"
checksum = "8e27e276e7b6b8d50f6376ee7769a71133e80d093bdc363bd0af71664228b831"
dependencies = [
"futures-channel",
"futures-core",
@ -1591,9 +1591,9 @@ dependencies = [
[[package]]
name = "glib"
version = "0.20.10"
version = "0.20.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c501c495842c2b23cdacead803a5a343ca2a5d7a7ddaff14cc5f6cf22cfb92c2"
checksum = "ffc4b6e352d4716d84d7dde562dd9aee2a7d48beb872dd9ece7f2d1515b2d683"
dependencies = [
"bitflags 2.9.1",
"futures-channel",
@ -1612,9 +1612,9 @@ dependencies = [
[[package]]
name = "glib-macros"
version = "0.20.10"
version = "0.20.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebe6dc9ce29887c4b3b74d78d5ba473db160a258ae7ed883d23632ac7fed7bc9"
checksum = "e8084af62f09475a3f529b1629c10c429d7600ee1398ae12dd3bf175d74e7145"
dependencies = [
"heck",
"proc-macro-crate",
@ -1793,9 +1793,9 @@ dependencies = [
[[package]]
name = "gstreamer"
version = "0.23.6"
version = "0.23.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50ab4c88f731596a2511a6f14cabdd666e0d8efab62a1d58e6ddb57faa96e22e"
checksum = "8757a87f3706560037a01a9f06a59fcc7bdb0864744dcf73546606e60c4316e1"
dependencies = [
"cfg-if",
"futures-channel",
@ -2003,9 +2003,9 @@ dependencies = [
[[package]]
name = "gtk4"
version = "0.9.6"
version = "0.9.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af1c491051f030994fd0cde6f3c44f3f5640210308cff1298c7673c47408091d"
checksum = "f274dd0102c21c47bbfa8ebcb92d0464fab794a22fad6c3f3d5f165139a326d6"
dependencies = [
"cairo-rs",
"field-offset",
@ -2122,9 +2122,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]]
name = "hermit-abi"
version = "0.5.1"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
[[package]]
name = "hex"
@ -2484,9 +2484,9 @@ dependencies = [
[[package]]
name = "indexmap"
version = "2.9.0"
version = "2.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
dependencies = [
"equivalent",
"hashbrown",
@ -2545,9 +2545,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
[[package]]
name = "jiff"
version = "0.2.14"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a194df1107f33c79f4f93d02c80798520551949d59dfad22b6157048a88cca93"
checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
dependencies = [
"jiff-static",
"log",
@ -2558,9 +2558,9 @@ dependencies = [
[[package]]
name = "jiff-static"
version = "0.2.14"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c6e1db7ed32c6c71b759497fae34bf7933636f75a251b9e736555da426f6442"
checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
dependencies = [
"proc-macro2",
"quote",
@ -2696,9 +2696,9 @@ dependencies = [
[[package]]
name = "libc"
version = "0.2.172"
version = "0.2.174"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
[[package]]
name = "libloading"
@ -2707,7 +2707,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
dependencies = [
"cfg-if",
"windows-targets 0.53.0",
"windows-targets 0.53.2",
]
[[package]]
@ -2984,8 +2984,7 @@ dependencies = [
[[package]]
name = "matrix-sdk"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db49400625f35b6dc7933886c016d3858310330773164eb9613c409b94df951d"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=115c7578d4c3cba68f5bb422e4ecc96817539b0d#115c7578d4c3cba68f5bb422e4ecc96817539b0d"
dependencies = [
"anymap2",
"aquamarine",
@ -3042,8 +3041,7 @@ dependencies = [
[[package]]
name = "matrix-sdk-base"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd248e900e1461d4cfba7c145275dd1fdfcaec1fb84205efb1f866a3d3defae9"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=115c7578d4c3cba68f5bb422e4ecc96817539b0d#115c7578d4c3cba68f5bb422e4ecc96817539b0d"
dependencies = [
"as_variant",
"async-trait",
@ -3070,8 +3068,7 @@ dependencies = [
[[package]]
name = "matrix-sdk-common"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df1029695dcc9f5c343e76a02824d679e32264928e1a202481430add2991b6c0"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=115c7578d4c3cba68f5bb422e4ecc96817539b0d#115c7578d4c3cba68f5bb422e4ecc96817539b0d"
dependencies = [
"eyeball-im",
"futures-core",
@ -3094,8 +3091,7 @@ dependencies = [
[[package]]
name = "matrix-sdk-crypto"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46a2d75518e77b54d5aa2d0a5f49c4efb534dd580dca07f50e62b74cbbca77b1"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=115c7578d4c3cba68f5bb422e4ecc96817539b0d#115c7578d4c3cba68f5bb422e4ecc96817539b0d"
dependencies = [
"aes",
"aquamarine",
@ -3136,8 +3132,7 @@ dependencies = [
[[package]]
name = "matrix-sdk-indexeddb"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6d3d7f2a4daea5100b45d82d2e62dd2f9e82f69e12af01838104460bd9955b6"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=115c7578d4c3cba68f5bb422e4ecc96817539b0d#115c7578d4c3cba68f5bb422e4ecc96817539b0d"
dependencies = [
"anyhow",
"async-trait",
@ -3165,8 +3160,7 @@ dependencies = [
[[package]]
name = "matrix-sdk-qrcode"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6ba86b8f305339c84c5749551e32cdce042de852def1c521ea4b79c6795dafb"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=115c7578d4c3cba68f5bb422e4ecc96817539b0d#115c7578d4c3cba68f5bb422e4ecc96817539b0d"
dependencies = [
"byteorder",
"qrcode",
@ -3178,8 +3172,7 @@ dependencies = [
[[package]]
name = "matrix-sdk-sqlite"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37f77f16f181c892ac3c64d71005e650f0607c2a625453d5f40fb2810ed219f0"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=115c7578d4c3cba68f5bb422e4ecc96817539b0d#115c7578d4c3cba68f5bb422e4ecc96817539b0d"
dependencies = [
"as_variant",
"async-trait",
@ -3203,8 +3196,7 @@ dependencies = [
[[package]]
name = "matrix-sdk-store-encryption"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "773f6c701ef4ff241dd19fd5d6999f68f86d5438903398f33b1f524da0c3ac99"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=115c7578d4c3cba68f5bb422e4ecc96817539b0d#115c7578d4c3cba68f5bb422e4ecc96817539b0d"
dependencies = [
"base64",
"blake3",
@ -3223,8 +3215,7 @@ dependencies = [
[[package]]
name = "matrix-sdk-ui"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb62755e650e35b0e61f724f3f71240711c4ccffdccf7f78cfa37ca9898eea42"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=115c7578d4c3cba68f5bb422e4ecc96817539b0d#115c7578d4c3cba68f5bb422e4ecc96817539b0d"
dependencies = [
"as_variant",
"async-rx",
@ -3262,9 +3253,9 @@ dependencies = [
[[package]]
name = "memchr"
version = "2.7.4"
version = "2.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
[[package]]
name = "memfd"
@ -3331,7 +3322,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
dependencies = [
"libc",
"wasi 0.11.0+wasi-snapshot-preview1",
"wasi 0.11.1+wasi-snapshot-preview1",
"windows-sys 0.59.0",
]
@ -3658,9 +3649,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "pango"
version = "0.20.10"
version = "0.20.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d88d37c161f2848f0d9382597f0168484c9335ac800995f3956641abb7002938"
checksum = "6576b311f6df659397043a5fa8a021da8f72e34af180b44f7d57348de691ab5c"
dependencies = [
"gio",
"glib",
@ -3965,9 +3956,9 @@ dependencies = [
[[package]]
name = "r-efi"
version = "5.2.0"
version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
[[package]]
name = "rand"
@ -4054,9 +4045,9 @@ dependencies = [
[[package]]
name = "redox_syscall"
version = "0.5.12"
version = "0.5.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6"
dependencies = [
"bitflags 2.9.1",
]
@ -4107,9 +4098,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "reqwest"
version = "0.12.19"
version = "0.12.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2f8e5513d63f2e5b386eb5106dc67eaf3f84e95258e210489136b8b92ad6119"
checksum = "eabf4c97d9130e2bf606614eb937e86edac8292eaa6f422f995d7e8de1eb1813"
dependencies = [
"async-compression",
"base64",
@ -4124,12 +4115,9 @@ dependencies = [
"hyper-rustls",
"hyper-tls",
"hyper-util",
"ipnet",
"js-sys",
"log",
"mime",
"native-tls",
"once_cell",
"percent-encoding",
"pin-project-lite",
"rustls-pki-types",
@ -4139,7 +4127,6 @@ dependencies = [
"sync_wrapper",
"tokio",
"tokio-native-tls",
"tokio-socks",
"tokio-util",
"tower",
"tower-http",
@ -4200,8 +4187,7 @@ dependencies = [
[[package]]
name = "ruma"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d910a9b75cbf0e88f74295997c1a41c3ab7a117879a029c72db815192c167a0d"
source = "git+https://github.com/ruma/ruma.git?rev=d1d53e2b7aaf9190f11a5465b9edf6a19fc5b59a#d1d53e2b7aaf9190f11a5465b9edf6a19fc5b59a"
dependencies = [
"assign",
"js_int",
@ -4217,8 +4203,7 @@ dependencies = [
[[package]]
name = "ruma-client-api"
version = "0.20.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09cc4ff88a70a3d1e7a2c5b51cca7499cb889b42687608ab664b9a216c49314d"
source = "git+https://github.com/ruma/ruma.git?rev=d1d53e2b7aaf9190f11a5465b9edf6a19fc5b59a#d1d53e2b7aaf9190f11a5465b9edf6a19fc5b59a"
dependencies = [
"as_variant",
"assign",
@ -4241,8 +4226,7 @@ dependencies = [
[[package]]
name = "ruma-common"
version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b75da013b362664c3e161662902e5da3f77e990525681b59c6035bac27e87b4"
source = "git+https://github.com/ruma/ruma.git?rev=d1d53e2b7aaf9190f11a5465b9edf6a19fc5b59a#d1d53e2b7aaf9190f11a5465b9edf6a19fc5b59a"
dependencies = [
"as_variant",
"base64",
@ -4274,8 +4258,7 @@ dependencies = [
[[package]]
name = "ruma-events"
version = "0.30.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41ab3d1b54c32a65194ecc44bc7f7575df50ef4255b139547d7dcc1753dc883d"
source = "git+https://github.com/ruma/ruma.git?rev=d1d53e2b7aaf9190f11a5465b9edf6a19fc5b59a#d1d53e2b7aaf9190f11a5465b9edf6a19fc5b59a"
dependencies = [
"as_variant",
"indexmap",
@ -4300,8 +4283,7 @@ dependencies = [
[[package]]
name = "ruma-federation-api"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "373bc5a30b84574dfce3e75c33d79d6ba9843bf0eee1bf351f904eef9bea001a"
source = "git+https://github.com/ruma/ruma.git?rev=d1d53e2b7aaf9190f11a5465b9edf6a19fc5b59a#d1d53e2b7aaf9190f11a5465b9edf6a19fc5b59a"
dependencies = [
"http",
"js_int",
@ -4315,8 +4297,7 @@ dependencies = [
[[package]]
name = "ruma-html"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "865afa2321e34fa836ea4c1d77ce0c2bb40f7d13fe18ee3e795091fd8d173a1d"
source = "git+https://github.com/ruma/ruma.git?rev=d1d53e2b7aaf9190f11a5465b9edf6a19fc5b59a#d1d53e2b7aaf9190f11a5465b9edf6a19fc5b59a"
dependencies = [
"as_variant",
"html5ever",
@ -4329,8 +4310,7 @@ dependencies = [
[[package]]
name = "ruma-identifiers-validation"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ad674b5e5368c53a2c90fde7dac7e30747004aaf7b1827b72874a25fc06d4d8"
source = "git+https://github.com/ruma/ruma.git?rev=d1d53e2b7aaf9190f11a5465b9edf6a19fc5b59a#d1d53e2b7aaf9190f11a5465b9edf6a19fc5b59a"
dependencies = [
"js_int",
"thiserror 2.0.12",
@ -4339,8 +4319,7 @@ dependencies = [
[[package]]
name = "ruma-macros"
version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1182e83ee5cd10121974f163337b16af68a93eedfc7cdbdbd52307ac7e1d743"
source = "git+https://github.com/ruma/ruma.git?rev=d1d53e2b7aaf9190f11a5465b9edf6a19fc5b59a#d1d53e2b7aaf9190f11a5465b9edf6a19fc5b59a"
dependencies = [
"cfg-if",
"proc-macro-crate",
@ -4409,9 +4388,9 @@ dependencies = [
[[package]]
name = "rustls"
version = "0.23.27"
version = "0.23.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321"
checksum = "7160e3e10bf4535308537f3c4e1641468cd0e485175d6163087c0393c7d46643"
dependencies = [
"once_cell",
"rustls-pki-types",
@ -4664,12 +4643,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
[[package]]
name = "slab"
version = "0.4.9"
version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
dependencies = [
"autocfg",
]
checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
[[package]]
name = "smallvec"
@ -4811,9 +4787,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "syn"
version = "2.0.102"
version = "2.0.104"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6397daf94fa90f058bd0fd88429dd9e5738999cca8d701813c80723add80462"
checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
dependencies = [
"proc-macro2",
"quote",
@ -4931,12 +4907,11 @@ dependencies = [
[[package]]
name = "thread_local"
version = "1.1.8"
version = "1.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
dependencies = [
"cfg-if",
"once_cell",
]
[[package]]
@ -5054,18 +5029,6 @@ dependencies = [
"tokio",
]
[[package]]
name = "tokio-socks"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f"
dependencies = [
"either",
"futures-util",
"thiserror 1.0.69",
"tokio",
]
[[package]]
name = "tokio-stream"
version = "0.1.17"
@ -5185,9 +5148,9 @@ dependencies = [
[[package]]
name = "tracing-attributes"
version = "0.1.29"
version = "0.1.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b1ffbcf9c6f6b99d386e7444eb608ba646ae452a36b39737deb9663b610f662"
checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
dependencies = [
"proc-macro2",
"quote",
@ -5436,9 +5399,9 @@ dependencies = [
[[package]]
name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
version = "0.11.1+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
[[package]]
name = "wasi"
@ -5627,9 +5590,9 @@ dependencies = [
[[package]]
name = "windows-link"
version = "0.1.1"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
[[package]]
name = "windows-result"
@ -5667,6 +5630,15 @@ dependencies = [
"windows-targets 0.52.6",
]
[[package]]
name = "windows-sys"
version = "0.60.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
dependencies = [
"windows-targets 0.53.2",
]
[[package]]
name = "windows-targets"
version = "0.52.6"
@ -5685,9 +5657,9 @@ dependencies = [
[[package]]
name = "windows-targets"
version = "0.53.0"
version = "0.53.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
dependencies = [
"windows_aarch64_gnullvm 0.53.0",
"windows_aarch64_msvc 0.53.0",
@ -5797,9 +5769,9 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
[[package]]
name = "winnow"
version = "0.7.10"
version = "0.7.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec"
checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd"
dependencies = [
"memchr",
]
@ -5941,18 +5913,18 @@ dependencies = [
[[package]]
name = "zerocopy"
version = "0.8.25"
version = "0.8.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
version = "0.8.25"
version = "0.8.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
dependencies = [
"proc-macro2",
"quote",

24
Cargo.toml

@ -71,25 +71,25 @@ shumate = { package = "libshumate", version = "0.6" }
sourceview = { package = "sourceview5", version = "0.9" }
[dependencies.matrix-sdk]
version = "0.12"
# git = "https://github.com/matrix-org/matrix-rust-sdk.git"
# rev = "1348525447e99cb27ddca2e23885d9bab3837297"
# version = "0.12"
git = "https://github.com/matrix-org/matrix-rust-sdk.git"
rev = "115c7578d4c3cba68f5bb422e4ecc96817539b0d"
features = ["socks", "sso-login", "markdown", "qrcode"]
[dependencies.matrix-sdk-store-encryption]
version = "0.12"
# git = "https://github.com/matrix-org/matrix-rust-sdk.git"
# rev = "1348525447e99cb27ddca2e23885d9bab3837297"
# version = "0.12"
git = "https://github.com/matrix-org/matrix-rust-sdk.git"
rev = "115c7578d4c3cba68f5bb422e4ecc96817539b0d"
[dependencies.matrix-sdk-ui]
version = "0.12"
# git = "https://github.com/matrix-org/matrix-rust-sdk.git"
# rev = "1348525447e99cb27ddca2e23885d9bab3837297"
# version = "0.12"
git = "https://github.com/matrix-org/matrix-rust-sdk.git"
rev = "115c7578d4c3cba68f5bb422e4ecc96817539b0d"
[dependencies.ruma]
version = "0.12.3"
# git = "https://github.com/ruma/ruma.git"
# rev = "a8fd1b0322649bf59e2a5cfc73ab4fe46b21edd7"
# version = "0.12.3"
git = "https://github.com/ruma/ruma.git"
rev = "d1d53e2b7aaf9190f11a5465b9edf6a19fc5b59a"
features = [
"unstable-unspecified",
"client-api-c",

8
src/session/model/room/join_rule.rs

@ -133,12 +133,12 @@ mod imp {
}
/// Update the join rule.
pub(super) fn update_join_rule(&self, join_rule: &MatrixJoinRule) {
if self.matrix_join_rule.borrow().as_ref() == Some(join_rule) {
pub(super) fn update_join_rule(&self, join_rule: Option<&MatrixJoinRule>) {
if self.matrix_join_rule.borrow().as_ref() == join_rule {
return;
}
self.matrix_join_rule.replace(Some(join_rule.clone()));
self.matrix_join_rule.replace(join_rule.cloned());
self.update_value();
self.update_can_knock();
@ -353,7 +353,7 @@ impl JoinRule {
}
/// Update the join rule with the given value from the SDK.
pub(super) fn update(&self, join_rule: &MatrixJoinRule) {
pub(super) fn update(&self, join_rule: Option<&MatrixJoinRule>) {
self.imp().update_join_rule(join_rule);
}

6
src/session/view/content/room_history/message_toolbar/composer_state.rs

@ -217,9 +217,9 @@ mod imp {
let draft_clone = draft.clone();
let handle = spawn_tokio!(async move {
if let Some(draft) = draft_clone {
matrix_room.save_composer_draft(draft).await
matrix_room.save_composer_draft(draft, None).await
} else {
matrix_room.clear_composer_draft().await
matrix_room.clear_composer_draft(None).await
}
});
@ -266,7 +266,7 @@ mod imp {
/// Restore the state from the persisted draft.
pub(super) async fn restore_draft(&self, timeline: &Timeline) {
let matrix_room = timeline.room().matrix_room().clone();
let handle = spawn_tokio!(async move { matrix_room.load_composer_draft().await });
let handle = spawn_tokio!(async move { matrix_room.load_composer_draft(None).await });
match handle.await.expect("task was not aborted") {
Ok(Some(draft)) => self.restore_from_draft(timeline, draft).await,

Loading…
Cancel
Save