MirrorHub/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-11-04 17:29:14 +01:00
Code Issues Releases Activity

fix: better migration, force e2ee device key updates

Browse source
This commit is contained in:
Timo Kösters 2021-08-25 17:40:10 +02:00
parent 9152b877a7
commit bef4fe50ce
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/client_server/sync.rs
View file

@ -563,7 +563,8 @@ async fn sync_helper(
} }
// Save the state after this sync so we can send the correct state diff next sync // Save the state after this sync so we can send the correct state diff next sync
db.rooms.associate_token_shortstatehash(&room_id, next_batch, current_shortstatehash)?; db.rooms
.associate_token_shortstatehash(&room_id, next_batch, current_shortstatehash)?;
let joined_room = sync_events::JoinedRoom { let joined_room = sync_events::JoinedRoom {
account_data: sync_events::RoomAccountData { account_data: sync_events::RoomAccountData {

6
src/database.rs
View file

@ -710,6 +710,12 @@ impl Database {
.insert(&shortstatekey, &statekey)?; .insert(&shortstatekey, &statekey)?;
} }
// Force E2EE device list updates so we can send them over federation
for user_id in db.users.iter().filter_map(|r| r.ok()) {
db.users
.mark_device_key_update(&user_id, &db.rooms, &db.globals)?;
}
db.globals.bump_database_version(10)?; db.globals.bump_database_version(10)?;
println!("Migration: 9 -> 10 finished"); println!("Migration: 9 -> 10 finished");