TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename api::client_server to api::client

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-06-06 18:21:02 +00:00
parent 8428f43c78
commit f32380772f
42 changed files with 149 additions and 154 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/admin/room/room_moderation_commands.rs
View file

@ -1,6 +1,6 @@
use std::fmt::Write; use std::fmt::Write;
use api::client_server::{get_alias_helper, leave_room}; use api::client::{get_alias_helper, leave_room};
use ruma::{ use ruma::{
events::room::message::RoomMessageEventContent, OwnedRoomId, OwnedUserId, RoomAliasId, RoomId, RoomOrAliasId, events::room::message::RoomMessageEventContent, OwnedRoomId, OwnedUserId, RoomAliasId, RoomId, RoomOrAliasId,
}; };

2
src/admin/user/user_commands.rs
View file

@ -1,6 +1,6 @@
use std::{fmt::Write as _, sync::Arc}; use std::{fmt::Write as _, sync::Arc};
use api::client_server::{join_room_by_id_helper, leave_all_rooms}; use api::client::{join_room_by_id_helper, leave_all_rooms};
use conduit::utils; use conduit::utils;
use ruma::{events::room::message::RoomMessageEventContent, OwnedRoomId, UserId}; use ruma::{events::room::message::RoomMessageEventContent, OwnedRoomId, UserId};
use tracing::{error, info, warn}; use tracing::{error, info, warn};

5
src/api/client_server/account.rs → src/api/client/account.rs
View file

@ -18,9 +18,8 @@ use ruma::{
}; };
use tracing::{error, info, warn}; use tracing::{error, info, warn};
use super::{DEVICE_ID_LENGTH, SESSION_ID_LENGTH, TOKEN_LENGTH}; use super::{join_room_by_id_helper, DEVICE_ID_LENGTH, SESSION_ID_LENGTH, TOKEN_LENGTH};
use crate::{ use crate::{
client_server::{self, join_room_by_id_helper},
service::user_is_local, service::user_is_local,
services, services,
utils::{self}, utils::{self},
@ -539,7 +538,7 @@ pub(crate) async fn deactivate_route(body: Ruma<deactivate::v3::Request>) -> Res
} }
// Make the user leave all rooms before deactivation // Make the user leave all rooms before deactivation
client_server::leave_all_rooms(sender_user).await; super::leave_all_rooms(sender_user).await;
// Remove devices and mark account as deactivated // Remove devices and mark account as deactivated
services().users.deactivate_account(sender_user)?; services().users.deactivate_account(sender_user)?;

0
src/api/client_server/alias.rs → src/api/client/alias.rs
View file

0
src/api/client_server/backup.rs → src/api/client/backup.rs
View file

0
src/api/client_server/capabilities.rs → src/api/client/capabilities.rs
View file

0
src/api/client_server/config.rs → src/api/client/config.rs
View file

0
src/api/client_server/context.rs → src/api/client/context.rs
View file

0
src/api/client_server/device.rs → src/api/client/device.rs
View file

0
src/api/client_server/directory.rs → src/api/client/directory.rs
View file

0
src/api/client_server/filter.rs → src/api/client/filter.rs
View file

0
src/api/client_server/keys.rs → src/api/client/keys.rs
View file

0
src/api/client_server/media.rs → src/api/client/media.rs
View file

0
src/api/client_server/membership.rs → src/api/client/membership.rs
View file

0
src/api/client_server/message.rs → src/api/client/message.rs
View file

0
src/api/client_server/mod.rs → src/api/client/mod.rs
View file

0
src/api/client_server/presence.rs → src/api/client/presence.rs
View file

0
src/api/client_server/profile.rs → src/api/client/profile.rs
View file

0
src/api/client_server/push.rs → src/api/client/push.rs
View file

0
src/api/client_server/read_marker.rs → src/api/client/read_marker.rs
View file

0
src/api/client_server/redact.rs → src/api/client/redact.rs
View file

0
src/api/client_server/relations.rs → src/api/client/relations.rs
View file

0
src/api/client_server/report.rs → src/api/client/report.rs
View file

2
src/api/client_server/room.rs → src/api/client/room.rs
View file

