mirror of
https://gitlab.com/famedly/conduit.git
synced 2024-09-12 01:09:11 +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
1 changed files with 1 additions and 7 deletions
|
@ -755,13 +755,7 @@ async fn sync_helper(
|
||||||
changed: device_list_updates.into_iter().collect(),
|
changed: device_list_updates.into_iter().collect(),
|
||||||
left: device_list_left.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
|
device_one_time_keys_count: db.users.count_one_time_keys(&sender_user, &sender_device)?,
|
||||||
|| since == 0
|
|
||||||
{
|
|
||||||
db.users.count_one_time_keys(&sender_user, &sender_device)?
|
|
||||||
} else {
|
|
||||||
BTreeMap::new()
|
|
||||||
},
|
|
||||||
to_device: sync_events::ToDevice {
|
to_device: sync_events::ToDevice {
|
||||||
events: db
|
events: db
|
||||||
.users
|
.users
|
||||||
|
|
Loading…
Reference in a new issue