Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI] Regenerated from spec #22

Merged
merged 6 commits into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions vrchat_dart/lib/src/convenience/user_extensions.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ extension CurrentUserExtension on CurrentUser {
/// Convert a [CurrentUser] to a [User]
User toUser() {
final currentUserJson = toJson();
currentUserJson['friendRequestStatus'] = '';
currentUserJson['last_activity'] = '';
currentUserJson['platform'] = '';
return User.fromJson(currentUserJson);
}

Expand All @@ -23,7 +21,8 @@ extension UserExtension on User {
/// Convert a [User] to a [LimitedUser]
LimitedUser toLimitedUser() {
final userJson = toJson();
userJson['fallbackAvatar'] = '';
userJson['last_login'] =
lastLogin.isNotEmpty ? DateTime.parse(lastLogin) : null;
return LimitedUser.fromJson(userJson);
}
}
1 change: 1 addition & 0 deletions vrchat_dart/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ dev_dependencies:
yaml: ^3.1.1
fixer: ^0.1.0
path: ^1.9.0
recase: ^4.1.0
49 changes: 49 additions & 0 deletions vrchat_dart/tool/patch_output.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'dart:io';

import 'package:fixer/fixer.dart';
import 'package:path/path.dart' as path;
import 'package:recase/recase.dart';

void main() async {
final spec =
Expand Down Expand Up @@ -100,11 +101,59 @@ void patchApi() {
}

void patchAnalysisIssues() {
// Map of file path to set of identifiers with issues
final identifierIssues = <String, Set<String>>{};

fix(
{
'deprecated_member_use_from_same_package': (_, line) =>
'// ignore: deprecated_member_use_from_same_package\n$line',
'non_constant_identifier_names': (diagnostic, line) {
final fieldMatch = RegExp(r'final .+ (\w+);').firstMatch(line);
if (fieldMatch != null) {
final group = fieldMatch[1]!;
final file = diagnostic.location.file;
identifierIssues.update(
file,
(value) => value..add(group),
ifAbsent: () => {group},
);
}
return line;
},
},
workingDirectory: '../vrchat_dart_generated',
);

for (final MapEntry(:key, :value) in identifierIssues.entries) {
final file = File(key);
var contents = file.readAsStringSync();
for (final identifier in value) {
final newIdentifier = identifier.camelCase;
contents = contents
// Constructor parameters
.replaceAllMapped(
// This is regex
// ignore: unnecessary_string_escapes
RegExp('this\.$identifier\\b(.*)'),
(m) => 'this.$newIdentifier${m[1]}',
)
// Fields
.replaceAllMapped(
RegExp('final (.+) $identifier;'),
(m) => 'final ${m[1]} $newIdentifier;',
)
// Equals operator
.replaceAll(
RegExp('other.$identifier == $identifier'),
'other.$newIdentifier == $newIdentifier',
)
// Hashcode
.replaceAll(
RegExp('$identifier.hashCode'),
'$newIdentifier.hashCode',
);
}
file.writeAsStringSync(contents);
}
}
63 changes: 63 additions & 0 deletions vrchat_dart_generated/.openapi-generator/FILES
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,20 @@
README.md
doc/APIConfig.md
doc/APIConfigAnnouncement.md
doc/APIConfigConstants.md
doc/APIConfigConstantsGROUPS.md
doc/APIConfigConstantsINSTANCE.md
doc/APIConfigConstantsINSTANCEPOPULATIONBRACKETS.md
doc/APIConfigConstantsINSTANCEPOPULATIONBRACKETSCROWDED.md
doc/APIConfigConstantsINSTANCEPOPULATIONBRACKETSFEW.md
doc/APIConfigConstantsINSTANCEPOPULATIONBRACKETSMANY.md
doc/APIConfigConstantsLANGUAGE.md
doc/APIConfigDownloadURLList.md
doc/APIConfigEvents.md
doc/APIConfigMinSupportedClientBuildNumber.md
doc/APIConfigOfflineAnalysis.md
doc/APIConfigReportCategories.md
doc/APIConfigReportReasons.md
doc/APIHealth.md
doc/AccountDeletionLog.md
doc/AddFavoriteRequest.md
Expand Down Expand Up @@ -36,6 +48,7 @@ doc/Favorite.md
doc/FavoriteGroup.md
doc/FavoriteGroupVisibility.md
doc/FavoriteType.md
doc/FavoritedWorld.md
doc/FavoritesApi.md
doc/File.md
doc/FileData.md
Expand Down Expand Up @@ -86,6 +99,9 @@ doc/InviteMessage.md
doc/InviteMessageType.md
doc/InviteRequest.md
doc/InviteResponse.md
doc/Jam.md
doc/JamStateChangeDates.md
doc/JamsApi.md
doc/License.md
doc/LicenseAction.md
doc/LicenseGroup.md
Expand All @@ -108,19 +124,24 @@ doc/NotificationsApi.md
doc/OrderOption.md
doc/PaginatedGroupAuditLogEntryList.md
doc/PastDisplayName.md
doc/PerformanceRatings.md
doc/Permission.md
doc/PermissionsApi.md
doc/PlatformBuildInfo.md
doc/PlayerModeration.md
doc/PlayerModerationType.md
doc/PlayermoderationApi.md
doc/Region.md
doc/ReleaseStatus.md
doc/ReportCategory.md
doc/ReportReason.md
doc/RepresentedGroup.md
doc/RequestInviteRequest.md
doc/RespondGroupJoinRequest.md
doc/Response.md
doc/SentNotification.md
doc/SortOption.md
doc/Submission.md
doc/Subscription.md
doc/SubscriptionPeriod.md
doc/Success.md
Expand Down Expand Up @@ -165,6 +186,7 @@ lib/src/api/friends_api.dart
lib/src/api/groups_api.dart
lib/src/api/instances_api.dart
lib/src/api/invite_api.dart
lib/src/api/jams_api.dart
lib/src/api/notifications_api.dart
lib/src/api/permissions_api.dart
lib/src/api/playermoderation_api.dart
Expand All @@ -182,8 +204,20 @@ lib/src/model/add_favorite_request.dart
lib/src/model/add_group_gallery_image_request.dart
lib/src/model/api_config.dart
lib/src/model/api_config_announcement.dart
lib/src/model/api_config_constants.dart
lib/src/model/api_config_constants_groups.dart
lib/src/model/api_config_constants_instance.dart
lib/src/model/api_config_constants_instancepopulationbrackets.dart
lib/src/model/api_config_constants_instancepopulationbracketscrowded.dart
lib/src/model/api_config_constants_instancepopulationbracketsfew.dart
lib/src/model/api_config_constants_instancepopulationbracketsmany.dart
lib/src/model/api_config_constants_language.dart
lib/src/model/api_config_download_url_list.dart
lib/src/model/api_config_events.dart
lib/src/model/api_config_min_supported_client_build_number.dart
lib/src/model/api_config_offline_analysis.dart
lib/src/model/api_config_report_categories.dart
lib/src/model/api_config_report_reasons.dart
lib/src/model/api_health.dart
lib/src/model/avatar.dart
lib/src/model/avatar_unity_package_url_object.dart
Expand All @@ -210,6 +244,7 @@ lib/src/model/favorite.dart
lib/src/model/favorite_group.dart
lib/src/model/favorite_group_visibility.dart
lib/src/model/favorite_type.dart
lib/src/model/favorited_world.dart
lib/src/model/file.dart
lib/src/model/file_data.dart
lib/src/model/file_status.dart
Expand Down Expand Up @@ -254,6 +289,8 @@ lib/src/model/invite_message.dart
lib/src/model/invite_message_type.dart
lib/src/model/invite_request.dart
lib/src/model/invite_response.dart
lib/src/model/jam.dart
lib/src/model/jam_state_change_dates.dart
lib/src/model/license.dart
lib/src/model/license_action.dart
lib/src/model/license_group.dart
Expand All @@ -275,17 +312,22 @@ lib/src/model/notification_type.dart
lib/src/model/order_option.dart
lib/src/model/paginated_group_audit_log_entry_list.dart
lib/src/model/past_display_name.dart
lib/src/model/performance_ratings.dart
lib/src/model/permission.dart
lib/src/model/platform_build_info.dart
lib/src/model/player_moderation.dart
lib/src/model/player_moderation_type.dart
lib/src/model/region.dart
lib/src/model/release_status.dart
lib/src/model/report_category.dart
lib/src/model/report_reason.dart
lib/src/model/represented_group.dart
lib/src/model/request_invite_request.dart
lib/src/model/respond_group_join_request.dart
lib/src/model/response.dart
lib/src/model/sent_notification.dart
lib/src/model/sort_option.dart
lib/src/model/submission.dart
lib/src/model/subscription.dart
lib/src/model/subscription_period.dart
lib/src/model/success.dart
Expand Down Expand Up @@ -322,8 +364,20 @@ test/account_deletion_log_test.dart
test/add_favorite_request_test.dart
test/add_group_gallery_image_request_test.dart
test/api_config_announcement_test.dart
test/api_config_constants_groups_test.dart
test/api_config_constants_instance_test.dart
test/api_config_constants_instancepopulationbrackets_test.dart
test/api_config_constants_instancepopulationbracketscrowded_test.dart
test/api_config_constants_instancepopulationbracketsfew_test.dart
test/api_config_constants_instancepopulationbracketsmany_test.dart
test/api_config_constants_language_test.dart
test/api_config_constants_test.dart
test/api_config_download_url_list_test.dart
test/api_config_events_test.dart
test/api_config_min_supported_client_build_number_test.dart
test/api_config_offline_analysis_test.dart
test/api_config_report_categories_test.dart
test/api_config_report_reasons_test.dart
test/api_config_test.dart
test/api_health_test.dart
test/authentication_api_test.dart
Expand Down Expand Up @@ -354,6 +408,7 @@ test/favorite_group_test.dart
test/favorite_group_visibility_test.dart
test/favorite_test.dart
test/favorite_type_test.dart
test/favorited_world_test.dart
test/favorites_api_test.dart
test/file_data_test.dart
test/file_status_test.dart
Expand Down Expand Up @@ -404,6 +459,9 @@ test/invite_message_test.dart
test/invite_message_type_test.dart
test/invite_request_test.dart
test/invite_response_test.dart
test/jam_state_change_dates_test.dart
test/jam_test.dart
test/jams_api_test.dart
test/license_action_test.dart
test/license_group_test.dart
test/license_test.dart
Expand All @@ -426,19 +484,24 @@ test/notifications_api_test.dart
test/order_option_test.dart
test/paginated_group_audit_log_entry_list_test.dart
test/past_display_name_test.dart
test/performance_ratings_test.dart
test/permission_test.dart
test/permissions_api_test.dart
test/platform_build_info_test.dart
test/player_moderation_test.dart
test/player_moderation_type_test.dart
test/playermoderation_api_test.dart
test/region_test.dart
test/release_status_test.dart
test/report_category_test.dart
test/report_reason_test.dart
test/represented_group_test.dart
test/request_invite_request_test.dart
test/respond_group_join_request_test.dart
test/response_test.dart
test/sent_notification_test.dart
test/sort_option_test.dart
test/submission_test.dart
test/subscription_period_test.dart
test/subscription_test.dart
test/success_test.dart
Expand Down
2 changes: 1 addition & 1 deletion vrchat_dart_generated/.openapi-generator/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.8.0
7.9.0
3 changes: 3 additions & 0 deletions vrchat_dart_generated/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 1.18.5
- Updated to match spec

## 1.18.4
- Updated to match spec

Expand Down
Loading