mirror of
https://gitlab.com/famedly/conduit.git
synced 2024-08-18 14:24:41 +02:00
Merge branch 'nyaaori/fix-otk-reporting' into 'next'
Always send device_one_time_keys_count, fixing #178 Closes #169 and #178 See merge request famedly/conduit!213
This commit is contained in:
commit
e88929e154
|
@ -755,13 +755,7 @@ async fn sync_helper(
|
|||
changed: device_list_updates.into_iter().collect(),
|
||||
left: device_list_left.into_iter().collect(),
|
||||
},
|
||||
device_one_time_keys_count: if db.users.last_one_time_keys_update(&sender_user)? > since
|
||||
|| since == 0
|
||||
{
|
||||
db.users.count_one_time_keys(&sender_user, &sender_device)?
|
||||
} else {
|
||||
BTreeMap::new()
|
||||
},
|
||||
device_one_time_keys_count: db.users.count_one_time_keys(&sender_user, &sender_device)?,
|
||||
to_device: sync_events::ToDevice {
|
||||
events: db
|
||||
.users
|
||||
|
|
Loading…
Reference in a new issue