diff --git a/openapi/components/paths/friends.yaml b/openapi/components/paths/friends.yaml index 184485fd..b1bfeaea 100644 --- a/openapi/components/paths/friends.yaml +++ b/openapi/components/paths/friends.yaml @@ -11,7 +11,7 @@ paths: - friends responses: '200': - $ref: ../responses/users/LimitedUserListResponse.yaml + $ref: ../responses/friends/LimitedUserFriendListResponse.yaml '401': $ref: ../responses/MissingCredentialsError.yaml operationId: getFriends diff --git a/openapi/components/paths/users.yaml b/openapi/components/paths/users.yaml index 49ff5cea..167b4dee 100644 --- a/openapi/components/paths/users.yaml +++ b/openapi/components/paths/users.yaml @@ -11,7 +11,7 @@ paths: - users responses: '200': - $ref: ../responses/users/LimitedUserListResponse.yaml + $ref: ../responses/users/LimitedUserSearchListResponse.yaml '400': $ref: ../responses/users/UsersInvalidSearchError.yaml '401': @@ -125,7 +125,7 @@ paths: schema: type: array items: - $ref: ../schemas/LimitedUser.yaml + $ref: ../schemas/LimitedUserFriend.yaml '401': $ref: ../responses/MissingCredentialsError.yaml '403': diff --git a/openapi/components/responses/friends/LimitedUserFriendListResponse.yaml b/openapi/components/responses/friends/LimitedUserFriendListResponse.yaml new file mode 100644 index 00000000..4f190ed8 --- /dev/null +++ b/openapi/components/responses/friends/LimitedUserFriendListResponse.yaml @@ -0,0 +1,7 @@ +description: Returns a list of LimitedUserFriend objects. +content: + application/json: + schema: + type: array + items: + $ref: ../../schemas/LimitedUserFriend.yaml \ No newline at end of file diff --git a/openapi/components/responses/users/LimitedUserListResponse.yaml b/openapi/components/responses/users/LimitedUserListResponse.yaml deleted file mode 100644 index 14c2e3f1..00000000 --- a/openapi/components/responses/users/LimitedUserListResponse.yaml +++ /dev/null @@ -1,7 +0,0 @@ -description: Returns a list of LimitedUser objects. -content: - application/json: - schema: - type: array - items: - $ref: ../../schemas/LimitedUser.yaml \ No newline at end of file diff --git a/openapi/components/responses/users/LimitedUserSearchListResponse.yaml b/openapi/components/responses/users/LimitedUserSearchListResponse.yaml new file mode 100644 index 00000000..25bf556c --- /dev/null +++ b/openapi/components/responses/users/LimitedUserSearchListResponse.yaml @@ -0,0 +1,7 @@ +description: Returns a list of LimitedUserSearch objects. +content: + application/json: + schema: + type: array + items: + $ref: ../../schemas/LimitedUserSearch.yaml \ No newline at end of file diff --git a/openapi/components/schemas/Avatar.yaml b/openapi/components/schemas/Avatar.yaml index 8ee98a99..07c2a02d 100644 --- a/openapi/components/schemas/Avatar.yaml +++ b/openapi/components/schemas/Avatar.yaml @@ -39,6 +39,21 @@ properties: name: minLength: 1 type: string + performance: + type: object + properties: + android: + type: string + android-sort: + type: integer + ios: + type: string + ios-sort: + type: integer + standalonewindows: + type: string + standalonewindows-sort: + type: integer productId: type: string publishedListings: @@ -116,6 +131,7 @@ required: - id - imageUrl - name + - performance - releaseStatus - styles - tags diff --git a/openapi/components/schemas/CurrentUserPresence.yaml b/openapi/components/schemas/CurrentUserPresence.yaml index faef4ab5..676a37f9 100644 --- a/openapi/components/schemas/CurrentUserPresence.yaml +++ b/openapi/components/schemas/CurrentUserPresence.yaml @@ -8,6 +8,8 @@ properties: type: string displayName: type: string + debugflag: + type: string groups: type: array nullable: true diff --git a/openapi/components/schemas/Instance.yaml b/openapi/components/schemas/Instance.yaml index d17969f7..7b91af27 100644 --- a/openapi/components/schemas/Instance.yaml +++ b/openapi/components/schemas/Instance.yaml @@ -120,7 +120,7 @@ properties: description: 'The users field is present on instances created by the requesting user.' type: array items: - $ref: ./LimitedUser.yaml + $ref: ./LimitedUserInstance.yaml groupAccessType: $ref: ./GroupAccessType.yaml hasCapacityForYou: diff --git a/openapi/components/schemas/InstanceContentSettings.yaml b/openapi/components/schemas/InstanceContentSettings.yaml index ceacc438..1ebb096e 100644 --- a/openapi/components/schemas/InstanceContentSettings.yaml +++ b/openapi/components/schemas/InstanceContentSettings.yaml @@ -17,3 +17,6 @@ properties: stickers: default: true type: boolean + props: + default: true + type: boolean \ No newline at end of file diff --git a/openapi/components/schemas/LimitedUser.yaml b/openapi/components/schemas/LimitedUserFriend.yaml similarity index 67% rename from openapi/components/schemas/LimitedUser.yaml rename to openapi/components/schemas/LimitedUserFriend.yaml index b8f66bfe..701e22e2 100644 --- a/openapi/components/schemas/LimitedUser.yaml +++ b/openapi/components/schemas/LimitedUserFriend.yaml @@ -1,4 +1,4 @@ -description: '' +description: 'User object received when querying your friends list' properties: bio: type: string @@ -19,22 +19,35 @@ properties: $ref: ./DeveloperType.yaml displayName: type: string - fallbackAvatar: - deprecated: true - $ref: ./AvatarID.yaml + friendKey: + type: string id: $ref: ./UserID.yaml isFriend: type: boolean + imageUrl: + type: string last_platform: $ref: ./Platform.yaml + location: + type: string last_login: type: string nullable: true format: date-time + last_activity: + type: string + nullable: true + format: date-time + last_mobile: + type: string + nullable: true + format: date-time + platform: + type: string profilePicOverride: type: string - pronouns: + profilePicOverrideThumbnail: type: string status: $ref: ./UserStatus.yaml @@ -47,23 +60,25 @@ properties: type: array userIcon: type: string - username: - type: string - deprecated: true - description: -| - **DEPRECATED:** VRChat API no longer return usernames of other users. [See issue by Tupper for more information](https://github.com/pypy-vrc/VRCX/issues/429). - location: - type: string - friendKey: - type: string required: - - id - - displayName - - statusDescription + - currentAvatarImageUrl - developerType + - displayName + - friendKey + - id + - isFriend + - imageUrl - last_platform + - location + - last_login + - last_activity + - last_mobile + - platform + - profilePicOverride + - profilePicOverrideThumbnail - status - - isFriend + - statusDescription - tags -title: LimitedUser + - userIcon +title: LimitedUserFriend type: object diff --git a/openapi/components/schemas/LimitedUserInstance.yaml b/openapi/components/schemas/LimitedUserInstance.yaml new file mode 100644 index 00000000..343c36bb --- /dev/null +++ b/openapi/components/schemas/LimitedUserInstance.yaml @@ -0,0 +1,95 @@ +description: 'User object received when querying your own instance' +properties: + ageVerificationStatus: + $ref: ./AgeVerificationStatus.yaml + ageVerified: + $ref: ./AgeVerified.yaml + allowAvatarCopying: + type: boolean + bio: + type: string + bioLinks: + description: ' ' + type: array + items: + type: string + currentAvatarImageUrl: + $ref: ./CurrentAvatarImageUrl.yaml + currentAvatarThumbnailImageUrl: + $ref: ./CurrentAvatarThumbnailImageUrl.yaml + currentAvatarTags: + type: array + items: + $ref: ./Tag.yaml + date_joined: + type: string + nullable: true + format: date-time + developerType: + $ref: ./DeveloperType.yaml + displayName: + type: string + friendKey: + type: string + id: + $ref: ./UserID.yaml + isFriend: + type: boolean + imageUrl: + type: string + last_platform: + $ref: ./Platform.yaml + last_activity: + type: string + nullable: true + format: date-time + last_mobile: + type: string + nullable: true + format: date-time + platform: + type: string + profilePicOverride: + type: string + profilePicOverrideThumbnail: + type: string + pronouns: + type: string + state: + $ref: ./UserState.yaml + status: + $ref: ./UserStatus.yaml + statusDescription: + type: string + tags: + items: + $ref: ./Tag.yaml + type: array + userIcon: + type: string +required: + - ageVerificationStatus + - ageVerified + - allowAvatarCopying + - currentAvatarImageUrl + - currentAvatarThumbnailImageUrl + - currentAvatarTags + - date_joined + - developerType + - displayName + - friendKey + - id + - isFriend + - last_platform + - last_activity + - last_mobile + - profilePicOverride + - profilePicOverrideThumbnail + - pronouns + - state + - status + - statusDescription + - tags + - userIcon +title: LimitedUserInstance +type: object diff --git a/openapi/components/schemas/LimitedUserSearch.yaml b/openapi/components/schemas/LimitedUserSearch.yaml new file mode 100644 index 00000000..123448aa --- /dev/null +++ b/openapi/components/schemas/LimitedUserSearch.yaml @@ -0,0 +1,58 @@ +description: 'User object received when searching' +properties: + bio: + type: string + bioLinks: + description: ' ' + type: array + items: + type: string + currentAvatarImageUrl: + $ref: ./CurrentAvatarImageUrl.yaml + currentAvatarThumbnailImageUrl: + $ref: ./CurrentAvatarThumbnailImageUrl.yaml + currentAvatarTags: + type: array + items: + $ref: ./Tag.yaml + developerType: + $ref: ./DeveloperType.yaml + displayName: + type: string + id: + $ref: ./UserID.yaml + isFriend: + type: boolean + last_platform: + $ref: ./Platform.yaml + profilePicOverride: + type: string + pronouns: + type: string + status: + $ref: ./UserStatus.yaml + statusDescription: + type: string + tags: + description: <- Always empty. + items: + $ref: ./Tag.yaml + type: array + userIcon: + type: string +required: + - currentAvatarImageUrl + - currentAvatarThumbnailImageUrl + - currentAvatarTags + - developerType + - displayName + - id + - isFriend + - last_platform + - profilePicOverride + - status + - statusDescription + - tags + - userIcon +title: LimitedUserSearch +type: object diff --git a/openapi/components/schemas/Subscription.yaml b/openapi/components/schemas/Subscription.yaml index 6a3e956e..e915095f 100644 --- a/openapi/components/schemas/Subscription.yaml +++ b/openapi/components/schemas/Subscription.yaml @@ -26,6 +26,9 @@ properties: picoSku: type: string minLength: 1 + appleProductId: + type: string + minLength: 1 amount: type: number description: diff --git a/openapi/components/schemas/TokenBundle.yaml b/openapi/components/schemas/TokenBundle.yaml index 5bbdd91c..56904064 100644 --- a/openapi/components/schemas/TokenBundle.yaml +++ b/openapi/components/schemas/TokenBundle.yaml @@ -7,6 +7,8 @@ properties: type: string oculusSku: type: string + googleProductId: + type: string amount: type: integer description: price of the bundle