From ee99486978737733337243355dda5018c2410227 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Sun, 13 Feb 2022 11:21:49 +0100 Subject: [PATCH] client-api: Use new path metadata fields --- crates/ruma-client-api/src/r0/account/add_3pid.rs | 4 +++- crates/ruma-client-api/src/r0/account/bind_3pid.rs | 4 +++- crates/ruma-client-api/src/r0/account/change_password.rs | 4 +++- .../src/r0/account/check_registration_token_validity.rs | 4 +++- crates/ruma-client-api/src/r0/account/deactivate.rs | 4 +++- crates/ruma-client-api/src/r0/account/delete_3pid.rs | 4 +++- crates/ruma-client-api/src/r0/account/get_3pids.rs | 4 +++- .../src/r0/account/get_username_availability.rs | 4 +++- crates/ruma-client-api/src/r0/account/register.rs | 4 +++- .../r0/account/request_3pid_management_token_via_email.rs | 4 +++- .../account/request_3pid_management_token_via_msisdn.rs | 4 +++- .../src/r0/account/request_openid_token.rs | 4 +++- .../r0/account/request_password_change_token_via_email.rs | 4 +++- .../account/request_password_change_token_via_msisdn.rs | 4 +++- .../r0/account/request_registration_token_via_email.rs | 4 +++- .../r0/account/request_registration_token_via_msisdn.rs | 4 +++- crates/ruma-client-api/src/r0/account/unbind_3pid.rs | 4 +++- crates/ruma-client-api/src/r0/account/whoami.rs | 4 +++- crates/ruma-client-api/src/r0/alias/create_alias.rs | 4 +++- crates/ruma-client-api/src/r0/alias/delete_alias.rs | 4 +++- crates/ruma-client-api/src/r0/alias/get_alias.rs | 4 +++- .../src/r0/appservice/set_room_visibility.rs | 4 +++- .../src/r0/backup/add_backup_key_session.rs | 5 ++++- .../src/r0/backup/add_backup_key_sessions.rs | 5 ++++- crates/ruma-client-api/src/r0/backup/add_backup_keys.rs | 4 +++- crates/ruma-client-api/src/r0/backup/create_backup.rs | 4 +++- crates/ruma-client-api/src/r0/backup/delete_backup.rs | 5 ++++- .../src/r0/backup/delete_backup_key_session.rs | 5 ++++- .../src/r0/backup/delete_backup_key_sessions.rs | 5 ++++- .../ruma-client-api/src/r0/backup/delete_backup_keys.rs | 5 ++++- crates/ruma-client-api/src/r0/backup/get_backup.rs | 4 +++- .../src/r0/backup/get_backup_key_session.rs | 5 ++++- .../src/r0/backup/get_backup_key_sessions.rs | 5 ++++- crates/ruma-client-api/src/r0/backup/get_backup_keys.rs | 5 ++++- crates/ruma-client-api/src/r0/backup/get_latest_backup.rs | 5 ++++- crates/ruma-client-api/src/r0/backup/update_backup.rs | 4 +++- .../src/r0/capabilities/get_capabilities.rs | 6 ++++-- .../src/r0/config/get_global_account_data.rs | 4 +++- .../src/r0/config/get_room_account_data.rs | 4 +++- .../src/r0/config/set_global_account_data.rs | 4 +++- .../src/r0/config/set_room_account_data.rs | 4 +++- crates/ruma-client-api/src/r0/context/get_context.rs | 4 +++- crates/ruma-client-api/src/r0/device/delete_device.rs | 4 +++- crates/ruma-client-api/src/r0/device/delete_devices.rs | 4 +++- crates/ruma-client-api/src/r0/device/get_device.rs | 4 +++- crates/ruma-client-api/src/r0/device/get_devices.rs | 4 +++- crates/ruma-client-api/src/r0/device/update_device.rs | 4 +++- .../ruma-client-api/src/r0/directory/get_public_rooms.rs | 8 +++++--- .../src/r0/directory/get_public_rooms_filtered.rs | 4 +++- .../src/r0/directory/get_room_visibility.rs | 4 +++- .../src/r0/directory/set_room_visibility.rs | 4 +++- crates/ruma-client-api/src/r0/filter/create_filter.rs | 6 ++++-- crates/ruma-client-api/src/r0/filter/get_filter.rs | 4 +++- crates/ruma-client-api/src/r0/keys/claim_keys.rs | 4 +++- crates/ruma-client-api/src/r0/keys/get_key_changes.rs | 4 +++- crates/ruma-client-api/src/r0/keys/get_keys.rs | 4 +++- crates/ruma-client-api/src/r0/keys/upload_keys.rs | 4 +++- crates/ruma-client-api/src/r0/keys/upload_signatures.rs | 4 +++- crates/ruma-client-api/src/r0/keys/upload_signing_keys.rs | 4 +++- crates/ruma-client-api/src/r0/knock/knock_room.rs | 4 +++- crates/ruma-client-api/src/r0/media/create_content.rs | 4 +++- crates/ruma-client-api/src/r0/media/get_content.rs | 4 +++- .../src/r0/media/get_content_as_filename.rs | 4 +++- .../ruma-client-api/src/r0/media/get_content_thumbnail.rs | 4 +++- crates/ruma-client-api/src/r0/media/get_media_config.rs | 4 +++- crates/ruma-client-api/src/r0/media/get_media_preview.rs | 4 +++- crates/ruma-client-api/src/r0/membership/ban_user.rs | 4 +++- crates/ruma-client-api/src/r0/membership/forget_room.rs | 4 +++- .../src/r0/membership/get_member_events.rs | 4 +++- crates/ruma-client-api/src/r0/membership/invite_user.rs | 4 +++- .../ruma-client-api/src/r0/membership/join_room_by_id.rs | 4 +++- .../src/r0/membership/join_room_by_id_or_alias.rs | 4 +++- .../ruma-client-api/src/r0/membership/joined_members.rs | 4 +++- crates/ruma-client-api/src/r0/membership/joined_rooms.rs | 4 +++- crates/ruma-client-api/src/r0/membership/kick_user.rs | 4 +++- crates/ruma-client-api/src/r0/membership/leave_room.rs | 4 +++- crates/ruma-client-api/src/r0/membership/unban_user.rs | 4 +++- .../ruma-client-api/src/r0/message/get_message_events.rs | 8 +++++--- .../ruma-client-api/src/r0/message/send_message_event.rs | 4 +++- crates/ruma-client-api/src/r0/presence/get_presence.rs | 4 +++- crates/ruma-client-api/src/r0/presence/set_presence.rs | 4 +++- crates/ruma-client-api/src/r0/profile/get_avatar_url.rs | 4 +++- crates/ruma-client-api/src/r0/profile/get_display_name.rs | 4 +++- crates/ruma-client-api/src/r0/profile/get_profile.rs | 4 +++- crates/ruma-client-api/src/r0/profile/set_avatar_url.rs | 4 +++- crates/ruma-client-api/src/r0/profile/set_display_name.rs | 4 +++- crates/ruma-client-api/src/r0/push/delete_pushrule.rs | 4 +++- crates/ruma-client-api/src/r0/push/get_notifications.rs | 4 +++- crates/ruma-client-api/src/r0/push/get_pushers.rs | 4 +++- crates/ruma-client-api/src/r0/push/get_pushrule.rs | 4 +++- .../ruma-client-api/src/r0/push/get_pushrule_actions.rs | 4 +++- .../ruma-client-api/src/r0/push/get_pushrule_enabled.rs | 4 +++- crates/ruma-client-api/src/r0/push/get_pushrules_all.rs | 4 +++- .../src/r0/push/get_pushrules_global_scope.rs | 4 +++- crates/ruma-client-api/src/r0/push/set_pusher.rs | 4 +++- crates/ruma-client-api/src/r0/push/set_pushrule.rs | 4 +++- .../ruma-client-api/src/r0/push/set_pushrule_actions.rs | 4 +++- .../ruma-client-api/src/r0/push/set_pushrule_enabled.rs | 4 +++- .../ruma-client-api/src/r0/read_marker/set_read_marker.rs | 4 +++- crates/ruma-client-api/src/r0/receipt/create_receipt.rs | 4 +++- crates/ruma-client-api/src/r0/redact/redact_event.rs | 4 +++- crates/ruma-client-api/src/r0/room/aliases.rs | 4 +++- crates/ruma-client-api/src/r0/room/create_room.rs | 4 +++- crates/ruma-client-api/src/r0/room/get_room_event.rs | 4 +++- crates/ruma-client-api/src/r0/room/report_content.rs | 4 +++- crates/ruma-client-api/src/r0/room/upgrade_room.rs | 4 +++- crates/ruma-client-api/src/r0/search/search_events.rs | 4 +++- crates/ruma-client-api/src/r0/server/get_user_info.rs | 4 +++- crates/ruma-client-api/src/r0/session/get_login_types.rs | 4 +++- crates/ruma-client-api/src/r0/session/login.rs | 8 +++++--- crates/ruma-client-api/src/r0/session/login_fallback.rs | 3 ++- crates/ruma-client-api/src/r0/session/logout.rs | 4 +++- crates/ruma-client-api/src/r0/session/logout_all.rs | 4 +++- crates/ruma-client-api/src/r0/session/sso_login.rs | 8 +++++--- crates/ruma-client-api/src/r0/state/get_state_events.rs | 4 +++- .../src/r0/state/get_state_events_for_key.rs | 4 +++- crates/ruma-client-api/src/r0/state/send_state_event.rs | 4 +++- crates/ruma-client-api/src/r0/sync/sync_events.rs | 8 +++++--- crates/ruma-client-api/src/r0/tag/create_tag.rs | 4 +++- crates/ruma-client-api/src/r0/tag/delete_tag.rs | 4 +++- crates/ruma-client-api/src/r0/tag/get_tags.rs | 4 +++- .../src/r0/thirdparty/get_location_for_protocol.rs | 4 +++- .../src/r0/thirdparty/get_location_for_room_alias.rs | 4 +++- crates/ruma-client-api/src/r0/thirdparty/get_protocol.rs | 4 +++- crates/ruma-client-api/src/r0/thirdparty/get_protocols.rs | 4 +++- .../src/r0/thirdparty/get_user_for_protocol.rs | 4 +++- .../src/r0/thirdparty/get_user_for_user_id.rs | 4 +++- .../src/r0/to_device/send_event_to_device.rs | 4 +++- .../ruma-client-api/src/r0/typing/create_typing_event.rs | 4 +++- .../ruma-client-api/src/r0/uiaa/get_uiaa_fallback_page.rs | 4 +++- .../ruma-client-api/src/r0/user_directory/search_users.rs | 4 +++- .../ruma-client-api/src/r0/voip/get_turn_server_info.rs | 4 +++- .../src/session/sso_login_with_provider/v3.rs | 6 ++++-- .../src/unversioned/discover_homeserver.rs | 3 ++- .../src/unversioned/get_supported_versions.rs | 3 ++- crates/ruma-client-api/tests/headers.rs | 2 +- 136 files changed, 426 insertions(+), 149 deletions(-) diff --git a/crates/ruma-client-api/src/r0/account/add_3pid.rs b/crates/ruma-client-api/src/r0/account/add_3pid.rs index c9502eb2..4e474d78 100644 --- a/crates/ruma-client-api/src/r0/account/add_3pid.rs +++ b/crates/ruma-client-api/src/r0/account/add_3pid.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Add contact information to a user's account", method: POST, name: "add_3pid", - path: "/_matrix/client/r0/account/3pid/add", + r0_path: "/_matrix/client/r0/account/3pid/add", + stable_path: "/_matrix/client/v3/account/3pid/add", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/account/bind_3pid.rs b/crates/ruma-client-api/src/r0/account/bind_3pid.rs index a6db9cc6..a3f45ae7 100644 --- a/crates/ruma-client-api/src/r0/account/bind_3pid.rs +++ b/crates/ruma-client-api/src/r0/account/bind_3pid.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Bind a 3PID to a user's account on an identity server", method: POST, name: "bind_3pid", - path: "/_matrix/client/r0/account/3pid/bind", + r0_path: "/_matrix/client/r0/account/3pid/bind", + stable_path: "/_matrix/client/v3/account/3pid/bind", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/account/change_password.rs b/crates/ruma-client-api/src/r0/account/change_password.rs index 4f554972..31cbc288 100644 --- a/crates/ruma-client-api/src/r0/account/change_password.rs +++ b/crates/ruma-client-api/src/r0/account/change_password.rs @@ -9,9 +9,11 @@ ruma_api! { description: "Change the password of the current user's account.", method: POST, name: "change_password", - path: "/_matrix/client/r0/account/password", + r0_path: "/_matrix/client/r0/account/password", + stable_path: "/_matrix/client/v3/account/password", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/account/check_registration_token_validity.rs b/crates/ruma-client-api/src/r0/account/check_registration_token_validity.rs index 8e57c240..672fb28c 100644 --- a/crates/ruma-client-api/src/r0/account/check_registration_token_validity.rs +++ b/crates/ruma-client-api/src/r0/account/check_registration_token_validity.rs @@ -7,9 +7,11 @@ ruma_api! { description: "Checks to see if the given registration token is valid.", method: GET, name: "check_registration_token_validity", - path: "/_matrix/client/v1/register/m.login.registration_token/validity", + unstable_path: "/_matrix/client/unstable/org.matrix.msc3231/register/org.matrix.msc3231.login.registration_token/validity", + stable_path: "/_matrix/client/v1/register/m.login.registration_token/validity", rate_limited: true, authentication: None, + added: 1.2, } request: { diff --git a/crates/ruma-client-api/src/r0/account/deactivate.rs b/crates/ruma-client-api/src/r0/account/deactivate.rs index 411db5b3..6d26e00c 100644 --- a/crates/ruma-client-api/src/r0/account/deactivate.rs +++ b/crates/ruma-client-api/src/r0/account/deactivate.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Deactivate the current user's account.", method: POST, name: "deactivate", - path: "/_matrix/client/r0/account/deactivate", + r0_path: "/_matrix/client/r0/account/deactivate", + stable_path: "/_matrix/client/v3/account/deactivate", rate_limited: true, authentication: AccessToken, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/r0/account/delete_3pid.rs b/crates/ruma-client-api/src/r0/account/delete_3pid.rs index a89d271d..f2bdc1c3 100644 --- a/crates/ruma-client-api/src/r0/account/delete_3pid.rs +++ b/crates/ruma-client-api/src/r0/account/delete_3pid.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Delete a 3PID from a user's account on an identity server.", method: POST, name: "delete_3pid", - path: "/_matrix/client/r0/account/3pid/delete", + r0_path: "/_matrix/client/r0/account/3pid/delete", + stable_path: "/_matrix/client/v3/account/3pid/delete", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/account/get_3pids.rs b/crates/ruma-client-api/src/r0/account/get_3pids.rs index 0eb263dc..958bdae2 100644 --- a/crates/ruma-client-api/src/r0/account/get_3pids.rs +++ b/crates/ruma-client-api/src/r0/account/get_3pids.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Get a list of 3rd party contacts associated with the user's account.", method: GET, name: "get_3pids", - path: "/_matrix/client/r0/account/3pid", + r0_path: "/_matrix/client/r0/account/3pid", + stable_path: "/_matrix/client/v3/account/3pid", rate_limited: false, authentication: AccessToken, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/r0/account/get_username_availability.rs b/crates/ruma-client-api/src/r0/account/get_username_availability.rs index bc86f3e7..90e0c6a5 100644 --- a/crates/ruma-client-api/src/r0/account/get_username_availability.rs +++ b/crates/ruma-client-api/src/r0/account/get_username_availability.rs @@ -7,9 +7,11 @@ ruma_api! { description: "Checks to see if a username is available, and valid, for the server.", method: GET, name: "get_username_availability", - path: "/_matrix/client/r0/register/available", + r0_path: "/_matrix/client/r0/register/available", + stable_path: "/_matrix/client/v3/register/available", rate_limited: true, authentication: None, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/account/register.rs b/crates/ruma-client-api/src/r0/account/register.rs index bc01ff40..77bcce29 100644 --- a/crates/ruma-client-api/src/r0/account/register.rs +++ b/crates/ruma-client-api/src/r0/account/register.rs @@ -11,9 +11,11 @@ ruma_api! { description: "Register an account on this homeserver.", method: POST, name: "register", - path: "/_matrix/client/r0/register", + r0_path: "/_matrix/client/r0/register", + stable_path: "/_matrix/client/v3/register", rate_limited: true, authentication: None, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/r0/account/request_3pid_management_token_via_email.rs b/crates/ruma-client-api/src/r0/account/request_3pid_management_token_via_email.rs index aa3c96da..bb5cc89d 100644 --- a/crates/ruma-client-api/src/r0/account/request_3pid_management_token_via_email.rs +++ b/crates/ruma-client-api/src/r0/account/request_3pid_management_token_via_email.rs @@ -11,9 +11,11 @@ ruma_api! { description: "Request a 3PID management token with a 3rd party email.", method: POST, name: "request_3pid_management_token_via_email", - path: "/_matrix/client/r0/account/3pid/email/requestToken", + r0_path: "/_matrix/client/r0/account/3pid/email/requestToken", + stable_path: "/_matrix/client/v3/account/3pid/email/requestToken", rate_limited: false, authentication: None, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/account/request_3pid_management_token_via_msisdn.rs b/crates/ruma-client-api/src/r0/account/request_3pid_management_token_via_msisdn.rs index e2f8f3a7..15045f89 100644 --- a/crates/ruma-client-api/src/r0/account/request_3pid_management_token_via_msisdn.rs +++ b/crates/ruma-client-api/src/r0/account/request_3pid_management_token_via_msisdn.rs @@ -11,9 +11,11 @@ ruma_api! { description: "Request a 3PID management token with a phone number.", method: POST, name: "request_3pid_management_token_via_msisdn", - path: "/_matrix/client/r0/account/3pid/msisdn/requestToken", + r0_path: "/_matrix/client/r0/account/3pid/msisdn/requestToken", + stable_path: "/_matrix/client/v3/account/3pid/msisdn/requestToken", rate_limited: false, authentication: None, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/account/request_openid_token.rs b/crates/ruma-client-api/src/r0/account/request_openid_token.rs index db06472b..0788646a 100644 --- a/crates/ruma-client-api/src/r0/account/request_openid_token.rs +++ b/crates/ruma-client-api/src/r0/account/request_openid_token.rs @@ -11,9 +11,11 @@ ruma_api! { description: "Request an OpenID 1.0 token to verify identity with a third party.", name: "request_openid_token", method: POST, - path: "/_matrix/client/r0/user/:user_id/openid/request_token", + r0_path: "/_matrix/client/r0/user/:user_id/openid/request_token", + stable_path: "/_matrix/client/v3/user/:user_id/openid/request_token", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/account/request_password_change_token_via_email.rs b/crates/ruma-client-api/src/r0/account/request_password_change_token_via_email.rs index 15183605..ae77d43e 100644 --- a/crates/ruma-client-api/src/r0/account/request_password_change_token_via_email.rs +++ b/crates/ruma-client-api/src/r0/account/request_password_change_token_via_email.rs @@ -11,9 +11,11 @@ ruma_api! { description: "Request that a password change token is sent to the given email address.", method: POST, name: "request_password_change_token_via_email", - path: "/_matrix/client/r0/account/password/email/requestToken", + r0_path: "/_matrix/client/r0/account/password/email/requestToken", + stable_path: "/_matrix/client/v3/account/password/email/requestToken", rate_limited: false, authentication: None, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/account/request_password_change_token_via_msisdn.rs b/crates/ruma-client-api/src/r0/account/request_password_change_token_via_msisdn.rs index f0fb60e3..c1dda776 100644 --- a/crates/ruma-client-api/src/r0/account/request_password_change_token_via_msisdn.rs +++ b/crates/ruma-client-api/src/r0/account/request_password_change_token_via_msisdn.rs @@ -9,9 +9,11 @@ ruma_api! { description: "Request that a password change token is sent to the given phone number.", method: POST, name: "request_password_change_token_via_msisdn", - path: "/_matrix/client/r0/account/password/msisdn/requestToken", + r0_path: "/_matrix/client/r0/account/password/msisdn/requestToken", + stable_path: "/_matrix/client/v3/account/password/msisdn/requestToken", rate_limited: false, authentication: None, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/account/request_registration_token_via_email.rs b/crates/ruma-client-api/src/r0/account/request_registration_token_via_email.rs index 565772c8..66a06ae9 100644 --- a/crates/ruma-client-api/src/r0/account/request_registration_token_via_email.rs +++ b/crates/ruma-client-api/src/r0/account/request_registration_token_via_email.rs @@ -11,9 +11,11 @@ ruma_api! { description: "Request a registration token with a 3rd party email.", method: POST, name: "request_registration_token_via_email", - path: "/_matrix/client/r0/register/email/requestToken", + r0_path: "/_matrix/client/r0/register/email/requestToken", + stable_path: "/_matrix/client/v3/register/email/requestToken", rate_limited: false, authentication: None, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/account/request_registration_token_via_msisdn.rs b/crates/ruma-client-api/src/r0/account/request_registration_token_via_msisdn.rs index d3b88770..4cbc544f 100644 --- a/crates/ruma-client-api/src/r0/account/request_registration_token_via_msisdn.rs +++ b/crates/ruma-client-api/src/r0/account/request_registration_token_via_msisdn.rs @@ -11,9 +11,11 @@ ruma_api! { description: "Request a registration token with a phone number.", method: POST, name: "request_registration_token_via_msisdn", - path: "/_matrix/client/r0/register/msisdn/requestToken", + r0_path: "/_matrix/client/r0/register/msisdn/requestToken", + stable_path: "/_matrix/client/v3/register/msisdn/requestToken", rate_limited: false, authentication: None, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/account/unbind_3pid.rs b/crates/ruma-client-api/src/r0/account/unbind_3pid.rs index 74e1640a..7612119b 100644 --- a/crates/ruma-client-api/src/r0/account/unbind_3pid.rs +++ b/crates/ruma-client-api/src/r0/account/unbind_3pid.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Unbind a 3PID from a user's account on an identity server.", method: POST, name: "unbind_3pid", - path: "/_matrix/client/r0/account/3pid/unbind", + r0_path: "/_matrix/client/r0/account/3pid/unbind", + stable_path: "/_matrix/client/v3/account/3pid/unbind", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/account/whoami.rs b/crates/ruma-client-api/src/r0/account/whoami.rs index cb5bc76c..f1aeed15 100644 --- a/crates/ruma-client-api/src/r0/account/whoami.rs +++ b/crates/ruma-client-api/src/r0/account/whoami.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Get information about the owner of a given access token.", method: GET, name: "whoami", - path: "/_matrix/client/r0/account/whoami", + r0_path: "/_matrix/client/r0/account/whoami", + stable_path: "/_matrix/client/v3/account/whoami", rate_limited: true, authentication: AccessToken, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/r0/alias/create_alias.rs b/crates/ruma-client-api/src/r0/alias/create_alias.rs index cafa43f0..0eb64101 100644 --- a/crates/ruma-client-api/src/r0/alias/create_alias.rs +++ b/crates/ruma-client-api/src/r0/alias/create_alias.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Add an alias to a room.", method: PUT, name: "create_alias", - path: "/_matrix/client/r0/directory/room/:room_alias", + r0_path: "/_matrix/client/r0/directory/room/:room_alias", + stable_path: "/_matrix/client/v3/directory/room/:room_alias", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/alias/delete_alias.rs b/crates/ruma-client-api/src/r0/alias/delete_alias.rs index 1ddbcd65..3cb0f75b 100644 --- a/crates/ruma-client-api/src/r0/alias/delete_alias.rs +++ b/crates/ruma-client-api/src/r0/alias/delete_alias.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Remove an alias from a room.", method: DELETE, name: "delete_alias", - path: "/_matrix/client/r0/directory/room/:room_alias", + r0_path: "/_matrix/client/r0/directory/room/:room_alias", + stable_path: "/_matrix/client/v3/directory/room/:room_alias", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/alias/get_alias.rs b/crates/ruma-client-api/src/r0/alias/get_alias.rs index 22533fd7..66cfce5e 100644 --- a/crates/ruma-client-api/src/r0/alias/get_alias.rs +++ b/crates/ruma-client-api/src/r0/alias/get_alias.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Resolve a room alias to a room ID.", method: GET, name: "get_alias", - path: "/_matrix/client/r0/directory/room/:room_alias", + r0_path: "/_matrix/client/r0/directory/room/:room_alias", + stable_path: "/_matrix/client/v3/directory/room/:room_alias", rate_limited: false, authentication: None, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/appservice/set_room_visibility.rs b/crates/ruma-client-api/src/r0/appservice/set_room_visibility.rs index 548e2edd..7737db25 100644 --- a/crates/ruma-client-api/src/r0/appservice/set_room_visibility.rs +++ b/crates/ruma-client-api/src/r0/appservice/set_room_visibility.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Updates the visibility of a given room on the application service's room directory.", method: PUT, name: "set_room_visibility", - path: "/_matrix/client/r0/directory/list/appservice/:network_id/:room_id", + r0_path: "/_matrix/client/r0/directory/list/appservice/:network_id/:room_id", + stable_path: "/_matrix/client/v3/directory/list/appservice/:network_id/:room_id", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/backup/add_backup_key_session.rs b/crates/ruma-client-api/src/r0/backup/add_backup_key_session.rs index 2a75edf9..e13bdd7c 100644 --- a/crates/ruma-client-api/src/r0/backup/add_backup_key_session.rs +++ b/crates/ruma-client-api/src/r0/backup/add_backup_key_session.rs @@ -12,9 +12,12 @@ ruma_api! { description: "Store several keys in the backup.", method: PUT, name: "add_backup_key_session", - path: "/_matrix/client/unstable/room_keys/keys/:room_id/:session_id", + unstable_path: "/_matrix/client/unstable/room_keys/keys/:room_id/:session_id", + r0_path: "/_matrix/client/r0/room_keys/keys/:room_id/:session_id", + stable_path: "/_matrix/client/v3/room_keys/keys/:room_id/:session_id", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/backup/add_backup_key_sessions.rs b/crates/ruma-client-api/src/r0/backup/add_backup_key_sessions.rs index ee1abde6..41e5bc7e 100644 --- a/crates/ruma-client-api/src/r0/backup/add_backup_key_sessions.rs +++ b/crates/ruma-client-api/src/r0/backup/add_backup_key_sessions.rs @@ -14,9 +14,12 @@ ruma_api! { description: "Store several sessions in the backup.", method: PUT, name: "add_backup_key_sessions", - path: "/_matrix/client/unstable/room_keys/keys/:room_id", + unstable_path: "/_matrix/client/unstable/room_keys/keys/:room_id", + r0_path: "/_matrix/client/r0/room_keys/keys/:room_id", + stable_path: "/_matrix/client/v3/room_keys/keys/:room_id", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/backup/add_backup_keys.rs b/crates/ruma-client-api/src/r0/backup/add_backup_keys.rs index 596bc88c..55a95282 100644 --- a/crates/ruma-client-api/src/r0/backup/add_backup_keys.rs +++ b/crates/ruma-client-api/src/r0/backup/add_backup_keys.rs @@ -13,9 +13,11 @@ ruma_api! { description: "Store several keys in the backup.", method: PUT, name: "add_backup_keys", - path: "/_matrix/client/unstable/room_keys/keys", + unstable_path: "/_matrix/client/unstable/room_keys/keys", + stable_path: "/_matrix/client/v3/room_keys/keys", rate_limited: true, authentication: AccessToken, + added: 1.1, } request: { diff --git a/crates/ruma-client-api/src/r0/backup/create_backup.rs b/crates/ruma-client-api/src/r0/backup/create_backup.rs index dd8efbe2..df6a6f12 100644 --- a/crates/ruma-client-api/src/r0/backup/create_backup.rs +++ b/crates/ruma-client-api/src/r0/backup/create_backup.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Creates a new backup.", method: POST, name: "create_backup", - path: "/_matrix/client/unstable/room_keys/version", + unstable_path: "/_matrix/client/unstable/room_keys/version", + stable_path: "/_matrix/client/v3/room_keys/version", rate_limited: true, authentication: AccessToken, + added: 1.1, } request: { diff --git a/crates/ruma-client-api/src/r0/backup/delete_backup.rs b/crates/ruma-client-api/src/r0/backup/delete_backup.rs index 6da452f4..f46ef1f7 100644 --- a/crates/ruma-client-api/src/r0/backup/delete_backup.rs +++ b/crates/ruma-client-api/src/r0/backup/delete_backup.rs @@ -7,9 +7,12 @@ ruma_api! { description: "Delete an existing backup.", method: DELETE, name: "delete_backup", - path: "/_matrix/client/unstable/room_keys/version/:version", + unstable_path: "/_matrix/client/unstable/room_keys/version/:version", + r0_path: "/_matrix/client/r0/room_keys/version/:version", + stable_path: "/_matrix/client/v3/room_keys/version/:version", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/backup/delete_backup_key_session.rs b/crates/ruma-client-api/src/r0/backup/delete_backup_key_session.rs index ed4fee4f..396ca59d 100644 --- a/crates/ruma-client-api/src/r0/backup/delete_backup_key_session.rs +++ b/crates/ruma-client-api/src/r0/backup/delete_backup_key_session.rs @@ -9,9 +9,12 @@ ruma_api! { description: "Delete a key from the backup", method: DELETE, name: "delete_backup_key_session", - path: "/_matrix/client/unstable/room_keys/keys/:room_id/:session_id", + unstable_path: "/_matrix/client/unstable/room_keys/keys/:room_id/:session_id", + r0_path: "/_matrix/client/r0/room_keys/keys/:room_id/:session_id", + stable_path: "/_matrix/client/v3/room_keys/keys/:room_id/:session_id", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/backup/delete_backup_key_sessions.rs b/crates/ruma-client-api/src/r0/backup/delete_backup_key_sessions.rs index df122734..1b08140c 100644 --- a/crates/ruma-client-api/src/r0/backup/delete_backup_key_sessions.rs +++ b/crates/ruma-client-api/src/r0/backup/delete_backup_key_sessions.rs @@ -9,9 +9,12 @@ ruma_api! { description: "Delete keys from the backup for a given room.", method: DELETE, name: "delete_backup_key_sessions", - path: "/_matrix/client/unstable/room_keys/keys/:room_id", + unstable_path: "/_matrix/client/unstable/room_keys/keys/:room_id", + r0_path: "/_matrix/client/r0/room_keys/keys/:room_id", + stable_path: "/_matrix/client/v3/room_keys/keys/:room_id", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/backup/delete_backup_keys.rs b/crates/ruma-client-api/src/r0/backup/delete_backup_keys.rs index 73d098f3..96e50933 100644 --- a/crates/ruma-client-api/src/r0/backup/delete_backup_keys.rs +++ b/crates/ruma-client-api/src/r0/backup/delete_backup_keys.rs @@ -8,9 +8,12 @@ ruma_api! { description: "Delete all keys in a backup.", method: DELETE, name: "delete_backup_keys", - path: "/_matrix/client/unstable/room_keys/keys", + unstable_path: "/_matrix/client/unstable/room_keys/keys", + r0_path: "/_matrix/client/r0/room_keys/keys", + stable_path: "/_matrix/client/v3/room_keys/keys", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/backup/get_backup.rs b/crates/ruma-client-api/src/r0/backup/get_backup.rs index 9f531ae5..4b9d8cfb 100644 --- a/crates/ruma-client-api/src/r0/backup/get_backup.rs +++ b/crates/ruma-client-api/src/r0/backup/get_backup.rs @@ -13,9 +13,11 @@ ruma_api! { description: "Get information about an existing backup.", method: GET, name: "get_backup", - path: "/_matrix/client/unstable/room_keys/version/:version", + unstable_path: "/_matrix/client/unstable/room_keys/version/:version", + stable_path: "/_matrix/client/v3/room_keys/version/:version", rate_limited: true, authentication: AccessToken, + added: 1.1, } request: { diff --git a/crates/ruma-client-api/src/r0/backup/get_backup_key_session.rs b/crates/ruma-client-api/src/r0/backup/get_backup_key_session.rs index dcda0b1e..b1c26b23 100644 --- a/crates/ruma-client-api/src/r0/backup/get_backup_key_session.rs +++ b/crates/ruma-client-api/src/r0/backup/get_backup_key_session.rs @@ -11,9 +11,12 @@ ruma_api! { description: "Retrieve a key from the backup", method: GET, name: "get_backup_key_session", - path: "/_matrix/client/unstable/room_keys/keys/:room_id/:session_id", + unstable_path: "/_matrix/client/unstable/room_keys/keys/:room_id/:session_id", + r0_path: "/_matrix/client/r0/room_keys/keys/:room_id/:session_id", + stable_path: "/_matrix/client/v3/room_keys/keys/:room_id/:session_id", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/backup/get_backup_key_sessions.rs b/crates/ruma-client-api/src/r0/backup/get_backup_key_sessions.rs index 31451f0b..cc3ff37a 100644 --- a/crates/ruma-client-api/src/r0/backup/get_backup_key_sessions.rs +++ b/crates/ruma-client-api/src/r0/backup/get_backup_key_sessions.rs @@ -13,9 +13,12 @@ ruma_api! { description: "Retrieve sessions from the backup for a given room.", method: GET, name: "get_backup_key_sessions", - path: "/_matrix/client/unstable/room_keys/keys/:room_id", + unstable_path: "/_matrix/client/unstable/room_keys/keys/:room_id", + r0_path: "/_matrix/client/r0/room_keys/keys/:room_id", + stable_path: "/_matrix/client/v3/room_keys/keys/:room_id", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/backup/get_backup_keys.rs b/crates/ruma-client-api/src/r0/backup/get_backup_keys.rs index be428acc..3c3023f5 100644 --- a/crates/ruma-client-api/src/r0/backup/get_backup_keys.rs +++ b/crates/ruma-client-api/src/r0/backup/get_backup_keys.rs @@ -12,9 +12,12 @@ ruma_api! { description: "Retrieve all keys from a backup.", method: GET, name: "get_backup_keys", - path: "/_matrix/client/unstable/room_keys/keys", + unstable_path: "/_matrix/client/unstable/room_keys/keys", + r0_path: "/_matrix/client/r0/room_keys/keys", + stable_path: "/_matrix/client/v3/room_keys/keys", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/backup/get_latest_backup.rs b/crates/ruma-client-api/src/r0/backup/get_latest_backup.rs index c31ccab0..7f387895 100644 --- a/crates/ruma-client-api/src/r0/backup/get_latest_backup.rs +++ b/crates/ruma-client-api/src/r0/backup/get_latest_backup.rs @@ -16,9 +16,12 @@ ruma_api! { description: "Get information about the latest backup.", method: GET, name: "get_latest_backup", - path: "/_matrix/client/unstable/room_keys/version", + unstable_path: "/_matrix/client/unstable/room_keys/version", + r0_path: "/_matrix/client/r0/room_keys/version", + stable_path: "/_matrix/client/v3/room_keys/version", rate_limited: true, authentication: AccessToken, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/r0/backup/update_backup.rs b/crates/ruma-client-api/src/r0/backup/update_backup.rs index 7ff11a15..652fe62b 100644 --- a/crates/ruma-client-api/src/r0/backup/update_backup.rs +++ b/crates/ruma-client-api/src/r0/backup/update_backup.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Update information about an existing backup.", method: POST, name: "update_backup", - path: "/_matrix/client/unstable/room_keys/version/:version", + unstable_path: "/_matrix/client/unstable/room_keys/version/:version", + stable_path: "/_matrix/client/v3/room_keys/version/:version", rate_limited: true, authentication: AccessToken, + added: 1.1, } request: { diff --git a/crates/ruma-client-api/src/r0/capabilities/get_capabilities.rs b/crates/ruma-client-api/src/r0/capabilities/get_capabilities.rs index d58eaf61..b3adef92 100644 --- a/crates/ruma-client-api/src/r0/capabilities/get_capabilities.rs +++ b/crates/ruma-client-api/src/r0/capabilities/get_capabilities.rs @@ -9,9 +9,11 @@ ruma_api! { description: "Gets information about the server's supported feature set and other relevant capabilities.", method: GET, name: "get_capabilities", - path: "/_matrix/client/r0/capabilities", + r0_path: "/_matrix/client/r0/capabilities", + stable_path: "/_matrix/client/v3/capabilities", rate_limited: true, - authentication: AccessToken + authentication: AccessToken, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/r0/config/get_global_account_data.rs b/crates/ruma-client-api/src/r0/config/get_global_account_data.rs index 85061228..664479db 100644 --- a/crates/ruma-client-api/src/r0/config/get_global_account_data.rs +++ b/crates/ruma-client-api/src/r0/config/get_global_account_data.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Gets global account data for a user.", name: "get_global_account_data", method: GET, - path: "/_matrix/client/r0/user/:user_id/account_data/:event_type", + r0_path: "/_matrix/client/r0/user/:user_id/account_data/:event_type", + stable_path: "/_matrix/client/v3/user/:user_id/account_data/:event_type", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/config/get_room_account_data.rs b/crates/ruma-client-api/src/r0/config/get_room_account_data.rs index 694c1856..ba6f5dd7 100644 --- a/crates/ruma-client-api/src/r0/config/get_room_account_data.rs +++ b/crates/ruma-client-api/src/r0/config/get_room_account_data.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Gets account data room for a user for a given room", name: "get_room_account_data", method: GET, - path: "/_matrix/client/r0/user/:user_id/rooms/:room_id/account_data/:event_type", + r0_path: "/_matrix/client/r0/user/:user_id/rooms/:room_id/account_data/:event_type", + stable_path: "/_matrix/client/v3/user/:user_id/rooms/:room_id/account_data/:event_type", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/config/set_global_account_data.rs b/crates/ruma-client-api/src/r0/config/set_global_account_data.rs index a7494c85..362a96e2 100644 --- a/crates/ruma-client-api/src/r0/config/set_global_account_data.rs +++ b/crates/ruma-client-api/src/r0/config/set_global_account_data.rs @@ -9,9 +9,11 @@ ruma_api! { description: "Sets global account data.", method: PUT, name: "set_global_account_data", - path: "/_matrix/client/r0/user/:user_id/account_data/:event_type", + r0_path: "/_matrix/client/r0/user/:user_id/account_data/:event_type", + stable_path: "/_matrix/client/v3/user/:user_id/account_data/:event_type", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/config/set_room_account_data.rs b/crates/ruma-client-api/src/r0/config/set_room_account_data.rs index c4fcc969..02c3dad0 100644 --- a/crates/ruma-client-api/src/r0/config/set_room_account_data.rs +++ b/crates/ruma-client-api/src/r0/config/set_room_account_data.rs @@ -9,9 +9,11 @@ ruma_api! { description: "Associate account data with a room.", method: PUT, name: "set_room_account_data", - path: "/_matrix/client/r0/user/:user_id/rooms/:room_id/account_data/:event_type", + r0_path: "/_matrix/client/r0/user/:user_id/rooms/:room_id/account_data/:event_type", + stable_path: "/_matrix/client/v3/user/:user_id/rooms/:room_id/account_data/:event_type", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/context/get_context.rs b/crates/ruma-client-api/src/r0/context/get_context.rs index 0ef45027..92843f14 100644 --- a/crates/ruma-client-api/src/r0/context/get_context.rs +++ b/crates/ruma-client-api/src/r0/context/get_context.rs @@ -12,10 +12,12 @@ ruma_api! { metadata: { description: "Get the events immediately preceding and following a given event.", method: GET, - path: "/_matrix/client/r0/rooms/:room_id/context/:event_id", + r0_path: "/_matrix/client/r0/rooms/:room_id/context/:event_id", + stable_path: "/_matrix/client/v3/rooms/:room_id/context/:event_id", name: "get_context", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/device/delete_device.rs b/crates/ruma-client-api/src/r0/device/delete_device.rs index 8437e2ac..ae847630 100644 --- a/crates/ruma-client-api/src/r0/device/delete_device.rs +++ b/crates/ruma-client-api/src/r0/device/delete_device.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Delete a device for authenticated user.", method: DELETE, name: "delete_device", - path: "/_matrix/client/r0/devices/:device_id", + r0_path: "/_matrix/client/r0/devices/:device_id", + stable_path: "/_matrix/client/v3/devices/:device_id", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/device/delete_devices.rs b/crates/ruma-client-api/src/r0/device/delete_devices.rs index 09d245d2..ec0f62de 100644 --- a/crates/ruma-client-api/src/r0/device/delete_devices.rs +++ b/crates/ruma-client-api/src/r0/device/delete_devices.rs @@ -9,10 +9,12 @@ ruma_api! { metadata: { description: "Delete specified devices.", method: POST, - path: "/_matrix/client/r0/delete_devices", + r0_path: "/_matrix/client/r0/delete_devices", + stable_path: "/_matrix/client/v3/delete_devices", name: "delete_devices", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/device/get_device.rs b/crates/ruma-client-api/src/r0/device/get_device.rs index 8ddf6bbd..50bd4e17 100644 --- a/crates/ruma-client-api/src/r0/device/get_device.rs +++ b/crates/ruma-client-api/src/r0/device/get_device.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Get a device for authenticated user.", method: GET, name: "get_device", - path: "/_matrix/client/r0/devices/:device_id", + r0_path: "/_matrix/client/r0/devices/:device_id", + stable_path: "/_matrix/client/v3/devices/:device_id", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/device/get_devices.rs b/crates/ruma-client-api/src/r0/device/get_devices.rs index ccc897da..0a6b5184 100644 --- a/crates/ruma-client-api/src/r0/device/get_devices.rs +++ b/crates/ruma-client-api/src/r0/device/get_devices.rs @@ -9,9 +9,11 @@ ruma_api! { description: "Get registered devices for authenticated user.", method: GET, name: "get_devices", - path: "/_matrix/client/r0/devices", + r0_path: "/_matrix/client/r0/devices", + stable_path: "/_matrix/client/v3/devices", rate_limited: false, authentication: AccessToken, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/r0/device/update_device.rs b/crates/ruma-client-api/src/r0/device/update_device.rs index 62344705..4dfa29df 100644 --- a/crates/ruma-client-api/src/r0/device/update_device.rs +++ b/crates/ruma-client-api/src/r0/device/update_device.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Update metadata for a device.", method: PUT, name: "update_device", - path: "/_matrix/client/r0/devices/:device_id", + r0_path: "/_matrix/client/r0/devices/:device_id", + stable_path: "/_matrix/client/v3/devices/:device_id", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/directory/get_public_rooms.rs b/crates/ruma-client-api/src/r0/directory/get_public_rooms.rs index 280a1659..0a188986 100644 --- a/crates/ruma-client-api/src/r0/directory/get_public_rooms.rs +++ b/crates/ruma-client-api/src/r0/directory/get_public_rooms.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Get the list of rooms in this homeserver's public directory.", method: GET, name: "get_public_rooms", - path: "/_matrix/client/r0/publicRooms", + r0_path: "/_matrix/client/r0/publicRooms", + stable_path: "/_matrix/client/v3/publicRooms", rate_limited: false, authentication: None, + added: 1.0, } #[derive(Default)] @@ -87,14 +89,14 @@ mod tests { .try_into_http_request::>( "https://homeserver.tld", SendAccessToken::IfRequired("auth_tok"), - &[MatrixVersion::V1_0], + &[MatrixVersion::V1_1], ) .unwrap(); let uri = req.uri(); let query = uri.query().unwrap(); - assert_eq!(uri.path(), "/_matrix/client/r0/publicRooms"); + assert_eq!(uri.path(), "/_matrix/client/v3/publicRooms"); assert!(query.contains("since=hello")); assert!(query.contains("limit=10")); assert!(query.contains("server=test.tld")); diff --git a/crates/ruma-client-api/src/r0/directory/get_public_rooms_filtered.rs b/crates/ruma-client-api/src/r0/directory/get_public_rooms_filtered.rs index d96e3c02..9d6b0268 100644 --- a/crates/ruma-client-api/src/r0/directory/get_public_rooms_filtered.rs +++ b/crates/ruma-client-api/src/r0/directory/get_public_rooms_filtered.rs @@ -12,9 +12,11 @@ ruma_api! { description: "Get the list of rooms in this homeserver's public directory.", method: POST, name: "get_public_rooms_filtered", - path: "/_matrix/client/r0/publicRooms", + r0_path: "/_matrix/client/r0/publicRooms", + stable_path: "/_matrix/client/v3/publicRooms", rate_limited: false, authentication: AccessToken, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/r0/directory/get_room_visibility.rs b/crates/ruma-client-api/src/r0/directory/get_room_visibility.rs index 1c4302b8..1c8909c2 100644 --- a/crates/ruma-client-api/src/r0/directory/get_room_visibility.rs +++ b/crates/ruma-client-api/src/r0/directory/get_room_visibility.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Get the visibility of a public room on a directory.", name: "get_room_visibility", method: GET, - path: "/_matrix/client/r0/directory/list/room/:room_id", + r0_path: "/_matrix/client/r0/directory/list/room/:room_id", + stable_path: "/_matrix/client/v3/directory/list/room/:room_id", rate_limited: false, authentication: None, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/directory/set_room_visibility.rs b/crates/ruma-client-api/src/r0/directory/set_room_visibility.rs index 1ff67186..274f712d 100644 --- a/crates/ruma-client-api/src/r0/directory/set_room_visibility.rs +++ b/crates/ruma-client-api/src/r0/directory/set_room_visibility.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Set the visibility of a public room on a directory.", name: "set_room_visibility", method: PUT, - path: "/_matrix/client/r0/directory/list/room/:room_id", + r0_path: "/_matrix/client/r0/directory/list/room/:room_id", + stable_path: "/_matrix/client/v3/directory/list/room/:room_id", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/filter/create_filter.rs b/crates/ruma-client-api/src/r0/filter/create_filter.rs index 4809353b..f367af91 100644 --- a/crates/ruma-client-api/src/r0/filter/create_filter.rs +++ b/crates/ruma-client-api/src/r0/filter/create_filter.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Create a new filter for event retrieval.", method: POST, name: "create_filter", - path: "/_matrix/client/r0/user/:user_id/filter", + r0_path: "/_matrix/client/r0/user/:user_id/filter", + stable_path: "/_matrix/client/v3/user/:user_id/filter", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { @@ -87,7 +89,7 @@ mod tests { .try_into_http_request::>( "https://matrix.org", SendAccessToken::IfRequired("tok"), - &[MatrixVersion::V1_0] + &[MatrixVersion::V1_1] ), Ok(res) if res.body() == b"{}" ); diff --git a/crates/ruma-client-api/src/r0/filter/get_filter.rs b/crates/ruma-client-api/src/r0/filter/get_filter.rs index 944e4697..f4f16b03 100644 --- a/crates/ruma-client-api/src/r0/filter/get_filter.rs +++ b/crates/ruma-client-api/src/r0/filter/get_filter.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Retrieve a previously created filter.", method: GET, name: "get_filter", - path: "/_matrix/client/r0/user/:user_id/filter/:filter_id", + r0_path: "/_matrix/client/r0/user/:user_id/filter/:filter_id", + stable_path: "/_matrix/client/v3/user/:user_id/filter/:filter_id", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/keys/claim_keys.rs b/crates/ruma-client-api/src/r0/keys/claim_keys.rs index 8dbc62a2..5c1845a7 100644 --- a/crates/ruma-client-api/src/r0/keys/claim_keys.rs +++ b/crates/ruma-client-api/src/r0/keys/claim_keys.rs @@ -13,9 +13,11 @@ ruma_api! { description: "Claims one-time keys for use in pre-key messages.", method: POST, name: "claim_keys", - path: "/_matrix/client/r0/keys/claim", + r0_path: "/_matrix/client/r0/keys/claim", + stable_path: "/_matrix/client/v3/keys/claim", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/keys/get_key_changes.rs b/crates/ruma-client-api/src/r0/keys/get_key_changes.rs index 8d75d128..d449813e 100644 --- a/crates/ruma-client-api/src/r0/keys/get_key_changes.rs +++ b/crates/ruma-client-api/src/r0/keys/get_key_changes.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Gets a list of users who have updated their device identity keys since a previous sync token.", method: GET, name: "get_key_changes", - path: "/_matrix/client/r0/keys/changes", + r0_path: "/_matrix/client/r0/keys/changes", + stable_path: "/_matrix/client/v3/keys/changes", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/keys/get_keys.rs b/crates/ruma-client-api/src/r0/keys/get_keys.rs index 20126db8..4f31d5ae 100644 --- a/crates/ruma-client-api/src/r0/keys/get_keys.rs +++ b/crates/ruma-client-api/src/r0/keys/get_keys.rs @@ -13,9 +13,11 @@ ruma_api! { description: "Returns the current devices and identity keys for the given users.", method: POST, name: "get_keys", - path: "/_matrix/client/r0/keys/query", + r0_path: "/_matrix/client/r0/keys/query", + stable_path: "/_matrix/client/v3/keys/query", rate_limited: false, authentication: AccessToken, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/r0/keys/upload_keys.rs b/crates/ruma-client-api/src/r0/keys/upload_keys.rs index 040992b3..7fd4b3c9 100644 --- a/crates/ruma-client-api/src/r0/keys/upload_keys.rs +++ b/crates/ruma-client-api/src/r0/keys/upload_keys.rs @@ -13,9 +13,11 @@ ruma_api! { description: "Publishes end-to-end encryption keys for the device.", method: POST, name: "upload_keys", - path: "/_matrix/client/r0/keys/upload", + r0_path: "/_matrix/client/r0/keys/upload", + stable_path: "/_matrix/client/v3/keys/upload", rate_limited: false, authentication: AccessToken, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/r0/keys/upload_signatures.rs b/crates/ruma-client-api/src/r0/keys/upload_signatures.rs index 17ad5a6f..c6e8d767 100644 --- a/crates/ruma-client-api/src/r0/keys/upload_signatures.rs +++ b/crates/ruma-client-api/src/r0/keys/upload_signatures.rs @@ -11,9 +11,11 @@ ruma_api! { description: "Publishes cross-signing signatures for the user.", method: POST, name: "upload_signatures", - path: "/_matrix/client/unstable/keys/signatures/upload", + unstable_path: "/_matrix/client/unstable/keys/signatures/upload", + stable_path: "/_matrix/client/v3/keys/signatures/upload", rate_limited: false, authentication: AccessToken, + added: 1.1, } request: { diff --git a/crates/ruma-client-api/src/r0/keys/upload_signing_keys.rs b/crates/ruma-client-api/src/r0/keys/upload_signing_keys.rs index c2f02a88..39c6f6f2 100644 --- a/crates/ruma-client-api/src/r0/keys/upload_signing_keys.rs +++ b/crates/ruma-client-api/src/r0/keys/upload_signing_keys.rs @@ -11,9 +11,11 @@ ruma_api! { description: "Publishes cross signing keys for the user.", method: POST, name: "upload_signing_keys", - path: "/_matrix/client/unstable/keys/device_signing/upload", + unstable_path: "/_matrix/client/unstable/keys/device_signing/upload", + stable_path: "/_matrix/client/v3/keys/device_signing/upload", rate_limited: false, authentication: AccessToken, + added: 1.1, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/r0/knock/knock_room.rs b/crates/ruma-client-api/src/r0/knock/knock_room.rs index bf6ada37..5472340a 100644 --- a/crates/ruma-client-api/src/r0/knock/knock_room.rs +++ b/crates/ruma-client-api/src/r0/knock/knock_room.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Knock on a room.", method: POST, name: "knock_room", - path: "/_matrix/client/r0/knock/:room_id_or_alias", + unstable_path: "/_matrix/client/unstable/xyz.amorgan.knock/knock/:room_id_or_alias", + stable_path: "/_matrix/client/v3/knock/:room_id_or_alias", rate_limited: true, authentication: AccessToken, + added: 1.1, } request: { diff --git a/crates/ruma-client-api/src/r0/media/create_content.rs b/crates/ruma-client-api/src/r0/media/create_content.rs index 53520be1..068e30e2 100644 --- a/crates/ruma-client-api/src/r0/media/create_content.rs +++ b/crates/ruma-client-api/src/r0/media/create_content.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Upload content to the media store.", method: POST, name: "create_media_content", - path: "/_matrix/media/r0/upload", + r0_path: "/_matrix/media/r0/upload", + stable_path: "/_matrix/media/v3/upload", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/media/get_content.rs b/crates/ruma-client-api/src/r0/media/get_content.rs index e5081e51..8c6b1799 100644 --- a/crates/ruma-client-api/src/r0/media/get_content.rs +++ b/crates/ruma-client-api/src/r0/media/get_content.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Retrieve content from the media store.", method: GET, name: "get_media_content", - path: "/_matrix/media/r0/download/:server_name/:media_id", + r0_path: "/_matrix/media/r0/download/:server_name/:media_id", + stable_path: "/_matrix/media/v3/download/:server_name/:media_id", rate_limited: false, authentication: None, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/media/get_content_as_filename.rs b/crates/ruma-client-api/src/r0/media/get_content_as_filename.rs index c359fc86..ffe92bce 100644 --- a/crates/ruma-client-api/src/r0/media/get_content_as_filename.rs +++ b/crates/ruma-client-api/src/r0/media/get_content_as_filename.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Retrieve content from the media store, specifying a filename to return.", method: GET, name: "get_media_content_as_filename", - path: "/_matrix/media/r0/download/:server_name/:media_id/:filename", + r0_path: "/_matrix/media/r0/download/:server_name/:media_id/:filename", + stable_path: "/_matrix/media/v3/download/:server_name/:media_id/:filename", rate_limited: false, authentication: None, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/media/get_content_thumbnail.rs b/crates/ruma-client-api/src/r0/media/get_content_thumbnail.rs index d2fc6cdf..dd81cee7 100644 --- a/crates/ruma-client-api/src/r0/media/get_content_thumbnail.rs +++ b/crates/ruma-client-api/src/r0/media/get_content_thumbnail.rs @@ -12,9 +12,11 @@ ruma_api! { description: "Get a thumbnail of content from the media store.", method: GET, name: "get_content_thumbnail", - path: "/_matrix/media/r0/thumbnail/:server_name/:media_id", + r0_path: "/_matrix/media/r0/thumbnail/:server_name/:media_id", + stable_path: "/_matrix/media/v3/thumbnail/:server_name/:media_id", rate_limited: true, authentication: None, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/media/get_media_config.rs b/crates/ruma-client-api/src/r0/media/get_media_config.rs index 717a5476..b3cc1aee 100644 --- a/crates/ruma-client-api/src/r0/media/get_media_config.rs +++ b/crates/ruma-client-api/src/r0/media/get_media_config.rs @@ -7,10 +7,12 @@ ruma_api! { metadata: { description: "Gets the config for the media repository.", method: GET, - path: "/_matrix/media/r0/config", + r0_path: "/_matrix/media/r0/config", + stable_path: "/_matrix/media/v3/config", name: "get_media_config", rate_limited: true, authentication: AccessToken, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/r0/media/get_media_preview.rs b/crates/ruma-client-api/src/r0/media/get_media_preview.rs index 23f605e5..d05bc479 100644 --- a/crates/ruma-client-api/src/r0/media/get_media_preview.rs +++ b/crates/ruma-client-api/src/r0/media/get_media_preview.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Get a preview for a URL.", name: "get_media_preview", method: GET, - path: "/_matrix/media/r0/preview_url", + r0_path: "/_matrix/media/r0/preview_url", + stable_path: "/_matrix/media/v3/preview_url", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/membership/ban_user.rs b/crates/ruma-client-api/src/r0/membership/ban_user.rs index 6b6fa3ac..6f738538 100644 --- a/crates/ruma-client-api/src/r0/membership/ban_user.rs +++ b/crates/ruma-client-api/src/r0/membership/ban_user.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Ban a user from a room.", method: POST, name: "ban_user", - path: "/_matrix/client/r0/rooms/:room_id/ban", + r0_path: "/_matrix/client/r0/rooms/:room_id/ban", + stable_path: "/_matrix/client/v3/rooms/:room_id/ban", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/membership/forget_room.rs b/crates/ruma-client-api/src/r0/membership/forget_room.rs index 53872f77..fd361e93 100644 --- a/crates/ruma-client-api/src/r0/membership/forget_room.rs +++ b/crates/ruma-client-api/src/r0/membership/forget_room.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Forget a room.", method: POST, name: "forget_room", - path: "/_matrix/client/r0/rooms/:room_id/forget", + r0_path: "/_matrix/client/r0/rooms/:room_id/forget", + stable_path: "/_matrix/client/v3/rooms/:room_id/forget", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/membership/get_member_events.rs b/crates/ruma-client-api/src/r0/membership/get_member_events.rs index 3c9ea3a8..ef4bc876 100644 --- a/crates/ruma-client-api/src/r0/membership/get_member_events.rs +++ b/crates/ruma-client-api/src/r0/membership/get_member_events.rs @@ -12,9 +12,11 @@ ruma_api! { description: "Get membership events for a room.", method: GET, name: "get_member_events", - path: "/_matrix/client/r0/rooms/:room_id/members", + r0_path: "/_matrix/client/r0/rooms/:room_id/members", + stable_path: "/_matrix/client/v3/rooms/:room_id/members", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/membership/invite_user.rs b/crates/ruma-client-api/src/r0/membership/invite_user.rs index 9102ef4f..fafc9926 100644 --- a/crates/ruma-client-api/src/r0/membership/invite_user.rs +++ b/crates/ruma-client-api/src/r0/membership/invite_user.rs @@ -19,9 +19,11 @@ ruma_api! { description: "Invite a user to a room.", method: POST, name: "invite_user", - path: "/_matrix/client/r0/rooms/:room_id/invite", + r0_path: "/_matrix/client/r0/rooms/:room_id/invite", + stable_path: "/_matrix/client/v3/rooms/:room_id/invite", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/membership/join_room_by_id.rs b/crates/ruma-client-api/src/r0/membership/join_room_by_id.rs index 5a5340f2..55bf85c0 100644 --- a/crates/ruma-client-api/src/r0/membership/join_room_by_id.rs +++ b/crates/ruma-client-api/src/r0/membership/join_room_by_id.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Join a room using its ID.", method: POST, name: "join_room_by_id", - path: "/_matrix/client/r0/rooms/:room_id/join", + r0_path: "/_matrix/client/r0/rooms/:room_id/join", + stable_path: "/_matrix/client/v3/rooms/:room_id/join", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/membership/join_room_by_id_or_alias.rs b/crates/ruma-client-api/src/r0/membership/join_room_by_id_or_alias.rs index 193c7a58..3f47262e 100644 --- a/crates/ruma-client-api/src/r0/membership/join_room_by_id_or_alias.rs +++ b/crates/ruma-client-api/src/r0/membership/join_room_by_id_or_alias.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Join a room using its ID or one of its aliases.", method: POST, name: "join_room_by_id_or_alias", - path: "/_matrix/client/r0/join/:room_id_or_alias", + r0_path: "/_matrix/client/r0/join/:room_id_or_alias", + stable_path: "/_matrix/client/v3/join/:room_id_or_alias", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/membership/joined_members.rs b/crates/ruma-client-api/src/r0/membership/joined_members.rs index c05a6228..2c9266b5 100644 --- a/crates/ruma-client-api/src/r0/membership/joined_members.rs +++ b/crates/ruma-client-api/src/r0/membership/joined_members.rs @@ -11,9 +11,11 @@ ruma_api! { description: "Get a map of user ids to member info objects for members of the room. Primarily for use in Application Services.", method: GET, name: "joined_members", - path: "/_matrix/client/r0/rooms/:room_id/joined_members", + r0_path: "/_matrix/client/r0/rooms/:room_id/joined_members", + stable_path: "/_matrix/client/v3/rooms/:room_id/joined_members", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/membership/joined_rooms.rs b/crates/ruma-client-api/src/r0/membership/joined_rooms.rs index 2248cc34..c6b4513d 100644 --- a/crates/ruma-client-api/src/r0/membership/joined_rooms.rs +++ b/crates/ruma-client-api/src/r0/membership/joined_rooms.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Get a list of the user's current rooms.", method: GET, name: "joined_rooms", - path: "/_matrix/client/r0/joined_rooms", + r0_path: "/_matrix/client/r0/joined_rooms", + stable_path: "/_matrix/client/v3/joined_rooms", rate_limited: false, authentication: AccessToken, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/r0/membership/kick_user.rs b/crates/ruma-client-api/src/r0/membership/kick_user.rs index 3ad009e4..5b7acb21 100644 --- a/crates/ruma-client-api/src/r0/membership/kick_user.rs +++ b/crates/ruma-client-api/src/r0/membership/kick_user.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Kick a user from a room.", method: POST, name: "kick_user", - path: "/_matrix/client/r0/rooms/:room_id/kick", + r0_path: "/_matrix/client/r0/rooms/:room_id/kick", + stable_path: "/_matrix/client/v3/rooms/:room_id/kick", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/membership/leave_room.rs b/crates/ruma-client-api/src/r0/membership/leave_room.rs index 41f5dc20..dcb7d420 100644 --- a/crates/ruma-client-api/src/r0/membership/leave_room.rs +++ b/crates/ruma-client-api/src/r0/membership/leave_room.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Leave a room.", method: POST, name: "leave_room", - path: "/_matrix/client/r0/rooms/:room_id/leave", + r0_path: "/_matrix/client/r0/rooms/:room_id/leave", + stable_path: "/_matrix/client/v3/rooms/:room_id/leave", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/membership/unban_user.rs b/crates/ruma-client-api/src/r0/membership/unban_user.rs index 5e2e6534..54376931 100644 --- a/crates/ruma-client-api/src/r0/membership/unban_user.rs +++ b/crates/ruma-client-api/src/r0/membership/unban_user.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Unban a user from a room.", method: POST, name: "unban_user", - path: "/_matrix/client/r0/rooms/:room_id/unban", + r0_path: "/_matrix/client/r0/rooms/:room_id/unban", + stable_path: "/_matrix/client/v3/rooms/:room_id/unban", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/message/get_message_events.rs b/crates/ruma-client-api/src/r0/message/get_message_events.rs index d486e0ea..2d247b3c 100644 --- a/crates/ruma-client-api/src/r0/message/get_message_events.rs +++ b/crates/ruma-client-api/src/r0/message/get_message_events.rs @@ -14,9 +14,11 @@ ruma_api! { description: "Get message events for a room.", method: GET, name: "get_message_events", - path: "/_matrix/client/r0/rooms/:room_id/messages", + r0_path: "/_matrix/client/r0/rooms/:room_id/messages", + stable_path: "/_matrix/client/v3/rooms/:room_id/messages", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { @@ -175,7 +177,7 @@ mod tests { .try_into_http_request( "https://homeserver.tld", SendAccessToken::IfRequired("auth_tok"), - &[MatrixVersion::V1_0], + &[MatrixVersion::V1_1], ) .unwrap(); assert_eq!( @@ -204,7 +206,7 @@ mod tests { .try_into_http_request::>( "https://homeserver.tld", SendAccessToken::IfRequired("auth_tok"), - &[MatrixVersion::V1_0], + &[MatrixVersion::V1_1], ) .unwrap(); assert_eq!("from=token&to=token2&dir=b&limit=0", request.uri().query().unwrap(),); diff --git a/crates/ruma-client-api/src/r0/message/send_message_event.rs b/crates/ruma-client-api/src/r0/message/send_message_event.rs index f5dfbbf5..4c360584 100644 --- a/crates/ruma-client-api/src/r0/message/send_message_event.rs +++ b/crates/ruma-client-api/src/r0/message/send_message_event.rs @@ -11,9 +11,11 @@ ruma_api! { description: "Send a message event to a room.", method: PUT, name: "create_message_event", - path: "/_matrix/client/r0/rooms/:room_id/send/:event_type/:txn_id", + r0_path: "/_matrix/client/r0/rooms/:room_id/send/:event_type/:txn_id", + stable_path: "/_matrix/client/v3/rooms/:room_id/send/:event_type/:txn_id", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/presence/get_presence.rs b/crates/ruma-client-api/src/r0/presence/get_presence.rs index 3a0cb742..a1ac53b7 100644 --- a/crates/ruma-client-api/src/r0/presence/get_presence.rs +++ b/crates/ruma-client-api/src/r0/presence/get_presence.rs @@ -11,9 +11,11 @@ ruma_api! { description: "Get presence status for this user.", method: GET, name: "get_presence", - path: "/_matrix/client/r0/presence/:user_id/status", + r0_path: "/_matrix/client/r0/presence/:user_id/status", + stable_path: "/_matrix/client/v3/presence/:user_id/status", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/presence/set_presence.rs b/crates/ruma-client-api/src/r0/presence/set_presence.rs index 5c8e2e15..09d457ee 100644 --- a/crates/ruma-client-api/src/r0/presence/set_presence.rs +++ b/crates/ruma-client-api/src/r0/presence/set_presence.rs @@ -9,9 +9,11 @@ ruma_api! { description: "Set presence status for this user.", method: PUT, name: "set_presence", - path: "/_matrix/client/r0/presence/:user_id/status", + r0_path: "/_matrix/client/r0/presence/:user_id/status", + stable_path: "/_matrix/client/v3/presence/:user_id/status", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/profile/get_avatar_url.rs b/crates/ruma-client-api/src/r0/profile/get_avatar_url.rs index 41b1a117..1baea0d3 100644 --- a/crates/ruma-client-api/src/r0/profile/get_avatar_url.rs +++ b/crates/ruma-client-api/src/r0/profile/get_avatar_url.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Get the avatar URL of a user.", method: GET, name: "get_avatar_url", - path: "/_matrix/client/r0/profile/:user_id/avatar_url", + r0_path: "/_matrix/client/r0/profile/:user_id/avatar_url", + stable_path: "/_matrix/client/v3/profile/:user_id/avatar_url", rate_limited: false, authentication: None, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/profile/get_display_name.rs b/crates/ruma-client-api/src/r0/profile/get_display_name.rs index 66619cea..c521dfd2 100644 --- a/crates/ruma-client-api/src/r0/profile/get_display_name.rs +++ b/crates/ruma-client-api/src/r0/profile/get_display_name.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Get the display name of a user.", method: GET, name: "get_display_name", - path: "/_matrix/client/r0/profile/:user_id/displayname", + r0_path: "/_matrix/client/r0/profile/:user_id/displayname", + stable_path: "/_matrix/client/v3/profile/:user_id/displayname", rate_limited: false, authentication: None, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/profile/get_profile.rs b/crates/ruma-client-api/src/r0/profile/get_profile.rs index 840a584b..8adc30d1 100644 --- a/crates/ruma-client-api/src/r0/profile/get_profile.rs +++ b/crates/ruma-client-api/src/r0/profile/get_profile.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Get all profile information of an user.", method: GET, name: "get_profile", - path: "/_matrix/client/r0/profile/:user_id", + r0_path: "/_matrix/client/r0/profile/:user_id", + stable_path: "/_matrix/client/v3/profile/:user_id", rate_limited: false, authentication: None, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/profile/set_avatar_url.rs b/crates/ruma-client-api/src/r0/profile/set_avatar_url.rs index 70fcbd32..67fa3977 100644 --- a/crates/ruma-client-api/src/r0/profile/set_avatar_url.rs +++ b/crates/ruma-client-api/src/r0/profile/set_avatar_url.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Set the avatar URL of the user.", method: PUT, name: "set_avatar_url", - path: "/_matrix/client/r0/profile/:user_id/avatar_url", + r0_path: "/_matrix/client/r0/profile/:user_id/avatar_url", + stable_path: "/_matrix/client/v3/profile/:user_id/avatar_url", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/profile/set_display_name.rs b/crates/ruma-client-api/src/r0/profile/set_display_name.rs index e1c5e32c..5bbb7c8f 100644 --- a/crates/ruma-client-api/src/r0/profile/set_display_name.rs +++ b/crates/ruma-client-api/src/r0/profile/set_display_name.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Set the display name of the user.", method: PUT, name: "set_display_name", - path: "/_matrix/client/r0/profile/:user_id/displayname", + r0_path: "/_matrix/client/r0/profile/:user_id/displayname", + stable_path: "/_matrix/client/v3/profile/:user_id/displayname", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/push/delete_pushrule.rs b/crates/ruma-client-api/src/r0/push/delete_pushrule.rs index e1569eef..48e1214a 100644 --- a/crates/ruma-client-api/src/r0/push/delete_pushrule.rs +++ b/crates/ruma-client-api/src/r0/push/delete_pushrule.rs @@ -9,9 +9,11 @@ ruma_api! { description: "This endpoint removes the push rule defined in the path.", method: DELETE, name: "delete_pushrule", - path: "/_matrix/client/r0/pushrules/:scope/:kind/:rule_id", + r0_path: "/_matrix/client/r0/pushrules/:scope/:kind/:rule_id", + stable_path: "/_matrix/client/v3/pushrules/:scope/:kind/:rule_id", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/push/get_notifications.rs b/crates/ruma-client-api/src/r0/push/get_notifications.rs index 7a5a3304..6babaa68 100644 --- a/crates/ruma-client-api/src/r0/push/get_notifications.rs +++ b/crates/ruma-client-api/src/r0/push/get_notifications.rs @@ -13,9 +13,11 @@ ruma_api! { description: "Paginate through the list of events that the user has been, or would have been notified about.", method: GET, name: "get_notifications", - path: "/_matrix/client/r0/notifications", + r0_path: "/_matrix/client/r0/notifications", + stable_path: "/_matrix/client/v3/notifications", rate_limited: false, authentication: AccessToken, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/r0/push/get_pushers.rs b/crates/ruma-client-api/src/r0/push/get_pushers.rs index 63f51424..964b07d2 100644 --- a/crates/ruma-client-api/src/r0/push/get_pushers.rs +++ b/crates/ruma-client-api/src/r0/push/get_pushers.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Gets all currently active pushers for the authenticated user.", method: GET, name: "get_pushers", - path: "/_matrix/client/r0/pushers", + r0_path: "/_matrix/client/r0/pushers", + stable_path: "/_matrix/client/v3/pushers", rate_limited: false, authentication: AccessToken, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/r0/push/get_pushrule.rs b/crates/ruma-client-api/src/r0/push/get_pushrule.rs index 941b6b01..5ee8fb9c 100644 --- a/crates/ruma-client-api/src/r0/push/get_pushrule.rs +++ b/crates/ruma-client-api/src/r0/push/get_pushrule.rs @@ -9,9 +9,11 @@ ruma_api! { description: "Retrieve a single specified push rule.", method: GET, name: "get_pushrule", - path: "/_matrix/client/r0/pushrules/:scope/:kind/:rule_id", + r0_path: "/_matrix/client/r0/pushrules/:scope/:kind/:rule_id", + stable_path: "/_matrix/client/v3/pushrules/:scope/:kind/:rule_id", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/push/get_pushrule_actions.rs b/crates/ruma-client-api/src/r0/push/get_pushrule_actions.rs index 868f4e56..052ab02c 100644 --- a/crates/ruma-client-api/src/r0/push/get_pushrule_actions.rs +++ b/crates/ruma-client-api/src/r0/push/get_pushrule_actions.rs @@ -10,9 +10,11 @@ ruma_api! { description: "This endpoint get the actions for the specified push rule.", method: GET, name: "get_pushrule_actions", - path: "/_matrix/client/r0/pushrules/:scope/:kind/:rule_id/actions", + r0_path: "/_matrix/client/r0/pushrules/:scope/:kind/:rule_id/actions", + stable_path: "/_matrix/client/v3/pushrules/:scope/:kind/:rule_id/actions", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/push/get_pushrule_enabled.rs b/crates/ruma-client-api/src/r0/push/get_pushrule_enabled.rs index 1274ac76..19880ee8 100644 --- a/crates/ruma-client-api/src/r0/push/get_pushrule_enabled.rs +++ b/crates/ruma-client-api/src/r0/push/get_pushrule_enabled.rs @@ -9,9 +9,11 @@ ruma_api! { description: "This endpoint gets whether the specified push rule is enabled.", method: GET, name: "get_pushrule_enabled", - path: "/_matrix/client/r0/pushrules/:scope/:kind/:rule_id/enabled", + r0_path: "/_matrix/client/r0/pushrules/:scope/:kind/:rule_id/enabled", + stable_path: "/_matrix/client/v3/pushrules/:scope/:kind/:rule_id/enabled", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/push/get_pushrules_all.rs b/crates/ruma-client-api/src/r0/push/get_pushrules_all.rs index abf57782..3d414350 100644 --- a/crates/ruma-client-api/src/r0/push/get_pushrules_all.rs +++ b/crates/ruma-client-api/src/r0/push/get_pushrules_all.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Retrieve all push rulesets for this user.", method: GET, name: "get_pushrules_all", - path: "/_matrix/client/r0/pushrules/", + r0_path: "/_matrix/client/r0/pushrules/", + stable_path: "/_matrix/client/v3/pushrules/", rate_limited: false, authentication: AccessToken, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/r0/push/get_pushrules_global_scope.rs b/crates/ruma-client-api/src/r0/push/get_pushrules_global_scope.rs index d9d1a376..1cecd8be 100644 --- a/crates/ruma-client-api/src/r0/push/get_pushrules_global_scope.rs +++ b/crates/ruma-client-api/src/r0/push/get_pushrules_global_scope.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Retrieve all push rulesets in the global scope for this user.", method: GET, name: "get_pushrules_global_scope", - path: "/_matrix/client/r0/pushrules/global/", + r0_path: "/_matrix/client/r0/pushrules/global/", + stable_path: "/_matrix/client/v3/pushrules/global/", rate_limited: false, authentication: AccessToken, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/r0/push/set_pusher.rs b/crates/ruma-client-api/src/r0/push/set_pusher.rs index 26d49659..60e66809 100644 --- a/crates/ruma-client-api/src/r0/push/set_pusher.rs +++ b/crates/ruma-client-api/src/r0/push/set_pusher.rs @@ -10,9 +10,11 @@ ruma_api! { description: "This endpoint allows the creation, modification and deletion of pushers for this user ID.", method: POST, name: "set_pusher", - path: "/_matrix/client/r0/pushers/set", + r0_path: "/_matrix/client/r0/pushers/set", + stable_path: "/_matrix/client/v3/pushers/set", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/push/set_pushrule.rs b/crates/ruma-client-api/src/r0/push/set_pushrule.rs index 89c6eac4..94f9c85c 100644 --- a/crates/ruma-client-api/src/r0/push/set_pushrule.rs +++ b/crates/ruma-client-api/src/r0/push/set_pushrule.rs @@ -10,9 +10,11 @@ ruma_api! { description: "This endpoint allows the creation, modification and deletion of pushers for this user ID.", method: PUT, name: "set_pushrule", - path: "/_matrix/client/r0/pushrules/:scope/:kind/:rule_id", + r0_path: "/_matrix/client/r0/pushrules/:scope/:kind/:rule_id", + stable_path: "/_matrix/client/v3/pushrules/:scope/:kind/:rule_id", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/push/set_pushrule_actions.rs b/crates/ruma-client-api/src/r0/push/set_pushrule_actions.rs index 033b731a..753a332c 100644 --- a/crates/ruma-client-api/src/r0/push/set_pushrule_actions.rs +++ b/crates/ruma-client-api/src/r0/push/set_pushrule_actions.rs @@ -10,9 +10,11 @@ ruma_api! { description: "This endpoint allows clients to change the actions of a push rule. This can be used to change the actions of builtin rules.", method: PUT, name: "set_pushrule_actions", - path: "/_matrix/client/r0/pushrules/:scope/:kind/:rule_id/actions", + r0_path: "/_matrix/client/r0/pushrules/:scope/:kind/:rule_id/actions", + stable_path: "/_matrix/client/v3/pushrules/:scope/:kind/:rule_id/actions", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/push/set_pushrule_enabled.rs b/crates/ruma-client-api/src/r0/push/set_pushrule_enabled.rs index ded0e0fd..7248ac2b 100644 --- a/crates/ruma-client-api/src/r0/push/set_pushrule_enabled.rs +++ b/crates/ruma-client-api/src/r0/push/set_pushrule_enabled.rs @@ -9,9 +9,11 @@ ruma_api! { description: "This endpoint allows clients to enable or disable the specified push rule.", method: PUT, name: "set_pushrule_enabled", - path: "/_matrix/client/r0/pushrules/:scope/:kind/:rule_id/enabled", + r0_path: "/_matrix/client/r0/pushrules/:scope/:kind/:rule_id/enabled", + stable_path: "/_matrix/client/v3/pushrules/:scope/:kind/:rule_id/enabled", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/read_marker/set_read_marker.rs b/crates/ruma-client-api/src/r0/read_marker/set_read_marker.rs index 00b4f468..65c8f317 100644 --- a/crates/ruma-client-api/src/r0/read_marker/set_read_marker.rs +++ b/crates/ruma-client-api/src/r0/read_marker/set_read_marker.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Sets the position of the read marker for a given room, and optionally the read receipt's location.", method: POST, name: "set_read_marker", - path: "/_matrix/client/r0/rooms/:room_id/read_markers", + r0_path: "/_matrix/client/r0/rooms/:room_id/read_markers", + stable_path: "/_matrix/client/v3/rooms/:room_id/read_markers", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/receipt/create_receipt.rs b/crates/ruma-client-api/src/r0/receipt/create_receipt.rs index cbd75cb3..030ed7b4 100644 --- a/crates/ruma-client-api/src/r0/receipt/create_receipt.rs +++ b/crates/ruma-client-api/src/r0/receipt/create_receipt.rs @@ -9,9 +9,11 @@ ruma_api! { description: "Send a receipt event to a room.", method: POST, name: "create_receipt", - path: "/_matrix/client/r0/rooms/:room_id/receipt/:receipt_type/:event_id", + r0_path: "/_matrix/client/r0/rooms/:room_id/receipt/:receipt_type/:event_id", + stable_path: "/_matrix/client/v3/rooms/:room_id/receipt/:receipt_type/:event_id", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/redact/redact_event.rs b/crates/ruma-client-api/src/r0/redact/redact_event.rs index 448829c7..558369b0 100644 --- a/crates/ruma-client-api/src/r0/redact/redact_event.rs +++ b/crates/ruma-client-api/src/r0/redact/redact_event.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Redact an event, stripping all information not critical to the event graph integrity.", method: PUT, name: "redact_event", - path: "/_matrix/client/r0/rooms/:room_id/redact/:event_id/:txn_id", + r0_path: "/_matrix/client/r0/rooms/:room_id/redact/:event_id/:txn_id", + stable_path: "/_matrix/client/v3/rooms/:room_id/redact/:event_id/:txn_id", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/room/aliases.rs b/crates/ruma-client-api/src/r0/room/aliases.rs index 9e3720e6..66d8cfb0 100644 --- a/crates/ruma-client-api/src/r0/room/aliases.rs +++ b/crates/ruma-client-api/src/r0/room/aliases.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Get a list of aliases maintained by the local server for the given room.", method: GET, name: "aliases", - path: "/_matrix/client/r0/rooms/:room_id/aliases", + r0_path: "/_matrix/client/r0/rooms/:room_id/aliases", + stable_path: "/_matrix/client/v3/rooms/:room_id/aliases", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/room/create_room.rs b/crates/ruma-client-api/src/r0/room/create_room.rs index 4c1a37c5..05e8ae04 100644 --- a/crates/ruma-client-api/src/r0/room/create_room.rs +++ b/crates/ruma-client-api/src/r0/room/create_room.rs @@ -24,9 +24,11 @@ ruma_api! { description: "Create a new room.", method: POST, name: "create_room", - path: "/_matrix/client/r0/createRoom", + r0_path: "/_matrix/client/r0/createRoom", + stable_path: "/_matrix/client/v3/createRoom", rate_limited: false, authentication: AccessToken, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/r0/room/get_room_event.rs b/crates/ruma-client-api/src/r0/room/get_room_event.rs index 06e0d91d..2375819a 100644 --- a/crates/ruma-client-api/src/r0/room/get_room_event.rs +++ b/crates/ruma-client-api/src/r0/room/get_room_event.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Get a single event based on roomId/eventId", method: GET, name: "get_room_event", - path: "/_matrix/client/r0/rooms/:room_id/event/:event_id", + r0_path: "/_matrix/client/r0/rooms/:room_id/event/:event_id", + stable_path: "/_matrix/client/v3/rooms/:room_id/event/:event_id", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/room/report_content.rs b/crates/ruma-client-api/src/r0/room/report_content.rs index 68ea1ed1..a5b54271 100644 --- a/crates/ruma-client-api/src/r0/room/report_content.rs +++ b/crates/ruma-client-api/src/r0/room/report_content.rs @@ -9,9 +9,11 @@ ruma_api! { description: "Report content as inappropriate.", method: POST, name: "report_content", - path: "/_matrix/client/r0/rooms/:room_id/report/:event_id", + r0_path: "/_matrix/client/r0/rooms/:room_id/report/:event_id", + stable_path: "/_matrix/client/v3/rooms/:room_id/report/:event_id", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/room/upgrade_room.rs b/crates/ruma-client-api/src/r0/room/upgrade_room.rs index b76dc102..727c2206 100644 --- a/crates/ruma-client-api/src/r0/room/upgrade_room.rs +++ b/crates/ruma-client-api/src/r0/room/upgrade_room.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Upgrades a room to a particular version.", method: POST, name: "upgrade_room", - path: "/_matrix/client/r0/rooms/:room_id/upgrade", + r0_path: "/_matrix/client/r0/rooms/:room_id/upgrade", + stable_path: "/_matrix/client/v3/rooms/:room_id/upgrade", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/search/search_events.rs b/crates/ruma-client-api/src/r0/search/search_events.rs index 77ec4053..1ade6eb1 100644 --- a/crates/ruma-client-api/src/r0/search/search_events.rs +++ b/crates/ruma-client-api/src/r0/search/search_events.rs @@ -19,9 +19,11 @@ ruma_api! { description: "Search events.", method: POST, name: "search", - path: "/_matrix/client/r0/search", + r0_path: "/_matrix/client/r0/search", + stable_path: "/_matrix/client/v3/search", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/server/get_user_info.rs b/crates/ruma-client-api/src/r0/server/get_user_info.rs index df9d5303..efa10c56 100644 --- a/crates/ruma-client-api/src/r0/server/get_user_info.rs +++ b/crates/ruma-client-api/src/r0/server/get_user_info.rs @@ -12,9 +12,11 @@ ruma_api! { description: "Get information about a particular user.", method: GET, name: "get_user_info", - path: "/_matrix/client/r0/admin/whois/:user_id", + r0_path: "/_matrix/client/r0/admin/whois/:user_id", + stable_path: "/_matrix/client/v3/admin/whois/:user_id", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/session/get_login_types.rs b/crates/ruma-client-api/src/r0/session/get_login_types.rs index 7134c8eb..ee06f755 100644 --- a/crates/ruma-client-api/src/r0/session/get_login_types.rs +++ b/crates/ruma-client-api/src/r0/session/get_login_types.rs @@ -15,9 +15,11 @@ ruma_api! { description: "Gets the homeserver's supported login types to authenticate users. Clients should pick one of these and supply it as the type when logging in.", method: GET, name: "get_login_types", - path: "/_matrix/client/r0/login", + r0_path: "/_matrix/client/r0/login", + stable_path: "/_matrix/client/v3/login", rate_limited: true, authentication: None, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/r0/session/login.rs b/crates/ruma-client-api/src/r0/session/login.rs index 1d1ef1e8..00680938 100644 --- a/crates/ruma-client-api/src/r0/session/login.rs +++ b/crates/ruma-client-api/src/r0/session/login.rs @@ -16,9 +16,11 @@ ruma_api! { description: "Login to the homeserver.", method: POST, name: "login", - path: "/_matrix/client/r0/login", + r0_path: "/_matrix/client/r0/login", + stable_path: "/_matrix/client/v3/login", rate_limited: true, authentication: None, + added: 1.0, } request: { @@ -332,7 +334,7 @@ mod tests { .try_into_http_request( "https://homeserver.tld", SendAccessToken::None, - &[MatrixVersion::V1_0], + &[MatrixVersion::V1_1], ) .unwrap(); @@ -360,7 +362,7 @@ mod tests { .try_into_http_request( "https://homeserver.tld", SendAccessToken::None, - &[MatrixVersion::V1_0], + &[MatrixVersion::V1_1], ) .unwrap(); diff --git a/crates/ruma-client-api/src/r0/session/login_fallback.rs b/crates/ruma-client-api/src/r0/session/login_fallback.rs index de82441d..d1c74d74 100644 --- a/crates/ruma-client-api/src/r0/session/login_fallback.rs +++ b/crates/ruma-client-api/src/r0/session/login_fallback.rs @@ -8,9 +8,10 @@ ruma_api! { description: "Get login fallback web page.", method: GET, name: "login_fallback", - path: "/_matrix/static/client/login/", + stable_path: "/_matrix/static/client/login/", rate_limited: false, authentication: None, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/r0/session/logout.rs b/crates/ruma-client-api/src/r0/session/logout.rs index f1ff75d2..11a69e02 100644 --- a/crates/ruma-client-api/src/r0/session/logout.rs +++ b/crates/ruma-client-api/src/r0/session/logout.rs @@ -7,9 +7,11 @@ ruma_api! { description: "Log out of the homeserver.", method: POST, name: "logout", - path: "/_matrix/client/r0/logout", + r0_path: "/_matrix/client/r0/logout", + stable_path: "/_matrix/client/v3/logout", rate_limited: false, authentication: AccessToken, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/r0/session/logout_all.rs b/crates/ruma-client-api/src/r0/session/logout_all.rs index 68d9e81f..492d9e8b 100644 --- a/crates/ruma-client-api/src/r0/session/logout_all.rs +++ b/crates/ruma-client-api/src/r0/session/logout_all.rs @@ -7,9 +7,11 @@ ruma_api! { description: "Invalidates all access tokens for a user, so that they can no longer be used for authorization.", method: POST, name: "logout_all", - path: "/_matrix/client/r0/logout/all", + r0_path: "/_matrix/client/r0/logout/all", + stable_path: "/_matrix/client/v3/logout/all", rate_limited: false, authentication: AccessToken, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/r0/session/sso_login.rs b/crates/ruma-client-api/src/r0/session/sso_login.rs index 7f9b85fa..96d9df4a 100644 --- a/crates/ruma-client-api/src/r0/session/sso_login.rs +++ b/crates/ruma-client-api/src/r0/session/sso_login.rs @@ -7,9 +7,11 @@ ruma_api! { description: "", method: GET, name: "sso_login", - path: "/_matrix/client/r0/login/sso/redirect", + unstable_path: "/_matrix/client/unstable/org.matrix.msc2858/login/sso/redirect", + stable_path: "/_matrix/client/v3/login/sso/redirect", rate_limited: false, authentication: None, + added: 1.1, } request: { @@ -55,13 +57,13 @@ mod tests { .try_into_http_request( "https://homeserver.tld", SendAccessToken::None, - &[MatrixVersion::V1_0], + &[MatrixVersion::V1_1], ) .unwrap(); assert_eq!( req.uri().to_string(), - "https://homeserver.tld/_matrix/client/r0/login/sso/redirect?redirectUrl=https%3A%2F%2Fexample.com%2Fsso" + "https://homeserver.tld/_matrix/client/v3/login/sso/redirect?redirectUrl=https%3A%2F%2Fexample.com%2Fsso" ); } } diff --git a/crates/ruma-client-api/src/r0/state/get_state_events.rs b/crates/ruma-client-api/src/r0/state/get_state_events.rs index 0f56a32c..8d16f146 100644 --- a/crates/ruma-client-api/src/r0/state/get_state_events.rs +++ b/crates/ruma-client-api/src/r0/state/get_state_events.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Get state events for a room.", method: GET, name: "get_state_events", - path: "/_matrix/client/r0/rooms/:room_id/state", + r0_path: "/_matrix/client/r0/rooms/:room_id/state", + stable_path: "/_matrix/client/v3/rooms/:room_id/state", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/state/get_state_events_for_key.rs b/crates/ruma-client-api/src/r0/state/get_state_events_for_key.rs index 23db4db5..401aafeb 100644 --- a/crates/ruma-client-api/src/r0/state/get_state_events_for_key.rs +++ b/crates/ruma-client-api/src/r0/state/get_state_events_for_key.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Get state events associated with a given key.", method: GET, name: "get_state_events_for_key", - path: "/_matrix/client/r0/rooms/:room_id/state/:event_type/:state_key", + r0_path: "/_matrix/client/r0/rooms/:room_id/state/:event_type/:state_key", + stable_path: "/_matrix/client/v3/rooms/:room_id/state/:event_type/:state_key", rate_limited: false, authentication: AccessToken, + added: 1.0, } response: { diff --git a/crates/ruma-client-api/src/r0/state/send_state_event.rs b/crates/ruma-client-api/src/r0/state/send_state_event.rs index 46f7635b..2fadd273 100644 --- a/crates/ruma-client-api/src/r0/state/send_state_event.rs +++ b/crates/ruma-client-api/src/r0/state/send_state_event.rs @@ -11,9 +11,11 @@ ruma_api! { description: "Send a state event to a room associated with a given state key.", method: PUT, name: "send_state_event", - path: "/_matrix/client/r0/rooms/:room_id/state/:event_type/:state_key", + r0_path: "/_matrix/client/r0/rooms/:room_id/state/:event_type/:state_key", + stable_path: "/_matrix/client/v3/rooms/:room_id/state/:event_type/:state_key", rate_limited: false, authentication: AccessToken, + added: 1.0, } response: { diff --git a/crates/ruma-client-api/src/r0/sync/sync_events.rs b/crates/ruma-client-api/src/r0/sync/sync_events.rs index 6e795b18..f62fd00f 100644 --- a/crates/ruma-client-api/src/r0/sync/sync_events.rs +++ b/crates/ruma-client-api/src/r0/sync/sync_events.rs @@ -21,9 +21,11 @@ ruma_api! { description: "Get all new events from all rooms since the last sync or a given point of time.", method: GET, name: "sync", - path: "/_matrix/client/r0/sync", + r0_path: "/_matrix/client/r0/sync", + stable_path: "/_matrix/client/v3/sync", rate_limited: false, authentication: AccessToken, + added: 1.0, } #[derive(Default)] @@ -626,14 +628,14 @@ mod client_tests { .try_into_http_request( "https://homeserver.tld", SendAccessToken::IfRequired("auth_tok"), - &[MatrixVersion::V1_0], + &[MatrixVersion::V1_1], ) .unwrap(); let uri = req.uri(); let query = uri.query().unwrap(); - assert_eq!(uri.path(), "/_matrix/client/r0/sync"); + assert_eq!(uri.path(), "/_matrix/client/v3/sync"); assert!(query.contains("filter=66696p746572")); assert!(query.contains("since=s72594_4483_1934")); assert!(query.contains("full_state=true")); diff --git a/crates/ruma-client-api/src/r0/tag/create_tag.rs b/crates/ruma-client-api/src/r0/tag/create_tag.rs index 6ba9049f..ebfaa591 100644 --- a/crates/ruma-client-api/src/r0/tag/create_tag.rs +++ b/crates/ruma-client-api/src/r0/tag/create_tag.rs @@ -9,9 +9,11 @@ ruma_api! { description: "Add a new tag to a room.", method: PUT, name: "create_tag", - path: "/_matrix/client/r0/user/:user_id/rooms/:room_id/tags/:tag", + r0_path: "/_matrix/client/r0/user/:user_id/rooms/:room_id/tags/:tag", + stable_path: "/_matrix/client/v3/user/:user_id/rooms/:room_id/tags/:tag", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/tag/delete_tag.rs b/crates/ruma-client-api/src/r0/tag/delete_tag.rs index 46c12955..9a341542 100644 --- a/crates/ruma-client-api/src/r0/tag/delete_tag.rs +++ b/crates/ruma-client-api/src/r0/tag/delete_tag.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Remove a tag from a room.", method: DELETE, name: "delete_tag", - path: "/_matrix/client/r0/user/:user_id/rooms/:room_id/tags/:tag", + r0_path: "/_matrix/client/r0/user/:user_id/rooms/:room_id/tags/:tag", + stable_path: "/_matrix/client/v3/user/:user_id/rooms/:room_id/tags/:tag", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/tag/get_tags.rs b/crates/ruma-client-api/src/r0/tag/get_tags.rs index 1ea47d3f..12992f33 100644 --- a/crates/ruma-client-api/src/r0/tag/get_tags.rs +++ b/crates/ruma-client-api/src/r0/tag/get_tags.rs @@ -9,9 +9,11 @@ ruma_api! { description: "Get the tags associated with a room.", method: GET, name: "get_tags", - path: "/_matrix/client/r0/user/:user_id/rooms/:room_id/tags", + r0_path: "/_matrix/client/r0/user/:user_id/rooms/:room_id/tags", + stable_path: "/_matrix/client/v3/user/:user_id/rooms/:room_id/tags", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/thirdparty/get_location_for_protocol.rs b/crates/ruma-client-api/src/r0/thirdparty/get_location_for_protocol.rs index f4352b17..15da6457 100644 --- a/crates/ruma-client-api/src/r0/thirdparty/get_location_for_protocol.rs +++ b/crates/ruma-client-api/src/r0/thirdparty/get_location_for_protocol.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Fetches third party locations for a protocol.", method: GET, name: "get_location_for_protocol", - path: "/_matrix/client/r0/thirdparty/location/:protocol", + r0_path: "/_matrix/client/r0/thirdparty/location/:protocol", + stable_path: "/_matrix/client/v3/thirdparty/location/:protocol", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/thirdparty/get_location_for_room_alias.rs b/crates/ruma-client-api/src/r0/thirdparty/get_location_for_room_alias.rs index 0f00964c..614c411b 100644 --- a/crates/ruma-client-api/src/r0/thirdparty/get_location_for_room_alias.rs +++ b/crates/ruma-client-api/src/r0/thirdparty/get_location_for_room_alias.rs @@ -9,9 +9,11 @@ ruma_api! { description: "Retrieve an array of third party network locations from a Matrix room alias.", method: GET, name: "get_location_for_room_alias", - path: "/_matrix/client/r0/thirdparty/location", + r0_path: "/_matrix/client/r0/thirdparty/location", + stable_path: "/_matrix/client/v3/thirdparty/location", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/thirdparty/get_protocol.rs b/crates/ruma-client-api/src/r0/thirdparty/get_protocol.rs index eadc64b9..d07228bf 100644 --- a/crates/ruma-client-api/src/r0/thirdparty/get_protocol.rs +++ b/crates/ruma-client-api/src/r0/thirdparty/get_protocol.rs @@ -8,9 +8,11 @@ ruma_api! { description: "Fetches the metadata from the homeserver about a particular third party protocol.", method: GET, name: "get_protocol", - path: "/_matrix/client/r0/thirdparty/protocol/:protocol", + r0_path: "/_matrix/client/r0/thirdparty/protocol/:protocol", + stable_path: "/_matrix/client/v3/thirdparty/protocol/:protocol", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/thirdparty/get_protocols.rs b/crates/ruma-client-api/src/r0/thirdparty/get_protocols.rs index 56957715..f925d547 100644 --- a/crates/ruma-client-api/src/r0/thirdparty/get_protocols.rs +++ b/crates/ruma-client-api/src/r0/thirdparty/get_protocols.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Fetches the overall metadata about protocols supported by the homeserver.", method: GET, name: "get_protocols", - path: "/_matrix/client/r0/thirdparty/protocols", + r0_path: "/_matrix/client/r0/thirdparty/protocols", + stable_path: "/_matrix/client/v3/thirdparty/protocols", rate_limited: false, authentication: AccessToken, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/r0/thirdparty/get_user_for_protocol.rs b/crates/ruma-client-api/src/r0/thirdparty/get_user_for_protocol.rs index c09c902c..0c1e2d70 100644 --- a/crates/ruma-client-api/src/r0/thirdparty/get_user_for_protocol.rs +++ b/crates/ruma-client-api/src/r0/thirdparty/get_user_for_protocol.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Fetches third party users for a protocol.", method: GET, name: "get_user_for_protocol", - path: "/_matrix/client/r0/thirdparty/user/:protocol", + r0_path: "/_matrix/client/r0/thirdparty/user/:protocol", + stable_path: "/_matrix/client/v3/thirdparty/user/:protocol", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/thirdparty/get_user_for_user_id.rs b/crates/ruma-client-api/src/r0/thirdparty/get_user_for_user_id.rs index 8c2b1119..7e150af5 100644 --- a/crates/ruma-client-api/src/r0/thirdparty/get_user_for_user_id.rs +++ b/crates/ruma-client-api/src/r0/thirdparty/get_user_for_user_id.rs @@ -9,9 +9,11 @@ ruma_api! { description: "Retrieve an array of third party users from a Matrix User ID.", method: GET, name: "get_user_for_user_id", - path: "/_matrix/client/r0/thirdparty/user", + r0_path: "/_matrix/client/r0/thirdparty/user", + stable_path: "/_matrix/client/v3/thirdparty/user", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/to_device/send_event_to_device.rs b/crates/ruma-client-api/src/r0/to_device/send_event_to_device.rs index aa08e207..5ede8de0 100644 --- a/crates/ruma-client-api/src/r0/to_device/send_event_to_device.rs +++ b/crates/ruma-client-api/src/r0/to_device/send_event_to_device.rs @@ -13,9 +13,11 @@ ruma_api! { description: "Send an event to a device or devices.", method: PUT, name: "send_event_to_device", - path: "/_matrix/client/r0/sendToDevice/:event_type/:txn_id", + r0_path: "/_matrix/client/r0/sendToDevice/:event_type/:txn_id", + stable_path: "/_matrix/client/v3/sendToDevice/:event_type/:txn_id", rate_limited: false, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/typing/create_typing_event.rs b/crates/ruma-client-api/src/r0/typing/create_typing_event.rs index 12b8a800..70d58c4e 100644 --- a/crates/ruma-client-api/src/r0/typing/create_typing_event.rs +++ b/crates/ruma-client-api/src/r0/typing/create_typing_event.rs @@ -9,11 +9,13 @@ use serde::{de::Error, Deserialize, Deserializer, Serialize}; ruma_api! { metadata: { method: PUT, - path: "/_matrix/client/r0/rooms/:room_id/typing/:user_id", + r0_path: "/_matrix/client/r0/rooms/:room_id/typing/:user_id", + stable_path: "/_matrix/client/v3/rooms/:room_id/typing/:user_id", name: "create_typing_event", description: "Send a typing event to a room.", authentication: AccessToken, rate_limited: true, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/uiaa/get_uiaa_fallback_page.rs b/crates/ruma-client-api/src/r0/uiaa/get_uiaa_fallback_page.rs index bbb418cc..5a760552 100644 --- a/crates/ruma-client-api/src/r0/uiaa/get_uiaa_fallback_page.rs +++ b/crates/ruma-client-api/src/r0/uiaa/get_uiaa_fallback_page.rs @@ -7,9 +7,11 @@ ruma_api! { description: "Get UIAA fallback web page.", method: GET, name: "authorize_fallback", - path: "/_matrix/client/r0/auth/:auth_type/fallback/web", + r0_path: "/_matrix/client/r0/auth/:auth_type/fallback/web", + stable_path: "/_matrix/client/v3/auth/:auth_type/fallback/web", rate_limited: false, authentication: None, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/user_directory/search_users.rs b/crates/ruma-client-api/src/r0/user_directory/search_users.rs index de6c7504..f7bb7bad 100644 --- a/crates/ruma-client-api/src/r0/user_directory/search_users.rs +++ b/crates/ruma-client-api/src/r0/user_directory/search_users.rs @@ -10,9 +10,11 @@ ruma_api! { description: "Performs a search for users.", method: POST, name: "search_users", - path: "/_matrix/client/r0/user_directory/search", + r0_path: "/_matrix/client/r0/user_directory/search", + stable_path: "/_matrix/client/v3/user_directory/search", rate_limited: true, authentication: AccessToken, + added: 1.0, } request: { diff --git a/crates/ruma-client-api/src/r0/voip/get_turn_server_info.rs b/crates/ruma-client-api/src/r0/voip/get_turn_server_info.rs index 7f67d144..cf44626f 100644 --- a/crates/ruma-client-api/src/r0/voip/get_turn_server_info.rs +++ b/crates/ruma-client-api/src/r0/voip/get_turn_server_info.rs @@ -9,9 +9,11 @@ ruma_api! { description: "Get credentials for the client to use when initiating VoIP calls.", method: GET, name: "turn_server_info", - path: "/_matrix/client/r0/voip/turnServer", + r0_path: "/_matrix/client/r0/voip/turnServer", + stable_path: "/_matrix/client/v3/voip/turnServer", rate_limited: true, authentication: AccessToken, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/session/sso_login_with_provider/v3.rs b/crates/ruma-client-api/src/session/sso_login_with_provider/v3.rs index cacfecfe..5529ed00 100644 --- a/crates/ruma-client-api/src/session/sso_login_with_provider/v3.rs +++ b/crates/ruma-client-api/src/session/sso_login_with_provider/v3.rs @@ -7,9 +7,11 @@ ruma_api! { description: "Get the SSO login identity provider url.", method: GET, name: "sso_login_with_provider", - path: "/_matrix/client/v3/login/sso/redirect/:idp_id", + unstable_path: "/_matrix/client/unstable/org.matrix.msc2858/login/sso/redirect/:idp_id", + stable_path: "/_matrix/client/v3/login/sso/redirect/:idp_id", rate_limited: false, authentication: None, + added: 1.1, } request: { @@ -59,7 +61,7 @@ mod tests { .try_into_http_request::>( "https://homeserver.tld", SendAccessToken::None, - &[MatrixVersion::V1_0], + &[MatrixVersion::V1_1], ) .unwrap(); diff --git a/crates/ruma-client-api/src/unversioned/discover_homeserver.rs b/crates/ruma-client-api/src/unversioned/discover_homeserver.rs index 1f81bf1e..b7c54cca 100644 --- a/crates/ruma-client-api/src/unversioned/discover_homeserver.rs +++ b/crates/ruma-client-api/src/unversioned/discover_homeserver.rs @@ -8,9 +8,10 @@ ruma_api! { description: "Get discovery information about the domain.", method: GET, name: "discover_homeserver", - path: "/.well-known/matrix/client", + stable_path: "/.well-known/matrix/client", rate_limited: false, authentication: None, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/src/unversioned/get_supported_versions.rs b/crates/ruma-client-api/src/unversioned/get_supported_versions.rs index 4dad6c67..424db2da 100644 --- a/crates/ruma-client-api/src/unversioned/get_supported_versions.rs +++ b/crates/ruma-client-api/src/unversioned/get_supported_versions.rs @@ -9,9 +9,10 @@ ruma_api! { description: "Get the versions of the client-server API supported by this homeserver.", method: GET, name: "api_versions", - path: "/_matrix/client/versions", + stable_path: "/_matrix/client/versions", rate_limited: false, authentication: None, + added: 1.0, } #[derive(Default)] diff --git a/crates/ruma-client-api/tests/headers.rs b/crates/ruma-client-api/tests/headers.rs index 37ffb17b..5fa39fa0 100644 --- a/crates/ruma-client-api/tests/headers.rs +++ b/crates/ruma-client-api/tests/headers.rs @@ -10,7 +10,7 @@ fn get_request_headers() { .try_into_http_request( "https://homeserver.tld", SendAccessToken::None, - &[MatrixVersion::V1_0], + &[MatrixVersion::V1_1], ) .unwrap();