GNOME.org
 

[fractal/fractal-next] bump deps

commit 9b9cea1b519fe2d747d956d885a06ec3cd813105
Author: Julian Sparber <julian sparber net>
Date:   Tue May 18 17:14:08 2021 +0200

    bump deps

 Cargo.lock                                 | 289 ++++++++++++++++-------------
 Cargo.toml                                 |   3 -
 build-aux/org.gnome.FractalNext.Devel.json |  52 +++---
 src/session/content/message_row.rs         |   8 +-
 src/session/room/event.rs                  |   5 +-
 src/session/room/room.rs                   |  19 +-
 src/utils.rs                               |   1 +
 7 files changed, 206 insertions(+), 171 deletions(-)
---
diff --git a/Cargo.lock b/Cargo.lock
index 45323381..f413244c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -186,7 +186,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
 checksum = "9fe17f59a06fe8b87a6fc8bf53bb70b3aba76d7685f432487a68cd5552853625"
 dependencies = [
  "futures-core",
- "getrandom 0.2.2",
+ "getrandom 0.2.3",
  "instant",
  "pin-project",
  "rand 0.8.3",
@@ -296,7 +296,7 @@ checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
 [[package]]
 name = "cairo-rs"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c";
+source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c";
 dependencies = [
  "bitflags",
  "cairo-sys-rs",
@@ -308,7 +308,7 @@ dependencies = [
 [[package]]
 name = "cairo-sys-rs"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c";
+source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c";
 dependencies = [
  "glib-sys",
  "libc",
@@ -440,9 +440,9 @@ dependencies = [
 
 [[package]]
 name = "const_fn"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "402da840495de3f976eaefc3485b7f5eb5b0bf9761f9a47be27fe975b3b8c2ec"
+checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7"
 
 [[package]]
 name = "core-foundation"
@@ -462,9 +462,12 @@ checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.1.0"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "5cd5a7748210e7ec1a9696610b1015e6e31fbf58f77a160801f124bd1c36592a"
+checksum = "ed00c67cb5d0a7d64a44f6ad2668db7e7530311dd53ea79bcd4fb022c64911c8"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "cpuid-bool"
@@ -628,9 +631,9 @@ dependencies = [
 
 [[package]]
 name = "field-offset"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "cf539fba70056b50f40a22e0da30639518a12ee18c35807858a63b158cb6dde7"
+checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92"
 dependencies = [
  "memoffset",
  "rustc_version 0.3.3",
@@ -674,7 +677,6 @@ dependencies = [
  "comrak",
  "futures",
  "gettext-rs",
- "glib",
  "gtk-macros",
  "gtk4",
  "html2pango",
@@ -714,9 +716,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253"
+checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -729,9 +731,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25"
+checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -739,15 +741,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815"
+checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d"
+checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -756,9 +758,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04"
+checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1"
 
 [[package]]
 name = "futures-lite"
@@ -786,10 +788,11 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b"
+checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121"
 dependencies = [
+ "autocfg",
  "proc-macro-hack",
  "proc-macro2",
  "quote",
@@ -798,15 +801,15 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23"
+checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282"
 
 [[package]]
 name = "futures-task"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc"
+checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae"
 
 [[package]]
 name = "futures-timer"
@@ -820,10 +823,11 @@ dependencies = [
 
 [[package]]
 name = "futures-util"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025"
+checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967"
 dependencies = [
+ "autocfg",
  "futures-channel",
  "futures-core",
  "futures-io",
@@ -850,7 +854,7 @@ dependencies = [
 [[package]]
 name = "gdk-pixbuf"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c";
+source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c";
 dependencies = [
  "gdk-pixbuf-sys",
  "gio",
@@ -861,7 +865,7 @@ dependencies = [
 [[package]]
 name = "gdk-pixbuf-sys"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c";
+source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c";
 dependencies = [
  "gio-sys",
  "glib-sys",
@@ -873,7 +877,7 @@ dependencies = [
 [[package]]
 name = "gdk4"
 version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#26f15fa2d2298869d5dfdc4bef68e8daf337718e";
+source = "git+https://github.com/gtk-rs/gtk4-rs#39f35f14cf0540094eed7999fd803c76d16be07a";
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -888,7 +892,7 @@ dependencies = [
 [[package]]
 name = "gdk4-sys"
 version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#26f15fa2d2298869d5dfdc4bef68e8daf337718e";
+source = "git+https://github.com/gtk-rs/gtk4-rs#39f35f14cf0540094eed7999fd803c76d16be07a";
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
@@ -933,9 +937,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
+checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -976,7 +980,7 @@ dependencies = [
 [[package]]
 name = "gio"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c";
+source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c";
 dependencies = [
  "bitflags",
  "futures-channel",
@@ -992,7 +996,7 @@ dependencies = [
 [[package]]
 name = "gio-sys"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c";
+source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c";
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -1004,7 +1008,7 @@ dependencies = [
 [[package]]
 name = "glib"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c";
+source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c";
 dependencies = [
  "bitflags",
  "futures-channel",
@@ -1022,7 +1026,7 @@ dependencies = [
 [[package]]
 name = "glib-macros"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c";
+source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c";
 dependencies = [
  "anyhow",
  "heck",
@@ -1036,7 +1040,7 @@ dependencies = [
 [[package]]
 name = "glib-sys"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c";
+source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c";
 dependencies = [
  "libc",
  "system-deps",
@@ -1058,7 +1062,7 @@ dependencies = [
 [[package]]
 name = "gobject-sys"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c";
+source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c";
 dependencies = [
  "glib-sys",
  "libc",
@@ -1068,7 +1072,7 @@ dependencies = [
 [[package]]
 name = "graphene-rs"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c";
+source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c";
 dependencies = [
  "glib",
  "graphene-sys",
@@ -1078,7 +1082,7 @@ dependencies = [
 [[package]]
 name = "graphene-sys"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c";
+source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c";
 dependencies = [
  "glib-sys",
  "libc",
@@ -1089,7 +1093,7 @@ dependencies = [
 [[package]]
 name = "gsk4"
 version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#26f15fa2d2298869d5dfdc4bef68e8daf337718e";
+source = "git+https://github.com/gtk-rs/gtk4-rs#39f35f14cf0540094eed7999fd803c76d16be07a";
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -1104,7 +1108,7 @@ dependencies = [
 [[package]]
 name = "gsk4-sys"
 version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#26f15fa2d2298869d5dfdc4bef68e8daf337718e";
+source = "git+https://github.com/gtk-rs/gtk4-rs#39f35f14cf0540094eed7999fd803c76d16be07a";
 dependencies = [
  "cairo-sys-rs",
  "gdk4-sys",
@@ -1125,7 +1129,7 @@ checksum = "1874c48e670519ce192093ac906c08a6dde7cb2d18b28722ef237726a39c3a63"
 [[package]]
 name = "gtk4"
 version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#26f15fa2d2298869d5dfdc4bef68e8daf337718e";
+source = "git+https://github.com/gtk-rs/gtk4-rs#39f35f14cf0540094eed7999fd803c76d16be07a";
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -1147,7 +1151,7 @@ dependencies = [
 [[package]]
 name = "gtk4-macros"
 version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#26f15fa2d2298869d5dfdc4bef68e8daf337718e";
+source = "git+https://github.com/gtk-rs/gtk4-rs#39f35f14cf0540094eed7999fd803c76d16be07a";
 dependencies = [
  "anyhow",
  "heck",
@@ -1162,7 +1166,7 @@ dependencies = [
 [[package]]
 name = "gtk4-sys"
 version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#26f15fa2d2298869d5dfdc4bef68e8daf337718e";
+source = "git+https://github.com/gtk-rs/gtk4-rs#39f35f14cf0540094eed7999fd803c76d16be07a";
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
@@ -1283,9 +1287,9 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "5dfb77c123b4e2f72a2069aeae0b4b4949cc7e966df277813fc16347e7549737"
+checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9"
 dependencies = [
  "bytes",
  "http",
@@ -1294,9 +1298,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4a1ce40d6fc9764887c2fdc7305c3dcc429ba11ff981c1509416afd5697e4437"
+checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68"
 
 [[package]]
 name = "httpdate"
@@ -1363,6 +1367,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "indoc"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "e5a75aeaaef0ce18b58056d306c27b07436fbb34b8816c53094b76dd81803136"
+dependencies = [
+ "unindent",
+]
+
 [[package]]
 name = "instant"
 version = "0.1.9"
@@ -1399,9 +1412,9 @@ checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
 
 [[package]]
 name = "js-sys"
-version = "0.3.50"
+version = "0.3.51"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c"
+checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1424,7 +1437,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 [[package]]
 name = "libadwaita"
 version = "0.1.0"
-source = 
"git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git#ddc44f4616de5b8820783cf5bf21565d3caab096";
+source = 
"git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git#b3c15ade781ba33960f9343593a67ee0dda6dd86";
 dependencies = [
  "gdk-pixbuf",
  "gdk4",
@@ -1439,7 +1452,7 @@ dependencies = [
 [[package]]
 name = "libadwaita-sys"
 version = "0.1.0"
-source = 
"git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git#ddc44f4616de5b8820783cf5bf21565d3caab096";
+source = 
"git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git#b3c15ade781ba33960f9343593a67ee0dda6dd86";
 dependencies = [
  "gdk-pixbuf-sys",
  "gdk4-sys",
@@ -1563,7 +1576,7 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 [[package]]
 name = "matrix-sdk"
 version = "0.2.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#da57061db0c470e06dd366c5f3f61fb3a8bf235e";
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#fe17dce813f500b4c633669a7078ee843bb44886";
 dependencies = [
  "backoff",
  "bytes",
@@ -1587,7 +1600,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-base"
 version = "0.2.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#da57061db0c470e06dd366c5f3f61fb3a8bf235e";
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#fe17dce813f500b4c633669a7078ee843bb44886";
 dependencies = [
  "chacha20poly1305",
  "dashmap",
@@ -1610,7 +1623,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-common"
 version = "0.2.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#da57061db0c470e06dd366c5f3f61fb3a8bf235e";
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#fe17dce813f500b4c633669a7078ee843bb44886";
 dependencies = [
  "async-trait",
  "futures",
@@ -1626,7 +1639,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-crypto"
 version = "0.2.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#da57061db0c470e06dd366c5f3f61fb3a8bf235e";
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#fe17dce813f500b4c633669a7078ee843bb44886";
 dependencies = [
  "aes-ctr",
  "aes-gcm",
@@ -1635,7 +1648,7 @@ dependencies = [
  "byteorder",
  "dashmap",
  "futures",
- "getrandom 0.2.2",
+ "getrandom 0.2.3",
  "hmac",
  "matrix-sdk-common",
  "olm-rs",
@@ -1869,7 +1882,7 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index";
 checksum = "8962a1fc909accf520991dcda872888554ecf16320097e02d3bd9981844a24ae"
 dependencies = [
- "getrandom 0.2.2",
+ "getrandom 0.2.3",
  "olm-sys",
  "serde",
  "serde_json",
@@ -1919,9 +1932,9 @@ dependencies = [
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
+checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
 
 [[package]]
 name = "openssl-sys"
@@ -1939,7 +1952,7 @@ dependencies = [
 [[package]]
 name = "pango"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c";
+source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c";
 dependencies = [
  "bitflags",
  "glib",
@@ -1951,7 +1964,7 @@ dependencies = [
 [[package]]
 name = "pango-sys"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c";
+source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c";
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -2233,9 +2246,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.26"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
+checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
 dependencies = [
  "unicode-xid",
 ]
@@ -2310,7 +2323,7 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index";
 checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
 dependencies = [
- "getrandom 0.2.2",
+ "getrandom 0.2.3",
 ]
 
 [[package]]
@@ -2351,9 +2364,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.5.3"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ce5f1ceb7f74abbce32601642fcf8e8508a8a8991e0621c7d750295b9095702b"
+checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2422,8 +2435,9 @@ dependencies = [
 
 [[package]]
 name = "ruma"
-version = "0.0.3"
-source = 
"git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88";
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "049e3d696c050a3bf493eac2bbc5a367e53549ae0539fd528b7c2730d7eab117"
 dependencies = [
  "assign",
  "js_int",
@@ -2438,8 +2452,9 @@ dependencies = [
 
 [[package]]
 name = "ruma-api"
-version = "0.17.0-alpha.4"
-source = 
"git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88";
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "51df85b3e2c4097abc60919864502083def5c3b12982b0c46f6431e5b1e1476d"
 dependencies = [
  "bytes",
  "http",
@@ -2454,8 +2469,9 @@ dependencies = [
 
 [[package]]
 name = "ruma-api-macros"
-version = "0.17.0-alpha.4"
-source = 
"git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88";
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "fe79932728de6a753163f4f30acfd70ebe4355c35fc638edb3f47c7cf47ab128"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -2465,8 +2481,9 @@ dependencies = [
 
 [[package]]
 name = "ruma-client-api"
-version = "0.10.0-alpha.3"
-source = 
"git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88";
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "3271fa4c6800589af326d033d9fe8ef78424789b20c4cea9a6fa60c2480b572f"
 dependencies = [
  "assign",
  "bytes",
@@ -2485,8 +2502,9 @@ dependencies = [
 
 [[package]]
 name = "ruma-common"
-version = "0.5.0"
-source = 
"git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88";
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "c87e1a95f3625cae17772e98b3479059e7aa18593fb623bcff498d32d399d956"
 dependencies = [
  "indexmap",
  "js_int",
@@ -2500,9 +2518,11 @@ dependencies = [
 
 [[package]]
 name = "ruma-events"
-version = "0.22.0-alpha.3"
-source = 
"git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88";
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "7f3b0aa9e199d77a89a88721ea01b6fd0f2102eff3c4c745c9adff2bc5fe4f5e"
 dependencies = [
+ "indoc",
  "js_int",
  "ruma-common",
  "ruma-events-macros",
@@ -2514,8 +2534,9 @@ dependencies = [
 
 [[package]]
 name = "ruma-events-macros"
-version = "0.22.0-alpha.3"
-source = 
"git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88";
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "55a7f9697f093c404f0e797fe88eb4dd5d2a6d5505171e05f76caebf95f15a86"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -2525,8 +2546,9 @@ dependencies = [
 
 [[package]]
 name = "ruma-federation-api"
-version = "0.1.0-alpha.2"
-source = 
"git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88";
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "40fe42fd5951c688b5c7b0c32ed74d973d21c33ba31f9d64d40bf4f98c01eb48"
 dependencies = [
  "js_int",
  "ruma-api",
@@ -2540,8 +2562,9 @@ dependencies = [
 
 [[package]]
 name = "ruma-identifiers"
-version = "0.19.0"
-source = 
"git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88";
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "4b63396866eab1d0dafe5bd3c1af2e16f1f71a725fcc89a3e3f42572bc20c65a"
 dependencies = [
  "paste",
  "ruma-identifiers-macros",
@@ -2553,8 +2576,9 @@ dependencies = [
 
 [[package]]
 name = "ruma-identifiers-macros"
-version = "0.19.0"
-source = 
"git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88";
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "a77e9bf8fd334e944d40f041155d4950da75a9b64cd05046ffc8ea670ad4ad12"
 dependencies = [
  "quote",
  "ruma-identifiers-validation",
@@ -2564,12 +2588,14 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-validation"
 version = "0.3.0"
-source = 
"git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88";
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "ecb664a32ba1cccf0d5cec34bef6bfccc042b54b8b5f9610729a128fcdf569a5"
 
 [[package]]
 name = "ruma-serde"
-version = "0.3.1"
-source = 
"git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88";
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "c888d69db1d5f134cbce7101f5610f1802966f359646ff48dbaf0f433d7bbd9f"
 dependencies = [
  "bytes",
  "form_urlencoded",
@@ -2582,8 +2608,9 @@ dependencies = [
 
 [[package]]
 name = "ruma-serde-macros"
-version = "0.3.1"
-source = 
"git+https://github.com/ruma/ruma?rev=a0f7e1b771d3294187bae0b2816fbcf6ceb40b88#a0f7e1b771d3294187bae0b2816fbcf6ceb40b88";
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "be418f3ee1593ebf1522d9ace1b1de0455bbcdd69c5d584c00d41e7717f8d0af"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -2721,18 +2748,18 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"
 
 [[package]]
 name = "serde"
-version = "1.0.125"
+version = "1.0.126"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
+checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.125"
+version = "1.0.126"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
+checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2752,9 +2779,9 @@ dependencies = [
 
 [[package]]
 name = "serde_repr"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76"
+checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2793,9 +2820,9 @@ checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 
 [[package]]
 name = "sha2"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d8f6b75b17576b792bef0db1bcc4b8b8bcdf9506744cf34b974195487af6cff2"
+checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12"
 dependencies = [
  "block-buffer 0.9.0",
  "cfg-if 1.0.0",
@@ -2866,7 +2893,7 @@ dependencies = [
 [[package]]
 name = "sourceview5"
 version = "0.1.0"
-source = 
"git+https://gitlab.gnome.org/World/Rust/sourceview5-rs.git?branch=main#12538aac057128d94bd720d9fe391d9233dd9eb1";
+source = 
"git+https://gitlab.gnome.org/World/Rust/sourceview5-rs.git?branch=main#dc0128cbe1dcfa7e393f088855eee50e124f6be7";
 dependencies = [
  "bitflags",
  "gdk-pixbuf",
@@ -2882,7 +2909,7 @@ dependencies = [
 [[package]]
 name = "sourceview5-sys"
 version = "0.1.0"
-source = 
"git+https://gitlab.gnome.org/World/Rust/sourceview5-rs.git?branch=main#12538aac057128d94bd720d9fe391d9233dd9eb1";
+source = 
"git+https://gitlab.gnome.org/World/Rust/sourceview5-rs.git?branch=main#dc0128cbe1dcfa7e393f088855eee50e124f6be7";
 dependencies = [
  "gdk-pixbuf-sys",
  "gdk4-sys",
@@ -3177,9 +3204,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "83f0c8e7c0addab50b663055baf787d0af7f413a46e6e7fb9559a4e4db7137a5"
+checksum = "bd3076b5c8cc18138b8f8814895c11eb4de37114a5d127bafdc5e55798ceef37"
 dependencies = [
  "autocfg",
  "bytes",
@@ -3214,9 +3241,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.6.6"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "940a12c99365c31ea8dd9ba04ec1be183ffe4920102bb7122c2f515437601e8e"
+checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592"
 dependencies = [
  "bytes",
  "futures-core",
@@ -3334,9 +3361,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 
 [[package]]
 name = "twoway"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "6b40075910de3a912adbd80b5d8bad6ad10a23eeb1f5bf9d4006839e899ba5bc"
+checksum = "c57ffb460d7c24cd6eda43694110189030a3d1dfe418416d9468fd1c1d290b47"
 dependencies = [
  "memchr",
  "unchecked-index",
@@ -3408,6 +3435,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index";
 checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
 
+[[package]]
+name = "unindent"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7"
+
 [[package]]
 name = "universal-hash"
 version = "0.4.0"
@@ -3420,9 +3453,9 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.2.1"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b"
+checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -3442,7 +3475,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index";
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 dependencies = [
- "getrandom 0.2.2",
+ "getrandom 0.2.3",
  "serde",
 ]
 
@@ -3506,9 +3539,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.73"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9"
+checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd"
 dependencies = [
  "cfg-if 1.0.0",
  "serde",
@@ -3518,9 +3551,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.73"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae"
+checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -3533,9 +3566,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.23"
+version = "0.4.24"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "81b8b767af23de6ac18bf2168b690bed2902743ddf0fb39252e36f9e2bfc63ea"
+checksum = "5fba7978c679d53ce2d0ac80c8c175840feb849a161664365d1287b41f2e67f1"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -3545,9 +3578,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.73"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f"
+checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3555,9 +3588,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.73"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c"
+checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3568,15 +3601,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.73"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489"
+checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f"
 
 [[package]]
 name = "web-sys"
-version = "0.3.50"
+version = "0.3.51"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be"
+checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
diff --git a/Cargo.toml b/Cargo.toml
index 614dd516..15c89dfa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,9 +32,6 @@ git = "https://gitlab.gnome.org/World/Rust/sourceview5-rs.git";
 package = "gtk4"
 git = "https://github.com/gtk-rs/gtk4-rs";
 
-[dependencies.glib]
-git = "https://github.com/gtk-rs/gtk-rs";
-
 [dependencies.adw]
 package = "libadwaita"
 git = "https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git";
diff --git a/build-aux/org.gnome.FractalNext.Devel.json b/build-aux/org.gnome.FractalNext.Devel.json
index 060d14f9..f256f4bd 100644
--- a/build-aux/org.gnome.FractalNext.Devel.json
+++ b/build-aux/org.gnome.FractalNext.Devel.json
@@ -1,17 +1,19 @@
 {
-    "app-id": "org.gnome.FractalNext.Devel",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "master",
-    "sdk": "org.gnome.Sdk",
-    "sdk-extensions": ["org.freedesktop.Sdk.Extension.rust-stable"],
-    "command": "fractal",
+    "app-id" : "org.gnome.FractalNext.Devel",
+    "runtime" : "org.gnome.Platform",
+    "runtime-version" : "master",
+    "sdk" : "org.gnome.Sdk",
+    "sdk-extensions" : [
+        "org.freedesktop.Sdk.Extension.rust-stable"
+    ],
+    "command" : "fractal",
     "finish-args" : [
         "--socket=fallback-x11",
         "--socket=wayland",
         "--share=network",
         "--device=dri",
         "--talk-name=org.a11y.Bus",
-       "--talk-name=org.freedesktop.secrets",
+        "--talk-name=org.freedesktop.secrets",
         "--env=RUST_LOG=fractal=debug",
         "--env=G_MESSAGES_DEBUG=none"
     ],
@@ -20,28 +22,28 @@
         "build-args" : [
             "--share=network"
         ],
-        "test-args": [
+        "test-args" : [
             "--socket=x11",
             "--share=network"
         ],
         "env" : {
-            "RUST_BACKTRACE": "1"
+            "RUST_BACKTRACE" : "1"
         }
     },
-    "modules": [
+    "modules" : [
         {
-            "name": "libadwaita",
-            "buildsystem": "meson",
-            "config-opts": [
+            "name" : "libadwaita",
+            "buildsystem" : "meson",
+            "config-opts" : [
                 "-Dlibadwaita:tests=false",
                 "-Dlibadwaita:examples=false",
                 "-Dlibadwaita:vapi=false"
             ],
-            "sources": [
+            "sources" : [
                 {
-                    "type": "git",
-                    "url": "https://gitlab.gnome.org/exalm/libadwaita.git";,
-                    "branch": "main"
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/exalm/libadwaita.git";,
+                    "branch" : "main"
                 }
             ]
         },
@@ -64,14 +66,16 @@
             ]
         },
         {
-            "name": "fractal",
-            "buildsystem": "meson",
-            "run-tests": true,
-            "config-opts": ["-Dprofile=development"],
-            "sources": [
+            "name" : "fractal",
+            "buildsystem" : "meson",
+            "run-tests" : true,
+            "config-opts" : [
+                "-Dprofile=development"
+            ],
+            "sources" : [
                 {
-                    "type": "dir",
-                    "path": "../"
+                    "type" : "dir",
+                    "path" : "../"
                 }
             ]
         }
diff --git a/src/session/content/message_row.rs b/src/session/content/message_row.rs
index dfd9eaf3..469d45b4 100644
--- a/src/session/content/message_row.rs
+++ b/src/session/content/message_row.rs
@@ -210,16 +210,16 @@ impl MessageRow {
             AnyRoomEvent::Message(message) => message.content(),
             AnyRoomEvent::RedactedMessage(message) => {
                 if let Some(ref redaction_event) = message.unsigned().redacted_because {
-                    AnyMessageEvent::RoomRedaction(*redaction_event.clone()).content()
+                    AnyMessageEventContent::RoomRedaction(redaction_event.content.clone())
                 } else {
-                    AnyMessageEventContent::RoomRedaction(RedactionEventContent { reason: None })
+                    AnyMessageEventContent::RoomRedaction(RedactionEventContent::new())
                 }
             }
             AnyRoomEvent::RedactedState(state) => {
                 if let Some(ref redaction_event) = state.unsigned().redacted_because {
-                    AnyMessageEvent::RoomRedaction(*redaction_event.clone()).content()
+                    AnyMessageEventContent::RoomRedaction(redaction_event.content.clone())
                 } else {
-                    AnyMessageEventContent::RoomRedaction(RedactionEventContent { reason: None })
+                    AnyMessageEventContent::RoomRedaction(RedactionEventContent::new())
                 }
             }
             _ => panic!("This event isn't a room message event or redacted event"),
diff --git a/src/session/room/event.rs b/src/session/room/event.rs
index 61da9939..01a6cd70 100644
--- a/src/session/room/event.rs
+++ b/src/session/room/event.rs
@@ -10,7 +10,7 @@ use matrix_sdk::{
 
 use crate::fn_event;
 use crate::session::User;
-use std::{cell::RefCell, time::SystemTime};
+use std::cell::RefCell;
 
 #[derive(Clone, Debug, glib::GBoxed)]
 #[gboxed(type_name = "BoxedAnyRoomEvent")]
@@ -180,7 +180,8 @@ impl Event {
 
         let ts = fn_event!(event, origin_server_ts).clone();
 
-        DateTime::from_unix_utc(ts.duration_since(SystemTime::UNIX_EPOCH).unwrap().as_secs() as i64)
+        // FIXME: we need to add `as_secs()` to `MilliSecondsSinceUnixEpoch`
+        DateTime::from_unix_utc(i64::from(ts.0) / 1000)
             .and_then(|t| t.to_local())
             .unwrap()
     }
diff --git a/src/session/room/room.rs b/src/session/room/room.rs
index aa65b253..4d99c718 100644
--- a/src/session/room/room.rs
+++ b/src/session/room/room.rs
@@ -7,8 +7,7 @@ use matrix_sdk::{
         room::{
             member::MemberEventContent,
             message::{
-                EmoteMessageEventContent, FormattedBody, MessageEventContent, MessageType,
-                TextMessageEventContent,
+                EmoteMessageEventContent, MessageEventContent, MessageType, TextMessageEventContent,
             },
         },
         tag::TagName,
@@ -17,10 +16,9 @@ use matrix_sdk::{
     identifiers::{EventId, RoomId, UserId},
     room::Room as MatrixRoom,
     uuid::Uuid,
-    RoomMember,
+    MilliSecondsSinceUnixEpoch, RoomMember,
 };
 use std::cell::RefCell;
-use std::time::SystemTime;
 
 use crate::session::{
     categories::CategoryType,
@@ -469,11 +467,12 @@ impl Room {
             };
 
             let content = if is_emote {
-                let emote = EmoteMessageEventContent {
-                    body: body.to_string(),
-                    formatted: formatted
-                        .filter(|formatted| formatted.as_str() == body)
-                        .map(|f| FormattedBody::html(f)),
+                let emote = if let Some(formatted) =
+                    formatted.filter(|formatted| formatted.as_str() == body)
+                {
+                    EmoteMessageEventContent::html(body, formatted)
+                } else {
+                    EmoteMessageEventContent::plain(body)
                 };
                 MessageEventContent::new(MessageType::Emote(emote))
             } else {
@@ -493,7 +492,7 @@ impl Room {
                 content,
                 event_id: EventId::try_from(format!("${}:fractal.gnome.org", txn_id)).unwrap(),
                 sender: self.user().user_id().clone(),
-                origin_server_ts: SystemTime::now(),
+                origin_server_ts: MilliSecondsSinceUnixEpoch::now(),
                 room_id: matrix_room.room_id().clone(),
                 unsigned: Unsigned::default(),
             });
diff --git a/src/utils.rs b/src/utils.rs
index 1f1f7e88..fda2c333 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -33,6 +33,7 @@ macro_rules! event_from_sync_event {
 }
 
 use crate::RUNTIME;
+use gtk::glib;
 use std::future::Future;
 /// Exexcute a future on a tokio runtime and spawn a future on the local thread to handle the result
 pub fn do_async<
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]