From ae6128207469f195005aa4ef9f4a33c60714aa2f Mon Sep 17 00:00:00 2001 From: VRCCat Date: Thu, 8 Sep 2022 22:36:49 +0000 Subject: [PATCH] Upgrade Rust SDK to spec 1.7.4 --- .openapi-generator/FILES | 4 +-- Cargo.toml | 2 +- docs/Instance.md | 3 +- ...equest.md => InstanceShortNameResponse.md} | 5 ++-- docs/InstancesApi.md | 4 +-- docs/InviteApi.md | 5 ++-- src/apis/instances_api.rs | 2 +- src/apis/invite_api.rs | 3 +- src/models/instance.rs | 11 ++++--- src/models/instance_short_name_response.rs | 29 +++++++++++++++++++ src/models/invite_myself_to_request.rs | 27 ----------------- src/models/mod.rs | 4 +-- 12 files changed, 52 insertions(+), 47 deletions(-) rename docs/{InviteMyselfToRequest.md => InstanceShortNameResponse.md} (65%) create mode 100644 src/models/instance_short_name_response.rs delete mode 100644 src/models/invite_myself_to_request.rs diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES index 2631ec4..3a73aff 100644 --- a/.openapi-generator/FILES +++ b/.openapi-generator/FILES @@ -41,12 +41,12 @@ docs/InfoPushDataArticleContent.md docs/InfoPushDataClickable.md docs/Instance.md docs/InstancePlatforms.md +docs/InstanceShortNameResponse.md docs/InstanceType.md docs/InstancesApi.md docs/InviteApi.md docs/InviteMessage.md docs/InviteMessageType.md -docs/InviteMyselfToRequest.md docs/InviteRequest.md docs/InviteResponse.md docs/License.md @@ -154,10 +154,10 @@ src/models/info_push_data_article_content.rs src/models/info_push_data_clickable.rs src/models/instance.rs src/models/instance_platforms.rs +src/models/instance_short_name_response.rs src/models/instance_type.rs src/models/invite_message.rs src/models/invite_message_type.rs -src/models/invite_myself_to_request.rs src/models/invite_request.rs src/models/invite_response.rs src/models/license.rs diff --git a/Cargo.toml b/Cargo.toml index 20cd6d7..cc66c63 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "vrchatapi" -version = "1.7.3" +version = "1.7.4" authors = ["OpenAPI Generator team and contributors"] license = "MIT" edition = "2018" diff --git a/docs/Instance.md b/docs/Instance.md index defa523..3101a7c 100644 --- a/docs/Instance.md +++ b/docs/Instance.md @@ -19,7 +19,8 @@ Name | Type | Description | Notes **photon_region** | [**crate::models::Region**](Region.md) | | **platforms** | [**crate::models::InstancePlatforms**](InstancePlatforms.md) | | **region** | [**crate::models::Region**](Region.md) | | -**short_name** | **String** | | +**secure_name** | **String** | | +**short_name** | Option<**String**> | | [optional] **tags** | **Vec** | The tags array on Instances usually contain the language tags of the people in the instance. | **_type** | [**crate::models::InstanceType**](InstanceType.md) | | **world_id** | **String** | WorldID be \"offline\" on User profiles if you are not friends with that user. | diff --git a/docs/InviteMyselfToRequest.md b/docs/InstanceShortNameResponse.md similarity index 65% rename from docs/InviteMyselfToRequest.md rename to docs/InstanceShortNameResponse.md index f88b609..88e48a5 100644 --- a/docs/InviteMyselfToRequest.md +++ b/docs/InstanceShortNameResponse.md @@ -1,10 +1,11 @@ -# InviteMyselfToRequest +# InstanceShortNameResponse ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**short_name** | **String** | Short Name of the Instance; can be retrieved from the Get Instance Short Name endpoint. | +**secure_name** | **String** | | +**short_name** | Option<**String**> | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/InstancesApi.md b/docs/InstancesApi.md index fc48491..bf3e32e 100644 --- a/docs/InstancesApi.md +++ b/docs/InstancesApi.md @@ -74,7 +74,7 @@ Name | Type | Description | Required | Notes ## get_short_name -> String get_short_name(world_id, instance_id) +> crate::models::InstanceShortNameResponse get_short_name(world_id, instance_id) Get Instance Short Name Returns an instance short name. @@ -89,7 +89,7 @@ Name | Type | Description | Required | Notes ### Return type -**String** +[**crate::models::InstanceShortNameResponse**](InstanceShortNameResponse.md) ### Authorization diff --git a/docs/InviteApi.md b/docs/InviteApi.md index 4bd2c64..6ec387c 100644 --- a/docs/InviteApi.md +++ b/docs/InviteApi.md @@ -80,7 +80,7 @@ Name | Type | Description | Required | Notes ## invite_myself_to -> crate::models::SentNotification invite_myself_to(world_id, instance_id, invite_myself_to_request) +> crate::models::SentNotification invite_myself_to(world_id, instance_id) Invite Myself To Instance Sends self an invite to an instance @@ -92,7 +92,6 @@ Name | Type | Description | Required | Notes ------------- | ------------- | ------------- | ------------- | ------------- **world_id** | **String** | | [required] | **instance_id** | **String** | | [required] | -**invite_myself_to_request** | Option<[**InviteMyselfToRequest**](InviteMyselfToRequest.md)> | | | ### Return type @@ -104,7 +103,7 @@ Name | Type | Description | Required | Notes ### HTTP request headers -- **Content-Type**: application/json +- **Content-Type**: Not defined - **Accept**: application/json [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/src/apis/instances_api.rs b/src/apis/instances_api.rs index 7248ab1..075cbd8 100644 --- a/src/apis/instances_api.rs +++ b/src/apis/instances_api.rs @@ -104,7 +104,7 @@ pub fn get_instance_by_short_name(configuration: &configuration::Configuration, } /// Returns an instance short name. -pub fn get_short_name(configuration: &configuration::Configuration, world_id: &str, instance_id: &str) -> Result> { +pub fn get_short_name(configuration: &configuration::Configuration, world_id: &str, instance_id: &str) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; diff --git a/src/apis/invite_api.rs b/src/apis/invite_api.rs index 3ae65e6..9531f54 100644 --- a/src/apis/invite_api.rs +++ b/src/apis/invite_api.rs @@ -144,7 +144,7 @@ pub fn get_invite_messages(configuration: &configuration::Configuration, user_id } /// Sends self an invite to an instance -pub fn invite_myself_to(configuration: &configuration::Configuration, world_id: &str, instance_id: &str, invite_myself_to_request: Option) -> Result> { +pub fn invite_myself_to(configuration: &configuration::Configuration, world_id: &str, instance_id: &str) -> Result> { let local_var_configuration = configuration; let local_var_client = &local_var_configuration.client; @@ -155,7 +155,6 @@ pub fn invite_myself_to(configuration: &configuration::Configuration, world_id: if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); } - local_var_req_builder = local_var_req_builder.json(&invite_myself_to_request); let local_var_req = local_var_req_builder.build()?; let mut local_var_resp = local_var_client.execute(local_var_req)?; diff --git a/src/models/instance.rs b/src/models/instance.rs index 13cc195..263a34f 100644 --- a/src/models/instance.rs +++ b/src/models/instance.rs @@ -46,8 +46,10 @@ pub struct Instance { pub platforms: Box, #[serde(rename = "region")] pub region: crate::models::Region, - #[serde(rename = "shortName")] - pub short_name: String, + #[serde(rename = "secureName")] + pub secure_name: String, + #[serde(rename = "shortName", skip_serializing_if = "Option::is_none")] + pub short_name: Option, /// The tags array on Instances usually contain the language tags of the people in the instance. #[serde(rename = "tags")] pub tags: Vec, @@ -69,7 +71,7 @@ pub struct Instance { impl Instance { /// * `hidden` field is only present if InstanceType is `hidden` aka \"Friends+\", and is instance creator. * `friends` field is only present if InstanceType is `friends` aka \"Friends\", and is instance creator. * `private` field is only present if InstanceType is `private` aka \"Invite\" or \"Invite+\", and is instance creator. - pub fn new(active: bool, can_request_invite: bool, capacity: i32, client_number: String, full: bool, id: String, instance_id: String, location: String, n_users: i32, name: String, permanent: bool, photon_region: crate::models::Region, platforms: crate::models::InstancePlatforms, region: crate::models::Region, short_name: String, tags: Vec, _type: crate::models::InstanceType, world_id: String) -> Instance { + pub fn new(active: bool, can_request_invite: bool, capacity: i32, client_number: String, full: bool, id: String, instance_id: String, location: String, n_users: i32, name: String, permanent: bool, photon_region: crate::models::Region, platforms: crate::models::InstancePlatforms, region: crate::models::Region, secure_name: String, tags: Vec, _type: crate::models::InstanceType, world_id: String) -> Instance { Instance { active, can_request_invite, @@ -86,7 +88,8 @@ impl Instance { photon_region, platforms: Box::new(platforms), region, - short_name, + secure_name, + short_name: None, tags, _type, world_id, diff --git a/src/models/instance_short_name_response.rs b/src/models/instance_short_name_response.rs new file mode 100644 index 0000000..5adad04 --- /dev/null +++ b/src/models/instance_short_name_response.rs @@ -0,0 +1,29 @@ +/* + * VRChat API Documentation + * + * + * Contact: me@ariesclark.com + * Generated by: https://openapi-generator.tech + */ + + + + +#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)] +pub struct InstanceShortNameResponse { + #[serde(rename = "secureName")] + pub secure_name: String, + #[serde(rename = "shortName", skip_serializing_if = "Option::is_none")] + pub short_name: Option, +} + +impl InstanceShortNameResponse { + pub fn new(secure_name: String) -> InstanceShortNameResponse { + InstanceShortNameResponse { + secure_name, + short_name: None, + } + } +} + + diff --git a/src/models/invite_myself_to_request.rs b/src/models/invite_myself_to_request.rs deleted file mode 100644 index 0a361f6..0000000 --- a/src/models/invite_myself_to_request.rs +++ /dev/null @@ -1,27 +0,0 @@ -/* - * VRChat API Documentation - * - * - * Contact: me@ariesclark.com - * Generated by: https://openapi-generator.tech - */ - - - - -#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)] -pub struct InviteMyselfToRequest { - /// Short Name of the Instance; can be retrieved from the Get Instance Short Name endpoint. - #[serde(rename = "shortName")] - pub short_name: String, -} - -impl InviteMyselfToRequest { - pub fn new(short_name: String) -> InviteMyselfToRequest { - InviteMyselfToRequest { - short_name, - } - } -} - - diff --git a/src/models/mod.rs b/src/models/mod.rs index c41ee1e..2e834ce 100644 --- a/src/models/mod.rs +++ b/src/models/mod.rs @@ -68,14 +68,14 @@ pub mod instance; pub use self::instance::Instance; pub mod instance_platforms; pub use self::instance_platforms::InstancePlatforms; +pub mod instance_short_name_response; +pub use self::instance_short_name_response::InstanceShortNameResponse; pub mod instance_type; pub use self::instance_type::InstanceType; pub mod invite_message; pub use self::invite_message::InviteMessage; pub mod invite_message_type; pub use self::invite_message_type::InviteMessageType; -pub mod invite_myself_to_request; -pub use self::invite_myself_to_request::InviteMyselfToRequest; pub mod invite_request; pub use self::invite_request::InviteRequest; pub mod invite_response;