@ -28,8 +28,8 @@ use ruma::{
use serde_json::{json, value::to_raw_value}; use serde_json::{json, value::to_raw_value};
use tracing::{error, info, warn}; use tracing::{error, info, warn};
use super::invite_helper;
use crate::{ use crate::{
client_server::invite_helper,
service::{appservice::RegistrationInfo, pdu::PduBuilder}, service::{appservice::RegistrationInfo, pdu::PduBuilder},
services, Error, Result, Ruma, services, Error, Result, Ruma,
}; };

0
src/api/client_server/search.rs → src/api/client/search.rs
View file

0
src/api/client_server/session.rs → src/api/client/session.rs
View file

0
src/api/client_server/space.rs → src/api/client/space.rs
View file

0
src/api/client_server/state.rs → src/api/client/state.rs
View file

0
src/api/client_server/sync.rs → src/api/client/sync.rs
View file

0
src/api/client_server/tag.rs → src/api/client/tag.rs
View file

0
src/api/client_server/thirdparty.rs → src/api/client/thirdparty.rs
View file

0
src/api/client_server/threads.rs → src/api/client/threads.rs
View file

0
src/api/client_server/to_device.rs → src/api/client/to_device.rs
View file

0
src/api/client_server/typing.rs → src/api/client/typing.rs
View file

0
src/api/client_server/unstable.rs → src/api/client/unstable.rs
View file

0
src/api/client_server/unversioned.rs → src/api/client/unversioned.rs
View file

0
src/api/client_server/user_directory.rs → src/api/client/user_directory.rs
View file

0
src/api/client_server/voip.rs → src/api/client/voip.rs
View file

3
src/api/mod.rs
View file

@ -1,4 +1,4 @@
pub mod client_server; pub mod client;
pub mod router; pub mod router;
mod ruma_wrapper; mod ruma_wrapper;
pub mod server; pub mod server;
@ -6,7 +6,6 @@ pub mod server;
extern crate conduit_core as conduit; extern crate conduit_core as conduit;
extern crate conduit_service as service; extern crate conduit_service as service;
pub use client_server::membership::{join_room_by_id_helper, leave_all_rooms};
pub(crate) use conduit::{debug_info, debug_warn, utils, Error, Result}; pub(crate) use conduit::{debug_info, debug_warn, utils, Error, Result};
pub(crate) use ruma_wrapper::{Ruma, RumaResponse}; pub(crate) use ruma_wrapper::{Ruma, RumaResponse};
pub(crate) use service::{pdu::PduEvent, services, user_is_local}; pub(crate) use service::{pdu::PduEvent, services, user_is_local};

278
src/api/router.rs
View file

@ -7,184 +7,184 @@ use conduit::{Error, Server};
use http::Uri; use http::Uri;
use ruma::api::client::error::ErrorKind; use ruma::api::client::error::ErrorKind;
use crate::{client_server, ruma_wrapper::RouterExt, server}; use crate::{client, ruma_wrapper::RouterExt, server};
pub fn build(router: Router, server: &Server) -> Router { pub fn build(router: Router, server: &Server) -> Router {
let config = &server.config; let config = &server.config;
let router = router let router = router
.ruma_route(client_server::get_supported_versions_route) .ruma_route(client::get_supported_versions_route)
.ruma_route(client_server::get_register_available_route) .ruma_route(client::get_register_available_route)
.ruma_route(client_server::register_route) .ruma_route(client::register_route)
.ruma_route(client_server::get_login_types_route) .ruma_route(client::get_login_types_route)
.ruma_route(client_server::login_route) .ruma_route(client::login_route)
.ruma_route(client_server::whoami_route) .ruma_route(client::whoami_route)
.ruma_route(client_server::logout_route) .ruma_route(client::logout_route)
.ruma_route(client_server::logout_all_route) .ruma_route(client::logout_all_route)
.ruma_route(client_server::change_password_route) .ruma_route(client::change_password_route)
.ruma_route(client_server::deactivate_route) .ruma_route(client::deactivate_route)
.ruma_route(client_server::third_party_route) .ruma_route(client::third_party_route)
.ruma_route(client_server::request_3pid_management_token_via_email_route) .ruma_route(client::request_3pid_management_token_via_email_route)
.ruma_route(client_server::request_3pid_management_token_via_msisdn_route) .ruma_route(client::request_3pid_management_token_via_msisdn_route)
.ruma_route(client_server::check_registration_token_validity) .ruma_route(client::check_registration_token_validity)
.ruma_route(client_server::get_capabilities_route) .ruma_route(client::get_capabilities_route)
.ruma_route(client_server::get_pushrules_all_route) .ruma_route(client::get_pushrules_all_route)
.ruma_route(client_server::set_pushrule_route) .ruma_route(client::set_pushrule_route)
.ruma_route(client_server::get_pushrule_route) .ruma_route(client::get_pushrule_route)
.ruma_route(client_server::set_pushrule_enabled_route) .ruma_route(client::set_pushrule_enabled_route)
.ruma_route(client_server::get_pushrule_enabled_route) .ruma_route(client::get_pushrule_enabled_route)
.ruma_route(client_server::get_pushrule_actions_route) .ruma_route(client::get_pushrule_actions_route)
.ruma_route(client_server::set_pushrule_actions_route) .ruma_route(client::set_pushrule_actions_route)
.ruma_route(client_server::delete_pushrule_route) .ruma_route(client::delete_pushrule_route)
.ruma_route(client_server::get_room_event_route) .ruma_route(client::get_room_event_route)
.ruma_route(client_server::get_room_aliases_route) .ruma_route(client::get_room_aliases_route)
.ruma_route(client_server::get_filter_route) .ruma_route(client::get_filter_route)
.ruma_route(client_server::create_filter_route) .ruma_route(client::create_filter_route)
.ruma_route(client_server::set_global_account_data_route) .ruma_route(client::set_global_account_data_route)
.ruma_route(client_server::set_room_account_data_route) .ruma_route(client::set_room_account_data_route)
.ruma_route(client_server::get_global_account_data_route) .ruma_route(client::get_global_account_data_route)
.ruma_route(client_server::get_room_account_data_route) .ruma_route(client::get_room_account_data_route)
.ruma_route(client_server::set_displayname_route) .ruma_route(client::set_displayname_route)
.ruma_route(client_server::get_displayname_route) .ruma_route(client::get_displayname_route)
.ruma_route(client_server::set_avatar_url_route) .ruma_route(client::set_avatar_url_route)
.ruma_route(client_server::get_avatar_url_route) .ruma_route(client::get_avatar_url_route)
.ruma_route(client_server::get_profile_route) .ruma_route(client::get_profile_route)
.ruma_route(client_server::set_presence_route) .ruma_route(client::set_presence_route)
.ruma_route(client_server::get_presence_route) .ruma_route(client::get_presence_route)
.ruma_route(client_server::upload_keys_route) .ruma_route(client::upload_keys_route)
.ruma_route(client_server::get_keys_route) .ruma_route(client::get_keys_route)
.ruma_route(client_server::claim_keys_route) .ruma_route(client::claim_keys_route)
.ruma_route(client_server::create_backup_version_route) .ruma_route(client::create_backup_version_route)
.ruma_route(client_server::update_backup_version_route) .ruma_route(client::update_backup_version_route)
.ruma_route(client_server::delete_backup_version_route) .ruma_route(client::delete_backup_version_route)
.ruma_route(client_server::get_latest_backup_info_route) .ruma_route(client::get_latest_backup_info_route)
.ruma_route(client_server::get_backup_info_route) .ruma_route(client::get_backup_info_route)
.ruma_route(client_server::add_backup_keys_route) .ruma_route(client::add_backup_keys_route)
.ruma_route(client_server::add_backup_keys_for_room_route) .ruma_route(client::add_backup_keys_for_room_route)
.ruma_route(client_server::add_backup_keys_for_session_route) .ruma_route(client::add_backup_keys_for_session_route)
.ruma_route(client_server::delete_backup_keys_for_room_route) .ruma_route(client::delete_backup_keys_for_room_route)
.ruma_route(client_server::delete_backup_keys_for_session_route) .ruma_route(client::delete_backup_keys_for_session_route)
.ruma_route(client_server::delete_backup_keys_route) .ruma_route(client::delete_backup_keys_route)
.ruma_route(client_server::get_backup_keys_for_room_route) .ruma_route(client::get_backup_keys_for_room_route)
.ruma_route(client_server::get_backup_keys_for_session_route) .ruma_route(client::get_backup_keys_for_session_route)
.ruma_route(client_server::get_backup_keys_route) .ruma_route(client::get_backup_keys_route)
.ruma_route(client_server::set_read_marker_route) .ruma_route(client::set_read_marker_route)
.ruma_route(client_server::create_receipt_route) .ruma_route(client::create_receipt_route)
.ruma_route(client_server::create_typing_event_route) .ruma_route(client::create_typing_event_route)
.ruma_route(client_server::create_room_route) .ruma_route(client::create_room_route)
.ruma_route(client_server::redact_event_route) .ruma_route(client::redact_event_route)
.ruma_route(client_server::report_event_route) .ruma_route(client::report_event_route)
.ruma_route(client_server::create_alias_route) .ruma_route(client::create_alias_route)
.ruma_route(client_server::delete_alias_route) .ruma_route(client::delete_alias_route)
.ruma_route(client_server::get_alias_route) .ruma_route(client::get_alias_route)
.ruma_route(client_server::join_room_by_id_route) .ruma_route(client::join_room_by_id_route)
.ruma_route(client_server::join_room_by_id_or_alias_route) .ruma_route(client::join_room_by_id_or_alias_route)
.ruma_route(client_server::joined_members_route) .ruma_route(client::joined_members_route)
.ruma_route(client_server::leave_room_route) .ruma_route(client::leave_room_route)
.ruma_route(client_server::forget_room_route) .ruma_route(client::forget_room_route)
.ruma_route(client_server::joined_rooms_route) .ruma_route(client::joined_rooms_route)
.ruma_route(client_server::kick_user_route) .ruma_route(client::kick_user_route)
.ruma_route(client_server::ban_user_route) .ruma_route(client::ban_user_route)
.ruma_route(client_server::unban_user_route) .ruma_route(client::unban_user_route)
.ruma_route(client_server::invite_user_route) .ruma_route(client::invite_user_route)
.ruma_route(client_server::set_room_visibility_route) .ruma_route(client::set_room_visibility_route)
.ruma_route(client_server::get_room_visibility_route) .ruma_route(client::get_room_visibility_route)
.ruma_route(client_server::get_public_rooms_route) .ruma_route(client::get_public_rooms_route)
.ruma_route(client_server::get_public_rooms_filtered_route) .ruma_route(client::get_public_rooms_filtered_route)
.ruma_route(client_server::search_users_route) .ruma_route(client::search_users_route)
.ruma_route(client_server::get_member_events_route) .ruma_route(client::get_member_events_route)
.ruma_route(client_server::get_protocols_route) .ruma_route(client::get_protocols_route)
.ruma_route(client_server::send_message_event_route) .ruma_route(client::send_message_event_route)
.ruma_route(client_server::send_state_event_for_key_route) .ruma_route(client::send_state_event_for_key_route)
.ruma_route(client_server::get_state_events_route) .ruma_route(client::get_state_events_route)
.ruma_route(client_server::get_state_events_for_key_route) .ruma_route(client::get_state_events_for_key_route)
// Ruma doesn't have support for multiple paths for a single endpoint yet, and these routes // Ruma doesn't have support for multiple paths for a single endpoint yet, and these routes
// share one Ruma request / response type pair with {get,send}_state_event_for_key_route // share one Ruma request / response type pair with {get,send}_state_event_for_key_route
.route( .route(
"/_matrix/client/r0/rooms/:room_id/state/:event_type", "/_matrix/client/r0/rooms/:room_id/state/:event_type",
get(client_server::get_state_events_for_empty_key_route) get(client::get_state_events_for_empty_key_route)
.put(client_server::send_state_event_for_empty_key_route), .put(client::send_state_event_for_empty_key_route),
) )
.route( .route(
"/_matrix/client/v3/rooms/:room_id/state/:event_type", "/_matrix/client/v3/rooms/:room_id/state/:event_type",
get(client_server::get_state_events_for_empty_key_route) get(client::get_state_events_for_empty_key_route)
.put(client_server::send_state_event_for_empty_key_route), .put(client::send_state_event_for_empty_key_route),
) )
// These two endpoints allow trailing slashes // These two endpoints allow trailing slashes
.route( .route(
"/_matrix/client/r0/rooms/:room_id/state/:event_type/", "/_matrix/client/r0/rooms/:room_id/state/:event_type/",
get(client_server::get_state_events_for_empty_key_route) get(client::get_state_events_for_empty_key_route)
.put(client_server::send_state_event_for_empty_key_route), .put(client::send_state_event_for_empty_key_route),
) )
.route( .route(
"/_matrix/client/v3/rooms/:room_id/state/:event_type/", "/_matrix/client/v3/rooms/:room_id/state/:event_type/",
get(client_server::get_state_events_for_empty_key_route) get(client::get_state_events_for_empty_key_route)
.put(client_server::send_state_event_for_empty_key_route), .put(client::send_state_event_for_empty_key_route),
) )
.ruma_route(client_server::sync_events_route) .ruma_route(client::sync_events_route)
.ruma_route(client_server::sync_events_v4_route) .ruma_route(client::sync_events_v4_route)
.ruma_route(client_server::get_context_route) .ruma_route(client::get_context_route)
.ruma_route(client_server::get_message_events_route) .ruma_route(client::get_message_events_route)
.ruma_route(client_server::search_events_route) .ruma_route(client::search_events_route)
.ruma_route(client_server::turn_server_route) .ruma_route(client::turn_server_route)
.ruma_route(client_server::send_event_to_device_route) .ruma_route(client::send_event_to_device_route)
.ruma_route(client_server::get_media_config_route) .ruma_route(client::get_media_config_route)
.ruma_route(client_server::get_media_preview_route) .ruma_route(client::get_media_preview_route)
.ruma_route(client_server::create_content_route) .ruma_route(client::create_content_route)
// legacy v1 media routes // legacy v1 media routes
.route( .route(
"/_matrix/media/v1/preview_url", "/_matrix/media/v1/preview_url",
get(client_server::get_media_preview_v1_route) get(client::get_media_preview_v1_route)
) )
.route( .route(
"/_matrix/media/v1/config", "/_matrix/media/v1/config",
get(client_server::get_media_config_v1_route) get(client::get_media_config_v1_route)
) )
.route( .route(
"/_matrix/media/v1/upload", "/_matrix/media/v1/upload",
post(client_server::create_content_v1_route) post(client::create_content_v1_route)
) )
.route( .route(
"/_matrix/media/v1/download/:server_name/:media_id", "/_matrix/media/v1/download/:server_name/:media_id",
get(client_server::get_content_v1_route) get(client::get_content_v1_route)
) )
.route( .route(
"/_matrix/media/v1/download/:server_name/:media_id/:file_name", "/_matrix/media/v1/download/:server_name/:media_id/:file_name",
get(client_server::get_content_as_filename_v1_route) get(client::get_content_as_filename_v1_route)
) )
.route( .route(
"/_matrix/media/v1/thumbnail/:server_name/:media_id", "/_matrix/media/v1/thumbnail/:server_name/:media_id",
get(client_server::get_content_thumbnail_v1_route) get(client::get_content_thumbnail_v1_route)
) )
.ruma_route(client_server::get_content_route) .ruma_route(client::get_content_route)
.ruma_route(client_server::get_content_as_filename_route) .ruma_route(client::get_content_as_filename_route)
.ruma_route(client_server::get_content_thumbnail_route) .ruma_route(client::get_content_thumbnail_route)
.ruma_route(client_server::get_devices_route) .ruma_route(client::get_devices_route)
.ruma_route(client_server::get_device_route) .ruma_route(client::get_device_route)
.ruma_route(client_server::update_device_route) .ruma_route(client::update_device_route)
.ruma_route(client_server::delete_device_route) .ruma_route(client::delete_device_route)
.ruma_route(client_server::delete_devices_route) .ruma_route(client::delete_devices_route)
.ruma_route(client_server::get_tags_route) .ruma_route(client::get_tags_route)
.ruma_route(client_server::update_tag_route) .ruma_route(client::update_tag_route)
.ruma_route(client_server::delete_tag_route) .ruma_route(client::delete_tag_route)
.ruma_route(client_server::upload_signing_keys_route) .ruma_route(client::upload_signing_keys_route)
.ruma_route(client_server::upload_signatures_route) .ruma_route(client::upload_signatures_route)
.ruma_route(client_server::get_key_changes_route) .ruma_route(client::get_key_changes_route)
.ruma_route(client_server::get_pushers_route) .ruma_route(client::get_pushers_route)
.ruma_route(client_server::set_pushers_route) .ruma_route(client::set_pushers_route)
// .ruma_route(client_server::third_party_route) // .ruma_route(client::third_party_route)
.ruma_route(client_server::upgrade_room_route) .ruma_route(client::upgrade_room_route)
.ruma_route(client_server::get_threads_route) .ruma_route(client::get_threads_route)
.ruma_route(client_server::get_relating_events_with_rel_type_and_event_type_route) .ruma_route(client::get_relating_events_with_rel_type_and_event_type_route)
.ruma_route(client_server::get_relating_events_with_rel_type_route) .ruma_route(client::get_relating_events_with_rel_type_route)
.ruma_route(client_server::get_relating_events_route) .ruma_route(client::get_relating_events_route)
.ruma_route(client_server::get_hierarchy_route) .ruma_route(client::get_hierarchy_route)
.ruma_route(client_server::get_mutual_rooms_route) .ruma_route(client::get_mutual_rooms_route)
.ruma_route(client_server::well_known_support) .ruma_route(client::well_known_support)
.ruma_route(client_server::well_known_client) .ruma_route(client::well_known_client)
.route("/_conduwuit/server_version", get(client_server::conduwuit_server_version)) .route("/_conduwuit/server_version", get(client::conduwuit_server_version))
.route("/_matrix/client/r0/rooms/:room_id/initialSync", get(initial_sync)) .route("/_matrix/client/r0/rooms/:room_id/initialSync", get(initial_sync))
.route("/_matrix/client/v3/rooms/:room_id/initialSync", get(initial_sync)) .route("/_matrix/client/v3/rooms/:room_id/initialSync", get(initial_sync))
.route("/client/server.json", get(client_server::syncv3_client_server_json)); .route("/client/server.json", get(client::syncv3_client_server_json));
if config.allow_federation { if config.allow_federation {
router router
@ -214,7 +214,7 @@ pub fn build(router: Router, server: &Server) -> Router {
.ruma_route(server::claim_keys_route) .ruma_route(server::claim_keys_route)
.ruma_route(server::get_hierarchy_route) .ruma_route(server::get_hierarchy_route)
.ruma_route(server::well_known_server) .ruma_route(server::well_known_server)
.route("/_conduwuit/local_user_count", get(client_server::conduwuit_local_user_count)) .route("/_conduwuit/local_user_count", get(client::conduwuit_local_user_count))
} else { } else {
router router
.route("/_matrix/federation/*path", any(federation_disabled)) .route("/_matrix/federation/*path", any(federation_disabled))

9
src/api/server/publicrooms.rs
View file

@ -6,10 +6,7 @@ use ruma::{
directory::Filter, directory::Filter,
}; };
use crate::{ use crate::{services, Error, Result, Ruma};
client_server::{self},
services, Error, Result, Ruma,
};
/// # `POST /_matrix/federation/v1/publicRooms` /// # `POST /_matrix/federation/v1/publicRooms`
/// ///
@ -24,7 +21,7 @@ pub(crate) async fn get_public_rooms_filtered_route(
return Err(Error::BadRequest(ErrorKind::forbidden(), "Room directory is not public")); return Err(Error::BadRequest(ErrorKind::forbidden(), "Room directory is not public"));
} }
let response = client_server::get_public_rooms_filtered_helper( let response = crate::client::get_public_rooms_filtered_helper(
None, None,
body.limit, body.limit,
body.since.as_deref(), body.since.as_deref(),
@ -55,7 +52,7 @@ pub(crate) async fn get_public_rooms_route(
return Err(Error::BadRequest(ErrorKind::forbidden(), "Room directory is not public")); return Err(Error::BadRequest(ErrorKind::forbidden(), "Room directory is not public"));
} }
let response = client_server::get_public_rooms_filtered_helper( let response = crate::client::get_public_rooms_filtered_helper(
None, None,
body.limit, body.limit,
body.since.as_deref(), body.since.as_deref(),

2
src/api/server/user.rs
View file

@ -7,7 +7,7 @@ use ruma::api::{
}; };
use crate::{ use crate::{
client_server::{claim_keys_helper, get_keys_helper}, client::{claim_keys_helper, get_keys_helper},
service::user_is_local, service::user_is_local,
services, Error, Result, Ruma, services, Error, Result, Ruma,
}; };