Update Generator and use Templates (#42)

* Update generator to `7.20.0`

* Generate default template folder

* Use templates in generation

* Remove transition help

* Alter templates

* Fix example

* Fix multipart data getting json serialized when it shouldn't be

* Add better multipart file uploading

* Reduce manual patches further

* Remove header

Author: C0D3-M4513R

.openapi-generator/VERSION

@@ -1 +1 @@
-7.17.0
+7.20.0

Cargo.toml

@@ -1,25 +1,27 @@
 [package]
-repository="https://github.com/vrchatapi/vrchatapi-rust"
 name = "vrchatapi"
-version = "1.20.8-nightly.9.1"
+version = "1.20.8-nightly.9"
 authors = ["vrchatapi.lpv0t@aries.fyi"]
 description = "VRChat API Client for Rust"
 license = "MIT"
 edition = "2021"
+repository = "https://github.com/vrchatapi/vrchatapi-rust"
 
 [dependencies]
 serde = { version = "^1.0", features = ["derive"] }
 serde_with = { version = "^3.8", default-features = false, features = ["base64", "std", "macros"] }
 serde_json = "^1.0"
 serde_repr = "^0.1"
 url = "^2.5"
-reqwest = { version = "^0.12", default-features = false, features = ["json", "multipart"] }
-reqwest-middleware = { version = "^0.4", features = ["json", "multipart"] }
+tokio = { version = "^1.46.0", features = ["fs"] }
+tokio-util = { version = "^0.7", features = ["codec"] }
+reqwest = { version = "^0.13", default-features = false, features = ["json", "multipart", "cookies", "stream", "query", "form"] }
+reqwest-middleware = { version = "^0.5", features = ["json", "multipart", "query", "form"] }
 
 [features]
 default = ["reqwest/cookies"]
 native-tls = ["reqwest/native-tls"]
-rustls-tls = ["reqwest/rustls-tls"]
+rustls = ["reqwest/rustls"]
 
 [dev-dependencies]
 tokio = { version = '1', features = ['macros', 'rt-multi-thread'] }

docs/AdminAssetBundle.md

@@ -16,7 +16,7 @@ Name | Type | Description | Notes
 **tags** | **Vec<String>** |  | 
 **thumbnail_image_url** | **String** |  | 
 **unity_package_url** | Option<**String**> |  | 
-**unity_packages** | [**Vec<models::AdminUnityPackage>**](AdminUnityPackage.md) |  | 
+**unity_packages** | [**HashSet<models::AdminUnityPackage>**](AdminUnityPackage.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

docs/ApiConfig.md

@@ -9,7 +9,7 @@ Name | Type | Description | Notes
 **location_gifting_non_sub_prio_enabled** | **bool** | Toggles whether users without a current VRC+ subscription are priority recipients for gift drops | [default to true]
 **voice_enable_degradation** | **bool** | Unknown, probably voice optimization testing | [default to false]
 **voice_enable_receiver_limiting** | **bool** | Unknown, probably voice optimization testing | [default to true]
-**access_logs_urls** | [**models::ApiConfigAccessLogsUrls**](APIConfig_accessLogsUrls.md) |  | 
+**access_logs_urls** | [**models::ApiConfigAccessLogsUrls**](APIConfigAccessLogsUrls.md) |  | 
 **address** | **String** | VRChat's office address | 
 **age_verification_invite_visible** | **bool** |  | 
 **age_verification_p** | **bool** |  | 
@@ -18,11 +18,11 @@ Name | Type | Description | Notes
 **analysis_retry_interval** | **i32** | Interval between retries for avatar analysis requests | 
 **analytics_segment_new_ui_pct_of_users** | **i32** | Unknown | 
 **analytics_segment_new_ui_salt** | **String** | Unknown | 
-**announcements** | [**Vec<models::ApiConfigAnnouncement>**](APIConfigAnnouncement.md) | Public Announcements | 
+**announcements** | [**HashSet<models::ApiConfigAnnouncement>**](APIConfigAnnouncement.md) | Public Announcements | 
 **audio_config** | Option<[**models::ApiConfigAudioConfig**](APIConfigAudioConfig.md)> |  | [optional]
 **available_language_codes** | **Vec<String>** | List of supported Languages | 
 **available_languages** | **Vec<String>** | List of supported Languages | 
-**avatar_perf_limiter** | [**models::ApiConfigAvatarPerfLimiter**](APIConfig_avatarPerfLimiter.md) |  | 
+**avatar_perf_limiter** | [**models::ApiConfigAvatarPerfLimiter**](APIConfigAvatarPerfLimiter.md) |  | 
 **chatbox_log_buffer_seconds** | **i32** | Unknown | [default to 40]
 **client_api_key** | **String** | apiKey to be used for all other requests | 
 **client_bps_ceiling** | **i32** | Unknown | [default to 18432]
@@ -72,7 +72,7 @@ Name | Type | Description | Notes
 **disable_upgrade_account** | **bool** | Toggles if account upgrading \"linking with Steam/Oculus\" should be disabled. | [default to false]
 **download_link_windows** | **String** | Download link for game on the Oculus Rift website. | 
 **download_urls** | [**models::ApiConfigDownloadUrlList**](APIConfigDownloadURLList.md) |  | 
-**dynamic_world_rows** | [**Vec<models::DynamicContentRow>**](DynamicContentRow.md) | Array of DynamicWorldRow objects, used by the game to display the list of world rows | 
+**dynamic_world_rows** | [**HashSet<models::DynamicContentRow>**](DynamicContentRow.md) | Array of DynamicWorldRow objects, used by the game to display the list of world rows | 
 **economy_ledger_backfill** | **bool** | Unknown | 
 **economy_ledger_migration_stop** | **String** | Unknown | 
 **economy_ledger_mode** | **String** | Unknown | 
@@ -89,23 +89,23 @@ Name | Type | Description | Notes
 **hub_world_id** | **String** | WorldID be \"offline\" on User profiles if you are not friends with that user. | 
 **image_host_url_list** | **Vec<String>** | A list of explicitly allowed origins that worlds can request images from via the Udon's [VRCImageDownloader#DownloadImage](https://creators.vrchat.com/worlds/udon/image-loading/#downloadimage). | 
 **ios_app_version** | **Vec<String>** | Current app version for iOS | 
-**ios_version** | [**models::ApiConfigIosVersion**](APIConfig_iosVersion.md) |  | 
+**ios_version** | [**models::ApiConfigIosVersion**](APIConfigIosVersion.md) |  | 
 **jobs_email** | **String** | VRChat's job application email | 
 **max_user_emoji** | **i32** | The maximum number of custom emoji each user may have at a given time. | [default to 18]
 **max_user_stickers** | **i32** | The maximum number of custom stickers each user may have at a given time. | [default to 18]
-**min_supported_client_build_number** | [**models::ApiConfigMinSupportedClientBuildNumber**](APIConfig_minSupportedClientBuildNumber.md) |  | 
+**min_supported_client_build_number** | [**models::ApiConfigMinSupportedClientBuildNumber**](APIConfigMinSupportedClientBuildNumber.md) |  | 
 **minimum_unity_version_for_uploads** | **String** | Minimum Unity version required for uploading assets | [default to 2019.0.0f1]
 **moderation_email** | **String** | VRChat's moderation related email | 
 **not_allowed_to_select_avatar_in_private_world_message** | **String** | Used in-game to notify a user they aren't allowed to select avatars in private worlds | 
-**offline_analysis** | [**models::ApiConfigOfflineAnalysis**](APIConfig_offlineAnalysis.md) |  | 
+**offline_analysis** | [**models::ApiConfigOfflineAnalysis**](APIConfigOfflineAnalysis.md) |  | 
 **photon_nameserver_overrides** | **Vec<String>** | Unknown | 
 **photon_public_keys** | **Vec<String>** | Unknown | 
 **player_url_resolver_sha1** | **String** | Currently used youtube-dl.exe hash in SHA1-delimited format | 
 **player_url_resolver_version** | **String** | Currently used youtube-dl.exe version | 
 **public_key** | **String** | Public key, hex encoded | 
 **report_categories** | [**std::collections::HashMap<String, models::ReportCategory>**](ReportCategory.md) | Categories available for reporting objectionable content | 
 **report_form_url** | **String** | URL to the report form | [default to https://help.vrchat.com/hc/en-us/requests/new?ticket_form_id=1500000182242&tf_360056455174=user_report&tf_360057451993={userId}&tf_1500001445142={reportedId}&tf_subject={reason} {category} By {contentType} {reportedName}&tf_description={description}]
-**report_options** | [**std::collections::HashMap<String, std::collections::HashMap<String, Vec<String>>>**](std::collections::HashMap.md) | Options for reporting content. Select a key+value from this mapping as the `type` of the report. Select one key+value from the object at reportOptions[type] as the `category` of the report. reportCategories[category] contains user-facing text to display for all possible categories. Select one value from the array at reportOptions[type][category] as the `reason` of the report. reportReasons[reason] contains user-facing text to display for all possible categories. | 
+**report_options** | **std::collections::HashMap<String, std::collections::HashMap<String, Vec<String>>>** | Options for reporting content. Select a key+value from this mapping as the `type` of the report. Select one key+value from the object at reportOptions[type] as the `category` of the report. reportCategories[category] contains user-facing text to display for all possible categories. Select one value from the array at reportOptions[type][category] as the `reason` of the report. reportReasons[reason] contains user-facing text to display for all possible categories. | 
 **report_reasons** | [**std::collections::HashMap<String, models::ReportReason>**](ReportReason.md) | Reasons available for submitting a report | 
 **require_age_verification_beta_tag** | **bool** |  | 
 **sdk_developer_faq_url** | **String** | Link to the developer FAQ | 

docs/ApiConfigConstants.md

@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**groups** | [**models::ApiConfigConstantsGroups**](APIConfigConstants_GROUPS.md) |  | 
-**instance** | [**models::ApiConfigConstantsInstance**](APIConfigConstants_INSTANCE.md) |  | 
-**language** | [**models::ApiConfigConstantsLanguage**](APIConfigConstants_LANGUAGE.md) |  | 
+**groups** | [**models::ApiConfigConstantsGroups**](APIConfigConstantsGROUPS.md) |  | 
+**instance** | [**models::ApiConfigConstantsInstance**](APIConfigConstantsINSTANCE.md) |  | 
+**language** | [**models::ApiConfigConstantsLanguage**](APIConfigConstantsLANGUAGE.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

docs/ApiConfigConstantsInstance.md

@@ -4,7 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**population_brackets** | Option<[**models::ApiConfigConstantsInstancePopulationBrackets**](APIConfigConstants_INSTANCE_POPULATION_BRACKETS.md)> |  | [optional]
+**population_brackets** | Option<[**models::ApiConfigConstantsInstancePopulationBrackets**](APIConfigConstantsINSTANCEPOPULATIONBRACKETS.md)> |  | [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)
 

docs/ApiConfigConstantsInstancePopulationBrackets.md

@@ -4,9 +4,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**crowded** | Option<[**models::ApiConfigConstantsInstancePopulationBracketsCrowded**](APIConfigConstants_INSTANCE_POPULATION_BRACKETS_CROWDED.md)> |  | [optional]
-**few** | Option<[**models::ApiConfigConstantsInstancePopulationBracketsFew**](APIConfigConstants_INSTANCE_POPULATION_BRACKETS_FEW.md)> |  | [optional]
-**many** | Option<[**models::ApiConfigConstantsInstancePopulationBracketsMany**](APIConfigConstants_INSTANCE_POPULATION_BRACKETS_MANY.md)> |  | [optional]
+**crowded** | Option<[**models::ApiConfigConstantsInstancePopulationBracketsCrowded**](APIConfigConstantsINSTANCEPOPULATIONBRACKETSCROWDED.md)> |  | [optional]
+**few** | Option<[**models::ApiConfigConstantsInstancePopulationBracketsFew**](APIConfigConstantsINSTANCEPOPULATIONBRACKETSFEW.md)> |  | [optional]
+**many** | Option<[**models::ApiConfigConstantsInstancePopulationBracketsMany**](APIConfigConstantsINSTANCEPOPULATIONBRACKETSMANY.md)> |  | [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)
 

docs/AuthenticationApi.md

@@ -164,7 +164,7 @@ Globally unmoderates an avatar.
 Name | Type | Description  | Required | Notes
 ------------- | ------------- | ------------- | ------------- | -------------
 **target_avatar_id** | **String** | Must be a valid avatar ID. | [required] |
-**avatar_moderation_type** | [**AvatarModerationType**](.md) | The avatar moderation type associated with the avatar. | [required] |
+**avatar_moderation_type** | [**AvatarModerationType**](AvatarModerationType.md) | The avatar moderation type associated with the avatar. | [required] |
 
 ### Return type
 

docs/Avatar.md

@@ -7,7 +7,7 @@ Name | Type | Description | Notes
 **acknowledgements** | Option<**String**> |  | [optional]
 **active_asset_review_id** | Option<**String**> | Only present for the avatar author on avatars under active review. | [optional]
 **asset_url** | Option<**String**> | Not present from general search `/avatars`, only on specific requests `/avatars/{avatarId}`. | [optional]
-**asset_url_object** | Option<[**serde_json::Value**](.md)> | Not present from general search `/avatars`, only on specific requests `/avatars/{avatarId}`. **Deprecation:** `Object` has unknown usage/fields, and is always empty. Use normal `Url` field instead. | [optional]
+**asset_url_object** | Option<**serde_json::Value**> | Not present from general search `/avatars`, only on specific requests `/avatars/{avatarId}`. **Deprecation:** `Object` has unknown usage/fields, and is always empty. Use normal `Url` field instead. | [optional]
 **author_id** | **String** | A users unique ID, usually in the form of `usr_c1644b5b-3ca4-45b4-97c6-a2a0de70d469`. Legacy players can have old IDs in the form of `8JoV9XEdpo`. The ID can never be changed. | 
 **author_name** | **String** |  | 
 **created_at** | **String** |  | 
@@ -21,17 +21,17 @@ Name | Type | Description | Notes
 **lowest_price** | Option<**i32**> |  | [optional]
 **name** | **String** |  | 
 **pending_upload** | Option<**bool**> |  | [optional][default to false]
-**performance** | [**models::AvatarPerformance**](Avatar_performance.md) |  | 
+**performance** | [**models::AvatarPerformance**](AvatarPerformance.md) |  | 
 **product_id** | Option<**String**> |  | [optional]
-**published_listings** | Option<[**Vec<models::AvatarPublishedListingsInner>**](Avatar_publishedListings_inner.md)> |  | [optional]
+**published_listings** | Option<[**Vec<models::AvatarPublishedListingsInner>**](AvatarPublishedListingsInner.md)> |  | [optional]
 **release_status** | [**models::ReleaseStatus**](ReleaseStatus.md) |  | 
 **searchable** | Option<**bool**> |  | [optional][default to false]
-**styles** | [**models::AvatarStyles**](Avatar_styles.md) |  | 
+**styles** | [**models::AvatarStyles**](AvatarStyles.md) |  | 
 **tags** | **Vec<String>** |   | 
 **thumbnail_image_url** | **String** |  | 
 **unity_package_url** | **String** |  | 
-**unity_package_url_object** | [**models::AvatarUnityPackageUrlObject**](Avatar_unityPackageUrlObject.md) |  | 
-**unity_packages** | [**Vec<models::UnityPackage>**](UnityPackage.md) |  | 
+**unity_package_url_object** | [**models::AvatarUnityPackageUrlObject**](AvatarUnityPackageUrlObject.md) |  | 
+**unity_packages** | [**HashSet<models::UnityPackage>**](UnityPackage.md) |  | 
 **updated_at** | **String** |  | 
 **version** | **i32** |  | [default to 0]
 

docs/AvatarsApi.md

@@ -211,14 +211,14 @@ Search and list favorited avatars by query filters.
 Name | Type | Description  | Required | Notes
 ------------- | ------------- | ------------- | ------------- | -------------
 **featured** | Option<**bool**> | Filters on featured results. |  |
-**sort** | Option<[**SortOption**](.md)> | The sort order of the results. |  |
+**sort** | Option<[**SortOption**](SortOption.md)> | The sort order of the results. |  |
 **n** | Option<**i32**> | The number of objects to return. |  |[default to 60]
-**order** | Option<[**OrderOption**](.md)> | Result ordering |  |
+**order** | Option<[**OrderOption**](OrderOption.md)> | Result ordering |  |
 **offset** | Option<**i32**> | A zero-based offset from the default object sorting from where search results start. |  |
 **search** | Option<**String**> | Filters by world name. |  |
 **tag** | Option<**String**> | Tags to include (comma-separated). Any of the tags needs to be present. |  |
 **notag** | Option<**String**> | Tags to exclude (comma-separated). |  |
-**release_status** | Option<[**ReleaseStatus**](.md)> | Filter by ReleaseStatus. |  |
+**release_status** | Option<[**ReleaseStatus**](ReleaseStatus.md)> | Filter by ReleaseStatus. |  |
 **max_unity_version** | Option<**String**> | The maximum Unity version supported by the asset. |  |
 **min_unity_version** | Option<**String**> | The minimum Unity version supported by the asset. |  |
 **platform** | Option<**String**> | The platform the asset supports. |  |
@@ -341,15 +341,15 @@ Search and list avatars by query filters. You can only search your own or featur
 Name | Type | Description  | Required | Notes
 ------------- | ------------- | ------------- | ------------- | -------------
 **featured** | Option<**bool**> | Filters on featured results. |  |
-**sort** | Option<[**SortOption**](.md)> | The sort order of the results. |  |
+**sort** | Option<[**SortOption**](SortOption.md)> | The sort order of the results. |  |
 **user** | Option<**String**> | Set to `me` for searching own avatars. |  |
 **user_id** | Option<**String**> | Filter by UserID. |  |
 **n** | Option<**i32**> | The number of objects to return. |  |[default to 60]
-**order** | Option<[**OrderOption**](.md)> | Result ordering |  |
+**order** | Option<[**OrderOption**](OrderOption.md)> | Result ordering |  |
 **offset** | Option<**i32**> | A zero-based offset from the default object sorting from where search results start. |  |
 **tag** | Option<**String**> | Tags to include (comma-separated). Any of the tags needs to be present. |  |
 **notag** | Option<**String**> | Tags to exclude (comma-separated). |  |
-**release_status** | Option<[**ReleaseStatus**](.md)> | Filter by ReleaseStatus. |  |
+**release_status** | Option<[**ReleaseStatus**](ReleaseStatus.md)> | Filter by ReleaseStatus. |  |
 **max_unity_version** | Option<**String**> | The maximum Unity version supported by the asset. |  |
 **min_unity_version** | Option<**String**> | The minimum Unity version supported by the asset. |  |
 **platform** | Option<**String**> | The platform the asset supports. |  |