diff --git a/Cargo.lock b/Cargo.lock index 7b5e16bc..fbc33205 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -73,9 +73,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "android-tzdata" @@ -104,9 +104,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" +checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" [[package]] name = "anymap2" @@ -151,9 +151,9 @@ checksum = "f38fa22307249f86fb7fad906fcae77f2564caeb56d7209103c551cd1cf4798f" [[package]] name = "ashpd" -version = "0.9.2" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d43c03d9e36dd40cab48435be0b09646da362c278223ca535493877b2c1dee9" +checksum = "e9c39d707614dbcc6bed00015539f488d8e3fe3e66ed60961efc0c90f4b380b3" dependencies = [ "enumflags2", "futures-channel", @@ -165,7 +165,7 @@ dependencies = [ "tokio", "tracing", "url", - "zbus", + "zbus 5.2.0", ] [[package]] @@ -200,9 +200,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.17" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cb8f1d480b0ea3783ab015936d2a55c87e219676f0c0b7dec61494043f21857" +checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522" dependencies = [ "flate2", "futures-core", @@ -394,9 +394,9 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper 1.0.2", + "sync_wrapper", "tokio", - "tower 0.5.1", + "tower", "tower-layer", "tower-service", "tracing", @@ -417,7 +417,7 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper 1.0.2", + "sync_wrapper", "tower-layer", "tower-service", "tracing", @@ -508,9 +508,9 @@ checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6" [[package]] name = "blake3" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" +checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e" dependencies = [ "arrayref", "arrayvec", @@ -585,9 +585,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "bytesize" @@ -597,9 +597,9 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "cairo-rs" -version = "0.20.5" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fa699e1d7ae691001a811dda5ef0e3e42e1d4119b26426352989df9e94e3e6" +checksum = "ae50b5510d86cf96ac2370e66d8dc960882f3df179d6a5a1e52bd94a1416c0f7" dependencies = [ "bitflags 2.6.0", "cairo-sys-rs", @@ -609,9 +609,9 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.20.0" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f" +checksum = "f18b6bb8e43c7eb0f2aac7976afe0c61b6f5fc2ab7bc4c139537ea56c92290df" dependencies = [ "glib-sys", "libc", @@ -629,9 +629,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.1" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" +checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf" dependencies = [ "jobserver", "libc", @@ -659,9 +659,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.17.1" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c360837f8f19e2e4468275138f1c0dec1647d1e17bb7c0215fe3cd7530e93c25" +checksum = "8d4ba6e40bd1184518716a6e1a781bf9160e286d219ccdb8ab2612e74cfe4789" dependencies = [ "smallvec", "target-lexicon", @@ -705,9 +705,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ "android-tzdata", "iana-time-zone", @@ -756,9 +756,9 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const_panic" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "013b6c2c3a14d678f38cd23994b02da3a1a1b6a5d1eedddfe63a5a5f11b13a81" +checksum = "53857514f72ee4a2b583de67401e3ff63a5472ca4acf289d09a9ea7636dfec17" [[package]] name = "constant_time_eq" @@ -820,9 +820,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crypto-common" @@ -935,9 +935,9 @@ dependencies = [ [[package]] name = "deadpool-sqlite" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f9cc6210316f8b7ced394e2a5d2833ce7097fb28afb5881299c61bc18e8e0e9" +checksum = "656f14fc1ab819c65f332045ea7cb38841bbe551f3b2bc7e3abefb559af4155c" dependencies = [ "deadpool", "deadpool-sync", @@ -1156,12 +1156,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1177,9 +1177,9 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2" dependencies = [ "event-listener", "pin-project-lite", @@ -1193,6 +1193,9 @@ checksum = "d93bd0ebf93d61d6332d3c09a96e97975968a44e19a64c947bde06e6baff383f" dependencies = [ "futures-core", "readlock", + "readlock-tokio", + "tokio", + "tokio-util", "tracing", ] @@ -1248,9 +1251,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "fiat-crypto" @@ -1382,7 +1385,7 @@ dependencies = [ "sourceview5", "strum", "tempfile", - "thiserror", + "thiserror 2.0.8", "tld", "tokio", "tokio-stream", @@ -1543,9 +1546,9 @@ checksum = "0fd8b261ccf00df8c5cc60c082bb7d7aa64c33a433cfcc091ca244326c924b2c" [[package]] name = "gdk-pixbuf" -version = "0.20.4" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4c29071a9e92337d8270a85cb0510cda4ac478be26d09ad027cc1d081911b19" +checksum = "b6efc7705f7863d37b12ad6974cbb310d35d054f5108cdc1e69037742f573c4c" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -1555,9 +1558,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.20.4" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "687343b059b91df5f3fbd87b4307038fa9e647fcc0461d0d3f93e94fee20bf3d" +checksum = "67f2587c9202bf997476bbba6aaed4f78a11538a2567df002a5f57f5331d0b5c" dependencies = [ "gio-sys", "glib-sys", @@ -1640,7 +1643,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba35eb77ce72d7eefe4058c11cc816c6f9eb4f62ecc11c154b1d77d4d75399ce" dependencies = [ "derive_builder", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1693,9 +1696,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "gio" -version = "0.20.6" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8826d2a9ad56ce3de1f04bea0bea0daff6f5f1c913cc834996cfea1f9401361c" +checksum = "a517657589a174be9f60c667f1fec8b7ac82ed5db4ebf56cf073a3b5955d8e2e" dependencies = [ "futures-channel", "futures-core", @@ -1710,22 +1713,22 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.20.6" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b965df6f3534c84816b5c1a7d9efcb5671ae790822de5abe8e299797039529bc" +checksum = "8446d9b475730ebef81802c1738d972db42fde1c5a36a627ebc4d665fc87db04" dependencies = [ "glib-sys", "gobject-sys", "libc", "system-deps 7.0.3", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "glib" -version = "0.20.6" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86bd3e4ee7998ab5a135d900db56930cc19ad16681adf245daff54f618b9d5e1" +checksum = "f969edf089188d821a30cde713b6f9eb08b20c63fc2e584aba2892a7984a8cc0" dependencies = [ "bitflags 2.6.0", "futures-channel", @@ -1744,9 +1747,9 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.20.5" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d21ca27acfc3e91da70456edde144b4ac7c36f78ee77b10189b3eb4901c156" +checksum = "715601f8f02e71baef9c1f94a657a9a77c192aea6097cf9ae7e5e177cd8cde68" dependencies = [ "heck", "proc-macro-crate", @@ -1757,9 +1760,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.20.6" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d0b1827e8621fc42c0dfb228e5d57ff6a71f9699e666ece8113f979ad87c2de" +checksum = "b360ff0f90d71de99095f79c526a5888c9c92fc9ee1b19da06c6f5e75f0c2a53" dependencies = [ "libc", "system-deps 7.0.3", @@ -1817,12 +1820,12 @@ dependencies = [ "memmap2", "nix 0.29.0", "static_assertions", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tracing", "yeslogic-fontconfig-sys", - "zbus", + "zbus 4.4.0", ] [[package]] @@ -1841,16 +1844,16 @@ dependencies = [ "paste", "rmp-serde", "serde", - "thiserror", + "thiserror 1.0.69", "tokio", - "zbus", + "zbus 4.4.0", ] [[package]] name = "gobject-sys" -version = "0.20.4" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c674d2ff8478cf0ec29d2be730ed779fef54415a2fb4b565c52def62696462" +checksum = "67a56235e971a63bfd75abb13ef70064e1346388723422a68580d8a6fbac6423" dependencies = [ "glib-sys", "libc", @@ -1859,9 +1862,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.20.4" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f53144c7fe78292705ff23935f1477d511366fb2f73c43d63b37be89076d2fe" +checksum = "f39d3bcd2e24fd9c2874a56f277b72c03e728de9bdc95a8d4ef4c962f10ced98" dependencies = [ "glib", "graphene-sys", @@ -1870,9 +1873,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.20.4" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e741797dc5081e59877a4d72c442c72d61efdd99161a0b1c1b29b6b988934b99" +checksum = "11a68d39515bf340e879b72cecd4a25c1332557757ada6e8aba8654b4b81d23a" dependencies = [ "glib-sys", "libc", @@ -1973,7 +1976,7 @@ dependencies = [ "paste", "pin-project-lite", "smallvec", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2103,7 +2106,7 @@ dependencies = [ "gstreamer-pbutils-sys", "gstreamer-video", "libc", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2174,7 +2177,7 @@ dependencies = [ "gstreamer-video-sys", "libc", "once_cell", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2261,7 +2264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4066b9e0375d2b44da9e7f0282c2bd65136fe5e7d033259b2181f499e312e1b" dependencies = [ "gufo-common", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -2276,9 +2279,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" dependencies = [ "allocator-api2", "equivalent", @@ -2352,9 +2355,9 @@ dependencies = [ [[package]] name = "http" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" dependencies = [ "bytes", "fnv", @@ -2404,9 +2407,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" +checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" dependencies = [ "bytes", "futures-channel", @@ -2686,12 +2689,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown 0.15.1", + "hashbrown 0.15.2", "serde", ] @@ -2749,9 +2752,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jobserver" @@ -2764,10 +2767,11 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -2791,9 +2795,9 @@ dependencies = [ [[package]] name = "konst" -version = "0.3.12" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed986a294ccbcc4cbb7de5a1cf8f62e2473d85cf220e72cb01afe20d49194481" +checksum = "298ddf99f06a97c1ecd0e910932662b7842855046234b0d0376d35d93add087f" dependencies = [ "const_panic", "konst_kernel", @@ -2802,9 +2806,9 @@ dependencies = [ [[package]] name = "konst_kernel" -version = "0.3.12" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599c1232f55c72c7fc378335a3efe1c878c92720838c8e6a4fd87784ef7764de" +checksum = "e4b1eb7788f3824c629b1116a7a9060d6e898c358ebff59070093d51103dcc3c" dependencies = [ "typewit", ] @@ -2880,15 +2884,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.164" +version = "0.2.168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" +checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" [[package]] name = "libloading" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", "windows-targets", @@ -2979,9 +2983,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.28.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ "pkg-config", "vcpkg", @@ -3014,9 +3018,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "locale_config" @@ -3053,7 +3057,7 @@ version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.15.1", + "hashbrown 0.15.2", ] [[package]] @@ -3160,7 +3164,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e2551de3bba2cc65b52dc6b268df6114011fe118ac24870fbcf1b35537bd721" dependencies = [ "matrix-pickle-derive", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -3178,8 +3182,9 @@ dependencies = [ [[package]] name = "matrix-sdk" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=e55a1c7e00d2693d87d798f09852161d5cbf0495#e55a1c7e00d2693d87d798f09852161d5cbf0495" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf5a99e79362e6d806d5b0102b8c58dca1f013a50f2f4bc5ffad1cb8dd6fcf43" dependencies = [ "anymap2", "aquamarine", @@ -3208,6 +3213,7 @@ dependencies = [ "matrix-sdk-sqlite", "mime", "mime2ext", + "once_cell", "pin-project-lite", "rand", "reqwest", @@ -3216,11 +3222,11 @@ dependencies = [ "serde_html_form", "serde_json", "tempfile", - "thiserror", + "thiserror 2.0.8", "tokio", "tokio-stream", "tokio-util", - "tower 0.4.13", + "tower", "tracing", "url", "urlencoding", @@ -3230,8 +3236,9 @@ dependencies = [ [[package]] name = "matrix-sdk-base" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=e55a1c7e00d2693d87d798f09852161d5cbf0495#e55a1c7e00d2693d87d798f09852161d5cbf0495" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6720c7df74eb1d4804af9d402cf56ba43873ae62f19b81857e96da6532e12e1a" dependencies = [ "as_variant", "async-trait", @@ -3249,7 +3256,7 @@ dependencies = [ "ruma", "serde", "serde_json", - "thiserror", + "thiserror 2.0.8", "tokio", "tracing", "unicode-normalization", @@ -3257,8 +3264,9 @@ dependencies = [ [[package]] name = "matrix-sdk-common" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=e55a1c7e00d2693d87d798f09852161d5cbf0495#e55a1c7e00d2693d87d798f09852161d5cbf0495" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ee4c56343d78cef759a0398b35bb192e508f203b3d697abe5a09dfcf17ff440" dependencies = [ "async-trait", "eyeball-im", @@ -3269,7 +3277,7 @@ dependencies = [ "ruma", "serde", "serde_json", - "thiserror", + "thiserror 2.0.8", "tokio", "tracing", "tracing-subscriber", @@ -3280,8 +3288,9 @@ dependencies = [ [[package]] name = "matrix-sdk-crypto" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=e55a1c7e00d2693d87d798f09852161d5cbf0495#e55a1c7e00d2693d87d798f09852161d5cbf0495" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7395a7ee99668e7ce63643f1cee8abc11a05c60ab953bd298e762c3356f9aef0" dependencies = [ "aes", "aquamarine", @@ -3296,7 +3305,7 @@ dependencies = [ "futures-util", "hkdf", "hmac", - "itertools 0.12.1", + "itertools 0.13.0", "js_option", "matrix-sdk-common", "matrix-sdk-qrcode", @@ -3308,7 +3317,7 @@ dependencies = [ "serde_json", "sha2", "subtle", - "thiserror", + "thiserror 2.0.8", "time", "tokio", "tokio-stream", @@ -3321,8 +3330,9 @@ dependencies = [ [[package]] name = "matrix-sdk-indexeddb" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=e55a1c7e00d2693d87d798f09852161d5cbf0495#e55a1c7e00d2693d87d798f09852161d5cbf0495" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72f86434be7e6256a5d6e7828b887a4e91a42cd66380f8b02e02eeb702819589" dependencies = [ "anyhow", "async-trait", @@ -3339,7 +3349,7 @@ dependencies = [ "serde-wasm-bindgen", "serde_json", "sha2", - "thiserror", + "thiserror 2.0.8", "tokio", "tracing", "wasm-bindgen", @@ -3349,24 +3359,26 @@ dependencies = [ [[package]] name = "matrix-sdk-qrcode" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=e55a1c7e00d2693d87d798f09852161d5cbf0495#e55a1c7e00d2693d87d798f09852161d5cbf0495" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffcf5247d9c0ad60bb11920dda62893185aec45e3a8ee43b00a0e724bd14a70c" dependencies = [ "byteorder", "qrcode", "ruma-common", - "thiserror", + "thiserror 2.0.8", "vodozemac", ] [[package]] name = "matrix-sdk-sqlite" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=e55a1c7e00d2693d87d798f09852161d5cbf0495#e55a1c7e00d2693d87d798f09852161d5cbf0495" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eec5d5bf5de2de1874caba8c97ca7c1e9c7b3b50aba22fac0067f03bfa2416bf" dependencies = [ "async-trait", "deadpool-sqlite", - "itertools 0.12.1", + "itertools 0.13.0", "matrix-sdk-base", "matrix-sdk-crypto", "matrix-sdk-store-encryption", @@ -3375,7 +3387,7 @@ dependencies = [ "rusqlite", "serde", "serde_json", - "thiserror", + "thiserror 2.0.8", "tokio", "tracing", "vodozemac", @@ -3383,8 +3395,9 @@ dependencies = [ [[package]] name = "matrix-sdk-store-encryption" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=e55a1c7e00d2693d87d798f09852161d5cbf0495#e55a1c7e00d2693d87d798f09852161d5cbf0495" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d702add6a56f288bf2e1a4e45145529620bff2003e746d7f23fc736ea806dbc8" dependencies = [ "base64", "blake3", @@ -3396,14 +3409,15 @@ dependencies = [ "serde", "serde_json", "sha2", - "thiserror", + "thiserror 2.0.8", "zeroize", ] [[package]] name = "matrix-sdk-ui" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=e55a1c7e00d2693d87d798f09852161d5cbf0495#e55a1c7e00d2693d87d798f09852161d5cbf0495" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68abc424ec8fc68d116720ed16bac4be8140b66f1fa135a57da268ca914e52db" dependencies = [ "as_variant", "async-once-cell", @@ -3420,7 +3434,7 @@ dependencies = [ "growable-bloom-filter", "imbl", "indexmap", - "itertools 0.12.1", + "itertools 0.13.0", "matrix-sdk", "matrix-sdk-base", "mime", @@ -3429,7 +3443,7 @@ dependencies = [ "ruma", "serde", "serde_json", - "thiserror", + "thiserror 2.0.8", "tokio", "tokio-stream", "tracing", @@ -3499,20 +3513,19 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" dependencies = [ "adler2", ] [[package]] name = "mio" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ - "hermit-abi 0.3.9", "libc", "wasi", "windows-sys 0.52.0", @@ -3757,9 +3770,9 @@ dependencies = [ "serde", "tokio", "tracing", - "zbus", + "zbus 4.4.0", "zeroize", - "zvariant", + "zvariant 4.2.0", ] [[package]] @@ -3839,9 +3852,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pango" -version = "0.20.6" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e34e7ca2c52e3933d7e5251409a82b83725fa9d6d48fbdaacec056b3a0554a" +checksum = "9e89bd74250a03a05cec047b43465469102af803be2bf5e5a1088f8b8455e087" dependencies = [ "gio", "glib", @@ -3851,9 +3864,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.20.4" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84fd65917bf12f06544ae2bbc200abf9fc0a513a5a88a0fa81013893aef2b838" +checksum = "71787e0019b499a5eda889279e4adb455a4f3fdd6870cd5ab7f4a5aa25df6699" dependencies = [ "glib-sys", "gobject-sys", @@ -3983,26 +3996,6 @@ dependencies = [ "siphasher", ] -[[package]] -name = "pin-project" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "pin-project-lite" version = "0.2.15" @@ -4040,7 +4033,7 @@ dependencies = [ "nix 0.27.1", "once_cell", "pipewire-sys", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4158,9 +4151,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" +checksum = "2c0fef6c4230e4ccf618a35c59d7ede15dea37de8427500f50aff708806e42ec" dependencies = [ "bytes", "prost-derive", @@ -4168,9 +4161,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" +checksum = "157c5a9d7ea5c2ed2d9fb8f495b64759f7816c7eaea54ba3978f0d63000162e3" dependencies = [ "anyhow", "itertools 0.13.0", @@ -4258,11 +4251,20 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "072cfe5b1d2dcd38d20e18f85e9c9978b6cc08f0b373e9f1fff1541335622974" +[[package]] +name = "readlock-tokio" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "867fac64d07214a87e5cf4e88b4ce855844a1cea243534392377d1ac2c911653" +dependencies = [ + "tokio", +] + [[package]] name = "redox_syscall" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ "bitflags 2.6.0", ] @@ -4340,7 +4342,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.2", + "sync_wrapper", "tokio", "tokio-native-tls", "tokio-socks", @@ -4388,9 +4390,9 @@ dependencies = [ [[package]] name = "ruma" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94984418ae8a5e1160e6c87608141330e9ae26330abf22e3d15416efa96d48a" +checksum = "f5100fcaf13d18b9c5c2dfdee5632c428e3201b04ddefd82c930953b461d000a" dependencies = [ "assign", "js_int", @@ -4400,15 +4402,14 @@ dependencies = [ "ruma-events", "ruma-federation-api", "ruma-html", - "ruma-push-gateway-api", "web-time", ] [[package]] name = "ruma-client-api" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325e054db8d5545c00767d9868356d61e63f2c6cb8b54768346d66696ea4ad48" +checksum = "25f5929f675a96adb22dcfbab1c527862d7f92a6346a280f2ddcfc6380b19391" dependencies = [ "as_variant", "assign", @@ -4423,16 +4424,16 @@ dependencies = [ "serde", "serde_html_form", "serde_json", - "thiserror", + "thiserror 2.0.8", "url", "web-time", ] [[package]] name = "ruma-common" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad71c7f49abaa047ba228339d34f9aaefa4d8b50ebeb8e859d0340cc2138bda8" +checksum = "6c537899b20312655aa9bf4cd825aaf00dd13203f215df2007bc4fbbeac8d8ba" dependencies = [ "as_variant", "base64", @@ -4452,7 +4453,7 @@ dependencies = [ "serde", "serde_html_form", "serde_json", - "thiserror", + "thiserror 2.0.8", "time", "tracing", "url", @@ -4463,9 +4464,9 @@ dependencies = [ [[package]] name = "ruma-events" -version = "0.29.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be86dccf3504588c1f4dc1bda4ce1f8bbd646fc6dda40c77cc7de6e203e62dad" +checksum = "34e4f72eb598c62f51a199bd9218f3fc36a5d50361ecc7a30d864df7bfcef220" dependencies = [ "as_variant", "indexmap", @@ -4480,7 +4481,7 @@ dependencies = [ "ruma-macros", "serde", "serde_json", - "thiserror", + "thiserror 2.0.8", "tracing", "url", "web-time", @@ -4489,9 +4490,9 @@ dependencies = [ [[package]] name = "ruma-federation-api" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5a09ac22b3352bf7a350514dc9a87e1b56aba04c326ac9ce142740f7218afa" +checksum = "5d70c3d37a8e42992aeaa5786cb406ad302bcd05c0e7e3073d5316b4574340dd" dependencies = [ "http", "js_int", @@ -4504,9 +4505,9 @@ dependencies = [ [[package]] name = "ruma-html" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7571886b6df90a4ed72e7481a5a39cc2a5b3a4e956e9366ad798e4e2e9fe8005" +checksum = "8f3257ce3398e171ff15245767b1a3d201cfc5cce75f5af7ec7f6b8b5e1d2bdb" dependencies = [ "as_variant", "html5ever", @@ -4518,22 +4519,21 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7f9b534a65698d7db3c08d94bf91de0046fe6c7893a7b360502f65e7011ac4" +checksum = "6ad674b5e5368c53a2c90fde7dac7e30747004aaf7b1827b72874a25fc06d4d8" dependencies = [ "js_int", - "thiserror", + "thiserror 2.0.8", ] [[package]] name = "ruma-macros" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8d57d3cb20e8e758e8f7c5e408ce831d46758003b615100099852e468631934" +checksum = "ff7bc55ea278668253c9898dd905325bf1f72df4bf2abddd04ff1c99b7b3c4fb" dependencies = [ "cfg-if", - "once_cell", "proc-macro-crate", "proc-macro2", "quote", @@ -4543,24 +4543,11 @@ dependencies = [ "toml", ] -[[package]] -name = "ruma-push-gateway-api" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfced466fbed6277f74ac3887eeb96c185a09f4323dc3c39bcea04870430fe9a" -dependencies = [ - "js_int", - "ruma-common", - "ruma-events", - "serde", - "serde_json", -] - [[package]] name = "rusqlite" -version = "0.31.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" +checksum = "7753b721174eb8ff87a9a0e799e2d7bc3749323e773db92e0984debb00019d6e" dependencies = [ "bitflags 2.6.0", "fallible-iterator", @@ -4593,15 +4580,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.41" +version = "0.38.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" +checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" dependencies = [ "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4615,9 +4602,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" +checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" [[package]] name = "rustversion" @@ -4670,9 +4657,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.1" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" +checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" dependencies = [ "core-foundation-sys", "libc", @@ -4680,15 +4667,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" [[package]] name = "serde" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" dependencies = [ "serde_derive", ] @@ -4715,9 +4702,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" dependencies = [ "proc-macro2", "quote", @@ -4869,9 +4856,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", @@ -5002,21 +4989,15 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.89" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - [[package]] name = "sync_wrapper" version = "1.0.2" @@ -5056,7 +5037,7 @@ version = "7.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66d23aaf9f331227789a99e8de4c91bf46703add012bdfd45fdecdfb2975a005" dependencies = [ - "cfg-expr 0.17.1", + "cfg-expr 0.17.2", "heck", "pkg-config", "toml", @@ -5105,7 +5086,16 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f5383f3e0071702bf93ab5ee99b52d26936be9dedd9413067cbdcddcb6141a" +dependencies = [ + "thiserror-impl 2.0.8", ] [[package]] @@ -5119,6 +5109,17 @@ dependencies = [ "syn", ] +[[package]] +name = "thiserror-impl" +version = "2.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f357fcec90b3caef6623a099691be676d033b40a058ac95d2a6ade6fa0c943" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "thread_local" version = "1.1.8" @@ -5131,9 +5132,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -5152,9 +5153,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ "num-conv", "time-core", @@ -5197,9 +5198,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.41.1" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" dependencies = [ "backtrace", "bytes", @@ -5242,15 +5243,15 @@ checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" dependencies = [ "either", "futures-util", - "thiserror", + "thiserror 1.0.69", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", @@ -5260,9 +5261,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.12" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" dependencies = [ "bytes", "futures-core", @@ -5307,29 +5308,14 @@ dependencies = [ [[package]] name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", "pin-project-lite", - "sync_wrapper 0.1.2", + "sync_wrapper", "tokio", "tower-layer", "tower-service", @@ -5350,9 +5336,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -5362,9 +5348,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", @@ -5373,9 +5359,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", "valuable", @@ -5394,9 +5380,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ "matchers", "nu-ansi-term", @@ -5424,9 +5410,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typewit" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fb9ae6a3cafaf0a5d14c2302ca525f9ae8e07a0f0e6949de88d882c37a6e24" +checksum = "cb77c29baba9e4d3a6182d51fa75e3215c7fd1dab8f4ea9d107c716878e55fc0" dependencies = [ "typewit_proc_macros", ] @@ -5597,7 +5583,7 @@ dependencies = [ "serde_json", "sha2", "subtle", - "thiserror", + "thiserror 1.0.69", "x25519-dalek", "zeroize", ] @@ -5619,9 +5605,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" dependencies = [ "cfg-if", "once_cell", @@ -5630,13 +5616,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn", @@ -5645,21 +5630,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.45" +version = "0.4.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5667,9 +5653,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", @@ -5680,9 +5666,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" [[package]] name = "wasm-streams" @@ -5699,9 +5685,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.72" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" dependencies = [ "js-sys", "wasm-bindgen", @@ -5946,9 +5932,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" dependencies = [ "serde", "stable_deref_trait", @@ -5958,9 +5944,9 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", @@ -5996,9 +5982,39 @@ dependencies = [ "uds_windows", "windows-sys 0.52.0", "xdg-home", - "zbus_macros", - "zbus_names", - "zvariant", + "zbus_macros 4.4.0", + "zbus_names 3.0.0", + "zvariant 4.2.0", +] + +[[package]] +name = "zbus" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb67eadba43784b6fb14857eba0d8fc518686d3ee537066eb6086dc318e2c8a1" +dependencies = [ + "async-broadcast", + "async-recursion", + "async-trait", + "enumflags2", + "event-listener", + "futures-core", + "futures-util", + "hex", + "nix 0.29.0", + "ordered-stream", + "serde", + "serde_repr", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "windows-sys 0.59.0", + "winnow", + "xdg-home", + "zbus_macros 5.2.0", + "zbus_names 4.1.0", + "zvariant 5.1.0", ] [[package]] @@ -6011,7 +6027,22 @@ dependencies = [ "proc-macro2", "quote", "syn", - "zvariant_utils", + "zvariant_utils 2.1.0", +] + +[[package]] +name = "zbus_macros" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d49ebc960ceb660f2abe40a5904da975de6986f2af0d7884b39eec6528c57" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", + "zbus_names 4.1.0", + "zvariant 5.1.0", + "zvariant_utils 3.0.2", ] [[package]] @@ -6022,7 +6053,19 @@ checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", - "zvariant", + "zvariant 4.2.0", +] + +[[package]] +name = "zbus_names" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "856b7a38811f71846fd47856ceee8bccaec8399ff53fb370247e66081ace647b" +dependencies = [ + "serde", + "static_assertions", + "winnow", + "zvariant 5.1.0", ] [[package]] @@ -6048,18 +6091,18 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", @@ -6114,13 +6157,28 @@ name = "zvariant" version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "zvariant_derive 4.2.0", +] + +[[package]] +name = "zvariant" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1200ee6ac32f1e5a312e455a949a4794855515d34f9909f4a3e082d14e1a56f" dependencies = [ "endi", "enumflags2", "serde", "static_assertions", "url", - "zvariant_derive", + "winnow", + "zvariant_derive 5.1.0", + "zvariant_utils 3.0.2", ] [[package]] @@ -6133,7 +6191,20 @@ dependencies = [ "proc-macro2", "quote", "syn", - "zvariant_utils", + "zvariant_utils 2.1.0", +] + +[[package]] +name = "zvariant_derive" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "687e3b97fae6c9104fbbd36c73d27d149abf04fb874e2efbd84838763daa8916" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", + "zvariant_utils 3.0.2", ] [[package]] @@ -6146,3 +6217,17 @@ dependencies = [ "quote", "syn", ] + +[[package]] +name = "zvariant_utils" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20d1d011a38f12360e5fcccceeff5e2c42a8eb7f27f0dcba97a0862ede05c9c6" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "static_assertions", + "syn", + "winnow", +] diff --git a/Cargo.toml b/Cargo.toml index 69d98052..a023df25 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "fractal" version = "9.0.0" authors = ["Julian Sparber "] edition = "2021" -rust-version = "1.80" +rust-version = "1.82" publish = false [profile.release] @@ -41,7 +41,7 @@ serde = "1" serde_json = "1" strum = { version = "0.26", features = ["derive"] } tempfile = "3" -thiserror = "1" +thiserror = "2" tld = "2" tokio = { version = "1", features = ["rt", "rt-multi-thread", "sync"] } tokio-stream = { version = "0.1", features = ["sync"] } @@ -65,8 +65,9 @@ shumate = { package = "libshumate", version = "0.6" } sourceview = { package = "sourceview5", version = "0.9" } [dependencies.matrix-sdk] -git = "https://github.com/matrix-org/matrix-rust-sdk.git" -rev = "e55a1c7e00d2693d87d798f09852161d5cbf0495" +version = "0.9" +# git = "https://github.com/matrix-org/matrix-rust-sdk.git" +# rev = "866b5fea40bea68be870f3cf02d59401c2d9933f" features = [ "socks", "sso-login", @@ -75,11 +76,12 @@ features = [ ] [dependencies.matrix-sdk-ui] -git = "https://github.com/matrix-org/matrix-rust-sdk.git" -rev = "e55a1c7e00d2693d87d798f09852161d5cbf0495" +version = "0.9" +# git = "https://github.com/matrix-org/matrix-rust-sdk.git" +# rev = "866b5fea40bea68be870f3cf02d59401c2d9933f" [dependencies.ruma] -version = "0.11" +version = "0.12" # git = "https://github.com/ruma/ruma.git" # rev = "26165b23fc2ae9928c5497a21db3d31f4b44cc2a" features = [ @@ -97,7 +99,7 @@ features = [ # Linux-only dependencies. [target.'cfg(target_os = "linux")'.dependencies] -ashpd = { version = "0.9", default-features = false, features = [ +ashpd = { version = "0.10", default-features = false, features = [ "pipewire", "tracing", "tokio", diff --git a/src/components/context_menu_bin.rs b/src/components/context_menu_bin.rs index 4ecf281e..5fa8a958 100644 --- a/src/components/context_menu_bin.rs +++ b/src/components/context_menu_bin.rs @@ -159,10 +159,7 @@ mod imp { let obj = self.obj(); if let Some(popover) = prev_popover { - if popover - .parent() - .is_some_and(|w| &w == obj.upcast_ref::()) - { + if popover.parent().is_some_and(|w| w == *obj) { popover.unparent(); } } @@ -176,10 +173,7 @@ mod imp { #[weak] obj, move |popover| { - if !popover - .parent() - .is_some_and(|w| &w == obj.upcast_ref::()) - { + if popover.parent().is_none_or(|w| w != obj) { obj.imp().popover.disconnect_signals(); } } diff --git a/src/components/crypto/identity_setup_view.rs b/src/components/crypto/identity_setup_view.rs index 80a59d2a..e78c2cb3 100644 --- a/src/components/crypto/identity_setup_view.rs +++ b/src/components/crypto/identity_setup_view.rs @@ -328,11 +328,11 @@ mod imp { self.verification_page.set_verification(verification); if has_verification - && !self + && self .navigation .visible_page() .and_then(|p| p.tag()) - .is_some_and(|t| t == CryptoIdentitySetupPage::Verify.as_ref()) + .is_none_or(|t| t != CryptoIdentitySetupPage::Verify.as_ref()) { self.navigation .push_by_tag(CryptoIdentitySetupPage::Verify.as_ref()); diff --git a/src/components/label_with_widgets.rs b/src/components/label_with_widgets.rs index 9a33dbed..5fb392ab 100644 --- a/src/components/label_with_widgets.rs +++ b/src/components/label_with_widgets.rs @@ -186,7 +186,7 @@ mod imp { /// Allocate shapes in the Pango layout for the child widgets. fn allocate_shapes(&self) { - if !self.label.borrow().as_ref().is_some_and(|s| !s.is_empty()) { + if self.label.borrow().as_ref().is_none_or(String::is_empty) { // No need to compute shapes if the label is empty. return; } diff --git a/src/components/power_level_selection/row.rs b/src/components/power_level_selection/row.rs index 7c4e3522..f8628377 100644 --- a/src/components/power_level_selection/row.rs +++ b/src/components/power_level_selection/row.rs @@ -166,10 +166,10 @@ mod imp { /// Update the position of the selected label. fn update_selected_position(&self) { if self.use_subtitle.get() { - if !self + if self .selected_box .parent() - .is_some_and(|p| p == *self.subtitle_bin) + .is_none_or(|p| p != *self.subtitle_bin) { if self.selected_box.parent().is_some() { self.combo_selection_bin.set_child(None::<>k::Widget>); @@ -177,10 +177,10 @@ mod imp { self.subtitle_bin.set_child(Some(&*self.selected_box)); } - } else if !self + } else if self .selected_box .parent() - .is_some_and(|p| p == *self.combo_selection_bin) + .is_none_or(|p| p != *self.combo_selection_bin) { if self.selected_box.parent().is_some() { self.subtitle_bin.set_child(None::<>k::Widget>); diff --git a/src/session/model/room/aliases.rs b/src/session/model/room/aliases.rs index 65783212..4e398942 100644 --- a/src/session/model/room/aliases.rs +++ b/src/session/model/room/aliases.rs @@ -103,7 +103,7 @@ mod imp { // Check if aliases were changed in the current list. for (i, old_alias) in old_aliases.iter().enumerate() { - if !alt_aliases.get(i).is_some_and(|alias| alias == old_alias) { + if alt_aliases.get(i).is_none_or(|alias| alias != old_alias) { pos = Some(i); break; } @@ -245,7 +245,7 @@ impl RoomAliases { .unwrap_or_default(); // Remove the canonical alias, if it is there. - if !event_content.alias.take().is_some_and(|a| a == *alias) { + if event_content.alias.take().is_none_or(|a| a != *alias) { // Nothing to do. return Err(()); } diff --git a/src/session/model/room/mod.rs b/src/session/model/room/mod.rs index 5469610c..94df27be 100644 --- a/src/session/model/room/mod.rs +++ b/src/session/model/room/mod.rs @@ -540,7 +540,7 @@ mod imp { self.set_up_typing(); } - RoomState::Left | RoomState::Knocked => {} + RoomState::Left | RoomState::Knocked | RoomState::Banned => {} RoomState::Invited => { spawn!( glib::Priority::DEFAULT_IDLE, @@ -588,7 +588,7 @@ mod imp { } } RoomState::Invited => RoomCategory::Invited, - RoomState::Left | RoomState::Knocked => RoomCategory::Left, + RoomState::Left | RoomState::Knocked | RoomState::Banned => RoomCategory::Left, }; self.set_category(category); @@ -877,17 +877,21 @@ mod imp { async fn direct_user_id(&self) -> Option { let matrix_room = self.matrix_room(); - // Check if the room direct and if there only one target. - let direct_targets = matrix_room.direct_targets(); - if direct_targets.len() != 1 { - // It was a direct chat with several users. + // Check if the room is direct and if there is only one target. + let mut direct_targets = matrix_room + .direct_targets() + .into_iter() + .filter_map(|id| OwnedUserId::try_from(id).ok()); + + let Some(direct_target_user_id) = direct_targets.next() else { + // It is not a direct chat. return None; - } + }; - let direct_target_user_id = direct_targets - .into_iter() - .next() - .expect("there is 1 direct target"); + if direct_targets.next().is_some() { + // It is a direct chat with several users. + return None; + } // Check that there are still at most 2 members. let members_count = matrix_room.active_members_count(); @@ -1132,7 +1136,7 @@ mod imp { /// Update the visibility of the history. fn update_history_visibility(&self) { let matrix_room = self.matrix_room(); - let visibility = matrix_room.history_visibility().into(); + let visibility = matrix_room.history_visibility_or_default().into(); if self.history_visibility.get() == visibility { return; diff --git a/src/session/model/room/timeline/virtual_item.rs b/src/session/model/room/timeline/virtual_item.rs index 93cfe917..134ed4f1 100644 --- a/src/session/model/room/timeline/virtual_item.rs +++ b/src/session/model/room/timeline/virtual_item.rs @@ -93,7 +93,7 @@ impl VirtualItem { /// Create a new `VirtualItem` from a virtual timeline item. pub fn new(item: &VirtualTimelineItem) -> Self { match item { - VirtualTimelineItem::DayDivider(ts) => Self::day_divider_with_timestamp(*ts), + VirtualTimelineItem::DateDivider(ts) => Self::day_divider_with_timestamp(*ts), VirtualTimelineItem::ReadMarker => Self::new_messages(), } } diff --git a/src/session/view/content/room_history/message_toolbar/completion/completion_popover.rs b/src/session/view/content/room_history/message_toolbar/completion/completion_popover.rs index 092c21ef..804982a6 100644 --- a/src/session/view/content/room_history/message_toolbar/completion/completion_popover.rs +++ b/src/session/view/content/room_history/message_toolbar/completion/completion_popover.rs @@ -572,9 +572,9 @@ impl CompletionPopover { /// Show the popover. fn popup(&self) { - if !self + if self .selected_row_index() - .is_some_and(|index| index < self.imp().visible_rows_count()) + .is_none_or(|index| index >= self.imp().visible_rows_count()) { self.select_row_at_index(Some(0)); } diff --git a/src/session/view/content/room_history/sender_avatar/mod.rs b/src/session/view/content/room_history/sender_avatar/mod.rs index 4c4b2570..b7c69b57 100644 --- a/src/session/view/content/room_history/sender_avatar/mod.rs +++ b/src/session/view/content/room_history/sender_avatar/mod.rs @@ -403,7 +403,7 @@ mod imp { #[weak] obj, move |popover| { - if !popover.parent().is_some_and(|w| w == obj) { + if popover.parent().is_none_or(|w| w != obj) { let imp = obj.imp(); imp.popover.disconnect_signals(); diff --git a/src/utils/location/linux.rs b/src/utils/location/linux.rs index ea5ebf50..c0283cda 100644 --- a/src/utils/location/linux.rs +++ b/src/utils/location/linux.rs @@ -1,11 +1,8 @@ //! Linux Location API. -use ashpd::{ - desktop::{ - location::{Accuracy, Location as PortalLocation, LocationProxy}, - Session, - }, - WindowIdentifier, +use ashpd::desktop::{ + location::{Accuracy, Location as PortalLocation, LocationProxy}, + Session, }; use futures_util::{future, stream, FutureExt, Stream, StreamExt, TryFutureExt}; use geo_uri::GeoUri; @@ -122,14 +119,13 @@ mod imp { spawn_tokio!(async move { let (proxy, session) = &*proxy; - let identifier = WindowIdentifier::default(); // We want to be listening for new locations whenever the session is up // otherwise we might lose the first response and will have to wait for a future // update by geoclue. let mut stream = proxy.receive_location_updated().await?; let (_, first_location) = future::try_join( - proxy.start(session, &identifier).into_future(), + proxy.start(session, None).into_future(), stream.next().map(|l| l.ok_or(ashpd::Error::NoResponse)), ) .await?; diff --git a/src/utils/media/image/mod.rs b/src/utils/media/image/mod.rs index 6fff2068..97d04688 100644 --- a/src/utils/media/image/mod.rs +++ b/src/utils/media/image/mod.rs @@ -5,7 +5,7 @@ use std::{error::Error, fmt, str::FromStr, sync::Arc}; use gettextrs::gettext; use gtk::{gdk, gio, graphene, gsk, prelude::*}; use matrix_sdk::{ - attachment::{BaseImageInfo, BaseThumbnailInfo, Thumbnail}, + attachment::{BaseImageInfo, Thumbnail}, media::{MediaFormat, MediaRequestParameters, MediaThumbnailSettings}, Client, }; @@ -396,19 +396,16 @@ impl TextureThumbnailer { let encoder = webp::Encoder::new(&data, webp_layout, dimensions.width, dimensions.height); let data = encoder.encode(WEBP_DEFAULT_QUALITY).to_vec(); + let size = data.len().try_into().ok()?; let content_type = mime::Mime::from_str(WEBP_CONTENT_TYPE).expect("content type should be valid"); - let thumbnail_info = BaseThumbnailInfo { - width: Some(dimensions.width.into()), - height: Some(dimensions.height.into()), - size: data.len().try_into().ok(), - }; - Some(Thumbnail { data, content_type, - info: Some(thumbnail_info), + width: dimensions.width.into(), + height: dimensions.height.into(), + size, }) } } @@ -523,9 +520,10 @@ impl ImageSource<'_> { /// accept to create a thumbnail of those. fn can_be_thumbnailed(&self) -> bool { !self.source.is_encrypted() - && !self + && self .info - .is_some_and(|i| i.mimetype.is_some_and(|m| m == SVG_CONTENT_TYPE)) + .and_then(|i| i.mimetype) + .is_none_or(|m| m != SVG_CONTENT_TYPE) } /// The filesize of this source.