Merge main into andybalaam/sliding-sync-reinvite (using imerge)

.github/workflows/ci.yml

@@ -345,7 +345,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Check the spelling of the files in our repo
-        uses: crate-ci/typos@v1.13.0
+        uses: crate-ci/typos@v1.15.0
 
   clippy:
     name: Run clippy

.typos.toml

@@ -1,17 +1,17 @@
-[default.extend-words]
-# Remove this once base64 gets correctly ignored by typos
-# Or if we're able to ignore certain lines.
-Fo = "Fo"
-BA = "BA"
-UE = "UE"
-Ure = "Ure"
-OFO = "OFO"
-Ot = "Ot"
-ket = "ket"
-# This is the thead html tag, remove this once typos is updated in the github
-# action. 1.3.1 seems to work correctly, while 1.11.0 on the CI seems to get
-# this wrong
-thead = "thead"
+[default]
+extend-ignore-re = [
+    # base 58 strings with spaces every four chars.
+    # this would also match regular sentence parts with eight or more words of
+    # exactly four characters in row, but that doesn't really happen.
+    "[1-9A-Za-z]{4}( [1-9A-Za-z]{4}){7,}",
+    # some heuristics for base64 strings with no false matches found at the
+    # time of writing.
+    "[A-Za-z0-9+=]{72,}",
+    "([A-Za-z0-9+=]|\\\\\\s\\*){72,}",
+    "[0-9+][A-Za-z0-9+]{30,}[a-z0-9+]",
+    "\\$[A-Z0-9+][A-Za-z0-9+]{6,}[a-z0-9+]",
+    "\\b[a-z0-9+/=][A-Za-z0-9+/=]{7,}[a-z0-9+/=][A-Z]\\b",
+]
 
 [files]
 # Our json files contain a bunch of base64 encoded ed25519 keys which aren't

Cargo.toml

@@ -35,8 +35,8 @@ futures-core = "0.3.28"
 futures-executor = "0.3.21"
 futures-util = { version = "0.3.26", default-features = false, features = ["alloc"] }
 http = "0.2.6"
-ruma = { git = "https://github.com/ruma/ruma", rev = "e3282d8bfebc69d2e64815105ebe9dced130b94a", features = ["client-api-c", "compat-user-id"] }
-ruma-common = { git = "https://github.com/ruma/ruma", rev = "e3282d8bfebc69d2e64815105ebe9dced130b94a" }
+ruma = { git = "https://github.com/ruma/ruma", rev = "beded100acb7cde34d5f2e67f194a25b35410f99", features = ["client-api-c", "compat-user-id"] }
+ruma-common = { git = "https://github.com/ruma/ruma", rev = "beded100acb7cde34d5f2e67f194a25b35410f99" }
 once_cell = "1.16.0"
 serde = "1.0.151"
 serde_html_form = "0.2.0"

UPGRADING-0.5-to-0.6.md

@@ -51,7 +51,7 @@ You can stay informed about updates on the access token by listening to `client.
  - [`MessageOptions`][message options] has been updated to Matrix 1.3 by making the `from` parameter optional (and function signatures have been updated, too). You can now request the server sends you messages from the first one you are allowed to have received.
  - `client.user_id()` is not a `future` anymore. Remove any `.await` you had behind it.
  - `verified()`, `blacklisted()` and `deleted()` on `matrix_sdk::encryption::identities::Device` have been renamed with a `is_` prefix.
- - `verified()` on `matrix_sdk::encryption::identities::UserIdentity`, too has been prefixed with `is_` and thus is onw called `is_verified()`.
+ - `verified()` on `matrix_sdk::encryption::identities::UserIdentity`, too has been prefixed with `is_` and thus is now called `is_verified()`.
  - The top-level crypto and state-store types of Indexeddb and Sled have been renamed to unique types>
  - `state_store` and `crypto_store` do not need to be boxed anymore when passed to the [`StoreConfig`][store config]
  - Indexeddb's `SerializationError` is now `IndexedDBStoreError`

benchmarks/benches/store_bench.rs

@@ -37,7 +37,7 @@ pub fn restore_session(c: &mut Criterion) {
 
     for i in 0..NUM_STRIPPED_JOINED_ROOMS {
         let room_id = RoomId::parse(format!("!strippedroom{i}:example.com")).unwrap().to_owned();
-        changes.add_stripped_room(RoomInfo::new(&room_id, RoomState::Joined));
+        changes.add_room(RoomInfo::new(&room_id, RoomState::Invited));
     }
 
     let session = Session {

bindings/matrix-sdk-crypto-js/src/device.rs

@@ -24,6 +24,9 @@ impl_from_to_inner!(matrix_sdk_crypto::Device => Device);
 #[wasm_bindgen]
 impl Device {
     /// Request an interactive verification with this device.
+    ///
+    /// Returns a Promise for a 2-element array `[VerificationRequest,
+    /// ToDeviceRequest]`.
     #[wasm_bindgen(js_name = "requestVerification")]
     pub fn request_verification(&self, methods: Option<Array>) -> Result<Promise, JsError> {
         let methods =

bindings/matrix-sdk-crypto-js/src/machine.rs

@@ -468,6 +468,9 @@ impl OlmMachine {
     }
 
     /// Get the cross signing user identity of a user.
+    ///
+    /// Returns a promise for an `OwnUserIdentity`, a `UserIdentity`, or
+    /// `undefined`.
     #[wasm_bindgen(js_name = "getIdentity")]
     pub fn get_identity(&self, user_id: &identifiers::UserId) -> Promise {
         let me = self.inner.clone();