diff --git a/src/admin/room/room_moderation_commands.rs b/src/admin/room/room_moderation_commands.rs
index 46ae0184aa9187caa63170b88a3c65574d58b7e2..f5176147b70e984f52881d4af28c79f06f57aadb 100644
--- a/src/admin/room/room_moderation_commands.rs
+++ b/src/admin/room/room_moderation_commands.rs
@@ -1,6 +1,6 @@
use std::fmt::Write;
-use api::client_server::{get_alias_helper, leave_room};
+use api::client::{get_alias_helper, leave_room};
use ruma::{
events::room::message::RoomMessageEventContent, OwnedRoomId, OwnedUserId, RoomAliasId, RoomId, RoomOrAliasId,
};
diff --git a/src/admin/user/user_commands.rs b/src/admin/user/user_commands.rs
index d7fc321df302ed827c0ff4bb77442740ee19e289..24f30931384428805b198484a382f9ae150fbd47 100644
--- a/src/admin/user/user_commands.rs
+++ b/src/admin/user/user_commands.rs
@@ -1,6 +1,6 @@
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 ruma::{events::room::message::RoomMessageEventContent, OwnedRoomId, UserId};
use tracing::{error, info, warn};
diff --git a/src/api/client_server/account.rs b/src/api/client/account.rs
similarity index 99%
rename from src/api/client_server/account.rs
rename to src/api/client/account.rs
index fe0c333b1dbd6a28c93c0a26dea7fd3503a0b3e5..a5ff5d8298fb7aab4011e861f58b4f256c5c42ac 100644
--- a/src/api/client_server/account.rs
+++ b/src/api/client/account.rs
@@ -18,9 +18,8 @@
};
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::{
- client_server::{self, join_room_by_id_helper},
service::user_is_local,
services,
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
- client_server::leave_all_rooms(sender_user).await;
+ super::leave_all_rooms(sender_user).await;
// Remove devices and mark account as deactivated
services().users.deactivate_account(sender_user)?;
diff --git a/src/api/client_server/alias.rs b/src/api/client/alias.rs
similarity index 100%
rename from src/api/client_server/alias.rs
rename to src/api/client/alias.rs
diff --git a/src/api/client_server/backup.rs b/src/api/client/backup.rs
similarity index 100%
rename from src/api/client_server/backup.rs
rename to src/api/client/backup.rs
diff --git a/src/api/client_server/capabilities.rs b/src/api/client/capabilities.rs
similarity index 100%
rename from src/api/client_server/capabilities.rs
rename to src/api/client/capabilities.rs
diff --git a/src/api/client_server/config.rs b/src/api/client/config.rs
similarity index 100%
rename from src/api/client_server/config.rs
rename to src/api/client/config.rs
diff --git a/src/api/client_server/context.rs b/src/api/client/context.rs
similarity index 100%
rename from src/api/client_server/context.rs
rename to src/api/client/context.rs
diff --git a/src/api/client_server/device.rs b/src/api/client/device.rs
similarity index 100%
rename from src/api/client_server/device.rs
rename to src/api/client/device.rs
diff --git a/src/api/client_server/directory.rs b/src/api/client/directory.rs
similarity index 100%
rename from src/api/client_server/directory.rs
rename to src/api/client/directory.rs
diff --git a/src/api/client_server/filter.rs b/src/api/client/filter.rs
similarity index 100%
rename from src/api/client_server/filter.rs
rename to src/api/client/filter.rs
diff --git a/src/api/client_server/keys.rs b/src/api/client/keys.rs
similarity index 100%
rename from src/api/client_server/keys.rs
rename to src/api/client/keys.rs
diff --git a/src/api/client_server/media.rs b/src/api/client/media.rs
similarity index 100%
rename from src/api/client_server/media.rs
rename to src/api/client/media.rs
diff --git a/src/api/client_server/membership.rs b/src/api/client/membership.rs
similarity index 100%
rename from src/api/client_server/membership.rs
rename to src/api/client/membership.rs
diff --git a/src/api/client_server/message.rs b/src/api/client/message.rs
similarity index 100%
rename from src/api/client_server/message.rs
rename to src/api/client/message.rs
diff --git a/src/api/client_server/mod.rs b/src/api/client/mod.rs
similarity index 100%
rename from src/api/client_server/mod.rs
rename to src/api/client/mod.rs
diff --git a/src/api/client_server/presence.rs b/src/api/client/presence.rs
similarity index 100%
rename from src/api/client_server/presence.rs
rename to src/api/client/presence.rs
diff --git a/src/api/client_server/profile.rs b/src/api/client/profile.rs
similarity index 100%
rename from src/api/client_server/profile.rs
rename to src/api/client/profile.rs
diff --git a/src/api/client_server/push.rs b/src/api/client/push.rs
similarity index 100%
rename from src/api/client_server/push.rs
rename to src/api/client/push.rs
diff --git a/src/api/client_server/read_marker.rs b/src/api/client/read_marker.rs
similarity index 100%
rename from src/api/client_server/read_marker.rs
rename to src/api/client/read_marker.rs
diff --git a/src/api/client_server/redact.rs b/src/api/client/redact.rs
similarity index 100%
rename from src/api/client_server/redact.rs
rename to src/api/client/redact.rs
diff --git a/src/api/client_server/relations.rs b/src/api/client/relations.rs
similarity index 100%
rename from src/api/client_server/relations.rs
rename to src/api/client/relations.rs
diff --git a/src/api/client_server/report.rs b/src/api/client/report.rs
similarity index 100%
rename from src/api/client_server/report.rs
rename to src/api/client/report.rs
diff --git a/src/api/client_server/room.rs b/src/api/client/room.rs
similarity index 99%
rename from src/api/client_server/room.rs
rename to src/api/client/room.rs
index 2c27f569337277e965bf0d26131eb688621eb600..0cea6ef7dabd9cb9bcec0b39cd0e351238356dd9 100644
--- a/src/api/client_server/room.rs
+++ b/src/api/client/room.rs
@@ -28,8 +28,8 @@
use serde_json::{json, value::to_raw_value};
use tracing::{error, info, warn};
+use super::invite_helper;
use crate::{
- client_server::invite_helper,
service::{appservice::RegistrationInfo, pdu::PduBuilder},
services, Error, Result, Ruma,
};
diff --git a/src/api/client_server/search.rs b/src/api/client/search.rs
similarity index 100%
rename from src/api/client_server/search.rs
rename to src/api/client/search.rs
diff --git a/src/api/client_server/session.rs b/src/api/client/session.rs
similarity index 100%
rename from src/api/client_server/session.rs
rename to src/api/client/session.rs
diff --git a/src/api/client_server/space.rs b/src/api/client/space.rs
similarity index 100%
rename from src/api/client_server/space.rs
rename to src/api/client/space.rs
diff --git a/src/api/client_server/state.rs b/src/api/client/state.rs
similarity index 100%
rename from src/api/client_server/state.rs
rename to src/api/client/state.rs
diff --git a/src/api/client_server/sync.rs b/src/api/client/sync.rs
similarity index 100%
rename from src/api/client_server/sync.rs
rename to src/api/client/sync.rs
diff --git a/src/api/client_server/tag.rs b/src/api/client/tag.rs
similarity index 100%
rename from src/api/client_server/tag.rs
rename to src/api/client/tag.rs
diff --git a/src/api/client_server/thirdparty.rs b/src/api/client/thirdparty.rs
similarity index 100%
rename from src/api/client_server/thirdparty.rs
rename to src/api/client/thirdparty.rs
diff --git a/src/api/client_server/threads.rs b/src/api/client/threads.rs
similarity index 100%
rename from src/api/client_server/threads.rs
rename to src/api/client/threads.rs
diff --git a/src/api/client_server/to_device.rs b/src/api/client/to_device.rs
similarity index 100%
rename from src/api/client_server/to_device.rs
rename to src/api/client/to_device.rs
diff --git a/src/api/client_server/typing.rs b/src/api/client/typing.rs
similarity index 100%
rename from src/api/client_server/typing.rs
rename to src/api/client/typing.rs
diff --git a/src/api/client_server/unstable.rs b/src/api/client/unstable.rs
similarity index 100%
rename from src/api/client_server/unstable.rs
rename to src/api/client/unstable.rs
diff --git a/src/api/client_server/unversioned.rs b/src/api/client/unversioned.rs
similarity index 100%
rename from src/api/client_server/unversioned.rs
rename to src/api/client/unversioned.rs
diff --git a/src/api/client_server/user_directory.rs b/src/api/client/user_directory.rs
similarity index 100%
rename from src/api/client_server/user_directory.rs
rename to src/api/client/user_directory.rs
diff --git a/src/api/client_server/voip.rs b/src/api/client/voip.rs
similarity index 100%
rename from src/api/client_server/voip.rs
rename to src/api/client/voip.rs
diff --git a/src/api/mod.rs b/src/api/mod.rs
index a42ba5517fb16a48474c468b4e5889d81fff83ed..2fef4dbf4be01f90c670d7723f0451bbbc297413 100644
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@@ -1,4 +1,4 @@
-pub mod client_server;
+pub mod client;
pub mod router;
mod ruma_wrapper;
pub mod server;
@@ -6,7 +6,6 @@
extern crate conduit_core as conduit;
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 ruma_wrapper::{Ruma, RumaResponse};
pub(crate) use service::{pdu::PduEvent, services, user_is_local};
diff --git a/src/api/router.rs b/src/api/router.rs
index ad592fc0dc5d9ee7f60c8fddd69bb2a0e718b0a0..3157f10d65b444f067202ce750be0ce5485e0a45 100644
--- a/src/api/router.rs
+++ b/src/api/router.rs
@@ -7,184 +7,184 @@
use http::Uri;
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 {
let config = &server.config;
let router = router
- .ruma_route(client_server::get_supported_versions_route)
- .ruma_route(client_server::get_register_available_route)
- .ruma_route(client_server::register_route)
- .ruma_route(client_server::get_login_types_route)
- .ruma_route(client_server::login_route)
- .ruma_route(client_server::whoami_route)
- .ruma_route(client_server::logout_route)
- .ruma_route(client_server::logout_all_route)
- .ruma_route(client_server::change_password_route)
- .ruma_route(client_server::deactivate_route)
- .ruma_route(client_server::third_party_route)
- .ruma_route(client_server::request_3pid_management_token_via_email_route)
- .ruma_route(client_server::request_3pid_management_token_via_msisdn_route)
- .ruma_route(client_server::check_registration_token_validity)
- .ruma_route(client_server::get_capabilities_route)
- .ruma_route(client_server::get_pushrules_all_route)
- .ruma_route(client_server::set_pushrule_route)
- .ruma_route(client_server::get_pushrule_route)
- .ruma_route(client_server::set_pushrule_enabled_route)
- .ruma_route(client_server::get_pushrule_enabled_route)
- .ruma_route(client_server::get_pushrule_actions_route)
- .ruma_route(client_server::set_pushrule_actions_route)
- .ruma_route(client_server::delete_pushrule_route)
- .ruma_route(client_server::get_room_event_route)
- .ruma_route(client_server::get_room_aliases_route)
- .ruma_route(client_server::get_filter_route)
- .ruma_route(client_server::create_filter_route)
- .ruma_route(client_server::set_global_account_data_route)
- .ruma_route(client_server::set_room_account_data_route)
- .ruma_route(client_server::get_global_account_data_route)
- .ruma_route(client_server::get_room_account_data_route)
- .ruma_route(client_server::set_displayname_route)
- .ruma_route(client_server::get_displayname_route)
- .ruma_route(client_server::set_avatar_url_route)
- .ruma_route(client_server::get_avatar_url_route)
- .ruma_route(client_server::get_profile_route)
- .ruma_route(client_server::set_presence_route)
- .ruma_route(client_server::get_presence_route)
- .ruma_route(client_server::upload_keys_route)
- .ruma_route(client_server::get_keys_route)
- .ruma_route(client_server::claim_keys_route)
- .ruma_route(client_server::create_backup_version_route)
- .ruma_route(client_server::update_backup_version_route)
- .ruma_route(client_server::delete_backup_version_route)
- .ruma_route(client_server::get_latest_backup_info_route)
- .ruma_route(client_server::get_backup_info_route)
- .ruma_route(client_server::add_backup_keys_route)
- .ruma_route(client_server::add_backup_keys_for_room_route)
- .ruma_route(client_server::add_backup_keys_for_session_route)
- .ruma_route(client_server::delete_backup_keys_for_room_route)
- .ruma_route(client_server::delete_backup_keys_for_session_route)
- .ruma_route(client_server::delete_backup_keys_route)
- .ruma_route(client_server::get_backup_keys_for_room_route)
- .ruma_route(client_server::get_backup_keys_for_session_route)
- .ruma_route(client_server::get_backup_keys_route)
- .ruma_route(client_server::set_read_marker_route)
- .ruma_route(client_server::create_receipt_route)
- .ruma_route(client_server::create_typing_event_route)
- .ruma_route(client_server::create_room_route)
- .ruma_route(client_server::redact_event_route)
- .ruma_route(client_server::report_event_route)
- .ruma_route(client_server::create_alias_route)
- .ruma_route(client_server::delete_alias_route)
- .ruma_route(client_server::get_alias_route)
- .ruma_route(client_server::join_room_by_id_route)
- .ruma_route(client_server::join_room_by_id_or_alias_route)
- .ruma_route(client_server::joined_members_route)
- .ruma_route(client_server::leave_room_route)
- .ruma_route(client_server::forget_room_route)
- .ruma_route(client_server::joined_rooms_route)
- .ruma_route(client_server::kick_user_route)
- .ruma_route(client_server::ban_user_route)
- .ruma_route(client_server::unban_user_route)
- .ruma_route(client_server::invite_user_route)
- .ruma_route(client_server::set_room_visibility_route)
- .ruma_route(client_server::get_room_visibility_route)
- .ruma_route(client_server::get_public_rooms_route)
- .ruma_route(client_server::get_public_rooms_filtered_route)
- .ruma_route(client_server::search_users_route)
- .ruma_route(client_server::get_member_events_route)
- .ruma_route(client_server::get_protocols_route)
- .ruma_route(client_server::send_message_event_route)
- .ruma_route(client_server::send_state_event_for_key_route)
- .ruma_route(client_server::get_state_events_route)
- .ruma_route(client_server::get_state_events_for_key_route)
+ .ruma_route(client::get_supported_versions_route)
+ .ruma_route(client::get_register_available_route)
+ .ruma_route(client::register_route)
+ .ruma_route(client::get_login_types_route)
+ .ruma_route(client::login_route)
+ .ruma_route(client::whoami_route)
+ .ruma_route(client::logout_route)
+ .ruma_route(client::logout_all_route)
+ .ruma_route(client::change_password_route)
+ .ruma_route(client::deactivate_route)
+ .ruma_route(client::third_party_route)
+ .ruma_route(client::request_3pid_management_token_via_email_route)
+ .ruma_route(client::request_3pid_management_token_via_msisdn_route)
+ .ruma_route(client::check_registration_token_validity)
+ .ruma_route(client::get_capabilities_route)
+ .ruma_route(client::get_pushrules_all_route)
+ .ruma_route(client::set_pushrule_route)
+ .ruma_route(client::get_pushrule_route)
+ .ruma_route(client::set_pushrule_enabled_route)
+ .ruma_route(client::get_pushrule_enabled_route)
+ .ruma_route(client::get_pushrule_actions_route)
+ .ruma_route(client::set_pushrule_actions_route)
+ .ruma_route(client::delete_pushrule_route)
+ .ruma_route(client::get_room_event_route)
+ .ruma_route(client::get_room_aliases_route)
+ .ruma_route(client::get_filter_route)
+ .ruma_route(client::create_filter_route)
+ .ruma_route(client::set_global_account_data_route)
+ .ruma_route(client::set_room_account_data_route)
+ .ruma_route(client::get_global_account_data_route)
+ .ruma_route(client::get_room_account_data_route)
+ .ruma_route(client::set_displayname_route)
+ .ruma_route(client::get_displayname_route)
+ .ruma_route(client::set_avatar_url_route)
+ .ruma_route(client::get_avatar_url_route)
+ .ruma_route(client::get_profile_route)
+ .ruma_route(client::set_presence_route)
+ .ruma_route(client::get_presence_route)
+ .ruma_route(client::upload_keys_route)
+ .ruma_route(client::get_keys_route)
+ .ruma_route(client::claim_keys_route)
+ .ruma_route(client::create_backup_version_route)
+ .ruma_route(client::update_backup_version_route)
+ .ruma_route(client::delete_backup_version_route)
+ .ruma_route(client::get_latest_backup_info_route)
+ .ruma_route(client::get_backup_info_route)
+ .ruma_route(client::add_backup_keys_route)
+ .ruma_route(client::add_backup_keys_for_room_route)
+ .ruma_route(client::add_backup_keys_for_session_route)
+ .ruma_route(client::delete_backup_keys_for_room_route)
+ .ruma_route(client::delete_backup_keys_for_session_route)
+ .ruma_route(client::delete_backup_keys_route)
+ .ruma_route(client::get_backup_keys_for_room_route)
+ .ruma_route(client::get_backup_keys_for_session_route)
+ .ruma_route(client::get_backup_keys_route)
+ .ruma_route(client::set_read_marker_route)
+ .ruma_route(client::create_receipt_route)
+ .ruma_route(client::create_typing_event_route)
+ .ruma_route(client::create_room_route)
+ .ruma_route(client::redact_event_route)
+ .ruma_route(client::report_event_route)
+ .ruma_route(client::create_alias_route)
+ .ruma_route(client::delete_alias_route)
+ .ruma_route(client::get_alias_route)
+ .ruma_route(client::join_room_by_id_route)
+ .ruma_route(client::join_room_by_id_or_alias_route)
+ .ruma_route(client::joined_members_route)
+ .ruma_route(client::leave_room_route)
+ .ruma_route(client::forget_room_route)
+ .ruma_route(client::joined_rooms_route)
+ .ruma_route(client::kick_user_route)
+ .ruma_route(client::ban_user_route)
+ .ruma_route(client::unban_user_route)
+ .ruma_route(client::invite_user_route)
+ .ruma_route(client::set_room_visibility_route)
+ .ruma_route(client::get_room_visibility_route)
+ .ruma_route(client::get_public_rooms_route)
+ .ruma_route(client::get_public_rooms_filtered_route)
+ .ruma_route(client::search_users_route)
+ .ruma_route(client::get_member_events_route)
+ .ruma_route(client::get_protocols_route)
+ .ruma_route(client::send_message_event_route)
+ .ruma_route(client::send_state_event_for_key_route)
+ .ruma_route(client::get_state_events_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
// share one Ruma request / response type pair with {get,send}_state_event_for_key_route
.route(
"/_matrix/client/r0/rooms/:room_id/state/:event_type",
- get(client_server::get_state_events_for_empty_key_route)
- .put(client_server::send_state_event_for_empty_key_route),
+ get(client::get_state_events_for_empty_key_route)
+ .put(client::send_state_event_for_empty_key_route),
)
.route(
"/_matrix/client/v3/rooms/:room_id/state/:event_type",
- get(client_server::get_state_events_for_empty_key_route)
- .put(client_server::send_state_event_for_empty_key_route),
+ get(client::get_state_events_for_empty_key_route)
+ .put(client::send_state_event_for_empty_key_route),
)
// These two endpoints allow trailing slashes
.route(
"/_matrix/client/r0/rooms/:room_id/state/:event_type/",
- get(client_server::get_state_events_for_empty_key_route)
- .put(client_server::send_state_event_for_empty_key_route),
+ get(client::get_state_events_for_empty_key_route)
+ .put(client::send_state_event_for_empty_key_route),
)
.route(
"/_matrix/client/v3/rooms/:room_id/state/:event_type/",
- get(client_server::get_state_events_for_empty_key_route)
- .put(client_server::send_state_event_for_empty_key_route),
+ get(client::get_state_events_for_empty_key_route)
+ .put(client::send_state_event_for_empty_key_route),
)
- .ruma_route(client_server::sync_events_route)
- .ruma_route(client_server::sync_events_v4_route)
- .ruma_route(client_server::get_context_route)
- .ruma_route(client_server::get_message_events_route)
- .ruma_route(client_server::search_events_route)
- .ruma_route(client_server::turn_server_route)
- .ruma_route(client_server::send_event_to_device_route)
- .ruma_route(client_server::get_media_config_route)
- .ruma_route(client_server::get_media_preview_route)
- .ruma_route(client_server::create_content_route)
+ .ruma_route(client::sync_events_route)
+ .ruma_route(client::sync_events_v4_route)
+ .ruma_route(client::get_context_route)
+ .ruma_route(client::get_message_events_route)
+ .ruma_route(client::search_events_route)
+ .ruma_route(client::turn_server_route)
+ .ruma_route(client::send_event_to_device_route)
+ .ruma_route(client::get_media_config_route)
+ .ruma_route(client::get_media_preview_route)
+ .ruma_route(client::create_content_route)
// legacy v1 media routes
.route(
"/_matrix/media/v1/preview_url",
- get(client_server::get_media_preview_v1_route)
+ get(client::get_media_preview_v1_route)
)
.route(
"/_matrix/media/v1/config",
- get(client_server::get_media_config_v1_route)
+ get(client::get_media_config_v1_route)
)
.route(
"/_matrix/media/v1/upload",
- post(client_server::create_content_v1_route)
+ post(client::create_content_v1_route)
)
.route(
"/_matrix/media/v1/download/:server_name/:media_id",
- get(client_server::get_content_v1_route)
+ get(client::get_content_v1_route)
)
.route(
"/_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(
"/_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_server::get_content_as_filename_route)
- .ruma_route(client_server::get_content_thumbnail_route)
- .ruma_route(client_server::get_devices_route)
- .ruma_route(client_server::get_device_route)
- .ruma_route(client_server::update_device_route)
- .ruma_route(client_server::delete_device_route)
- .ruma_route(client_server::delete_devices_route)
- .ruma_route(client_server::get_tags_route)
- .ruma_route(client_server::update_tag_route)
- .ruma_route(client_server::delete_tag_route)
- .ruma_route(client_server::upload_signing_keys_route)
- .ruma_route(client_server::upload_signatures_route)
- .ruma_route(client_server::get_key_changes_route)
- .ruma_route(client_server::get_pushers_route)
- .ruma_route(client_server::set_pushers_route)
- // .ruma_route(client_server::third_party_route)
- .ruma_route(client_server::upgrade_room_route)
- .ruma_route(client_server::get_threads_route)
- .ruma_route(client_server::get_relating_events_with_rel_type_and_event_type_route)
- .ruma_route(client_server::get_relating_events_with_rel_type_route)
- .ruma_route(client_server::get_relating_events_route)
- .ruma_route(client_server::get_hierarchy_route)
- .ruma_route(client_server::get_mutual_rooms_route)
- .ruma_route(client_server::well_known_support)
- .ruma_route(client_server::well_known_client)
- .route("/_conduwuit/server_version", get(client_server::conduwuit_server_version))
+ .ruma_route(client::get_content_route)
+ .ruma_route(client::get_content_as_filename_route)
+ .ruma_route(client::get_content_thumbnail_route)
+ .ruma_route(client::get_devices_route)
+ .ruma_route(client::get_device_route)
+ .ruma_route(client::update_device_route)
+ .ruma_route(client::delete_device_route)
+ .ruma_route(client::delete_devices_route)
+ .ruma_route(client::get_tags_route)
+ .ruma_route(client::update_tag_route)
+ .ruma_route(client::delete_tag_route)
+ .ruma_route(client::upload_signing_keys_route)
+ .ruma_route(client::upload_signatures_route)
+ .ruma_route(client::get_key_changes_route)
+ .ruma_route(client::get_pushers_route)
+ .ruma_route(client::set_pushers_route)
+ // .ruma_route(client::third_party_route)
+ .ruma_route(client::upgrade_room_route)
+ .ruma_route(client::get_threads_route)
+ .ruma_route(client::get_relating_events_with_rel_type_and_event_type_route)
+ .ruma_route(client::get_relating_events_with_rel_type_route)
+ .ruma_route(client::get_relating_events_route)
+ .ruma_route(client::get_hierarchy_route)
+ .ruma_route(client::get_mutual_rooms_route)
+ .ruma_route(client::well_known_support)
+ .ruma_route(client::well_known_client)
+ .route("/_conduwuit/server_version", get(client::conduwuit_server_version))
.route("/_matrix/client/r0/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 {
router
@@ -214,7 +214,7 @@ pub fn build(router: Router, server: &Server) -> Router {
.ruma_route(server::claim_keys_route)
.ruma_route(server::get_hierarchy_route)
.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 {
router
.route("/_matrix/federation/*path", any(federation_disabled))
diff --git a/src/api/server/publicrooms.rs b/src/api/server/publicrooms.rs
index 2a1a2ab9c6b9f36a189765bd689ef8a76d19c818..5a91f018e1291d04fdcac50409ded46d6ec33a03 100644
--- a/src/api/server/publicrooms.rs
+++ b/src/api/server/publicrooms.rs
@@ -6,10 +6,7 @@
directory::Filter,
};
-use crate::{
- client_server::{self},
- services, Error, Result, Ruma,
-};
+use crate::{services, Error, Result, Ruma};
/// # `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"));
}
- let response = client_server::get_public_rooms_filtered_helper(
+ let response = crate::client::get_public_rooms_filtered_helper(
None,
body.limit,
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"));
}
- let response = client_server::get_public_rooms_filtered_helper(
+ let response = crate::client::get_public_rooms_filtered_helper(
None,
body.limit,
body.since.as_deref(),
diff --git a/src/api/server/user.rs b/src/api/server/user.rs
index 0176de756d9bcdbdde72f76ee77e58fca540491f..5bfc070ceb6c2e4747dbf85a6adca6de80ad3e8e 100644
--- a/src/api/server/user.rs
+++ b/src/api/server/user.rs
@@ -7,7 +7,7 @@
};
use crate::{
- client_server::{claim_keys_helper, get_keys_helper},
+ client::{claim_keys_helper, get_keys_helper},
service::user_is_local,
services, Error, Result, Ruma,
};