tornapi-typescript 0.1.3 → 0.1.5

package/dist/index.d.ts

@@ -4160,7 +4160,8 @@ export type FactionStatEnum =
     | "attacksdamaging"
     | "attacksrunaway"
     | "highestterritories"
-    | "territoryrespect";
+    | "territoryrespect"
+    | "membersamount";
 
 export type FactionBranchStateEnum = "war" | "peace";
 
@@ -4511,10 +4512,14 @@ export type LogCategoryId = number;
 
 export type FactionId = number;
 
+export type EducationId = number;
+
 export type FactionBranchId = number;
 
 export type FactionCrimeId = number;
 
+export type TornCrimeId = number;
+
 export type ChainId = number;
 
 export type AttackId = number;
@@ -5005,7 +5010,7 @@ export interface FactionHofStats {
 }
 
 export interface FactionHofResponse {
-    hof: FactionHofStats[];
+    hof: FactionHofStats;
 }
 
 /** Details about a faction member. */
@@ -5185,7 +5190,7 @@ export interface FactionApplication {
     user: {
         id: UserId;
         name: string;
-        level: string;
+        level: number;
         stats: {
             strength: number;
             speed: number;
@@ -5393,7 +5398,10 @@ export interface FactionBalanceResponse {
     balance: FactionBalance;
 }
 
-/** The following selections will fallback to API v1 and may change at any time: 'armor', 'boosters', 'caches', 'cesium', 'crimeexp', 'drugs', 'medical', 'positions', 'reports', 'temporary', 'weapons'. */
+/**
+ * The following selections will fallback to API v1 and may change at any time: 'armor', 'boosters', 'caches', 'cesium', 'crimeexp', 'drugs', 'medical', 'positions', 'reports', 'temporary', 'weapons'.
+ *  * The following selections are not available in API v2: 'armorynews', 'attacknews', 'crimenews', 'currency', 'donations', 'fundsnews', 'mainnews', 'membershipnews', 'territorynews'.
+ */
 export type FactionSelectionName =
     | "applications"
     | "attacks"
@@ -5410,11 +5418,16 @@ export type FactionSelectionName =
     | "lookup"
     | "members"
     | "news"
+    | "rackets"
     | "rankedwars"
     | "rankedwarreport"
     | "revives"
     | "revivesfull"
     | "stats"
+    | "territory"
+    | "territoryownership"
+    | "territorywarreport"
+    | "territorywars"
     | "timestamp"
     | "upgrades"
     | "wars"
@@ -5428,8 +5441,16 @@ export type FactionSelectionName =
     | "positions"
     | "reports"
     | "temporary"
-    | "territory"
-    | "weapons";
+    | "weapons"
+    | "armorynews"
+    | "attacknews"
+    | "crimenews"
+    | "currency"
+    | "donations"
+    | "fundsnews"
+    | "mainnews"
+    | "membershipnews"
+    | "territorynews";
 
 export interface FactionLookupResponse {
     selections: FactionSelectionName[];
@@ -5671,7 +5692,8 @@ export type MarketSelectionName =
     | "itemmarket"
     | "lookup"
     | "timestamp"
-    | "pointsmarket";
+    | "pointsmarket"
+    | "bazaar";
 
 export interface MarketLookupResponse {
     selections: MarketSelectionName[];
@@ -5788,8 +5810,10 @@ export interface RacerDetails {
     time_ended: number | null;
 }
 
-export interface RacingRaceDetailsResponse extends Race {
-    results: RacerDetails[];
+export interface RacingRaceDetailsResponse {
+    race?: {
+        results: RacerDetails[];
+    } & Race;
 }
 
 export type RacingSelectionName =
@@ -5806,6 +5830,41 @@ export interface RacingLookupResponse {
     selections: RacingSelectionName[];
 }
 
+export interface TornEducationRewards {
+    working_stats: {
+        manual_labor: number | null;
+        intelligence: number | null;
+        endurance: number | null;
+    };
+    effect: string | null;
+    honor: string | null;
+}
+
+export interface TornEducationPrerequisites {
+    cost: number;
+    courses: number[];
+}
+
+export interface TornEducationCourses {
+    id: EducationId;
+    code: string;
+    name: string;
+    description: string;
+    duration: number;
+    rewards: TornEducationRewards;
+    prerequisites: TornEducationPrerequisites;
+}
+
+export interface TornEducation {
+    id: number;
+    name: string;
+    courses: TornEducationCourses[];
+}
+
+export interface TornEducationResponse {
+    education: TornEducation[];
+}
+
 export interface TornTerritoryCoordinates {
     x: number;
     y: number;
@@ -5846,7 +5905,7 @@ export interface TornCrimesResponse {
 }
 
 export interface TornCrime {
-    id: number;
+    id: TornCrimeId;
     name: string;
     category_id: number;
     category_name?: string;
@@ -5854,7 +5913,7 @@ export interface TornCrime {
     enhancer_name: string;
     unique_outcomes_count: number;
     unique_outcomes_ids: number[];
-    notes: string[];
+    notes?: string[];
 }
 
 export interface TornCalendarActivity {
@@ -5898,7 +5957,7 @@ export interface FactionHofValues {
 }
 
 export interface TornFactionHof {
-    faction_id: FactionId;
+    id: FactionId;
     name: string;
     members: number;
     position: number;
@@ -6096,15 +6155,19 @@ export interface TornFactionTree {
 }
 
 export interface TornFactionTreeResponse {
-    factionTree: TornFactionTree;
+    factionTree: TornFactionTree[];
 }
 
-/** The following selections will fallback to API v1 and may change at any time: 'bank','cards','cityshops','companies','competition','dirtybombs','education','gyms','honors','itemdetails','itemstats','medals','organisedcrimes','pawnshop','pokertables','properties','rackets','raidreport','raids','rockpaperscissors','searchforcash','shoplifting','stats','stocks'. */
+/**
+ * The following selections will fallback to API v1 and may change at any time: 'bank','cards','cityshops','companies','competition','dirtybombs','gyms','honors','itemdetails','itemstats','medals','organisedcrimes','pawnshop','pokertables','properties','raidreport','raids','rockpaperscissors','searchforcash','shoplifting','stats','stocks'.
+ *  *  The following selections are not available in API v2: 'chainreport', 'rackets', 'rankedwarreport', 'rankedwars', 'territorynames', 'territorywarreport', 'territorywars'.
+ */
 export type TornSelectionName =
     | "attacklog"
     | "bounties"
     | "calendar"
     | "crimes"
+    | "education"
     | "factionHof"
     | "factiontree"
     | "hof"
@@ -6123,7 +6186,6 @@ export type TornSelectionName =
     | "companies"
     | "competition"
     | "dirtybombs"
-    | "education"
     | "gyms"
     | "honors"
     | "itemdetails"
@@ -6133,16 +6195,20 @@ export type TornSelectionName =
     | "pawnshop"
     | "pokertables"
     | "properties"
-    | "rackets"
     | "raidreport"
     | "raids"
-    | "rankedwarreport"
-    | "rankedwars"
     | "rockpaperscissors"
     | "searchforcash"
     | "shoplifting"
     | "stats"
-    | "stocks";
+    | "stocks"
+    | "chainreport"
+    | "rackets"
+    | "rankedwarreport"
+    | "rankedwars"
+    | "territorynames"
+    | "territorywarreport"
+    | "territorywars";
 
 export interface TornLookupResponse {
     selections: TornSelectionName[];
@@ -7059,6 +7125,20 @@ export type PersonalStatsStatName =
     | "forgeryskill"
     | "scammingskill";
 
+export interface UserCurrentEducation {
+    id: EducationId;
+    until: number;
+}
+
+export interface UserEducation {
+    complete: EducationId[];
+    current: UserCurrentEducation | null;
+}
+
+export interface UserEducationResponse {
+    education: UserEducation;
+}
+
 export interface UserCrimeDetailsBootlegging {
     /** Online store statistics. */
     online_store: {
@@ -7209,7 +7289,7 @@ export interface UserCrimeUniquesReward {
 export interface UserCrimeUniques {
     /** Unique result id. */
     id: number;
-    rewards: UserCrimeUniquesReward[];
+    rewards: UserCrimeUniquesReward;
 }
 
 export interface UserCrimesResponse {
@@ -7230,7 +7310,8 @@ export interface UserCrime {
         | UserCrimeDetailsCardSkimming
         | UserCrimeDetailsHustling
         | UserCrimeDetailsCracking
-        | UserCrimeDetailsScamming;
+        | UserCrimeDetailsScamming
+        | null;
 }
 
 export interface UserRacesResponse {
@@ -7240,7 +7321,7 @@ export interface UserRacesResponse {
 
 export interface UserRaceCarDetails extends RaceCar {
     id: RaceCarId;
-    name: string;
+    name: string | null;
     worth: number;
     points_spent: number;
     races_entered: number;
@@ -7304,7 +7385,7 @@ export interface UserHofStats {
 }
 
 export interface UserHofResponse {
-    hof: UserHofStats[];
+    hof: UserHofStats;
 }
 
 export interface UserCalendar {

package/dist/openapi.json

@@ -3,7 +3,7 @@
   "info": {
     "title": "Torn API",
     "description": "\n * The development of Torn's API v2 is still ongoing.\n * If selections remain unaltered, they will default to the API v1 version.\n * Unlike API v1, API v2 accepts both selections and IDs as path and query parameters.\n * If any discrepancies or errors are found, please submit a [bug report](https://www.torn.com/forums.php#/p=forums&f=19&b=0&a=0) on the Torn Forums.\n * In case you're using bots to check for changes on openapi.json file, make sure to specificy a custom user-agent header - CloudFlare sometimes prevents requests from default user-agents.",
-    "version": "1.2.0"
+    "version": "1.3.2"
   },
   "servers": [
     {
@@ -200,7 +200,7 @@
             "description": "Crime id",
             "required": true,
             "schema": {
-              "type": "string"
+              "$ref": "#/components/schemas/TornCrimeId"
             }
           }
         ],
@@ -224,6 +224,33 @@
         "x-stability": "Stable"
       }
     },
+    "/user/education": {
+      "get": {
+        "tags": [
+          "User"
+        ],
+        "summary": "Get your education information",
+        "description": "The response contains a list of complete eduactions and of a current education (if any).",
+        "responses": {
+          "200": {
+            "description": "Successful operation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserEducationResponse"
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "api_key": []
+          }
+        ],
+        "x-stability": "Unstable"
+      }
+    },
     "/user/enlistedcars": {
       "get": {
         "tags": [
@@ -1180,12 +1207,24 @@
                     {
                       "$ref": "#/components/schemas/UserCalendarResponse"
                     },
+                    {
+                      "$ref": "#/components/schemas/UserEducationResponse"
+                    },
                     {
                       "$ref": "#/components/schemas/UserBountiesResponse"
                     },
                     {
                       "$ref": "#/components/schemas/UserJobRanksResponse"
                     },
+                    {
+                      "$ref": "#/components/schemas/UserFactionBalanceResponse"
+                    },
+                    {
+                      "$ref": "#/components/schemas/RevivesResponse"
+                    },
+                    {
+                      "$ref": "#/components/schemas/RevivesFullResponse"
+                    },
                     {
                       "$ref": "#/components/schemas/UserItemMarketResponse"
                     },
@@ -1757,7 +1796,7 @@
         "x-stability": "Stable"
       }
     },
-    "/faction/{id}/crime": {
+    "/faction/{crimeId}/crime": {
       "get": {
         "tags": [
           "Faction"
@@ -1766,12 +1805,12 @@
         "description": "Requires minimal access key with faction API access permissions. <br>",
         "parameters": [
           {
-            "name": "id",
+            "name": "crimeId",
             "in": "path",
             "description": "Crime id",
             "required": true,
             "schema": {
-              "$ref": "#/components/schemas/ItemId"
+              "$ref": "#/components/schemas/FactionCrimeId"
             }
           }
         ],
@@ -2737,9 +2776,27 @@
                     {
                       "$ref": "#/components/schemas/FactionNewsResponse"
                     },
+                    {
+                      "$ref": "#/components/schemas/RevivesResponse"
+                    },
+                    {
+                      "$ref": "#/components/schemas/FactionTerritoryWarsHistoryResponse"
+                    },
                     {
                       "$ref": "#/components/schemas/FactionAttacksResponse"
                     },
+                    {
+                      "$ref": "#/components/schemas/FactionBalanceResponse"
+                    },
+                    {
+                      "$ref": "#/components/schemas/FactionTerritoriesOwnershipResponse"
+                    },
+                    {
+                      "$ref": "#/components/schemas/FactionPositionsResponse"
+                    },
+                    {
+                      "$ref": "#/components/schemas/RevivesFullResponse"
+                    },
                     {
                       "$ref": "#/components/schemas/FactionAttacksFullResponse"
                     },
@@ -2776,9 +2833,18 @@
                     {
                       "$ref": "#/components/schemas/FactionStatsResponse"
                     },
+                    {
+                      "$ref": "#/components/schemas/FactionTerritoryWarsResponse"
+                    },
                     {
                       "$ref": "#/components/schemas/FactionContributorsResponse"
                     },
+                    {
+                      "$ref": "#/components/schemas/FactionRacketsReponse"
+                    },
+                    {
+                      "$ref": "#/components/schemas/FactionRankedWarResponse"
+                    },
                     {
                       "$ref": "#/components/schemas/FactionLookupResponse"
                     },
@@ -3743,7 +3809,7 @@
             "description": "Code of the attack log. E.g. d51ad4fe6be884b309b142e2d1d4f807",
             "required": true,
             "schema": {
-              "type": "string"
+              "$ref": "#/components/schemas/AttackCode"
             }
           },
           {
@@ -3865,6 +3931,33 @@
         "x-stability": "Stable"
       }
     },
+    "/torn/education": {
+      "get": {
+        "tags": [
+          "Torn"
+        ],
+        "summary": "Get education information",
+        "description": "Requires public access key.<br>",
+        "responses": {
+          "200": {
+            "description": "Successful operation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TornEducationResponse"
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "api_key": []
+          }
+        ],
+        "x-stability": "Unstable"
+      }
+    },
     "/torn/factionhof": {
       "get": {
         "tags": [
@@ -4224,7 +4317,7 @@
             "description": "Crime id",
             "required": true,
             "schema": {
-              "type": "string"
+              "$ref": "#/components/schemas/TornCrimeId"
             }
           }
         ],
@@ -4283,7 +4376,7 @@
         "x-stability": "Unstable"
       }
     },
-    "/torn/{territoryIds}/territories": {
+    "/torn/{territoryIds}/territory": {
       "get": {
         "tags": [
           "Torn"
@@ -4415,22 +4508,13 @@
             "$ref": "#/components/parameters/ApiLimit"
           },
           {
-            "name": "to",
-            "in": "query",
-            "description": "Timestamp until when rows are returned",
-            "required": false,
-            "schema": {
-              "type": "integer"
-            }
+            "$ref": "#/components/parameters/ApiTo"
           },
           {
-            "name": "from",
-            "in": "query",
-            "description": "Timestamp after when rows are returned",
-            "required": false,
-            "schema": {
-              "type": "integer"
-            }
+            "$ref": "#/components/parameters/ApiFrom"
+          },
+          {
+            "$ref": "#/components/parameters/ApiSort"
           },
           {
             "name": "cat",
@@ -4441,19 +4525,6 @@
               "type": "string"
             }
           },
-          {
-            "name": "sort",
-            "in": "query",
-            "description": "Direction to sort rows in",
-            "required": false,
-            "schema": {
-              "type": "string",
-              "enum": [
-                "DESC",
-                "ASC"
-              ]
-            }
-          },
           {
             "$ref": "#/components/parameters/ApiOffsetNoDefault"
           }
@@ -4483,9 +4554,15 @@
                     {
                       "$ref": "#/components/schemas/TornLogTypesResponse"
                     },
+                    {
+                      "$ref": "#/components/schemas/TornItemsResponse"
+                    },
                     {
                       "$ref": "#/components/schemas/TornLogCategoriesResponse"
                     },
+                    {
+                      "$ref": "#/components/schemas/TornEducationResponse"
+                    },
                     {
                       "$ref": "#/components/schemas/TornBountiesResponse"
                     },
@@ -4495,6 +4572,9 @@
                     {
                       "$ref": "#/components/schemas/TornFactionTreeResponse"
                     },
+                    {
+                      "$ref": "#/components/schemas/AttackLogResponse"
+                    },
                     {
                       "$ref": "#/components/schemas/TornTerritoriesResponse"
                     },
@@ -8693,7 +8773,8 @@
           "attacksdamaging",
           "attacksrunaway",
           "highestterritories",
-          "territoryrespect"
+          "territoryrespect",
+          "membersamount"
         ]
       },
       "FactionBranchStateEnum": {
@@ -9176,6 +9257,10 @@
         "type": "integer",
         "format": "int32"
       },
+      "EducationId": {
+        "type": "integer",
+        "format": "int32"
+      },
       "FactionBranchId": {
         "type": "integer",
         "format": "int32"
@@ -9184,6 +9269,10 @@
         "type": "integer",
         "format": "int64"
       },
+      "TornCrimeId": {
+        "type": "integer",
+        "format": "int32"
+      },
       "ChainId": {
         "type": "integer",
         "format": "int32"
@@ -10704,10 +10793,7 @@
         ],
         "properties": {
           "hof": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/FactionHofStats"
-            }
+            "$ref": "#/components/schemas/FactionHofStats"
           }
         },
         "type": "object"
@@ -11399,7 +11485,8 @@
                 "type": "string"
               },
               "level": {
-                "type": "string"
+                "type": "integer",
+                "format": "int32"
               },
               "stats": {
                 "required": [
@@ -12245,7 +12332,7 @@
         "type": "object"
       },
       "FactionSelectionName": {
-        "description": "The following selections will fallback to API v1 and may change at any time: 'armor', 'boosters', 'caches', 'cesium', 'crimeexp', 'drugs', 'medical', 'positions', 'reports', 'temporary', 'weapons'.",
+        "description": "The following selections will fallback to API v1 and may change at any time: 'armor', 'boosters', 'caches', 'cesium', 'crimeexp', 'drugs', 'medical', 'positions', 'reports', 'temporary', 'weapons'.\n * The following selections are not available in API v2: 'armorynews', 'attacknews', 'crimenews', 'currency', 'donations', 'fundsnews', 'mainnews', 'membershipnews', 'territorynews'.",
         "type": "string",
         "enum": [
           "applications",
@@ -12263,11 +12350,16 @@
           "lookup",
           "members",
           "news",
+          "rackets",
           "rankedwars",
           "rankedwarreport",
           "revives",
           "revivesfull",
           "stats",
+          "territory",
+          "territoryownership",
+          "territorywarreport",
+          "territorywars",
           "timestamp",
           "upgrades",
           "wars",
@@ -12281,8 +12373,16 @@
           "positions",
           "reports",
           "temporary",
-          "territory",
-          "weapons"
+          "weapons",
+          "armorynews",
+          "attacknews",
+          "crimenews",
+          "currency",
+          "donations",
+          "fundsnews",
+          "mainnews",
+          "membershipnews",
+          "territorynews"
         ]
       },
       "FactionLookupResponse": {
@@ -13249,7 +13349,8 @@
           "itemmarket",
           "lookup",
           "timestamp",
-          "pointsmarket"
+          "pointsmarket",
+          "bazaar"
         ]
       },
       "MarketLookupResponse": {
@@ -13764,25 +13865,30 @@
         "type": "object"
       },
       "RacingRaceDetailsResponse": {
-        "allOf": [
-          {
-            "required": [
-              "results"
-            ],
-            "properties": {
-              "results": {
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/RacerDetails"
-                }
+        "properties": {
+          "race": {
+            "allOf": [
+              {
+                "required": [
+                  "results"
+                ],
+                "properties": {
+                  "results": {
+                    "type": "array",
+                    "items": {
+                      "$ref": "#/components/schemas/RacerDetails"
+                    }
+                  }
+                },
+                "type": "object"
+              },
+              {
+                "$ref": "#/components/schemas/Race"
               }
-            },
-            "type": "object"
-          },
-          {
-            "$ref": "#/components/schemas/Race"
+            ]
           }
-        ]
+        },
+        "type": "object"
       },
       "RacingSelectionName": {
         "type": "string",
@@ -13811,6 +13917,172 @@
         },
         "type": "object"
       },
+      "TornEducationRewards": {
+        "required": [
+          "working_stats",
+          "effect",
+          "honor"
+        ],
+        "properties": {
+          "working_stats": {
+            "required": [
+              "manual_labor",
+              "intelligence",
+              "endurance"
+            ],
+            "properties": {
+              "manual_labor": {
+                "oneOf": [
+                  {
+                    "type": "integer",
+                    "format": "int32"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "intelligence": {
+                "oneOf": [
+                  {
+                    "type": "integer",
+                    "format": "int32"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "endurance": {
+                "oneOf": [
+                  {
+                    "type": "integer",
+                    "format": "int32"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "type": "object"
+          },
+          "effect": {
+            "oneOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "honor": {
+            "oneOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object"
+      },
+      "TornEducationPrerequisites": {
+        "required": [
+          "cost",
+          "courses"
+        ],
+        "properties": {
+          "cost": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "courses": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        },
+        "type": "object"
+      },
+      "TornEducationCourses": {
+        "required": [
+          "id",
+          "code",
+          "name",
+          "description",
+          "duration",
+          "rewards",
+          "prerequisites"
+        ],
+        "properties": {
+          "id": {
+            "$ref": "#/components/schemas/EducationId"
+          },
+          "code": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "duration": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "rewards": {
+            "$ref": "#/components/schemas/TornEducationRewards"
+          },
+          "prerequisites": {
+            "$ref": "#/components/schemas/TornEducationPrerequisites"
+          }
+        },
+        "type": "object"
+      },
+      "TornEducation": {
+        "required": [
+          "id",
+          "name",
+          "courses"
+        ],
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string"
+          },
+          "courses": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/TornEducationCourses"
+            }
+          }
+        },
+        "type": "object"
+      },
+      "TornEducationResponse": {
+        "required": [
+          "education"
+        ],
+        "properties": {
+          "education": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/TornEducation"
+            }
+          }
+        },
+        "type": "object"
+      },
       "TornTerritoryCoordinates": {
         "required": [
           "x",
@@ -13964,13 +14236,11 @@
           "enhancer_id",
           "enhancer_name",
           "unique_outcomes_count",
-          "unique_outcomes_ids",
-          "notes"
+          "unique_outcomes_ids"
         ],
         "properties": {
           "id": {
-            "type": "integer",
-            "format": "int32"
+            "$ref": "#/components/schemas/TornCrimeId"
           },
           "name": {
             "type": "string"
@@ -14190,7 +14460,7 @@
       },
       "TornFactionHof": {
         "required": [
-          "faction_id",
+          "id",
           "name",
           "members",
           "position",
@@ -14198,7 +14468,7 @@
           "values"
         ],
         "properties": {
-          "faction_id": {
+          "id": {
             "$ref": "#/components/schemas/FactionId"
           },
           "name": {
@@ -15038,19 +15308,23 @@
         ],
         "properties": {
           "factionTree": {
-            "$ref": "#/components/schemas/TornFactionTree"
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/TornFactionTree"
+            }
           }
         },
         "type": "object"
       },
       "TornSelectionName": {
-        "description": "The following selections will fallback to API v1 and may change at any time: 'bank','cards','cityshops','companies','competition','dirtybombs','education','gyms','honors','itemdetails','itemstats','medals','organisedcrimes','pawnshop','pokertables','properties','rackets','raidreport','raids','rockpaperscissors','searchforcash','shoplifting','stats','stocks'.",
+        "description": "The following selections will fallback to API v1 and may change at any time: 'bank','cards','cityshops','companies','competition','dirtybombs','gyms','honors','itemdetails','itemstats','medals','organisedcrimes','pawnshop','pokertables','properties','raidreport','raids','rockpaperscissors','searchforcash','shoplifting','stats','stocks'.\n *  The following selections are not available in API v2: 'chainreport', 'rackets', 'rankedwarreport', 'rankedwars', 'territorynames', 'territorywarreport', 'territorywars'.",
         "type": "string",
         "enum": [
           "attacklog",
           "bounties",
           "calendar",
           "crimes",
+          "education",
           "factionHof",
           "factiontree",
           "hof",
@@ -15069,7 +15343,6 @@
           "companies",
           "competition",
           "dirtybombs",
-          "education",
           "gyms",
           "honors",
           "itemdetails",
@@ -15079,16 +15352,20 @@
           "pawnshop",
           "pokertables",
           "properties",
-          "rackets",
           "raidreport",
           "raids",
-          "rankedwarreport",
-          "rankedwars",
           "rockpaperscissors",
           "searchforcash",
           "shoplifting",
           "stats",
-          "stocks"
+          "stocks",
+          "chainreport",
+          "rackets",
+          "rankedwarreport",
+          "rankedwars",
+          "territorynames",
+          "territorywarreport",
+          "territorywars"
         ]
       },
       "TornLookupResponse": {
@@ -18113,6 +18390,58 @@
           "scammingskill"
         ]
       },
+      "UserCurrentEducation": {
+        "required": [
+          "id",
+          "until"
+        ],
+        "properties": {
+          "id": {
+            "$ref": "#/components/schemas/EducationId"
+          },
+          "until": {
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "type": "object"
+      },
+      "UserEducation": {
+        "required": [
+          "complete",
+          "current"
+        ],
+        "properties": {
+          "complete": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/EducationId"
+            }
+          },
+          "current": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/UserCurrentEducation"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object"
+      },
+      "UserEducationResponse": {
+        "required": [
+          "education"
+        ],
+        "properties": {
+          "education": {
+            "$ref": "#/components/schemas/UserEducation"
+          }
+        },
+        "type": "object"
+      },
       "UserCrimeDetailsBootlegging": {
         "required": [
           "online_store",
@@ -18746,10 +19075,7 @@
             "format": "int64"
           },
           "rewards": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/UserCrimeUniquesReward"
-            }
+            "$ref": "#/components/schemas/UserCrimeUniquesReward"
           }
         },
         "type": "object"
@@ -18823,6 +19149,9 @@
               },
               {
                 "$ref": "#/components/schemas/UserCrimeDetailsScamming"
+              },
+              {
+                "type": "null"
               }
             ]
           }
@@ -18865,7 +19194,14 @@
                 "$ref": "#/components/schemas/RaceCarId"
               },
               "name": {
-                "type": "string"
+                "oneOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
               },
               "worth": {
                 "type": "integer",
@@ -19105,10 +19441,7 @@
         ],
         "properties": {
           "hof": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/UserHofStats"
-            }
+            "$ref": "#/components/schemas/UserHofStats"
           }
         },
         "type": "object"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tornapi-typescript",
   "type": "module",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "scripts": {
     "generate-types": "tsc && node build/index.js"
   },