From dc096d7ad70308a51e873be9f9c718a1bf8ead59 Mon Sep 17 00:00:00 2001 From: Charles Hall Date: Thu, 16 May 2024 16:05:23 -0700 Subject: [PATCH] abbreviate api categories This reduces the amount of characters on each line. --- src/main.rs | 290 ++++++++++++++++++++++++++-------------------------- 1 file changed, 145 insertions(+), 145 deletions(-) diff --git a/src/main.rs b/src/main.rs index bd7b1aae..1b44322f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -293,120 +293,123 @@ async fn unrecognized_method( #[allow(clippy::too_many_lines)] fn routes(config: &Config) -> Router { + use client_server as c2s; + use server_server as s2s; + let router = Router::new() - .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::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::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_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::create_content_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::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(c2s::get_supported_versions_route) + .ruma_route(c2s::get_register_available_route) + .ruma_route(c2s::register_route) + .ruma_route(c2s::get_login_types_route) + .ruma_route(c2s::login_route) + .ruma_route(c2s::whoami_route) + .ruma_route(c2s::logout_route) + .ruma_route(c2s::logout_all_route) + .ruma_route(c2s::change_password_route) + .ruma_route(c2s::deactivate_route) + .ruma_route(c2s::third_party_route) + .ruma_route(c2s::request_3pid_management_token_via_email_route) + .ruma_route(c2s::request_3pid_management_token_via_msisdn_route) + .ruma_route(c2s::get_capabilities_route) + .ruma_route(c2s::get_pushrules_all_route) + .ruma_route(c2s::set_pushrule_route) + .ruma_route(c2s::get_pushrule_route) + .ruma_route(c2s::set_pushrule_enabled_route) + .ruma_route(c2s::get_pushrule_enabled_route) + .ruma_route(c2s::get_pushrule_actions_route) + .ruma_route(c2s::set_pushrule_actions_route) + .ruma_route(c2s::delete_pushrule_route) + .ruma_route(c2s::get_room_event_route) + .ruma_route(c2s::get_room_aliases_route) + .ruma_route(c2s::get_filter_route) + .ruma_route(c2s::create_filter_route) + .ruma_route(c2s::set_global_account_data_route) + .ruma_route(c2s::set_room_account_data_route) + .ruma_route(c2s::get_global_account_data_route) + .ruma_route(c2s::get_room_account_data_route) + .ruma_route(c2s::set_displayname_route) + .ruma_route(c2s::get_displayname_route) + .ruma_route(c2s::set_avatar_url_route) + .ruma_route(c2s::get_avatar_url_route) + .ruma_route(c2s::get_profile_route) + .ruma_route(c2s::upload_keys_route) + .ruma_route(c2s::get_keys_route) + .ruma_route(c2s::claim_keys_route) + .ruma_route(c2s::create_backup_version_route) + .ruma_route(c2s::update_backup_version_route) + .ruma_route(c2s::delete_backup_version_route) + .ruma_route(c2s::get_latest_backup_info_route) + .ruma_route(c2s::get_backup_info_route) + .ruma_route(c2s::add_backup_keys_route) + .ruma_route(c2s::add_backup_keys_for_room_route) + .ruma_route(c2s::add_backup_keys_for_session_route) + .ruma_route(c2s::delete_backup_keys_for_room_route) + .ruma_route(c2s::delete_backup_keys_for_session_route) + .ruma_route(c2s::delete_backup_keys_route) + .ruma_route(c2s::get_backup_keys_for_room_route) + .ruma_route(c2s::get_backup_keys_for_session_route) + .ruma_route(c2s::get_backup_keys_route) + .ruma_route(c2s::set_read_marker_route) + .ruma_route(c2s::create_receipt_route) + .ruma_route(c2s::create_typing_event_route) + .ruma_route(c2s::create_room_route) + .ruma_route(c2s::redact_event_route) + .ruma_route(c2s::report_event_route) + .ruma_route(c2s::create_alias_route) + .ruma_route(c2s::delete_alias_route) + .ruma_route(c2s::get_alias_route) + .ruma_route(c2s::join_room_by_id_route) + .ruma_route(c2s::join_room_by_id_or_alias_route) + .ruma_route(c2s::joined_members_route) + .ruma_route(c2s::leave_room_route) + .ruma_route(c2s::forget_room_route) + .ruma_route(c2s::joined_rooms_route) + .ruma_route(c2s::kick_user_route) + .ruma_route(c2s::ban_user_route) + .ruma_route(c2s::unban_user_route) + .ruma_route(c2s::invite_user_route) + .ruma_route(c2s::set_room_visibility_route) + .ruma_route(c2s::get_room_visibility_route) + .ruma_route(c2s::get_public_rooms_route) + .ruma_route(c2s::get_public_rooms_filtered_route) + .ruma_route(c2s::search_users_route) + .ruma_route(c2s::get_member_events_route) + .ruma_route(c2s::get_protocols_route) + .ruma_route(c2s::send_message_event_route) + .ruma_route(c2s::send_state_event_for_key_route) + .ruma_route(c2s::get_state_events_route) + .ruma_route(c2s::get_state_events_for_key_route) + .ruma_route(c2s::sync_events_route) + .ruma_route(c2s::sync_events_v4_route) + .ruma_route(c2s::get_context_route) + .ruma_route(c2s::get_message_events_route) + .ruma_route(c2s::search_events_route) + .ruma_route(c2s::turn_server_route) + .ruma_route(c2s::send_event_to_device_route) + .ruma_route(c2s::get_media_config_route) + .ruma_route(c2s::create_content_route) + .ruma_route(c2s::get_content_route) + .ruma_route(c2s::get_content_as_filename_route) + .ruma_route(c2s::get_content_thumbnail_route) + .ruma_route(c2s::get_devices_route) + .ruma_route(c2s::get_device_route) + .ruma_route(c2s::update_device_route) + .ruma_route(c2s::delete_device_route) + .ruma_route(c2s::delete_devices_route) + .ruma_route(c2s::get_tags_route) + .ruma_route(c2s::update_tag_route) + .ruma_route(c2s::delete_tag_route) + .ruma_route(c2s::upload_signing_keys_route) + .ruma_route(c2s::upload_signatures_route) + .ruma_route(c2s::get_key_changes_route) + .ruma_route(c2s::get_pushers_route) + .ruma_route(c2s::set_pushers_route) + .ruma_route(c2s::upgrade_room_route) + .ruma_route(c2s::get_threads_route) + .ruma_route(c2s::get_relating_events_with_rel_type_and_event_type_route) + .ruma_route(c2s::get_relating_events_with_rel_type_route) + .ruma_route(c2s::get_relating_events_route) + .ruma_route(c2s::get_hierarchy_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. @@ -414,23 +417,23 @@ fn routes(config: &Config) -> Router { let router = router .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(c2s::get_state_events_for_empty_key_route) + .put(c2s::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(c2s::get_state_events_for_empty_key_route) + .put(c2s::send_state_event_for_empty_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(c2s::get_state_events_for_empty_key_route) + .put(c2s::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(c2s::get_state_events_for_empty_key_route) + .put(c2s::send_state_event_for_empty_key_route), ); let router = router @@ -447,33 +450,30 @@ fn routes(config: &Config) -> Router { if config.allow_federation { router - .ruma_route(server_server::get_server_version_route) - .route( - "/_matrix/key/v2/server", - get(server_server::get_server_keys_route), - ) + .ruma_route(s2s::get_server_version_route) + .route("/_matrix/key/v2/server", get(s2s::get_server_keys_route)) .route( "/_matrix/key/v2/server/:key_id", - get(server_server::get_server_keys_deprecated_route), + get(s2s::get_server_keys_deprecated_route), ) - .ruma_route(server_server::get_public_rooms_route) - .ruma_route(server_server::get_public_rooms_filtered_route) - .ruma_route(server_server::send_transaction_message_route) - .ruma_route(server_server::get_event_route) - .ruma_route(server_server::get_backfill_route) - .ruma_route(server_server::get_missing_events_route) - .ruma_route(server_server::get_event_authorization_route) - .ruma_route(server_server::get_room_state_route) - .ruma_route(server_server::get_room_state_ids_route) - .ruma_route(server_server::create_join_event_template_route) - .ruma_route(server_server::create_join_event_v1_route) - .ruma_route(server_server::create_join_event_v2_route) - .ruma_route(server_server::create_invite_route) - .ruma_route(server_server::get_devices_route) - .ruma_route(server_server::get_room_information_route) - .ruma_route(server_server::get_profile_information_route) - .ruma_route(server_server::get_keys_route) - .ruma_route(server_server::claim_keys_route) + .ruma_route(s2s::get_public_rooms_route) + .ruma_route(s2s::get_public_rooms_filtered_route) + .ruma_route(s2s::send_transaction_message_route) + .ruma_route(s2s::get_event_route) + .ruma_route(s2s::get_backfill_route) + .ruma_route(s2s::get_missing_events_route) + .ruma_route(s2s::get_event_authorization_route) + .ruma_route(s2s::get_room_state_route) + .ruma_route(s2s::get_room_state_ids_route) + .ruma_route(s2s::create_join_event_template_route) + .ruma_route(s2s::create_join_event_v1_route) + .ruma_route(s2s::create_join_event_v2_route) + .ruma_route(s2s::create_invite_route) + .ruma_route(s2s::get_devices_route) + .ruma_route(s2s::get_room_information_route) + .ruma_route(s2s::get_profile_information_route) + .ruma_route(s2s::get_keys_route) + .ruma_route(s2s::claim_keys_route) } else { router .route("/_matrix/federation/*path", any(federation_disabled))