26.diff (30771B)
1 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml 2 index ee3ee1e..5d16852 100644 3 --- a/.github/workflows/deploy.yml 4 +++ b/.github/workflows/deploy.yml 5 @@ -2,7 +2,7 @@ name: Deploy to Netlify 6 7 on: 8 push: 9 - branches: [master] 10 + branches: [none] 11 12 jobs: 13 deploy: 14 diff --git a/Cargo.lock b/Cargo.lock 15 index ee3c2b3..fe0ca57 100644 16 --- a/Cargo.lock 17 +++ b/Cargo.lock 18 @@ -2,9 +2,9 @@ 19 # It is not intended for manual editing. 20 [[package]] 21 name = "adler32" 22 -version = "1.1.0" 23 +version = "1.2.0" 24 source = "registry+https://github.com/rust-lang/crates.io-index" 25 -checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d" 26 +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" 27 28 [[package]] 29 name = "anyhow" 30 @@ -24,15 +24,21 @@ version = "0.5.1" 31 source = "registry+https://github.com/rust-lang/crates.io-index" 32 checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" 33 34 +[[package]] 35 +name = "assign" 36 +version = "1.1.0" 37 +source = "registry+https://github.com/rust-lang/crates.io-index" 38 +checksum = "4af5687fe33aec5e70ef14caac5e0d363e335e5e5d6385fb75978d0c241b1d67" 39 + 40 [[package]] 41 name = "async-trait" 42 -version = "0.1.36" 43 +version = "0.1.38" 44 source = "registry+https://github.com/rust-lang/crates.io-index" 45 -checksum = "a265e3abeffdce30b2e26b7a11b222fe37c6067404001b434101457d0385eb92" 46 +checksum = "6e1a4a2f97ce50c9d0282c1468816208588441492b40d813b2e0419c22c05e7f" 47 dependencies = [ 48 "proc-macro2 1.0.19", 49 "quote 1.0.7", 50 - "syn 1.0.35", 51 + "syn 1.0.38", 52 ] 53 54 [[package]] 55 @@ -79,9 +85,9 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" 56 57 [[package]] 58 name = "cc" 59 -version = "1.0.58" 60 +version = "1.0.59" 61 source = "registry+https://github.com/rust-lang/crates.io-index" 62 -checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518" 63 +checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381" 64 65 [[package]] 66 name = "cfg-if" 67 @@ -359,7 +365,7 @@ dependencies = [ 68 "proc-macro-hack", 69 "proc-macro2 1.0.19", 70 "quote 1.0.7", 71 - "syn 1.0.35", 72 + "syn 1.0.38", 73 ] 74 75 [[package]] 76 @@ -515,9 +521,9 @@ dependencies = [ 77 78 [[package]] 79 name = "hashbrown" 80 -version = "0.8.1" 81 +version = "0.8.2" 82 source = "registry+https://github.com/rust-lang/crates.io-index" 83 -checksum = "34f595585f103464d8d2f6e9864682d74c1601fed5e07d62b1c9058dba8246fb" 84 +checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" 85 dependencies = [ 86 "autocfg", 87 ] 88 @@ -610,9 +616,9 @@ dependencies = [ 89 90 [[package]] 91 name = "i18n-embed" 92 -version = "0.6.0" 93 +version = "0.6.1" 94 source = "registry+https://github.com/rust-lang/crates.io-index" 95 -checksum = "f85e9383646a5f071c6dfe27e5f55acb6d24da25406485b0ebe9067593855dab" 96 +checksum = "325388e0591fad1d9b4da8f26195b086f9dee7c35f4b80c3fb0abb9b89b82a9d" 97 dependencies = [ 98 "fluent-langneg", 99 "gettext", 100 @@ -636,7 +642,7 @@ dependencies = [ 101 "quote 1.0.7", 102 "serde", 103 "serde_derive", 104 - "syn 1.0.35", 105 + "syn 1.0.38", 106 ] 107 108 [[package]] 109 @@ -686,9 +692,9 @@ dependencies = [ 110 111 [[package]] 112 name = "indexmap" 113 -version = "1.5.0" 114 +version = "1.5.1" 115 source = "registry+https://github.com/rust-lang/crates.io-index" 116 -checksum = "5b88cd59ee5f71fea89a62248fc8f387d44400cefe05ef548466d61ced9029a7" 117 +checksum = "86b45e59b16c76b11bf9738fd5d38879d3bd28ad292d7b313608becb17ae2df9" 118 dependencies = [ 119 "autocfg", 120 "hashbrown", 121 @@ -729,9 +735,9 @@ checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" 122 123 [[package]] 124 name = "js-sys" 125 -version = "0.3.42" 126 +version = "0.3.44" 127 source = "registry+https://github.com/rust-lang/crates.io-index" 128 -checksum = "52732a3d3ad72c58ad2dc70624f9c17b46ecd0943b9a4f1ee37c4c18c5d983e2" 129 +checksum = "85a7e2c92a4804dd459b86c339278d0fe87cf93757fae222c3fa3ae75458bc73" 130 dependencies = [ 131 "wasm-bindgen", 132 ] 133 @@ -776,9 +782,9 @@ dependencies = [ 134 135 [[package]] 136 name = "libc" 137 -version = "0.2.73" 138 +version = "0.2.76" 139 source = "registry+https://github.com/rust-lang/crates.io-index" 140 -checksum = "bd7d4bd64732af4bf3a67f367c27df8520ad7e230c5817b8ff485864d80242b9" 141 +checksum = "755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3" 142 143 [[package]] 144 name = "libflate" 145 @@ -819,8 +825,9 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" 146 [[package]] 147 name = "matrix-sdk" 148 version = "0.1.0" 149 -source = "git+https://github.com/matrix-org/matrix-rust-sdk#d4fe2fe0a2575e788e12aa6aea05bdd383a85d68" 150 +source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=89c9e311408d2c57245f4ec5af7bbd4daa0046d3#89c9e311408d2c57245f4ec5af7bbd4daa0046d3" 151 dependencies = [ 152 + "async-trait", 153 "futures-timer", 154 "http", 155 "matrix-sdk-base", 156 @@ -837,7 +844,7 @@ dependencies = [ 157 [[package]] 158 name = "matrix-sdk-base" 159 version = "0.1.0" 160 -source = "git+https://github.com/matrix-org/matrix-rust-sdk#d4fe2fe0a2575e788e12aa6aea05bdd383a85d68" 161 +source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=89c9e311408d2c57245f4ec5af7bbd4daa0046d3#89c9e311408d2c57245f4ec5af7bbd4daa0046d3" 162 dependencies = [ 163 "async-trait", 164 "matrix-sdk-common", 165 @@ -853,8 +860,9 @@ dependencies = [ 166 [[package]] 167 name = "matrix-sdk-common" 168 version = "0.1.0" 169 -source = "git+https://github.com/matrix-org/matrix-rust-sdk#d4fe2fe0a2575e788e12aa6aea05bdd383a85d68" 170 +source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=89c9e311408d2c57245f4ec5af7bbd4daa0046d3#89c9e311408d2c57245f4ec5af7bbd4daa0046d3" 171 dependencies = [ 172 + "assign", 173 "futures-locks", 174 "instant", 175 "js_int", 176 @@ -866,10 +874,10 @@ dependencies = [ 177 [[package]] 178 name = "matrix-sdk-common-macros" 179 version = "0.1.0" 180 -source = "git+https://github.com/matrix-org/matrix-rust-sdk#d4fe2fe0a2575e788e12aa6aea05bdd383a85d68" 181 +source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=89c9e311408d2c57245f4ec5af7bbd4daa0046d3#89c9e311408d2c57245f4ec5af7bbd4daa0046d3" 182 dependencies = [ 183 "quote 1.0.7", 184 - "syn 1.0.35", 185 + "syn 1.0.38", 186 ] 187 188 [[package]] 189 @@ -967,9 +975,9 @@ dependencies = [ 190 191 [[package]] 192 name = "once_cell" 193 -version = "1.4.0" 194 +version = "1.4.1" 195 source = "registry+https://github.com/rust-lang/crates.io-index" 196 -checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" 197 +checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad" 198 199 [[package]] 200 name = "openssl" 201 @@ -1012,22 +1020,22 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" 202 203 [[package]] 204 name = "pin-project" 205 -version = "0.4.22" 206 +version = "0.4.23" 207 source = "registry+https://github.com/rust-lang/crates.io-index" 208 -checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17" 209 +checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa" 210 dependencies = [ 211 "pin-project-internal", 212 ] 213 214 [[package]] 215 name = "pin-project-internal" 216 -version = "0.4.22" 217 +version = "0.4.23" 218 source = "registry+https://github.com/rust-lang/crates.io-index" 219 -checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7" 220 +checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f" 221 dependencies = [ 222 "proc-macro2 1.0.19", 223 "quote 1.0.7", 224 - "syn 1.0.35", 225 + "syn 1.0.38", 226 ] 227 228 [[package]] 229 @@ -1050,9 +1058,18 @@ checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" 230 231 [[package]] 232 name = "ppv-lite86" 233 -version = "0.2.8" 234 +version = "0.2.9" 235 source = "registry+https://github.com/rust-lang/crates.io-index" 236 -checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" 237 +checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20" 238 + 239 +[[package]] 240 +name = "proc-macro-crate" 241 +version = "0.1.5" 242 +source = "registry+https://github.com/rust-lang/crates.io-index" 243 +checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" 244 +dependencies = [ 245 + "toml", 246 +] 247 248 [[package]] 249 name = "proc-macro-hack" 250 @@ -1173,7 +1190,7 @@ dependencies = [ 251 [[package]] 252 name = "reqwest" 253 version = "0.10.7" 254 -source = "git+https://github.com/daydream-mx/reqwest.git?branch=MTRNord/wasm-worker-support#3cfec388702b239ba0daf41dc48a4fee775ce43a" 255 +source = "git+https://github.com/jplatte/reqwest.git?branch=wasm-fix-get-via-http-req#28d9ece4bbc70f3ea02a0343e583d971119e0845" 256 dependencies = [ 257 "base64", 258 "bytes", 259 @@ -1212,26 +1229,26 @@ checksum = "cabe4fa914dec5870285fa7f71f602645da47c486e68486d2b4ceb4a343e90ac" 260 261 [[package]] 262 name = "ruma" 263 -version = "0.1.0" 264 -source = "git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3#ea2992a4120d34495d6f07f141350d8f2a3429d3" 265 +version = "0.0.1" 266 +source = "git+https://github.com/ruma/ruma?rev=e74158b2626186ce23d4d3c07782e60b3be39434#e74158b2626186ce23d4d3c07782e60b3be39434" 267 dependencies = [ 268 "ruma-api", 269 "ruma-client-api", 270 "ruma-common", 271 "ruma-events", 272 - "ruma-identifiers 0.17.0 (git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3)", 273 - "ruma-identifiers-macros", 274 + "ruma-identifiers", 275 + "ruma-serde", 276 ] 277 278 [[package]] 279 name = "ruma-api" 280 -version = "0.16.1" 281 -source = "git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3#ea2992a4120d34495d6f07f141350d8f2a3429d3" 282 +version = "0.17.0-alpha.1" 283 +source = "git+https://github.com/ruma/ruma?rev=e74158b2626186ce23d4d3c07782e60b3be39434#e74158b2626186ce23d4d3c07782e60b3be39434" 284 dependencies = [ 285 "http", 286 "percent-encoding", 287 "ruma-api-macros", 288 - "ruma-identifiers 0.17.0 (git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3)", 289 + "ruma-identifiers", 290 "ruma-serde", 291 "serde", 292 "serde_json", 293 @@ -1240,25 +1257,28 @@ dependencies = [ 294 295 [[package]] 296 name = "ruma-api-macros" 297 -version = "0.16.1" 298 -source = "git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3#ea2992a4120d34495d6f07f141350d8f2a3429d3" 299 +version = "0.17.0-alpha.1" 300 +source = "git+https://github.com/ruma/ruma?rev=e74158b2626186ce23d4d3c07782e60b3be39434#e74158b2626186ce23d4d3c07782e60b3be39434" 301 dependencies = [ 302 + "proc-macro-crate", 303 "proc-macro2 1.0.19", 304 "quote 1.0.7", 305 - "syn 1.0.35", 306 + "syn 1.0.38", 307 ] 308 309 [[package]] 310 name = "ruma-client-api" 311 -version = "0.9.0" 312 -source = "git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3#ea2992a4120d34495d6f07f141350d8f2a3429d3" 313 +version = "0.10.0-alpha.1" 314 +source = "git+https://github.com/ruma/ruma?rev=e74158b2626186ce23d4d3c07782e60b3be39434#e74158b2626186ce23d4d3c07782e60b3be39434" 315 dependencies = [ 316 + "assign", 317 "http", 318 "js_int", 319 + "percent-encoding", 320 "ruma-api", 321 "ruma-common", 322 "ruma-events", 323 - "ruma-identifiers 0.17.0 (git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3)", 324 + "ruma-identifiers", 325 "ruma-serde", 326 "serde", 327 "serde_json", 328 @@ -1268,9 +1288,10 @@ dependencies = [ 329 [[package]] 330 name = "ruma-common" 331 version = "0.2.0" 332 -source = "git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3#ea2992a4120d34495d6f07f141350d8f2a3429d3" 333 +source = "git+https://github.com/ruma/ruma?rev=e74158b2626186ce23d4d3c07782e60b3be39434#e74158b2626186ce23d4d3c07782e60b3be39434" 334 dependencies = [ 335 "js_int", 336 + "ruma-identifiers", 337 "ruma-serde", 338 "serde", 339 "serde_json", 340 @@ -1279,13 +1300,13 @@ dependencies = [ 341 342 [[package]] 343 name = "ruma-events" 344 -version = "0.21.3" 345 -source = "git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3#ea2992a4120d34495d6f07f141350d8f2a3429d3" 346 +version = "0.22.0-alpha.1" 347 +source = "git+https://github.com/ruma/ruma?rev=e74158b2626186ce23d4d3c07782e60b3be39434#e74158b2626186ce23d4d3c07782e60b3be39434" 348 dependencies = [ 349 "js_int", 350 "ruma-common", 351 "ruma-events-macros", 352 - "ruma-identifiers 0.17.0 (git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3)", 353 + "ruma-identifiers", 354 "ruma-serde", 355 "serde", 356 "serde_json", 357 @@ -1294,48 +1315,52 @@ dependencies = [ 358 359 [[package]] 360 name = "ruma-events-macros" 361 -version = "0.21.3" 362 -source = "git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3#ea2992a4120d34495d6f07f141350d8f2a3429d3" 363 +version = "0.22.0-alpha.1" 364 +source = "git+https://github.com/ruma/ruma?rev=e74158b2626186ce23d4d3c07782e60b3be39434#e74158b2626186ce23d4d3c07782e60b3be39434" 365 dependencies = [ 366 + "proc-macro-crate", 367 "proc-macro2 1.0.19", 368 "quote 1.0.7", 369 - "syn 1.0.35", 370 + "syn 1.0.38", 371 ] 372 373 [[package]] 374 name = "ruma-identifiers" 375 -version = "0.17.0" 376 -source = "git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3#ea2992a4120d34495d6f07f141350d8f2a3429d3" 377 +version = "0.17.4" 378 +source = "git+https://github.com/ruma/ruma?rev=e74158b2626186ce23d4d3c07782e60b3be39434#e74158b2626186ce23d4d3c07782e60b3be39434" 379 dependencies = [ 380 + "ruma-identifiers-macros", 381 + "ruma-identifiers-validation", 382 "serde", 383 "strum", 384 ] 385 386 [[package]] 387 -name = "ruma-identifiers" 388 -version = "0.17.0" 389 -source = "registry+https://github.com/rust-lang/crates.io-index" 390 -checksum = "f7046d6ff26cf4f5b8bc77af68527544c61e32cab5810c40035c6491c08da0d3" 391 +name = "ruma-identifiers-macros" 392 +version = "0.17.4" 393 +source = "git+https://github.com/ruma/ruma?rev=e74158b2626186ce23d4d3c07782e60b3be39434#e74158b2626186ce23d4d3c07782e60b3be39434" 394 dependencies = [ 395 - "serde", 396 - "strum", 397 + "proc-macro2 1.0.19", 398 + "quote 1.0.7", 399 + "ruma-identifiers-validation", 400 + "syn 1.0.38", 401 ] 402 403 [[package]] 404 -name = "ruma-identifiers-macros" 405 -version = "0.17.0" 406 -source = "git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3#ea2992a4120d34495d6f07f141350d8f2a3429d3" 407 +name = "ruma-identifiers-validation" 408 +version = "0.1.1" 409 +source = "git+https://github.com/ruma/ruma?rev=e74158b2626186ce23d4d3c07782e60b3be39434#e74158b2626186ce23d4d3c07782e60b3be39434" 410 dependencies = [ 411 - "proc-macro2 1.0.19", 412 - "quote 1.0.7", 413 - "ruma-identifiers 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", 414 - "syn 1.0.35", 415 + "ruma-serde", 416 + "serde", 417 + "serde_json", 418 + "strum", 419 ] 420 421 [[package]] 422 name = "ruma-serde" 423 -version = "0.2.2" 424 -source = "git+https://github.com/ruma/ruma?rev=ea2992a4120d34495d6f07f141350d8f2a3429d3#ea2992a4120d34495d6f07f141350d8f2a3429d3" 425 +version = "0.2.3" 426 +source = "git+https://github.com/ruma/ruma?rev=e74158b2626186ce23d4d3c07782e60b3be39434#e74158b2626186ce23d4d3c07782e60b3be39434" 427 dependencies = [ 428 "form_urlencoded", 429 "itoa", 430 @@ -1364,7 +1389,7 @@ checksum = "7903c2cf599db8f310b392332f38367ca4acc84420fa1aee3536299f433c10d5" 431 dependencies = [ 432 "quote 1.0.7", 433 "rust-embed-utils", 434 - "syn 1.0.35", 435 + "syn 1.0.38", 436 "walkdir", 437 ] 438 439 @@ -1433,29 +1458,29 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" 440 441 [[package]] 442 name = "serde" 443 -version = "1.0.114" 444 +version = "1.0.115" 445 source = "registry+https://github.com/rust-lang/crates.io-index" 446 -checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" 447 +checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5" 448 dependencies = [ 449 "serde_derive", 450 ] 451 452 [[package]] 453 name = "serde_derive" 454 -version = "1.0.114" 455 +version = "1.0.115" 456 source = "registry+https://github.com/rust-lang/crates.io-index" 457 -checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" 458 +checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48" 459 dependencies = [ 460 "proc-macro2 1.0.19", 461 "quote 1.0.7", 462 - "syn 1.0.35", 463 + "syn 1.0.38", 464 ] 465 466 [[package]] 467 name = "serde_json" 468 -version = "1.0.56" 469 +version = "1.0.57" 470 source = "registry+https://github.com/rust-lang/crates.io-index" 471 -checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3" 472 +checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c" 473 dependencies = [ 474 "itoa", 475 "ryu", 476 @@ -1500,23 +1525,23 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" 477 478 [[package]] 479 name = "strum" 480 -version = "0.18.0" 481 +version = "0.19.2" 482 source = "registry+https://github.com/rust-lang/crates.io-index" 483 -checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b" 484 +checksum = "3924a58d165da3b7b2922c667ab0673c7b5fd52b5c19ea3442747bcb3cd15abe" 485 dependencies = [ 486 "strum_macros", 487 ] 488 489 [[package]] 490 name = "strum_macros" 491 -version = "0.18.0" 492 +version = "0.19.2" 493 source = "registry+https://github.com/rust-lang/crates.io-index" 494 -checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" 495 +checksum = "2d2ab682ecdcae7f5f45ae85cd7c1e6c8e68ea42c8a612d47fedf831c037146a" 496 dependencies = [ 497 "heck", 498 "proc-macro2 1.0.19", 499 "quote 1.0.7", 500 - "syn 1.0.35", 501 + "syn 1.0.38", 502 ] 503 504 [[package]] 505 @@ -1532,9 +1557,9 @@ dependencies = [ 506 507 [[package]] 508 name = "syn" 509 -version = "1.0.35" 510 +version = "1.0.38" 511 source = "registry+https://github.com/rust-lang/crates.io-index" 512 -checksum = "fb7f4c519df8c117855e19dd8cc851e89eb746fe7a73f0157e0d95fdec5369b0" 513 +checksum = "e69abc24912995b3038597a7a593be5053eb0fb44f3cc5beec0deb421790c1f4" 514 dependencies = [ 515 "proc-macro2 1.0.19", 516 "quote 1.0.7", 517 @@ -1578,7 +1603,7 @@ checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" 518 dependencies = [ 519 "proc-macro2 1.0.19", 520 "quote 1.0.7", 521 - "syn 1.0.35", 522 + "syn 1.0.38", 523 ] 524 525 [[package]] 526 @@ -1593,15 +1618,15 @@ dependencies = [ 527 528 [[package]] 529 name = "tinystr" 530 -version = "0.3.2" 531 +version = "0.3.3" 532 source = "registry+https://github.com/rust-lang/crates.io-index" 533 -checksum = "4bac79c4b51eda1b090b1edebfb667821bbb51f713855164dc7cec2cb8ac2ba3" 534 +checksum = "707151f004e8db265b83b1c7509d6c3b4c2c2bc8696113cbe0a8e595c2fdbd3b" 535 536 [[package]] 537 name = "tinyvec" 538 -version = "0.3.3" 539 +version = "0.3.4" 540 source = "registry+https://github.com/rust-lang/crates.io-index" 541 -checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" 542 +checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117" 543 544 [[package]] 545 name = "tokio" 546 @@ -1671,9 +1696,9 @@ dependencies = [ 547 548 [[package]] 549 name = "tracing" 550 -version = "0.1.17" 551 +version = "0.1.19" 552 source = "registry+https://github.com/rust-lang/crates.io-index" 553 -checksum = "dbdf4ccd1652592b01286a5dbe1e2a77d78afaa34beadd9872a5f7396f92aaa9" 554 +checksum = "6d79ca061b032d6ce30c660fded31189ca0b9922bf483cd70759f13a2d86786c" 555 dependencies = [ 556 "cfg-if", 557 "log", 558 @@ -1683,20 +1708,20 @@ dependencies = [ 559 560 [[package]] 561 name = "tracing-attributes" 562 -version = "0.1.9" 563 +version = "0.1.11" 564 source = "registry+https://github.com/rust-lang/crates.io-index" 565 -checksum = "f0693bf8d6f2bf22c690fc61a9d21ac69efdbb894a17ed596b9af0f01e64b84b" 566 +checksum = "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada" 567 dependencies = [ 568 "proc-macro2 1.0.19", 569 "quote 1.0.7", 570 - "syn 1.0.35", 571 + "syn 1.0.38", 572 ] 573 574 [[package]] 575 name = "tracing-core" 576 -version = "0.1.11" 577 +version = "0.1.14" 578 source = "registry+https://github.com/rust-lang/crates.io-index" 579 -checksum = "94ae75f0d28ae10786f3b1895c55fe72e79928fd5ccdebb5438c75e93fec178f" 580 +checksum = "db63662723c316b43ca36d833707cc93dff82a02ba3d7e354f342682cc8b3545" 581 dependencies = [ 582 "lazy_static", 583 ] 584 @@ -1847,9 +1872,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" 585 586 [[package]] 587 name = "wasm-bindgen" 588 -version = "0.2.65" 589 +version = "0.2.67" 590 source = "registry+https://github.com/rust-lang/crates.io-index" 591 -checksum = "f3edbcc9536ab7eababcc6d2374a0b7bfe13a2b6d562c5e07f370456b1a8f33d" 592 +checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c" 593 dependencies = [ 594 "cfg-if", 595 "serde", 596 @@ -1859,24 +1884,24 @@ dependencies = [ 597 598 [[package]] 599 name = "wasm-bindgen-backend" 600 -version = "0.2.65" 601 +version = "0.2.67" 602 source = "registry+https://github.com/rust-lang/crates.io-index" 603 -checksum = "89ed2fb8c84bfad20ea66b26a3743f3e7ba8735a69fe7d95118c33ec8fc1244d" 604 +checksum = "bc71e4c5efa60fb9e74160e89b93353bc24059999c0ae0fb03affc39770310b0" 605 dependencies = [ 606 "bumpalo", 607 "lazy_static", 608 "log", 609 "proc-macro2 1.0.19", 610 "quote 1.0.7", 611 - "syn 1.0.35", 612 + "syn 1.0.38", 613 "wasm-bindgen-shared", 614 ] 615 616 [[package]] 617 name = "wasm-bindgen-futures" 618 -version = "0.4.15" 619 +version = "0.4.17" 620 source = "registry+https://github.com/rust-lang/crates.io-index" 621 -checksum = "41ad6e4e8b2b7f8c90b6e09a9b590ea15cb0d1dbe28502b5a405cd95d1981671" 622 +checksum = "95f8d235a77f880bcef268d379810ea6c0af2eacfa90b1ad5af731776e0c4699" 623 dependencies = [ 624 "cfg-if", 625 "js-sys", 626 @@ -1886,9 +1911,9 @@ dependencies = [ 627 628 [[package]] 629 name = "wasm-bindgen-macro" 630 -version = "0.2.65" 631 +version = "0.2.67" 632 source = "registry+https://github.com/rust-lang/crates.io-index" 633 -checksum = "eb071268b031a64d92fc6cf691715ca5a40950694d8f683c5bb43db7c730929e" 634 +checksum = "97c57cefa5fa80e2ba15641578b44d36e7a64279bc5ed43c6dbaf329457a2ed2" 635 dependencies = [ 636 "quote 1.0.7", 637 "wasm-bindgen-macro-support", 638 @@ -1896,22 +1921,22 @@ dependencies = [ 639 640 [[package]] 641 name = "wasm-bindgen-macro-support" 642 -version = "0.2.65" 643 +version = "0.2.67" 644 source = "registry+https://github.com/rust-lang/crates.io-index" 645 -checksum = "cf592c807080719d1ff2f245a687cbadb3ed28b2077ed7084b47aba8b691f2c6" 646 +checksum = "841a6d1c35c6f596ccea1f82504a192a60378f64b3bb0261904ad8f2f5657556" 647 dependencies = [ 648 "proc-macro2 1.0.19", 649 "quote 1.0.7", 650 - "syn 1.0.35", 651 + "syn 1.0.38", 652 "wasm-bindgen-backend", 653 "wasm-bindgen-shared", 654 ] 655 656 [[package]] 657 name = "wasm-bindgen-shared" 658 -version = "0.2.65" 659 +version = "0.2.67" 660 source = "registry+https://github.com/rust-lang/crates.io-index" 661 -checksum = "72b6c0220ded549d63860c78c38f3bcc558d1ca3f4efa74942c536ddbbb55e87" 662 +checksum = "93b162580e34310e5931c4b792560108b10fd14d64915d7fff8ff00180e70092" 663 664 [[package]] 665 name = "wasm-logger" 666 @@ -1926,9 +1951,9 @@ dependencies = [ 667 668 [[package]] 669 name = "web-sys" 670 -version = "0.3.42" 671 +version = "0.3.44" 672 source = "registry+https://github.com/rust-lang/crates.io-index" 673 -checksum = "8be2398f326b7ba09815d0b403095f34dd708579220d099caae89be0b32137b2" 674 +checksum = "dda38f4e5ca63eda02c059d243aa25b5f35ab98451e518c51612cd0f1bd19a47" 675 dependencies = [ 676 "js-sys", 677 "wasm-bindgen", 678 @@ -2035,7 +2060,7 @@ dependencies = [ 679 "proc-macro-hack", 680 "proc-macro2 1.0.19", 681 "quote 1.0.7", 682 - "syn 1.0.35", 683 + "syn 1.0.38", 684 ] 685 686 [[package]] 687 @@ -2065,7 +2090,7 @@ source = "git+https://github.com/daydream-mx/yew.git?branch=MTRNord/daydream-no- 688 dependencies = [ 689 "proc-macro2 1.0.19", 690 "quote 1.0.7", 691 - "syn 1.0.35", 692 + "syn 1.0.38", 693 "yew-router-route-parser", 694 ] 695 696 diff --git a/Cargo.toml b/Cargo.toml 697 index 3ddc03c..dc6b4a2 100644 698 --- a/Cargo.toml 699 +++ b/Cargo.toml 700 @@ -34,7 +34,7 @@ yewtil = { git = "https://github.com/daydream-mx/yew.git", branch = "MTRNord/day 701 702 # Matrix 703 #, branch = "daydream" 704 -matrix-sdk = { version = "0.1.0", git = "https://github.com/matrix-org/matrix-rust-sdk", default-features = false, features = ["messages"]}# features = ["encryption"]} 705 +matrix-sdk = { version = "0.1.0", git = "https://github.com/matrix-org/matrix-rust-sdk", default-features = false, features = ["messages"], rev = "89c9e311408d2c57245f4ec5af7bbd4daa0046d3"}# features = ["encryption"]} 706 url = "2.1.1" 707 thiserror = "1.0" 708 futures-locks = { git = "https://github.com/asomers/futures-locks", default-features = false } 709 @@ -68,7 +68,9 @@ features = [ 710 [patch.crates-io] 711 olm-sys = { git = "https://gitlab.gnome.org/stoically/olm-sys", branch = "wasm-target" } 712 cjson = { git = "https://github.com/engineerd/cjson" } 713 -reqwest = { git = "https://github.com/daydream-mx/reqwest.git", branch = "MTRNord/wasm-worker-support"} 714 + 715 +[patch.'https://github.com/seanmonstar/reqwest'] 716 +reqwest = { git = "https://github.com/jplatte/reqwest.git", branch = "wasm-fix-get-via-http-req"} 717 718 [profile.release] 719 # less code to include into binary 720 diff --git a/src/app/components/room_list/item.rs b/src/app/components/room_list/item.rs 721 index 77ccbfb..a17e083 100644 722 --- a/src/app/components/room_list/item.rs 723 +++ b/src/app/components/room_list/item.rs 724 @@ -54,7 +54,7 @@ impl Component for RoomItem { 725 let room = self.props.room.clone(); 726 727 // TODO placeholder for encrypted rooms 728 - let last_message = match room.messages.iter().last().map(|m| &**m) { 729 + let last_message = match room.messages.iter().last() { 730 Some(AnyPossiblyRedactedSyncMessageEvent::Regular( 731 AnySyncMessageEvent::RoomMessage(SyncMessageEvent { 732 content: MessageEventContent::Text(text_event), 733 diff --git a/src/app/matrix/mod.rs b/src/app/matrix/mod.rs 734 index 0085168..faf9bf5 100644 735 --- a/src/app/matrix/mod.rs 736 +++ b/src/app/matrix/mod.rs 737 @@ -3,16 +3,20 @@ use std::sync::Arc; 738 739 use log::*; 740 use matrix_sdk::{ 741 - api::r0::{filter::RoomEventFilter, message::get_message_events::Direction}, 742 - events::{ 743 - room::message::{ 744 - FormattedBody, MessageEventContent, TextMessageEventContent, 745 + api::r0::{ 746 + filter::RoomEventFilter, 747 + message::{ 748 + get_message_events::Direction, get_message_events::Request as GetMessagesRequest, 749 }, 750 - AnyMessageEvent, AnyRoomEvent, AnySyncMessageEvent, EventJson, 751 + }, 752 + events::{ 753 + room::message::{FormattedBody, MessageEventContent, TextMessageEventContent}, 754 + AnyMessageEvent, AnyRoomEvent, AnySyncMessageEvent, 755 }, 756 identifiers::RoomId, 757 + js_int::uint, 758 locks::RwLock, 759 - Client, MessagesRequestBuilder, Room, 760 + Client, Raw, Room, 761 }; 762 use pulldown_cmark::{html, Options, Parser}; 763 use serde::{Deserialize, Serialize}; 764 @@ -64,10 +68,10 @@ pub enum Response { 765 Error(MatrixError), 766 LoggedIn(bool), 767 // TODO properly handle sync events 768 - Sync((RoomId, EventJson<AnySyncMessageEvent>)), 769 + Sync((RoomId, Raw<AnySyncMessageEvent>)), 770 JoinedRoomSync(RoomId), 771 SyncPing, 772 - OldMessages((RoomId, Vec<EventJson<AnyMessageEvent>>)), 773 + OldMessages((RoomId, Vec<Raw<AnyMessageEvent>>)), 774 JoinedRoom((RoomId, Room)), 775 SaveSession(SessionStore), 776 } 777 @@ -140,11 +144,12 @@ impl Agent for MatrixAgent { 778 let agent = self.clone(); 779 spawn_local(async move { 780 // FIXME gracefully handle login errors 781 + // TODO make the String to &str conversion smarter if possible 782 let login_response = agent 783 .matrix_client 784 .as_ref() 785 .unwrap() 786 - .login(username, password, None, Some("Daydream".to_string())) 787 + .login(&username, &password, None, Some("Daydream")) 788 .await; 789 match login_response { 790 Ok(login_response) => { 791 @@ -252,42 +257,38 @@ impl Agent for MatrixAgent { 792 Request::GetOldMessages((room_id, from)) => { 793 let agent = self.clone(); 794 spawn_local(async move { 795 - let mut builder = match from { 796 - Some(from) => MessagesRequestBuilder::new(room_id.clone(), from), 797 - None => MessagesRequestBuilder::new( 798 - room_id.clone(), 799 - agent 800 - .matrix_client 801 - .as_ref() 802 - .unwrap() 803 - .sync_token() 804 - .await 805 - .unwrap(), 806 - ), 807 + let sync_token = match from { 808 + Some(from) => from, 809 + None => agent 810 + .matrix_client 811 + .as_ref() 812 + .unwrap() 813 + .sync_token() 814 + .await 815 + .unwrap(), 816 }; 817 + let mut req = 818 + GetMessagesRequest::new(&room_id, &sync_token, Direction::Backward); 819 let filter = RoomEventFilter { 820 types: Some(vec!["m.room.message".to_string()]), 821 ..Default::default() 822 }; 823 // TODO find better way than cloning 824 - builder = (*builder 825 - .filter(filter) 826 - .direction(Direction::Backward) 827 - .limit(30)) 828 - .clone(); 829 + req.filter = Some(filter); 830 + req.limit = uint!(30); 831 832 // TODO handle error gracefully 833 let messsages = agent 834 .matrix_client 835 .clone() 836 .unwrap() 837 - .room_messages(builder.clone()) 838 + .room_messages(req) 839 .await 840 .unwrap(); 841 // TODO save end point for future loading 842 843 - let mut wrapped_messages: Vec<EventJson<AnyMessageEvent>> = Vec::new(); 844 - let chunk_iter: Vec<EventJson<AnyRoomEvent>> = messsages.chunk; 845 + let mut wrapped_messages: Vec<Raw<AnyMessageEvent>> = Vec::new(); 846 + let chunk_iter: Vec<Raw<AnyRoomEvent>> = messsages.chunk; 847 let (oks, _): (Vec<_>, Vec<_>) = chunk_iter 848 .iter() 849 .map(|event| event.deserialize()) 850 @@ -346,7 +347,7 @@ impl Agent for MatrixAgent { 851 } 852 853 let serialized_event = 854 - EventJson::from(AnyMessageEvent::RoomMessage(event.clone())); 855 + Raw::from(AnyMessageEvent::RoomMessage(event.clone())); 856 wrapped_messages.push(serialized_event); 857 } 858 } 859 diff --git a/src/app/matrix/sync.rs b/src/app/matrix/sync.rs 860 index 7e6dc9f..b7a873a 100644 861 --- a/src/app/matrix/sync.rs 862 +++ b/src/app/matrix/sync.rs 863 @@ -10,11 +10,11 @@ use matrix_sdk::{ 864 api::r0::sync::sync_events::Response as SyncResponse, 865 events::{ 866 room::message::MessageEventContent, AnySyncMessageEvent, AnySyncRoomEvent, 867 - AnySyncStateEvent, EventJson, 868 + AnySyncStateEvent, 869 }, 870 identifiers::RoomId, 871 locks::RwLock, 872 - Client, Room, SyncSettings, 873 + Client, Raw, Room, SyncSettings, 874 }; 875 use wasm_bindgen_futures::spawn_local; 876 use yew::Callback; 877 @@ -192,7 +192,7 @@ impl Sync { 878 } 879 } 880 881 - let serialized_event = EventJson::from(AnySyncMessageEvent::RoomMessage(event)); 882 + let serialized_event = Raw::from(AnySyncMessageEvent::RoomMessage(event)); 883 let resp = Response::Sync((room_id.clone(), serialized_event)); 884 self.callback.emit(resp); 885 }