magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

split keys_changed for stronger-type overloads

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-10-22 04:03:07 +00:00 • committed by strawberry
parent 0e0438e1f9
commit a74461fc9a
5 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/api/client/keys.rs
View file

@ -232,7 +232,7 @@ pub(crate) async fn get_key_changes_route(
device_list_updates.extend(
services
.users
.keys_changed(sender_user.as_str(), from, Some(to))
.keys_changed(sender_user, from, Some(to))
.map(ToOwned::to_owned)
.collect::<Vec<_>>()
.await,
@ -244,7 +244,8 @@ pub(crate) async fn get_key_changes_route(
device_list_updates.extend(
services
.users
.keys_changed(room_id.as_str(), from, Some(to))
.room_keys_changed(room_id, from, Some(to))
.map(|(user_id, _)| user_id)
.map(ToOwned::to_owned)
.collect::<Vec<_>>()
.await,

5
src/api/client/sync/v3.rs
View file

@ -138,7 +138,7 @@ pub(crate) async fn sync_events_route(
device_list_updates.extend(
services
.users
.keys_changed(sender_user.as_ref(), since, None)
.keys_changed(&sender_user, since, None)
.map(ToOwned::to_owned)
.collect::<Vec<_>>()
.await,
@ -917,7 +917,8 @@ async fn load_joined_room(
device_list_updates.extend(
services
.users
.keys_changed(room_id.as_ref(), since, None)
.room_keys_changed(room_id, since, None)
.map(|(user_id, _)| user_id)
.map(ToOwned::to_owned)
.collect::<Vec<_>>()
.await,

5
src/api/client/sync/v4.rs
View file

@ -162,7 +162,7 @@ pub(crate) async fn sync_events_v4_route(
device_list_changes.extend(
services
.users
.keys_changed(sender_user.as_ref(), globalsince, None)
.keys_changed(sender_user, globalsince, None)
.map(ToOwned::to_owned)
.collect::<Vec<_>>()
.await,
@ -285,7 +285,8 @@ pub(crate) async fn sync_events_v4_route(
device_list_changes.extend(
services
.users
.keys_changed(room_id.as_ref(), globalsince, None)
.room_keys_changed(room_id, globalsince, None)
.map(|(user_id, _)| user_id)
.map(ToOwned::to_owned)
.collect::<Vec<_>>()
.await,

1
src/api/mod.rs
View file

@ -6,7 +6,6 @@ extern crate conduit_core as conduit;
extern crate conduit_service as service;
pub(crate) use conduit::{debug_info, pdu::PduEvent, utils, Error, Result};
pub(crate) use service::services;
pub(crate) use self::router::{Ruma, RumaResponse, State};