diff --git a/lib/src/common/model/authorizations.g.dart b/lib/src/common/model/authorizations.g.dart
index 7c3a2e73..918a8a47 100644
--- a/lib/src/common/model/authorizations.g.dart
+++ b/lib/src/common/model/authorizations.g.dart
@@ -8,7 +8,7 @@ part of 'authorizations.dart';
 
 Authorization _$AuthorizationFromJson(Map<String, dynamic> json) =>
     Authorization(
-      id: json['id'] as int?,
+      id: (json['id'] as num?)?.toInt(),
       scopes:
           (json['scopes'] as List<dynamic>?)?.map((e) => e as String).toList(),
       token: json['token'] as String?,
diff --git a/lib/src/common/model/gists.g.dart b/lib/src/common/model/gists.g.dart
index e1d6db23..3438e5ea 100644
--- a/lib/src/common/model/gists.g.dart
+++ b/lib/src/common/model/gists.g.dart
@@ -20,7 +20,7 @@ Gist _$GistFromJson(Map<String, dynamic> json) => Gist(
         (k, e) => MapEntry(k, GistFile.fromJson(e as Map<String, dynamic>)),
       ),
       htmlUrl: json['html_url'] as String?,
-      commentsCount: json['comments'] as int?,
+      commentsCount: (json['comments'] as num?)?.toInt(),
       gitPullUrl: json['git_pull_url'] as String?,
       gitPushUrl: json['git_push_url'] as String?,
       createdAt: json['created_at'] == null
@@ -48,7 +48,7 @@ Map<String, dynamic> _$GistToJson(Gist instance) => <String, dynamic>{
 
 GistFile _$GistFileFromJson(Map<String, dynamic> json) => GistFile(
       filename: json['filename'] as String?,
-      size: json['size'] as int?,
+      size: (json['size'] as num?)?.toInt(),
       rawUrl: json['raw_url'] as String?,
       type: json['type'] as String?,
       language: json['language'] as String?,
@@ -70,7 +70,7 @@ GistFork _$GistForkFromJson(Map<String, dynamic> json) => GistFork(
       user: json['user'] == null
           ? null
           : User.fromJson(json['user'] as Map<String, dynamic>),
-      id: json['id'] as int?,
+      id: (json['id'] as num?)?.toInt(),
       createdAt: json['created_at'] == null
           ? null
           : DateTime.parse(json['created_at'] as String),
@@ -92,9 +92,9 @@ GistHistoryEntry _$GistHistoryEntryFromJson(Map<String, dynamic> json) =>
       user: json['user'] == null
           ? null
           : User.fromJson(json['user'] as Map<String, dynamic>),
-      deletions: json['change_status/deletions'] as int?,
-      additions: json['change_status/additions'] as int?,
-      totalChanges: json['change_status/total'] as int?,
+      deletions: (json['change_status/deletions'] as num?)?.toInt(),
+      additions: (json['change_status/additions'] as num?)?.toInt(),
+      totalChanges: (json['change_status/total'] as num?)?.toInt(),
       committedAt: json['committed_at'] == null
           ? null
           : DateTime.parse(json['committed_at'] as String),
@@ -111,7 +111,7 @@ Map<String, dynamic> _$GistHistoryEntryToJson(GistHistoryEntry instance) =>
     };
 
 GistComment _$GistCommentFromJson(Map<String, dynamic> json) => GistComment(
-      id: json['id'] as int?,
+      id: (json['id'] as num?)?.toInt(),
       user: json['user'] == null
           ? null
           : User.fromJson(json['user'] as Map<String, dynamic>),
diff --git a/lib/src/common/model/git.g.dart b/lib/src/common/model/git.g.dart
index 61d5fc44..e041aeb3 100644
--- a/lib/src/common/model/git.g.dart
+++ b/lib/src/common/model/git.g.dart
@@ -11,7 +11,7 @@ GitBlob _$GitBlobFromJson(Map<String, dynamic> json) => GitBlob(
       encoding: json['encoding'] as String?,
       url: json['url'] as String?,
       sha: json['sha'] as String?,
-      size: json['size'] as int?,
+      size: (json['size'] as num?)?.toInt(),
     );
 
 Map<String, dynamic> _$GitBlobToJson(GitBlob instance) => <String, dynamic>{
@@ -50,7 +50,7 @@ GitCommit _$GitCommitFromJson(Map<String, dynamic> json) => GitCommit(
       parents: (json['parents'] as List<dynamic>?)
           ?.map((e) => GitCommit.fromJson(e as Map<String, dynamic>))
           .toList(),
-      commentCount: json['comment_count'] as int?,
+      commentCount: (json['comment_count'] as num?)?.toInt(),
     );
 
 Map<String, dynamic> _$GitCommitToJson(GitCommit instance) => <String, dynamic>{
@@ -130,7 +130,7 @@ GitTreeEntry _$GitTreeEntryFromJson(Map<String, dynamic> json) => GitTreeEntry(
       json['path'] as String?,
       json['mode'] as String?,
       json['type'] as String?,
-      json['size'] as int?,
+      (json['size'] as num?)?.toInt(),
       json['sha'] as String?,
       json['url'] as String?,
     );
diff --git a/lib/src/common/model/issues.g.dart b/lib/src/common/model/issues.g.dart
index 40bbfa94..e4a80082 100644
--- a/lib/src/common/model/issues.g.dart
+++ b/lib/src/common/model/issues.g.dart
@@ -7,10 +7,10 @@ part of 'issues.dart';
 // **************************************************************************
 
 Issue _$IssueFromJson(Map<String, dynamic> json) => Issue(
-      id: json['id'] as int? ?? 0,
+      id: (json['id'] as num?)?.toInt() ?? 0,
       url: json['url'] as String? ?? '',
       htmlUrl: json['html_url'] as String? ?? '',
-      number: json['number'] as int? ?? 0,
+      number: (json['number'] as num?)?.toInt() ?? 0,
       state: json['state'] as String? ?? '',
       title: json['title'] as String? ?? '',
       user: json['user'] == null
@@ -29,7 +29,7 @@ Issue _$IssueFromJson(Map<String, dynamic> json) => Issue(
       milestone: json['milestone'] == null
           ? null
           : Milestone.fromJson(json['milestone'] as Map<String, dynamic>),
-      commentsCount: json['comments'] as int? ?? 0,
+      commentsCount: (json['comments'] as num?)?.toInt() ?? 0,
       pullRequest: json['pull_request'] == null
           ? null
           : IssuePullRequest.fromJson(
@@ -119,7 +119,7 @@ IssueRequest _$IssueRequestFromJson(Map<String, dynamic> json) => IssueRequest(
           ?.map((e) => e as String)
           .toList(),
       state: json['state'] as String?,
-      milestone: json['milestone'] as int?,
+      milestone: (json['milestone'] as num?)?.toInt(),
     );
 
 Map<String, dynamic> _$IssueRequestToJson(IssueRequest instance) =>
@@ -148,7 +148,7 @@ Map<String, dynamic> _$IssuePullRequestToJson(IssuePullRequest instance) =>
     };
 
 IssueComment _$IssueCommentFromJson(Map<String, dynamic> json) => IssueComment(
-      id: json['id'] as int?,
+      id: (json['id'] as num?)?.toInt(),
       body: json['body'] as String?,
       user: json['user'] == null
           ? null
@@ -192,16 +192,16 @@ Map<String, dynamic> _$IssueLabelToJson(IssueLabel instance) =>
     };
 
 Milestone _$MilestoneFromJson(Map<String, dynamic> json) => Milestone(
-      id: json['id'] as int?,
-      number: json['number'] as int?,
+      id: (json['id'] as num?)?.toInt(),
+      number: (json['number'] as num?)?.toInt(),
       state: json['state'] as String?,
       title: json['title'] as String?,
       description: json['description'] as String?,
       creator: json['creator'] == null
           ? null
           : User.fromJson(json['creator'] as Map<String, dynamic>),
-      openIssuesCount: json['open_issues'] as int?,
-      closedIssuesCount: json['closed_issues'] as int?,
+      openIssuesCount: (json['open_issues'] as num?)?.toInt(),
+      closedIssuesCount: (json['closed_issues'] as num?)?.toInt(),
       createdAt: json['created_at'] == null
           ? null
           : DateTime.parse(json['created_at'] as String),
diff --git a/lib/src/common/model/keys.g.dart b/lib/src/common/model/keys.g.dart
index 1db24c87..7cecbcf2 100644
--- a/lib/src/common/model/keys.g.dart
+++ b/lib/src/common/model/keys.g.dart
@@ -7,7 +7,7 @@ part of 'keys.dart';
 // **************************************************************************
 
 PublicKey _$PublicKeyFromJson(Map<String, dynamic> json) => PublicKey(
-      id: json['id'] as int?,
+      id: (json['id'] as num?)?.toInt(),
       key: json['key'] as String?,
       title: json['title'] as String?,
     );
diff --git a/lib/src/common/model/misc.g.dart b/lib/src/common/model/misc.g.dart
index d7b3896c..4ad9a310 100644
--- a/lib/src/common/model/misc.g.dart
+++ b/lib/src/common/model/misc.g.dart
@@ -19,8 +19,8 @@ Map<String, dynamic> _$GitignoreTemplateToJson(GitignoreTemplate instance) =>
     };
 
 RateLimit _$RateLimitFromJson(Map<String, dynamic> json) => RateLimit(
-      json['limit'] as int?,
-      json['remaining'] as int?,
+      (json['limit'] as num?)?.toInt(),
+      (json['remaining'] as num?)?.toInt(),
       json['resets'] == null ? null : DateTime.parse(json['resets'] as String),
     );
 
diff --git a/lib/src/common/model/orgs.g.dart b/lib/src/common/model/orgs.g.dart
index c32f6702..dc9dc349 100644
--- a/lib/src/common/model/orgs.g.dart
+++ b/lib/src/common/model/orgs.g.dart
@@ -8,7 +8,7 @@ part of 'orgs.dart';
 
 Organization _$OrganizationFromJson(Map<String, dynamic> json) => Organization(
       login: json['login'] as String?,
-      id: json['id'] as int?,
+      id: (json['id'] as num?)?.toInt(),
       htmlUrl: json['html_url'] as String?,
       avatarUrl: json['avatar_url'] as String?,
       name: json['name'] as String?,
@@ -16,10 +16,10 @@ Organization _$OrganizationFromJson(Map<String, dynamic> json) => Organization(
       blog: json['blog'] as String?,
       location: json['location'] as String?,
       email: json['email'] as String?,
-      publicReposCount: json['public_repos'] as int?,
-      publicGistsCount: json['public_gists'] as int?,
-      followersCount: json['followers'] as int?,
-      followingCount: json['following'] as int?,
+      publicReposCount: (json['public_repos'] as num?)?.toInt(),
+      publicGistsCount: (json['public_gists'] as num?)?.toInt(),
+      followersCount: (json['followers'] as num?)?.toInt(),
+      followingCount: (json['following'] as num?)?.toInt(),
       createdAt: json['created_at'] == null
           ? null
           : DateTime.parse(json['created_at'] as String),
@@ -66,9 +66,9 @@ Map<String, dynamic> _$OrganizationMembershipToJson(
 Team _$TeamFromJson(Map<String, dynamic> json) => Team(
       description: json['description'] as String?,
       htmlUrl: json['html_url'] as String?,
-      id: json['id'] as int?,
+      id: (json['id'] as num?)?.toInt(),
       ldapDn: json['ldap_dn'] as String?,
-      membersCount: json['members_count'] as int?,
+      membersCount: (json['members_count'] as num?)?.toInt(),
       membersUrl: json['members_url'] as String?,
       name: json['name'] as String?,
       nodeId: json['node_id'] as String?,
@@ -83,7 +83,7 @@ Team _$TeamFromJson(Map<String, dynamic> json) => Team(
           ? null
           : Permissions.fromJson(json['permissions'] as Map<String, dynamic>),
       privacy: json['privacy'] as String?,
-      reposCount: json['repos_count'] as int?,
+      reposCount: (json['repos_count'] as num?)?.toInt(),
       repositoriesUrl: json['repositories_url'] as String?,
       slug: json['slug'] as String?,
       url: json['url'] as String?,
@@ -128,7 +128,7 @@ Map<String, dynamic> _$PermissionsToJson(Permissions instance) =>
 
 TeamMember _$TeamMemberFromJson(Map<String, dynamic> json) => TeamMember(
       login: json['login'] as String?,
-      id: json['id'] as int?,
+      id: (json['id'] as num?)?.toInt(),
       avatarUrl: json['avatar_url'] as String?,
       type: json['type'] as String?,
       siteAdmin: json['site_admin'] as bool?,
diff --git a/lib/src/common/model/pulls.g.dart b/lib/src/common/model/pulls.g.dart
index cf370e22..e7dea0cb 100644
--- a/lib/src/common/model/pulls.g.dart
+++ b/lib/src/common/model/pulls.g.dart
@@ -7,12 +7,12 @@ part of 'pulls.dart';
 // **************************************************************************
 
 PullRequest _$PullRequestFromJson(Map<String, dynamic> json) => PullRequest(
-      id: json['id'] as int?,
+      id: (json['id'] as num?)?.toInt(),
       nodeId: json['node_id'] as String?,
       htmlUrl: json['html_url'] as String?,
       diffUrl: json['diff_url'] as String?,
       patchUrl: json['patch_url'] as String?,
-      number: json['number'] as int?,
+      number: (json['number'] as num?)?.toInt(),
       state: json['state'] as String?,
       title: json['title'] as String?,
       body: json['body'] as String?,
@@ -44,18 +44,18 @@ PullRequest _$PullRequestFromJson(Map<String, dynamic> json) => PullRequest(
       mergedBy: json['merged_by'] == null
           ? null
           : User.fromJson(json['merged_by'] as Map<String, dynamic>),
-      commentsCount: json['comments'] as int? ?? 0,
-      commitsCount: json['commits'] as int? ?? 0,
-      additionsCount: json['additions'] as int? ?? 0,
-      deletionsCount: json['deletions'] as int? ?? 0,
-      changedFilesCount: json['changed_files'] as int? ?? 0,
+      commentsCount: (json['comments'] as num?)?.toInt() ?? 0,
+      commitsCount: (json['commits'] as num?)?.toInt() ?? 0,
+      additionsCount: (json['additions'] as num?)?.toInt() ?? 0,
+      deletionsCount: (json['deletions'] as num?)?.toInt() ?? 0,
+      changedFilesCount: (json['changed_files'] as num?)?.toInt() ?? 0,
       labels: (json['labels'] as List<dynamic>?)
           ?.map((e) => IssueLabel.fromJson(e as Map<String, dynamic>))
           .toList(),
       requestedReviewers: (json['requested_reviewers'] as List<dynamic>?)
           ?.map((e) => User.fromJson(e as Map<String, dynamic>))
           .toList(),
-      reviewCommentCount: json['review_comments'] as int? ?? 0,
+      reviewCommentCount: (json['review_comments'] as num?)?.toInt() ?? 0,
       milestone: json['milestone'] == null
           ? null
           : Milestone.fromJson(json['milestone'] as Map<String, dynamic>),
@@ -162,11 +162,11 @@ Map<String, dynamic> _$CreatePullRequestToJson(CreatePullRequest instance) =>
 
 PullRequestComment _$PullRequestCommentFromJson(Map<String, dynamic> json) =>
     PullRequestComment(
-      id: json['id'] as int?,
+      id: (json['id'] as num?)?.toInt(),
       diffHunk: json['diff_hunk'] as String?,
       path: json['path'] as String?,
-      position: json['position'] as int?,
-      originalPosition: json['original_position'] as int?,
+      position: (json['position'] as num?)?.toInt(),
+      originalPosition: (json['original_position'] as num?)?.toInt(),
       commitId: json['commit_id'] as String?,
       originalCommitId: json['original_commit_id'] as String?,
       user: json['user'] == null
@@ -210,7 +210,7 @@ CreatePullRequestComment _$CreatePullRequestCommentFromJson(
       json['body'] as String?,
       json['commit_id'] as String?,
       json['path'] as String?,
-      json['position'] as int?,
+      (json['position'] as num?)?.toInt(),
     );
 
 Map<String, dynamic> _$CreatePullRequestCommentToJson(
@@ -227,9 +227,9 @@ PullRequestFile _$PullRequestFileFromJson(Map<String, dynamic> json) =>
       sha: json['sha'] as String?,
       filename: json['filename'] as String?,
       status: json['status'] as String?,
-      additionsCount: json['additions'] as int?,
-      deletionsCount: json['deletions'] as int?,
-      changesCount: json['changes'] as int?,
+      additionsCount: (json['additions'] as num?)?.toInt(),
+      deletionsCount: (json['deletions'] as num?)?.toInt(),
+      changesCount: (json['changes'] as num?)?.toInt(),
       blobUrl: json['blob_url'] as String?,
       rawUrl: json['raw_url'] as String?,
       contentsUrl: json['contents_url'] as String?,
@@ -252,7 +252,7 @@ Map<String, dynamic> _$PullRequestFileToJson(PullRequestFile instance) =>
 
 PullRequestReview _$PullRequestReviewFromJson(Map<String, dynamic> json) =>
     PullRequestReview(
-      id: json['id'] as int,
+      id: (json['id'] as num).toInt(),
       user: json['user'] == null
           ? null
           : User.fromJson(json['user'] as Map<String, dynamic>),
@@ -285,7 +285,7 @@ CreatePullRequestReview _$CreatePullRequestReviewFromJson(
     CreatePullRequestReview(
       json['owner'] as String,
       json['repo'] as String,
-      json['pull_number'] as int,
+      (json['pull_number'] as num).toInt(),
       json['event'] as String,
       body: json['body'] as String?,
       comments: (json['comments'] as List<dynamic>?)
@@ -318,26 +318,26 @@ PullRequestReviewComment _$PullRequestReviewCommentFromJson(
           : DateTime.parse(json['created_at'] as String),
       diffHunk: json['diff_hunk'] as String?,
       htmlUrl: json['html_url'] as String?,
-      id: json['id'] as int?,
-      inReplyToId: json['in_reply_to_id'] as int?,
-      line: json['line'] as int?,
+      id: (json['id'] as num?)?.toInt(),
+      inReplyToId: (json['in_reply_to_id'] as num?)?.toInt(),
+      line: (json['line'] as num?)?.toInt(),
       links: json['_links'] == null
           ? null
           : ReviewLinks.fromJson(json['_links'] as Map<String, dynamic>),
       nodeId: json['node_id'] as String?,
       originalCommitId: json['original_commit_id'] as String?,
-      originalLine: json['original_line'] as int?,
-      originalPosition: json['original_position'] as int?,
-      originalStartLine: json['original_start_line'] as int?,
+      originalLine: (json['original_line'] as num?)?.toInt(),
+      originalPosition: (json['original_position'] as num?)?.toInt(),
+      originalStartLine: (json['original_start_line'] as num?)?.toInt(),
       path: json['path'] as String?,
-      position: json['position'] as int?,
-      pullRequestReviewId: json['pull_request_review_id'] as int?,
+      position: (json['position'] as num?)?.toInt(),
+      pullRequestReviewId: (json['pull_request_review_id'] as num?)?.toInt(),
       pullRequestUrl: json['pull_request_url'] as String?,
       reactions: json['reactions'] == null
           ? null
           : ReactionRollup.fromJson(json['reactions'] as Map<String, dynamic>),
       side: json['side'] as String?,
-      startLine: json['start_line'] as int?,
+      startLine: (json['start_line'] as num?)?.toInt(),
       startSide: json['start_side'] as String?,
       subjectType: json['subject_type'] as String?,
       updatedAt: json['updated_at'] == null
diff --git a/lib/src/common/model/reaction.g.dart b/lib/src/common/model/reaction.g.dart
index d94eede4..4647e160 100644
--- a/lib/src/common/model/reaction.g.dart
+++ b/lib/src/common/model/reaction.g.dart
@@ -7,7 +7,7 @@ part of 'reaction.dart';
 // **************************************************************************
 
 Reaction _$ReactionFromJson(Map<String, dynamic> json) => Reaction(
-      id: json['id'] as int?,
+      id: (json['id'] as num?)?.toInt(),
       nodeId: json['node_id'] as String?,
       user: json['user'] == null
           ? null
@@ -28,15 +28,15 @@ Map<String, dynamic> _$ReactionToJson(Reaction instance) => <String, dynamic>{
 
 ReactionRollup _$ReactionRollupFromJson(Map<String, dynamic> json) =>
     ReactionRollup(
-      plusOne: json['+1'] as int?,
-      minusOne: json['-1'] as int?,
-      confused: json['confused'] as int?,
-      eyes: json['eyes'] as int?,
-      heart: json['heart'] as int?,
-      hooray: json['hooray'] as int?,
-      laugh: json['laugh'] as int?,
-      rocket: json['rocket'] as int?,
-      totalCount: json['total_count'] as int?,
+      plusOne: (json['+1'] as num?)?.toInt(),
+      minusOne: (json['-1'] as num?)?.toInt(),
+      confused: (json['confused'] as num?)?.toInt(),
+      eyes: (json['eyes'] as num?)?.toInt(),
+      heart: (json['heart'] as num?)?.toInt(),
+      hooray: (json['hooray'] as num?)?.toInt(),
+      laugh: (json['laugh'] as num?)?.toInt(),
+      rocket: (json['rocket'] as num?)?.toInt(),
+      totalCount: (json['total_count'] as num?)?.toInt(),
       url: json['url'] as String?,
     );
 
diff --git a/lib/src/common/model/repos.g.dart b/lib/src/common/model/repos.g.dart
index 490b18b1..fe19ea97 100644
--- a/lib/src/common/model/repos.g.dart
+++ b/lib/src/common/model/repos.g.dart
@@ -10,9 +10,9 @@ GitHubComparison _$GitHubComparisonFromJson(Map<String, dynamic> json) =>
     GitHubComparison(
       json['url'] as String?,
       json['status'] as String?,
-      json['ahead_by'] as int?,
-      json['behind_by'] as int?,
-      json['total_commits'] as int?,
+      (json['ahead_by'] as num?)?.toInt(),
+      (json['behind_by'] as num?)?.toInt(),
+      (json['total_commits'] as num?)?.toInt(),
       (json['files'] as List<dynamic>?)
           ?.map((e) => CommitFile.fromJson(e as Map<String, dynamic>))
           .toList(),
@@ -34,7 +34,7 @@ Map<String, dynamic> _$GitHubComparisonToJson(GitHubComparison instance) =>
 
 Repository _$RepositoryFromJson(Map<String, dynamic> json) => Repository(
       name: json['name'] as String? ?? '',
-      id: json['id'] as int? ?? 0,
+      id: (json['id'] as num?)?.toInt() ?? 0,
       fullName: json['full_name'] as String? ?? '',
       owner: json['owner'] == null
           ? null
@@ -51,17 +51,17 @@ Repository _$RepositoryFromJson(Map<String, dynamic> json) => Repository(
           : DateTime.parse(json['created_at'] as String),
       isPrivate: json['private'] as bool? ?? false,
       isFork: json['fork'] as bool? ?? false,
-      stargazersCount: json['stargazers_count'] as int? ?? 0,
-      watchersCount: json['watchers_count'] as int? ?? 0,
+      stargazersCount: (json['stargazers_count'] as num?)?.toInt() ?? 0,
+      watchersCount: (json['watchers_count'] as num?)?.toInt() ?? 0,
       language: json['language'] as String? ?? '',
       hasWiki: json['has_wiki'] as bool? ?? false,
       hasDownloads: json['has_downloads'] as bool? ?? false,
-      forksCount: json['forks_count'] as int? ?? 0,
-      openIssuesCount: json['open_issues_count'] as int? ?? 0,
-      subscribersCount: json['subscribers_count'] as int? ?? 0,
-      networkCount: json['network_count'] as int? ?? 0,
+      forksCount: (json['forks_count'] as num?)?.toInt() ?? 0,
+      openIssuesCount: (json['open_issues_count'] as num?)?.toInt() ?? 0,
+      subscribersCount: (json['subscribers_count'] as num?)?.toInt() ?? 0,
+      networkCount: (json['network_count'] as num?)?.toInt() ?? 0,
       hasIssues: json['has_issues'] as bool? ?? false,
-      size: json['size'] as int? ?? 0,
+      size: (json['size'] as num?)?.toInt() ?? 0,
       archived: json['archived'] as bool? ?? false,
       disabled: json['disabled'] as bool? ?? false,
       homepage: json['homepage'] as String? ?? '',
@@ -100,7 +100,7 @@ Repository _$RepositoryFromJson(Map<String, dynamic> json) => Repository(
       deploymentsUrl: json['deployments_url'] as String?,
       downloadsUrl: json['downloads_url'] as String?,
       eventsUrl: json['events_url'] as String?,
-      forks: json['forks'] as int?,
+      forks: (json['forks'] as num?)?.toInt(),
       forksUrl: json['forks_url'] as String?,
       gitCommitsUrl: json['git_commits_url'] as String?,
       gitRefsUrl: json['git_refs_url'] as String?,
@@ -123,7 +123,7 @@ Repository _$RepositoryFromJson(Map<String, dynamic> json) => Repository(
       mirrorUrl: json['mirror_url'] as String?,
       nodeId: json['node_id'] as String?,
       notificationsUrl: json['notifications_url'] as String?,
-      openIssues: json['open_issues'] as int?,
+      openIssues: (json['open_issues'] as num?)?.toInt(),
       organization: json['organization'] == null
           ? null
           : User.fromJson(json['organization'] as Map<String, dynamic>),
@@ -150,7 +150,7 @@ Repository _$RepositoryFromJson(Map<String, dynamic> json) => Repository(
       treesUrl: json['trees_url'] as String?,
       url: json['url'] as String?,
       visibility: json['visibility'] as String?,
-      watchers: json['watchers'] as int?,
+      watchers: (json['watchers'] as num?)?.toInt(),
       webCommitSignoffRequired: json['web_commit_signoff_required'] as bool?,
     );
 
@@ -320,7 +320,7 @@ Map<String, dynamic> _$CommitDataToJson(CommitData instance) =>
 CommitDataUser _$CommitDataUserFromJson(Map<String, dynamic> json) =>
     CommitDataUser(
       json['login'] as String?,
-      json['id'] as int?,
+      (json['id'] as num?)?.toInt(),
       json['type'] as String?,
     );
 
@@ -347,7 +347,7 @@ Map<String, dynamic> _$CommitInfoToJson(CommitInfo instance) =>
 UserInformation _$UserInformationFromJson(Map<String, dynamic> json) =>
     UserInformation(
       json['login'] as String,
-      json['id'] as int,
+      (json['id'] as num).toInt(),
       json['avatar_url'] as String,
       json['html_url'] as String,
     );
@@ -380,7 +380,7 @@ CreateRepository _$CreateRepositoryFromJson(Map<String, dynamic> json) =>
       private: json['private'] as bool?,
       hasIssues: json['has_issues'] as bool?,
       hasDownloads: json['has_downloads'] as bool?,
-      teamId: json['team_id'] as int?,
+      teamId: (json['team_id'] as num?)?.toInt(),
       autoInit: json['auto_init'] as bool?,
       gitignoreTemplate: json['gitignore_template'] as String?,
       licenseTemplate: json['license_template'] as String?,
@@ -419,7 +419,7 @@ LicenseDetails _$LicenseDetailsFromJson(Map<String, dynamic> json) =>
       name: json['name'] as String?,
       path: json['path'] as String?,
       sha: json['sha'] as String?,
-      size: json['size'] as int?,
+      size: (json['size'] as num?)?.toInt(),
       url: json['url'] == null ? null : Uri.parse(json['url'] as String),
       htmlUrl: json['html_url'] == null
           ? null
diff --git a/lib/src/common/model/repos_commits.g.dart b/lib/src/common/model/repos_commits.g.dart
index 5e74c999..a4b3a5fe 100644
--- a/lib/src/common/model/repos_commits.g.dart
+++ b/lib/src/common/model/repos_commits.g.dart
@@ -47,9 +47,9 @@ Map<String, dynamic> _$RepositoryCommitToJson(RepositoryCommit instance) =>
     };
 
 CommitStats _$CommitStatsFromJson(Map<String, dynamic> json) => CommitStats(
-      additions: json['additions'] as int?,
-      deletions: json['deletions'] as int?,
-      total: json['total'] as int?,
+      additions: (json['additions'] as num?)?.toInt(),
+      deletions: (json['deletions'] as num?)?.toInt(),
+      total: (json['total'] as num?)?.toInt(),
     );
 
 Map<String, dynamic> _$CommitStatsToJson(CommitStats instance) =>
@@ -61,9 +61,9 @@ Map<String, dynamic> _$CommitStatsToJson(CommitStats instance) =>
 
 CommitFile _$CommitFileFromJson(Map<String, dynamic> json) => CommitFile(
       name: json['filename'] as String?,
-      additions: json['additions'] as int?,
-      deletions: json['deletions'] as int?,
-      changes: json['changes'] as int?,
+      additions: (json['additions'] as num?)?.toInt(),
+      deletions: (json['deletions'] as num?)?.toInt(),
+      changes: (json['changes'] as num?)?.toInt(),
       status: json['status'] as String?,
       rawUrl: json['raw_url'] as String?,
       blobUrl: json['blob_url'] as String?,
@@ -84,9 +84,9 @@ Map<String, dynamic> _$CommitFileToJson(CommitFile instance) =>
 
 CommitComment _$CommitCommentFromJson(Map<String, dynamic> json) =>
     CommitComment(
-      id: json['id'] as int?,
-      line: json['line'] as int?,
-      position: json['position'] as int?,
+      id: (json['id'] as num?)?.toInt(),
+      line: (json['line'] as num?)?.toInt(),
+      position: (json['position'] as num?)?.toInt(),
       path: json['path'] as String?,
       apiUrl: json['url'] as String?,
       commitId: json['commit_id'] as String?,
diff --git a/lib/src/common/model/repos_contents.g.dart b/lib/src/common/model/repos_contents.g.dart
index 96f92749..84dc677b 100644
--- a/lib/src/common/model/repos_contents.g.dart
+++ b/lib/src/common/model/repos_contents.g.dart
@@ -9,7 +9,7 @@ part of 'repos_contents.dart';
 GitHubFile _$GitHubFileFromJson(Map<String, dynamic> json) => GitHubFile(
       type: json['type'] as String?,
       encoding: json['encoding'] as String?,
-      size: json['size'] as int?,
+      size: (json['size'] as num?)?.toInt(),
       name: json['name'] as String?,
       path: json['path'] as String?,
       content: json['content'] as String?,
diff --git a/lib/src/common/model/repos_hooks.g.dart b/lib/src/common/model/repos_hooks.g.dart
index c199f2ea..fa57fa4f 100644
--- a/lib/src/common/model/repos_hooks.g.dart
+++ b/lib/src/common/model/repos_hooks.g.dart
@@ -7,7 +7,7 @@ part of 'repos_hooks.dart';
 // **************************************************************************
 
 Hook _$HookFromJson(Map<String, dynamic> json) => Hook(
-      id: json['id'] as int?,
+      id: (json['id'] as num?)?.toInt(),
       name: json['name'] as String?,
     )
       ..events =
diff --git a/lib/src/common/model/repos_pages.g.dart b/lib/src/common/model/repos_pages.g.dart
index a550ad75..ead9a68f 100644
--- a/lib/src/common/model/repos_pages.g.dart
+++ b/lib/src/common/model/repos_pages.g.dart
@@ -30,7 +30,7 @@ PageBuild _$PageBuildFromJson(Map<String, dynamic> json) => PageBuild(
           ? null
           : PageBuildPusher.fromJson(json['pusher'] as Map<String, dynamic>),
       commit: json['commit'] as String?,
-      duration: json['duration'] as int?,
+      duration: (json['duration'] as num?)?.toInt(),
       createdAt: json['created_at'] == null
           ? null
           : DateTime.parse(json['created_at'] as String),
@@ -53,7 +53,7 @@ Map<String, dynamic> _$PageBuildToJson(PageBuild instance) => <String, dynamic>{
 PageBuildPusher _$PageBuildPusherFromJson(Map<String, dynamic> json) =>
     PageBuildPusher(
       login: json['login'] as String?,
-      id: json['id'] as int?,
+      id: (json['id'] as num?)?.toInt(),
       apiUrl: json['url'] as String?,
       htmlUrl: json['html_url'] as String?,
       type: json['type'] as String?,
diff --git a/lib/src/common/model/repos_releases.g.dart b/lib/src/common/model/repos_releases.g.dart
index 2e0998e7..e0596897 100644
--- a/lib/src/common/model/repos_releases.g.dart
+++ b/lib/src/common/model/repos_releases.g.dart
@@ -7,7 +7,7 @@ part of 'repos_releases.dart';
 // **************************************************************************
 
 Release _$ReleaseFromJson(Map<String, dynamic> json) => Release(
-      id: json['id'] as int?,
+      id: (json['id'] as num?)?.toInt(),
       url: json['url'] as String?,
       htmlUrl: json['html_url'] as String?,
       tarballUrl: json['tarball_url'] as String?,
@@ -61,13 +61,13 @@ Map<String, dynamic> _$ReleaseToJson(Release instance) => <String, dynamic>{
     };
 
 ReleaseAsset _$ReleaseAssetFromJson(Map<String, dynamic> json) => ReleaseAsset(
-      id: json['id'] as int?,
+      id: (json['id'] as num?)?.toInt(),
       name: json['name'] as String?,
       label: json['label'] as String?,
       state: json['state'] as String?,
       contentType: json['content_type'] as String?,
-      size: json['size'] as int?,
-      downloadCount: json['download_count'] as int?,
+      size: (json['size'] as num?)?.toInt(),
+      downloadCount: (json['download_count'] as num?)?.toInt(),
       browserDownloadUrl: json['browser_download_url'] as String?,
       createdAt: json['created_at'] == null
           ? null
diff --git a/lib/src/common/model/repos_stats.g.dart b/lib/src/common/model/repos_stats.g.dart
index 12a609a5..83bd1650 100644
--- a/lib/src/common/model/repos_stats.g.dart
+++ b/lib/src/common/model/repos_stats.g.dart
@@ -12,7 +12,7 @@ ContributorStatistics _$ContributorStatisticsFromJson(
       json['author'] == null
           ? null
           : User.fromJson(json['author'] as Map<String, dynamic>),
-      json['total'] as int?,
+      (json['total'] as num?)?.toInt(),
       (json['weeks'] as List<dynamic>?)
           ?.map((e) =>
               ContributorWeekStatistics.fromJson(e as Map<String, dynamic>))
@@ -30,10 +30,10 @@ Map<String, dynamic> _$ContributorStatisticsToJson(
 ContributorWeekStatistics _$ContributorWeekStatisticsFromJson(
         Map<String, dynamic> json) =>
     ContributorWeekStatistics(
-      json['w'] as int?,
-      json['a'] as int?,
-      json['d'] as int?,
-      json['c'] as int?,
+      (json['w'] as num?)?.toInt(),
+      (json['a'] as num?)?.toInt(),
+      (json['d'] as num?)?.toInt(),
+      (json['c'] as num?)?.toInt(),
     );
 
 Map<String, dynamic> _$ContributorWeekStatisticsToJson(
@@ -48,8 +48,12 @@ Map<String, dynamic> _$ContributorWeekStatisticsToJson(
 ContributorParticipation _$ContributorParticipationFromJson(
         Map<String, dynamic> json) =>
     ContributorParticipation(
-      all: (json['all'] as List<dynamic>?)?.map((e) => e as int).toList(),
-      owner: (json['owner'] as List<dynamic>?)?.map((e) => e as int).toList(),
+      all: (json['all'] as List<dynamic>?)
+          ?.map((e) => (e as num).toInt())
+          .toList(),
+      owner: (json['owner'] as List<dynamic>?)
+          ?.map((e) => (e as num).toInt())
+          .toList(),
     );
 
 Map<String, dynamic> _$ContributorParticipationToJson(
@@ -61,9 +65,11 @@ Map<String, dynamic> _$ContributorParticipationToJson(
 
 YearCommitCountWeek _$YearCommitCountWeekFromJson(Map<String, dynamic> json) =>
     YearCommitCountWeek(
-      days: (json['days'] as List<dynamic>?)?.map((e) => e as int).toList(),
-      total: json['total'] as int?,
-      timestamp: json['timestamp'] as int?,
+      days: (json['days'] as List<dynamic>?)
+          ?.map((e) => (e as num).toInt())
+          .toList(),
+      total: (json['total'] as num?)?.toInt(),
+      timestamp: (json['timestamp'] as num?)?.toInt(),
     );
 
 Map<String, dynamic> _$YearCommitCountWeekToJson(
@@ -76,9 +82,9 @@ Map<String, dynamic> _$YearCommitCountWeekToJson(
 
 WeeklyChangesCount _$WeeklyChangesCountFromJson(Map<String, dynamic> json) =>
     WeeklyChangesCount(
-      timestamp: json['timestamp'] as int?,
-      additions: json['additions'] as int?,
-      deletions: json['deletions'] as int?,
+      timestamp: (json['timestamp'] as num?)?.toInt(),
+      additions: (json['additions'] as num?)?.toInt(),
+      deletions: (json['deletions'] as num?)?.toInt(),
     );
 
 Map<String, dynamic> _$WeeklyChangesCountToJson(WeeklyChangesCount instance) =>
@@ -90,9 +96,9 @@ Map<String, dynamic> _$WeeklyChangesCountToJson(WeeklyChangesCount instance) =>
 
 PunchcardEntry _$PunchcardEntryFromJson(Map<String, dynamic> json) =>
     PunchcardEntry(
-      weekday: json['weekday'] as int?,
-      hour: json['hour'] as int?,
-      commits: json['commits'] as int?,
+      weekday: (json['weekday'] as num?)?.toInt(),
+      hour: (json['hour'] as num?)?.toInt(),
+      commits: (json['commits'] as num?)?.toInt(),
     );
 
 Map<String, dynamic> _$PunchcardEntryToJson(PunchcardEntry instance) =>
diff --git a/lib/src/common/model/repos_statuses.g.dart b/lib/src/common/model/repos_statuses.g.dart
index 6cb7c947..86b7b8e3 100644
--- a/lib/src/common/model/repos_statuses.g.dart
+++ b/lib/src/common/model/repos_statuses.g.dart
@@ -11,7 +11,7 @@ CombinedRepositoryStatus _$CombinedRepositoryStatusFromJson(
     CombinedRepositoryStatus(
       state: json['state'] as String?,
       sha: json['sha'] as String?,
-      totalCount: json['total_count'] as int?,
+      totalCount: (json['total_count'] as num?)?.toInt(),
       statuses: (json['statuses'] as List<dynamic>?)
           ?.map((e) => RepositoryStatus.fromJson(e as Map<String, dynamic>))
           .toList(),
diff --git a/lib/src/common/model/search.g.dart b/lib/src/common/model/search.g.dart
index d24fa9cb..9d606865 100644
--- a/lib/src/common/model/search.g.dart
+++ b/lib/src/common/model/search.g.dart
@@ -8,7 +8,7 @@ part of 'search.dart';
 
 CodeSearchResults _$CodeSearchResultsFromJson(Map<String, dynamic> json) =>
     CodeSearchResults()
-      ..totalCount = json['total_count'] as int?
+      ..totalCount = (json['total_count'] as num?)?.toInt()
       ..incompleteResults = json['incomplete_results'] as bool?
       ..items = CodeSearchItem.fromJsonList(json['items'] as List);
 
diff --git a/lib/src/common/model/timeline.g.dart b/lib/src/common/model/timeline.g.dart
index 9d0bfc5a..be7d916d 100644
--- a/lib/src/common/model/timeline.g.dart
+++ b/lib/src/common/model/timeline.g.dart
@@ -8,7 +8,7 @@ part of 'timeline.dart';
 
 TimelineEvent _$TimelineEventFromJson(Map<String, dynamic> json) =>
     TimelineEvent(
-      id: json['id'] as int? ?? 0,
+      id: (json['id'] as num?)?.toInt() ?? 0,
       nodeId: json['node_id'] as String?,
       url: json['url'] as String?,
       actor: json['actor'] == null
@@ -40,7 +40,7 @@ Map<String, dynamic> _$TimelineEventToJson(TimelineEvent instance) =>
     };
 
 LabelEvent _$LabelEventFromJson(Map<String, dynamic> json) => LabelEvent(
-      id: json['id'] as int? ?? 0,
+      id: (json['id'] as num?)?.toInt() ?? 0,
       nodeId: json['node_id'] as String?,
       url: json['url'] as String?,
       actor: json['actor'] == null
@@ -77,7 +77,7 @@ Map<String, dynamic> _$LabelEventToJson(LabelEvent instance) =>
 
 MilestoneEvent _$MilestoneEventFromJson(Map<String, dynamic> json) =>
     MilestoneEvent(
-      id: json['id'] as int? ?? 0,
+      id: (json['id'] as num?)?.toInt() ?? 0,
       nodeId: json['node_id'] as String?,
       url: json['url'] as String?,
       actor: json['actor'] == null
@@ -113,7 +113,7 @@ Map<String, dynamic> _$MilestoneEventToJson(MilestoneEvent instance) =>
     };
 
 RenameEvent _$RenameEventFromJson(Map<String, dynamic> json) => RenameEvent(
-      id: json['id'] as int? ?? 0,
+      id: (json['id'] as num?)?.toInt() ?? 0,
       nodeId: json['node_id'] as String?,
       url: json['url'] as String?,
       actor: json['actor'] == null
@@ -150,7 +150,7 @@ Map<String, dynamic> _$RenameEventToJson(RenameEvent instance) =>
 
 ReviewRequestEvent _$ReviewRequestEventFromJson(Map<String, dynamic> json) =>
     ReviewRequestEvent(
-      id: json['id'] as int? ?? 0,
+      id: (json['id'] as num?)?.toInt() ?? 0,
       nodeId: json['node_id'] as String?,
       url: json['url'] as String?,
       actor: json['actor'] == null
@@ -195,7 +195,7 @@ Map<String, dynamic> _$ReviewRequestEventToJson(ReviewRequestEvent instance) =>
 ReviewDismissedEvent _$ReviewDismissedEventFromJson(
         Map<String, dynamic> json) =>
     ReviewDismissedEvent(
-      id: json['id'] as int? ?? 0,
+      id: (json['id'] as num?)?.toInt() ?? 0,
       nodeId: json['node_id'] as String?,
       url: json['url'] as String?,
       actor: json['actor'] == null
@@ -233,7 +233,7 @@ Map<String, dynamic> _$ReviewDismissedEventToJson(
     };
 
 LockEvent _$LockEventFromJson(Map<String, dynamic> json) => LockEvent(
-      id: json['id'] as int? ?? 0,
+      id: (json['id'] as num?)?.toInt() ?? 0,
       nodeId: json['node_id'] as String?,
       url: json['url'] as String?,
       actor: json['actor'] == null
@@ -266,7 +266,7 @@ Map<String, dynamic> _$LockEventToJson(LockEvent instance) => <String, dynamic>{
     };
 
 ProjectEvent _$ProjectEventFromJson(Map<String, dynamic> json) => ProjectEvent(
-      id: json['id'] as int? ?? 0,
+      id: (json['id'] as num?)?.toInt() ?? 0,
       nodeId: json['node_id'] as String?,
       url: json['url'] as String?,
       actor: json['actor'] == null
@@ -302,7 +302,7 @@ Map<String, dynamic> _$ProjectEventToJson(ProjectEvent instance) =>
     };
 
 CommentEvent _$CommentEventFromJson(Map<String, dynamic> json) => CommentEvent(
-      id: json['id'] as int? ?? 0,
+      id: (json['id'] as num?)?.toInt() ?? 0,
       nodeId: json['node_id'] as String?,
       url: json['url'] as String?,
       actor: json['actor'] == null
@@ -359,7 +359,7 @@ Map<String, dynamic> _$CommentEventToJson(CommentEvent instance) =>
 
 CrossReferenceEvent _$CrossReferenceEventFromJson(Map<String, dynamic> json) =>
     CrossReferenceEvent(
-      id: json['id'] as int? ?? 0,
+      id: (json['id'] as num?)?.toInt() ?? 0,
       nodeId: json['node_id'] as String?,
       url: json['url'] as String?,
       actor: json['actor'] == null
@@ -401,7 +401,7 @@ Map<String, dynamic> _$CrossReferenceEventToJson(
 
 TimelineCommitEvent _$TimelineCommitEventFromJson(Map<String, dynamic> json) =>
     TimelineCommitEvent(
-      id: json['id'] as int? ?? 0,
+      id: (json['id'] as num?)?.toInt() ?? 0,
       nodeId: json['node_id'] as String?,
       url: json['url'] as String?,
       actor: json['actor'] == null
@@ -460,7 +460,7 @@ Map<String, dynamic> _$TimelineCommitEventToJson(
     };
 
 ReviewEvent _$ReviewEventFromJson(Map<String, dynamic> json) => ReviewEvent(
-      id: json['id'] as int? ?? 0,
+      id: (json['id'] as num?)?.toInt() ?? 0,
       nodeId: json['node_id'] as String?,
       url: json['url'] as String?,
       actor: json['actor'] == null
@@ -520,7 +520,7 @@ Map<String, dynamic> _$ReviewEventToJson(ReviewEvent instance) =>
 TimelineLineCommentedEvent _$TimelineLineCommentedEventFromJson(
         Map<String, dynamic> json) =>
     TimelineLineCommentedEvent(
-      id: json['id'] as int? ?? 0,
+      id: (json['id'] as num?)?.toInt() ?? 0,
       nodeId: json['node_id'] as String?,
       url: json['url'] as String?,
       actor: json['actor'] == null
@@ -560,7 +560,7 @@ Map<String, dynamic> _$TimelineLineCommentedEventToJson(
 TimelineCommitCommentedEvent _$TimelineCommitCommentedEventFromJson(
         Map<String, dynamic> json) =>
     TimelineCommitCommentedEvent(
-      id: json['id'] as int? ?? 0,
+      id: (json['id'] as num?)?.toInt() ?? 0,
       nodeId: json['node_id'] as String?,
       url: json['url'] as String?,
       actor: json['actor'] == null
@@ -598,7 +598,7 @@ Map<String, dynamic> _$TimelineCommitCommentedEventToJson(
 
 AssigneeEvent _$AssigneeEventFromJson(Map<String, dynamic> json) =>
     AssigneeEvent(
-      id: json['id'] as int? ?? 0,
+      id: (json['id'] as num?)?.toInt() ?? 0,
       nodeId: json['node_id'] as String?,
       url: json['url'] as String?,
       actor: json['actor'] == null
@@ -636,7 +636,7 @@ Map<String, dynamic> _$AssigneeEventToJson(AssigneeEvent instance) =>
 StateChangeIssueEvent _$StateChangeIssueEventFromJson(
         Map<String, dynamic> json) =>
     StateChangeIssueEvent(
-      id: json['id'] as int? ?? 0,
+      id: (json['id'] as num?)?.toInt() ?? 0,
       nodeId: json['node_id'] as String?,
       url: json['url'] as String?,
       actor: json['actor'] == null
diff --git a/lib/src/common/model/timeline_support.g.dart b/lib/src/common/model/timeline_support.g.dart
index c1e441f2..83adf60a 100644
--- a/lib/src/common/model/timeline_support.g.dart
+++ b/lib/src/common/model/timeline_support.g.dart
@@ -17,8 +17,8 @@ GitHubApp _$GitHubAppFromJson(Map<String, dynamic> json) => GitHubApp(
           (json['events'] as List<dynamic>?)?.map((e) => e as String).toList(),
       externalUrl: json['external_url'] as String?,
       htmlUrl: json['html_url'] as String?,
-      id: json['id'] as int?,
-      installationsCount: json['installations_count'] as int?,
+      id: (json['id'] as num?)?.toInt(),
+      installationsCount: (json['installations_count'] as num?)?.toInt(),
       name: json['name'] as String?,
       nodeId: json['node_id'] as String?,
       owner: json['owner'] == null
@@ -69,7 +69,7 @@ DismissedReview _$DismissedReviewFromJson(Map<String, dynamic> json) =>
     DismissedReview(
       dismissalCommitId: json['dismissal_commit_id'] as String?,
       dismissalMessage: json['dismissal_message'] as String?,
-      reviewId: json['review_id'] as int?,
+      reviewId: (json['review_id'] as num?)?.toInt(),
       state: json['state'] as String?,
     );
 
@@ -83,9 +83,9 @@ Map<String, dynamic> _$DismissedReviewToJson(DismissedReview instance) =>
 
 ProjectCard _$ProjectCardFromJson(Map<String, dynamic> json) => ProjectCard(
       columnName: json['column_name'] as String?,
-      id: json['id'] as int?,
+      id: (json['id'] as num?)?.toInt(),
       previousColumnName: json['previous_column_name'] as String?,
-      projectId: json['project_id'] as int?,
+      projectId: (json['project_id'] as num?)?.toInt(),
       projectUrl: json['project_url'] as String?,
       url: json['url'] as String?,
     );
@@ -160,7 +160,7 @@ TemplateRepository _$TemplateRepositoryFromJson(Map<String, dynamic> json) =>
       downloadsUrl: json['downloads_url'] as String?,
       eventsUrl: json['events_url'] as String?,
       fork: json['fork'] as bool?,
-      forksCount: json['forks_count'] as int?,
+      forksCount: (json['forks_count'] as num?)?.toInt(),
       forksUrl: json['forks_url'] as String?,
       fullName: json['full_name'] as String?,
       gitCommitsUrl: json['git_commits_url'] as String?,
@@ -175,7 +175,7 @@ TemplateRepository _$TemplateRepositoryFromJson(Map<String, dynamic> json) =>
       homepage: json['homepage'] as String?,
       hooksUrl: json['hooks_url'] as String?,
       htmlUrl: json['html_url'] as String?,
-      id: json['id'] as int?,
+      id: (json['id'] as num?)?.toInt(),
       isTemplate: json['is_template'] as bool?,
       issueCommentUrl: json['issue_comment_url'] as String?,
       issueEventsUrl: json['issue_events_url'] as String?,
@@ -190,10 +190,10 @@ TemplateRepository _$TemplateRepositoryFromJson(Map<String, dynamic> json) =>
       milestonesUrl: json['milestones_url'] as String?,
       mirrorUrl: json['mirror_url'] as String?,
       name: json['name'] as String?,
-      networkCount: json['network_count'] as int?,
+      networkCount: (json['network_count'] as num?)?.toInt(),
       nodeId: json['node_id'] as String?,
       notificationsUrl: json['notifications_url'] as String?,
-      openIssuesCount: json['open_issues_count'] as int?,
+      openIssuesCount: (json['open_issues_count'] as num?)?.toInt(),
       owner: json['owner'] == null
           ? null
           : Owner.fromJson(json['owner'] as Map<String, dynamic>),
@@ -206,14 +206,14 @@ TemplateRepository _$TemplateRepositoryFromJson(Map<String, dynamic> json) =>
           ? null
           : DateTime.parse(json['pushed_at'] as String),
       releasesUrl: json['releases_url'] as String?,
-      size: json['size'] as int?,
+      size: (json['size'] as num?)?.toInt(),
       squashMergeCommitMessage: json['squash_merge_commit_message'] as String?,
       squashMergeCommitTitle: json['squash_merge_commit_title'] as String?,
       sshUrl: json['ssh_url'] as String?,
-      stargazersCount: json['stargazers_count'] as int?,
+      stargazersCount: (json['stargazers_count'] as num?)?.toInt(),
       stargazersUrl: json['stargazers_url'] as String?,
       statusesUrl: json['statuses_url'] as String?,
-      subscribersCount: json['subscribers_count'] as int?,
+      subscribersCount: (json['subscribers_count'] as num?)?.toInt(),
       subscribersUrl: json['subscribers_url'] as String?,
       subscriptionUrl: json['subscription_url'] as String?,
       svnUrl: json['svn_url'] as String?,
@@ -228,7 +228,7 @@ TemplateRepository _$TemplateRepositoryFromJson(Map<String, dynamic> json) =>
           : DateTime.parse(json['updated_at'] as String),
       url: json['url'] as String?,
       visibility: json['visibility'] as String?,
-      watchersCount: json['watchers_count'] as int?,
+      watchersCount: (json['watchers_count'] as num?)?.toInt(),
     );
 
 Map<String, dynamic> _$TemplateRepositoryToJson(TemplateRepository instance) =>
@@ -329,7 +329,7 @@ Owner _$OwnerFromJson(Map<String, dynamic> json) => Owner(
       gistsUrl: json['gists_url'] as String?,
       gravatarId: json['gravatar_id'] as String?,
       htmlUrl: json['html_url'] as String?,
-      id: json['id'] as int?,
+      id: (json['id'] as num?)?.toInt(),
       login: json['login'] as String?,
       nodeId: json['node_id'] as String?,
       organizationsUrl: json['organizations_url'] as String?,
diff --git a/lib/src/common/model/users.g.dart b/lib/src/common/model/users.g.dart
index 40e4a306..1e61153c 100644
--- a/lib/src/common/model/users.g.dart
+++ b/lib/src/common/model/users.g.dart
@@ -7,7 +7,7 @@ part of 'users.dart';
 // **************************************************************************
 
 User _$UserFromJson(Map<String, dynamic> json) => User(
-      id: json['id'] as int?,
+      id: (json['id'] as num?)?.toInt(),
       login: json['login'] as String?,
       avatarUrl: json['avatar_url'] as String?,
       htmlUrl: json['html_url'] as String?,
@@ -19,10 +19,10 @@ User _$UserFromJson(Map<String, dynamic> json) => User(
       email: json['email'] as String?,
       hirable: json['hirable'] as bool?,
       bio: json['bio'] as String?,
-      publicReposCount: json['public_repos'] as int?,
-      publicGistsCount: json['public_gists'] as int?,
-      followersCount: json['followers'] as int?,
-      followingCount: json['following'] as int?,
+      publicReposCount: (json['public_repos'] as num?)?.toInt(),
+      publicGistsCount: (json['public_gists'] as num?)?.toInt(),
+      followersCount: (json['followers'] as num?)?.toInt(),
+      followingCount: (json['following'] as num?)?.toInt(),
       createdAt: json['created_at'] == null
           ? null
           : DateTime.parse(json['created_at'] as String),
@@ -85,7 +85,7 @@ Map<String, dynamic> _$UserToJson(User instance) => <String, dynamic>{
 
 Collaborator _$CollaboratorFromJson(Map<String, dynamic> json) => Collaborator(
       json['login'] as String?,
-      json['id'] as int?,
+      (json['id'] as num?)?.toInt(),
       json['html_url'] as String?,
       json['type'] as String?,
       json['site_admin'] as bool?,
@@ -105,13 +105,13 @@ Map<String, dynamic> _$CollaboratorToJson(Collaborator instance) =>
     };
 
 Contributor _$ContributorFromJson(Map<String, dynamic> json) => Contributor(
-      id: json['id'] as int?,
+      id: (json['id'] as num?)?.toInt(),
       login: json['login'] as String?,
       avatarUrl: json['avatar_url'] as String?,
       htmlUrl: json['html_url'] as String?,
       type: json['type'] as String?,
       siteAdmin: json['site_admin'] as bool?,
-      contributions: json['contributions'] as int?,
+      contributions: (json['contributions'] as num?)?.toInt(),
     );
 
 Map<String, dynamic> _$ContributorToJson(Contributor instance) =>
@@ -127,7 +127,7 @@ Map<String, dynamic> _$ContributorToJson(Contributor instance) =>
 
 CurrentUser _$CurrentUserFromJson(Map<String, dynamic> json) => CurrentUser()
   ..login = json['login'] as String?
-  ..id = json['id'] as int?
+  ..id = (json['id'] as num?)?.toInt()
   ..avatarUrl = json['avatar_url'] as String?
   ..htmlUrl = json['html_url'] as String?
   ..siteAdmin = json['site_admin'] as bool?
@@ -138,10 +138,10 @@ CurrentUser _$CurrentUserFromJson(Map<String, dynamic> json) => CurrentUser()
   ..email = json['email'] as String?
   ..hirable = json['hirable'] as bool?
   ..bio = json['bio'] as String?
-  ..publicReposCount = json['public_repos'] as int?
-  ..publicGistsCount = json['public_gists'] as int?
-  ..followersCount = json['followers'] as int?
-  ..followingCount = json['following'] as int?
+  ..publicReposCount = (json['public_repos'] as num?)?.toInt()
+  ..publicGistsCount = (json['public_gists'] as num?)?.toInt()
+  ..followersCount = (json['followers'] as num?)?.toInt()
+  ..followingCount = (json['following'] as num?)?.toInt()
   ..createdAt = json['created_at'] == null
       ? null
       : DateTime.parse(json['created_at'] as String)
@@ -165,9 +165,9 @@ CurrentUser _$CurrentUserFromJson(Map<String, dynamic> json) => CurrentUser()
   ..subscriptionsUrl = json['subscriptions_url'] as String?
   ..type = json['type'] as String?
   ..url = json['url'] as String?
-  ..privateReposCount = json['total_private_repos'] as int?
-  ..ownedPrivateReposCount = json['owned_private_repos'] as int?
-  ..diskUsage = json['disk_usage'] as int?
+  ..privateReposCount = (json['total_private_repos'] as num?)?.toInt()
+  ..ownedPrivateReposCount = (json['owned_private_repos'] as num?)?.toInt()
+  ..diskUsage = (json['disk_usage'] as num?)?.toInt()
   ..plan = json['plan'] == null
       ? null
       : UserPlan.fromJson(json['plan'] as Map<String, dynamic>);
@@ -215,9 +215,9 @@ Map<String, dynamic> _$CurrentUserToJson(CurrentUser instance) =>
 
 UserPlan _$UserPlanFromJson(Map<String, dynamic> json) => UserPlan()
   ..name = json['name'] as String?
-  ..space = json['space'] as int?
-  ..privateReposCount = json['private_repos'] as int?
-  ..collaboratorsCount = json['collaborators'] as int?;
+  ..space = (json['space'] as num?)?.toInt()
+  ..privateReposCount = (json['private_repos'] as num?)?.toInt()
+  ..collaboratorsCount = (json['collaborators'] as num?)?.toInt();
 
 Map<String, dynamic> _$UserPlanToJson(UserPlan instance) => <String, dynamic>{
       'name': instance.name,
diff --git a/lib/src/server/hooks.g.dart b/lib/src/server/hooks.g.dart
index e78b6cc9..81cbb790 100644
--- a/lib/src/server/hooks.g.dart
+++ b/lib/src/server/hooks.g.dart
@@ -132,7 +132,7 @@ Map<String, dynamic> _$IssueEventToJson(IssueEvent instance) =>
 PullRequestEvent _$PullRequestEventFromJson(Map<String, dynamic> json) =>
     PullRequestEvent(
       action: json['action'] as String?,
-      number: json['number'] as int?,
+      number: (json['number'] as num?)?.toInt(),
       pullRequest: json['pull_request'] == null
           ? null
           : PullRequest.fromJson(json['pull_request'] as Map<String, dynamic>),