Merge branch 'main' into dev

Signed-off-by: ふぁ <yuki@yuki0311.com>

.vscode/settings.json

@@ -4,7 +4,7 @@
   "yaml.validate": true,
   "yaml.hover": true,
   "yaml.schemas": {
-    "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.0/schema.json": "src/**/*.yaml"
+    "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/refs/heads/main/schemas/v3.0/schema.yaml": "src/**/*.yaml"
   },
   "[json]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"

.vscode/tasks.json

@@ -4,6 +4,14 @@
     {
       "label": "build-task",
       "type": "shell",
+      "osx": {
+        "command": [
+          "source .venv/bin/activate;",
+          "python3 tools/build.py;",
+          "java -jar openapi-generator-cli.jar generate -c test/python/openapi-generator-config.yaml -g python;",
+          "python3 -m pip install ./python_generated;"
+        ]
+      },
       "linux": {
         "command": [
           "source .venv/bin/activate;",
@@ -27,6 +35,13 @@
       "runOptions": {
         "runOn": "folderOpen"
       },
+      "osx": {
+        "command": [
+          "python3.10 -m venv .venv;",
+          ".venv/bin/python3 -m pip install -r requirements.txt;",
+          "curl https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.9.0/openapi-generator-cli-7.9.0.jar -o openapi-generator-cli.jar;"
+        ]
+      },
       "linux": {
         "command": [
           "python3 -m venv .venv;",

README.md

@@ -15,8 +15,9 @@ Twitter OpenAPI(Swagger) specification
 openapi-generator-cli generate -g <language> -i https://raw.githubusercontent.com/fa0311/twitter-openapi/main/dist/docs/openapi-3.0.yaml -o ./generated
 ```
 
-There are several outputs, but the one that best follows the OpenAPI specification is `dist/docs`.  
+There are several outputs, but the one that most closely follows the OpenAPI specification is `dist/docs`.
-However, some Generators may use a syntax that is not supported.  
+However, a lot of syntax that is not supported by some generators is used.
+
 You can also modify the hook to make the generated results more user-friendly. [build_config.py](./tools/build_config.py)
 
 Note that the license also inherits to the output.

dist/compatible/openapi-3.0.yaml

@@ -266,14 +266,14 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/BookmarksResponseData'
-      required:
+        errors:
-      - data
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
     BookmarksResponseData:
       properties:
         bookmark_timeline_v2:
           $ref: '#/components/schemas/BookmarksTimeline'
-      required:
-      - bookmark_timeline_v2
     BookmarksTimeline:
       properties:
         timeline:
@@ -577,14 +577,16 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/CreateBookmarkResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     CreateBookmarkResponseData:
       properties:
         tweet_bookmark_put:
           type: string
-      required:
-      - tweet_bookmark_put
     CreateRetweet:
       properties:
         result:
@@ -595,14 +597,16 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/CreateRetweetResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     CreateRetweetResponseData:
       properties:
         create_retweet:
           $ref: '#/components/schemas/CreateRetweetResponseResult'
-      required:
-      - create_retweet
     CreateRetweetResponseResult:
       properties:
         retweet_results:
@@ -619,14 +623,16 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/CreateTweetResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     CreateTweetResponseData:
       properties:
         create_tweet:
           $ref: '#/components/schemas/CreateTweetResponseResult'
-      required:
-      - create_tweet
     CreateTweetResponseResult:
       properties:
         tweet_results:
@@ -654,14 +660,16 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/DeleteBookmarkResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     DeleteBookmarkResponseData:
       properties:
         tweet_bookmark_delete:
           type: string
-      required:
-      - tweet_bookmark_delete
     DeleteRetweet:
       properties:
         result:
@@ -674,14 +682,16 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/DeleteRetweetResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     DeleteRetweetResponseData:
       properties:
         create_retweet:
-          $ref: '#/components/schemas/CreateRetweetResponseResult'
+          $ref: '#/components/schemas/DeleteRetweetResponseResult'
-      required:
-      - unretweet
     DeleteRetweetResponseResult:
       properties:
         retweet_results:
@@ -692,14 +702,16 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/DeleteTweetResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     DeleteTweetResponseData:
       properties:
         delete_retweet:
           $ref: '#/components/schemas/DeleteTweetResponseResult'
-      required:
-      - delete_tweet
     DeleteTweetResponseResult:
       properties:
         tweet_results:
@@ -811,23 +823,6 @@ components:
       - kind
       - tracing
       type: object
-    Errors:
-      properties:
-        data:
-          $ref: '#/components/schemas/ErrorsData'
-        errors:
-          items:
-            $ref: '#/components/schemas/Error'
-          type: array
-      required:
-      - errors
-      type: object
-    ErrorsData:
-      properties:
-        user:
-          pattern: dummy
-          type: string
-      type: object
     ExtMediaAvailability:
       properties:
         reason:
@@ -849,12 +844,14 @@ components:
       properties:
         favorite_tweet:
           type: string
-      required:
+    FavoriteTweetResponse:
-      - favorite_tweet
-    FavoriteTweetResponseData:
       properties:
         data:
           $ref: '#/components/schemas/FavoriteTweet'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     FeedbackInfo:
@@ -869,14 +866,16 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/FollowResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     FollowResponseData:
       properties:
         user:
           $ref: '#/components/schemas/FollowResponseUser'
-      required:
-      - user
     FollowResponseResult:
       properties:
         __typename:
@@ -920,8 +919,6 @@ components:
       properties:
         home:
           $ref: '#/components/schemas/HomeTimelineHome'
-      required:
-      - home
     InstructionType:
       enum:
       - TimelineAddEntries
@@ -981,6 +978,10 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/ListTweetsTimelineData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     ListTweetsTimeline:
@@ -991,8 +992,6 @@ components:
       properties:
         list:
           $ref: '#/components/schemas/ListTweetsTimelineList'
-      required:
-      - list
     ListTweetsTimelineList:
       properties:
         tweets_timeline:
@@ -1368,7 +1367,7 @@ components:
       required:
       - fetchStatus
       type: object
-    OtherResponse:
+    OtherObjectAll:
       properties:
         Session:
           $ref: '#/components/schemas/Session'
@@ -1387,14 +1386,16 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/ProfileResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     ProfileResponseData:
       properties:
         user_result_by_screen_name:
           $ref: '#/components/schemas/UserResultByScreenName'
-      required:
-      - user_result_by_screen_name
     QuotedRefResult:
       properties:
         result:
@@ -1445,12 +1446,14 @@ components:
       properties:
         search_by_raw_query:
           $ref: '#/components/schemas/SearchByRawQuery'
-      required:
-      - search_by_raw_query
     SearchTimelineResponse:
       properties:
         data:
           $ref: '#/components/schemas/SearchTimelineData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     SelfThread:
@@ -1468,10 +1471,6 @@ components:
           type: boolean
         other:
           type: boolean
-      required:
-      - adult_content
-      - graphic_violence
-      - other
     Session:
       properties:
         SsoInitTokens:
@@ -1800,6 +1799,10 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/HomeTimelineResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     TimelineShowAlert:
@@ -2199,14 +2202,16 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/TweetDetailResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     TweetDetailResponseData:
       properties:
         threaded_conversation_with_injections_v2:
           $ref: '#/components/schemas/Timeline'
-      required:
-      - threaded_conversation_with_injections_v2
     TweetEditControl:
       properties:
         edit_control_initial:
@@ -2257,14 +2262,16 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/TweetFavoritersResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     TweetFavoritersResponseData:
       properties:
         favoriters_timeline:
           $ref: '#/components/schemas/TimelineV2'
-      required:
-      - favoriters_timeline
     TweetInterstitial:
       properties:
         __typename:
@@ -2464,26 +2471,30 @@ components:
       properties:
         tweetResult:
           $ref: '#/components/schemas/ItemResult'
-      required:
-      - tweetResult
     TweetResultByRestIdResponse:
       properties:
         data:
           $ref: '#/components/schemas/TweetResultByRestIdData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     TweetRetweetersResponse:
       properties:
         data:
           $ref: '#/components/schemas/TweetRetweetersResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     TweetRetweetersResponseData:
       properties:
         retweeters_timeline:
           $ref: '#/components/schemas/TimelineV2'
-      required:
-      - retweeters_timeline
     TweetTombstone:
       additionalProperties: true
       properties:
@@ -2573,12 +2584,14 @@ components:
       properties:
         unfavorite_tweet:
           type: string
-      required:
+    UnfavoriteTweetResponse:
-      - unfavorite_tweet
-    UnfavoriteTweetResponseData:
       properties:
         data:
           $ref: '#/components/schemas/UnfavoriteTweet'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     UnifiedCard:
@@ -2714,12 +2727,14 @@ components:
       properties:
         user:
           $ref: '#/components/schemas/UserHighlightsTweetsUser'
-      required:
-      - user
     UserHighlightsTweetsResponse:
       properties:
         data:
           $ref: '#/components/schemas/UserHighlightsTweetsData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     UserHighlightsTweetsResult:
@@ -2934,6 +2949,10 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/UserResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     UserResponseData:
@@ -3019,12 +3038,14 @@ components:
       properties:
         user:
           $ref: '#/components/schemas/UserTweetsUser'
-      required:
-      - user
     UserTweetsResponse:
       properties:
         data:
           $ref: '#/components/schemas/UserTweetsData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     UserTweetsResult:
@@ -3129,6 +3150,10 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/UsersResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     UsersResponseData:
@@ -3137,8 +3162,6 @@ components:
           items:
             $ref: '#/components/schemas/UserResults'
           type: array
-      required:
-      - users
   securitySchemes:
     Accept:
       description: '*/*'
@@ -4076,9 +4099,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/BookmarksResponse'
-                - $ref: '#/components/schemas/BookmarksResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -4147,9 +4168,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/CreateBookmarkResponse'
-                - $ref: '#/components/schemas/CreateBookmarkResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -4223,9 +4242,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/CreateRetweetResponse'
-                - $ref: '#/components/schemas/CreateRetweetResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -4477,9 +4494,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/CreateTweetResponse'
-                - $ref: '#/components/schemas/CreateTweetResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -4548,9 +4563,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/DeleteBookmarkResponse'
-                - $ref: '#/components/schemas/DeleteBookmarkResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -4624,9 +4637,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/DeleteRetweetResponse'
-                - $ref: '#/components/schemas/DeleteRetweetResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -4700,9 +4711,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/DeleteTweetResponse'
-                - $ref: '#/components/schemas/DeleteTweetResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -4771,9 +4780,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/FavoriteTweetResponse'
-                - $ref: '#/components/schemas/FavoriteTweetResponseData'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -4861,9 +4868,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/TweetFavoritersResponse'
-                - $ref: '#/components/schemas/TweetFavoritersResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -4951,9 +4956,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/FollowResponse'
-                - $ref: '#/components/schemas/FollowResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -5041,9 +5044,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/FollowResponse'
-                - $ref: '#/components/schemas/FollowResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -5131,9 +5132,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/FollowResponse'
-                - $ref: '#/components/schemas/FollowResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -5221,9 +5220,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/TimelineResponse'
-                - $ref: '#/components/schemas/TimelineResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -5313,9 +5310,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/TimelineResponse'
-                - $ref: '#/components/schemas/TimelineResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -5412,9 +5407,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/UserTweetsResponse'
-                - $ref: '#/components/schemas/UserTweetsResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -5500,9 +5493,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/ListLatestTweetsTimelineResponse'
-                - $ref: '#/components/schemas/ListLatestTweetsTimelineResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -5562,9 +5553,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/ProfileResponse'
-                - $ref: '#/components/schemas/ProfileResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -5650,9 +5639,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/TweetRetweetersResponse'
-                - $ref: '#/components/schemas/TweetRetweetersResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -5740,9 +5727,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/SearchTimelineResponse'
-                - $ref: '#/components/schemas/SearchTimelineResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -5843,9 +5828,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/TweetDetailResponse'
-                - $ref: '#/components/schemas/TweetDetailResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -5946,9 +5929,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/TweetResultByRestIdResponse'
-                - $ref: '#/components/schemas/TweetResultByRestIdResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -6020,9 +6001,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/UnfavoriteTweetResponse'
-                - $ref: '#/components/schemas/UnfavoriteTweetResponseData'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -6090,9 +6069,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/UserResponse'
-                - $ref: '#/components/schemas/UserResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -6173,9 +6150,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/UserResponse'
-                - $ref: '#/components/schemas/UserResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -6263,9 +6238,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/UserHighlightsTweetsResponse'
-                - $ref: '#/components/schemas/UserHighlightsTweetsResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -6362,9 +6335,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/UserTweetsResponse'
-                - $ref: '#/components/schemas/UserTweetsResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -6461,9 +6432,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/UserTweetsResponse'
-                - $ref: '#/components/schemas/UserTweetsResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -6558,9 +6527,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/UserTweetsResponse'
-                - $ref: '#/components/schemas/UserTweetsResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -6624,9 +6591,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/UsersResponse'
-                - $ref: '#/components/schemas/UsersResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -6664,7 +6629,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/OtherResponse'
+                $ref: '#/components/schemas/OtherObjectAll'
           description: Successful operation
       tags:
       - other

dist/docs/openapi-3.0.yaml

@@ -266,14 +266,14 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/BookmarksResponseData'
-      required:
+        errors:
-      - data
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
     BookmarksResponseData:
       properties:
         bookmark_timeline_v2:
           $ref: '#/components/schemas/BookmarksTimeline'
-      required:
-      - bookmark_timeline_v2
     BookmarksTimeline:
       properties:
         timeline:
@@ -577,14 +577,16 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/CreateBookmarkResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     CreateBookmarkResponseData:
       properties:
         tweet_bookmark_put:
           type: string
-      required:
-      - tweet_bookmark_put
     CreateRetweet:
       properties:
         result:
@@ -595,14 +597,16 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/CreateRetweetResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     CreateRetweetResponseData:
       properties:
         create_retweet:
           $ref: '#/components/schemas/CreateRetweetResponseResult'
-      required:
-      - create_retweet
     CreateRetweetResponseResult:
       properties:
         retweet_results:
@@ -619,14 +623,16 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/CreateTweetResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     CreateTweetResponseData:
       properties:
         create_tweet:
           $ref: '#/components/schemas/CreateTweetResponseResult'
-      required:
-      - create_tweet
     CreateTweetResponseResult:
       properties:
         tweet_results:
@@ -654,14 +660,16 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/DeleteBookmarkResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     DeleteBookmarkResponseData:
       properties:
         tweet_bookmark_delete:
           type: string
-      required:
-      - tweet_bookmark_delete
     DeleteRetweet:
       properties:
         result:
@@ -674,14 +682,16 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/DeleteRetweetResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     DeleteRetweetResponseData:
       properties:
         create_retweet:
-          $ref: '#/components/schemas/CreateRetweetResponseResult'
+          $ref: '#/components/schemas/DeleteRetweetResponseResult'
-      required:
-      - unretweet
     DeleteRetweetResponseResult:
       properties:
         retweet_results:
@@ -692,14 +702,16 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/DeleteTweetResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     DeleteTweetResponseData:
       properties:
         delete_retweet:
           $ref: '#/components/schemas/DeleteTweetResponseResult'
-      required:
-      - delete_tweet
     DeleteTweetResponseResult:
       properties:
         tweet_results:
@@ -811,23 +823,6 @@ components:
       - kind
       - tracing
       type: object
-    Errors:
-      properties:
-        data:
-          $ref: '#/components/schemas/ErrorsData'
-        errors:
-          items:
-            $ref: '#/components/schemas/Error'
-          type: array
-      required:
-      - errors
-      type: object
-    ErrorsData:
-      properties:
-        user:
-          pattern: dummy
-          type: string
-      type: object
     ExtMediaAvailability:
       properties:
         reason:
@@ -849,12 +844,14 @@ components:
       properties:
         favorite_tweet:
           type: string
-      required:
+    FavoriteTweetResponse:
-      - favorite_tweet
-    FavoriteTweetResponseData:
       properties:
         data:
           $ref: '#/components/schemas/FavoriteTweet'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     FeedbackInfo:
@@ -869,14 +866,16 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/FollowResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     FollowResponseData:
       properties:
         user:
           $ref: '#/components/schemas/FollowResponseUser'
-      required:
-      - user
     FollowResponseResult:
       properties:
         __typename:
@@ -920,8 +919,6 @@ components:
       properties:
         home:
           $ref: '#/components/schemas/HomeTimelineHome'
-      required:
-      - home
     InstructionType:
       enum:
       - TimelineAddEntries
@@ -981,6 +978,10 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/ListTweetsTimelineData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     ListTweetsTimeline:
@@ -991,8 +992,6 @@ components:
       properties:
         list:
           $ref: '#/components/schemas/ListTweetsTimelineList'
-      required:
-      - list
     ListTweetsTimelineList:
       properties:
         tweets_timeline:
@@ -1368,7 +1367,7 @@ components:
       required:
       - fetchStatus
       type: object
-    OtherResponse:
+    OtherObjectAll:
       properties:
         Session:
           $ref: '#/components/schemas/Session'
@@ -1387,14 +1386,16 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/ProfileResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     ProfileResponseData:
       properties:
         user_result_by_screen_name:
           $ref: '#/components/schemas/UserResultByScreenName'
-      required:
-      - user_result_by_screen_name
     QuotedRefResult:
       properties:
         result:
@@ -1445,12 +1446,14 @@ components:
       properties:
         search_by_raw_query:
           $ref: '#/components/schemas/SearchByRawQuery'
-      required:
-      - search_by_raw_query
     SearchTimelineResponse:
       properties:
         data:
           $ref: '#/components/schemas/SearchTimelineData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     SelfThread:
@@ -1468,10 +1471,6 @@ components:
           type: boolean
         other:
           type: boolean
-      required:
-      - adult_content
-      - graphic_violence
-      - other
     Session:
       properties:
         SsoInitTokens:
@@ -1800,6 +1799,10 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/HomeTimelineResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     TimelineShowAlert:
@@ -2199,14 +2202,16 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/TweetDetailResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     TweetDetailResponseData:
       properties:
         threaded_conversation_with_injections_v2:
           $ref: '#/components/schemas/Timeline'
-      required:
-      - threaded_conversation_with_injections_v2
     TweetEditControl:
       properties:
         edit_control_initial:
@@ -2257,14 +2262,16 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/TweetFavoritersResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     TweetFavoritersResponseData:
       properties:
         favoriters_timeline:
           $ref: '#/components/schemas/TimelineV2'
-      required:
-      - favoriters_timeline
     TweetInterstitial:
       properties:
         __typename:
@@ -2464,26 +2471,30 @@ components:
       properties:
         tweetResult:
           $ref: '#/components/schemas/ItemResult'
-      required:
-      - tweetResult
     TweetResultByRestIdResponse:
       properties:
         data:
           $ref: '#/components/schemas/TweetResultByRestIdData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     TweetRetweetersResponse:
       properties:
         data:
           $ref: '#/components/schemas/TweetRetweetersResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     TweetRetweetersResponseData:
       properties:
         retweeters_timeline:
           $ref: '#/components/schemas/TimelineV2'
-      required:
-      - retweeters_timeline
     TweetTombstone:
       additionalProperties: true
       properties:
@@ -2573,12 +2584,14 @@ components:
       properties:
         unfavorite_tweet:
           type: string
-      required:
+    UnfavoriteTweetResponse:
-      - unfavorite_tweet
-    UnfavoriteTweetResponseData:
       properties:
         data:
           $ref: '#/components/schemas/UnfavoriteTweet'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     UnifiedCard:
@@ -2714,12 +2727,14 @@ components:
       properties:
         user:
           $ref: '#/components/schemas/UserHighlightsTweetsUser'
-      required:
-      - user
     UserHighlightsTweetsResponse:
       properties:
         data:
           $ref: '#/components/schemas/UserHighlightsTweetsData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     UserHighlightsTweetsResult:
@@ -2934,6 +2949,10 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/UserResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     UserResponseData:
@@ -3019,12 +3038,14 @@ components:
       properties:
         user:
           $ref: '#/components/schemas/UserTweetsUser'
-      required:
-      - user
     UserTweetsResponse:
       properties:
         data:
           $ref: '#/components/schemas/UserTweetsData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     UserTweetsResult:
@@ -3129,6 +3150,10 @@ components:
       properties:
         data:
           $ref: '#/components/schemas/UsersResponseData'
+        errors:
+          items:
+            $ref: '#/components/schemas/Error'
+          type: array
       required:
       - data
     UsersResponseData:
@@ -3137,8 +3162,6 @@ components:
           items:
             $ref: '#/components/schemas/UserResults'
           type: array
-      required:
-      - users
   securitySchemes:
     Accept:
       description: '*/*'
@@ -4182,9 +4205,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/BookmarksResponse'
-                - $ref: '#/components/schemas/BookmarksResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -4253,9 +4274,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/CreateBookmarkResponse'
-                - $ref: '#/components/schemas/CreateBookmarkResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -4329,9 +4348,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/CreateRetweetResponse'
-                - $ref: '#/components/schemas/CreateRetweetResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -4583,9 +4600,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/CreateTweetResponse'
-                - $ref: '#/components/schemas/CreateTweetResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -4654,9 +4669,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/DeleteBookmarkResponse'
-                - $ref: '#/components/schemas/DeleteBookmarkResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -4730,9 +4743,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/DeleteRetweetResponse'
-                - $ref: '#/components/schemas/DeleteRetweetResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -4806,9 +4817,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/DeleteTweetResponse'
-                - $ref: '#/components/schemas/DeleteTweetResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -4877,9 +4886,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/FavoriteTweetResponse'
-                - $ref: '#/components/schemas/FavoriteTweetResponseData'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -5073,9 +5080,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/TweetFavoritersResponse'
-                - $ref: '#/components/schemas/TweetFavoritersResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -5269,9 +5274,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/FollowResponse'
-                - $ref: '#/components/schemas/FollowResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -5465,9 +5468,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/FollowResponse'
-                - $ref: '#/components/schemas/FollowResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -5661,9 +5662,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/FollowResponse'
-                - $ref: '#/components/schemas/FollowResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -5869,9 +5868,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/TimelineResponse'
-                - $ref: '#/components/schemas/TimelineResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -6082,9 +6079,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/TimelineResponse'
-                - $ref: '#/components/schemas/TimelineResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -6312,9 +6307,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/UserTweetsResponse'
-                - $ref: '#/components/schemas/UserTweetsResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -6503,9 +6496,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/ListLatestTweetsTimelineResponse'
-                - $ref: '#/components/schemas/ListLatestTweetsTimelineResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -6573,9 +6564,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/ProfileResponse'
-                - $ref: '#/components/schemas/ProfileResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -6767,9 +6756,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/TweetRetweetersResponse'
-                - $ref: '#/components/schemas/TweetRetweetersResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -6968,9 +6955,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/SearchTimelineResponse'
-                - $ref: '#/components/schemas/SearchTimelineResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -7223,9 +7208,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/TweetDetailResponse'
-                - $ref: '#/components/schemas/TweetDetailResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -7453,9 +7436,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/TweetResultByRestIdResponse'
-                - $ref: '#/components/schemas/TweetResultByRestIdResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -7527,9 +7508,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/UnfavoriteTweetResponse'
-                - $ref: '#/components/schemas/UnfavoriteTweetResponseData'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -7648,9 +7627,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/UserResponse'
-                - $ref: '#/components/schemas/UserResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -7793,9 +7770,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/UserResponse'
-                - $ref: '#/components/schemas/UserResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -7994,9 +7969,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/UserHighlightsTweetsResponse'
-                - $ref: '#/components/schemas/UserHighlightsTweetsResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -8224,9 +8197,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/UserTweetsResponse'
-                - $ref: '#/components/schemas/UserTweetsResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -8449,9 +8420,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/UserTweetsResponse'
-                - $ref: '#/components/schemas/UserTweetsResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -8674,9 +8643,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/UserTweetsResponse'
-                - $ref: '#/components/schemas/UserTweetsResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -8772,9 +8739,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/UsersResponse'
-                - $ref: '#/components/schemas/UsersResponse'
-                - $ref: '#/components/schemas/Errors'
           description: Successful operation
           headers:
             x-connection-hash:
@@ -8812,7 +8777,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/OtherResponse'
+                $ref: '#/components/schemas/OtherObjectAll'
           description: Successful operation
       tags:
       - other

src/openapi/paths/bookmarks.yaml

@@ -14,24 +14,22 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/BookmarksResponse"
-                  - $ref: "#/components/schemas/BookmarksResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "tweet"
 
 components:
   schemas:
     BookmarksResponse:
-      required:
-        - "data"
       properties:
         data:
           $ref: "#/components/schemas/BookmarksResponseData"
+        errors:
+          type: array
+          items:
+            $ref: "./../response/error.yaml#/components/schemas/Error"
 
     BookmarksResponseData:
-      required:
-        - "bookmark_timeline_v2"
       properties:
         bookmark_timeline_v2:
           $ref: "#/components/schemas/BookmarksTimeline"

src/openapi/paths/follow.yaml

@@ -14,9 +14,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/FollowResponse"
-                  - $ref: "#/components/schemas/FollowResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "user-list"
 
@@ -30,9 +28,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/FollowResponse"
-                  - $ref: "#/components/schemas/FollowResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "user-list"
 
@@ -46,9 +42,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/FollowResponse"
-                  - $ref: "#/components/schemas/FollowResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "user-list"
 
@@ -60,10 +54,12 @@ components:
       properties:
         data:
           $ref: "#/components/schemas/FollowResponseData"
+        errors:
+          type: array
+          items:
+            $ref: "./../response/error.yaml#/components/schemas/Error"
 
     FollowResponseData:
-      required:
-        - "user"
       properties:
         user:
           $ref: "#/components/schemas/FollowResponseUser"

src/openapi/paths/other.yaml

@@ -14,13 +14,13 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/OtherResponse"
+                $ref: "#/components/schemas/OtherObjectAll"
       tags:
         - "other"
 
 components:
   schemas:
-    OtherResponse:
+    OtherObjectAll:
       type: object
       properties:
         Session:

src/openapi/paths/post.yaml

@@ -14,9 +14,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/FavoriteTweetResponse"
-                  - $ref: "#/components/schemas/FavoriteTweetResponseData"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "post"
 
@@ -30,9 +28,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/UnfavoriteTweetResponse"
-                  - $ref: "#/components/schemas/UnfavoriteTweetResponseData"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "post"
 
@@ -46,9 +42,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/CreateRetweetResponse"
-                  - $ref: "#/components/schemas/CreateRetweetResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "post"
 
@@ -62,9 +56,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/DeleteRetweetResponse"
-                  - $ref: "#/components/schemas/DeleteRetweetResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "post"
 
@@ -78,9 +70,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/CreateTweetResponse"
-                  - $ref: "#/components/schemas/CreateTweetResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "post"
 
@@ -94,9 +84,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/DeleteTweetResponse"
-                  - $ref: "#/components/schemas/DeleteTweetResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "post"
 
@@ -110,9 +98,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/CreateBookmarkResponse"
-                  - $ref: "#/components/schemas/CreateBookmarkResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "post"
 
@@ -126,38 +112,43 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/DeleteBookmarkResponse"
-                  - $ref: "#/components/schemas/DeleteBookmarkResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "post"
 
 components:
   schemas:
-    FavoriteTweetResponseData:
+    # ---Favorite---
+    FavoriteTweetResponse:
       required:
         - "data"
       properties:
         data:
           $ref: "#/components/schemas/FavoriteTweet"
+        errors:
+          type: array
+          items:
+            $ref: "./../response/error.yaml#/components/schemas/Error"
 
     FavoriteTweet:
-      required:
-        - "favorite_tweet"
       properties:
         favorite_tweet:
           type: string
 
-    UnfavoriteTweetResponseData:
+    # ---Unfavorite---
+
+    UnfavoriteTweetResponse:
       required:
         - "data"
       properties:
         data:
           $ref: "#/components/schemas/UnfavoriteTweet"
+        errors:
+          type: array
+          items:
+            $ref: "./../response/error.yaml#/components/schemas/Error"
 
     UnfavoriteTweet:
-      required:
-        - "unfavorite_tweet"
       properties:
         unfavorite_tweet:
           type: string
@@ -170,10 +161,12 @@ components:
       properties:
         data:
           $ref: "#/components/schemas/CreateRetweetResponseData"
+        errors:
+          type: array
+          items:
+            $ref: "./../response/error.yaml#/components/schemas/Error"
 
     CreateRetweetResponseData:
-      required:
-        - "create_retweet"
       properties:
         create_retweet:
           $ref: "#/components/schemas/CreateRetweetResponseResult"
@@ -208,19 +201,23 @@ components:
             full_text:
               type: string
 
+    # ---DeleteRetweet---
+
     DeleteRetweetResponse:
       required:
         - "data"
       properties:
         data:
           $ref: "#/components/schemas/DeleteRetweetResponseData"
+        errors:
+          type: array
+          items:
+            $ref: "./../response/error.yaml#/components/schemas/Error"
 
     DeleteRetweetResponseData:
-      required:
-        - "unretweet"
       properties:
         create_retweet:
-          $ref: "#/components/schemas/CreateRetweetResponseResult"
+          $ref: "#/components/schemas/DeleteRetweetResponseResult"
 
     DeleteRetweetResponseResult:
       required:
@@ -246,10 +243,12 @@ components:
       properties:
         data:
           $ref: "#/components/schemas/CreateTweetResponseData"
+        errors:
+          type: array
+          items:
+            $ref: "./../response/error.yaml#/components/schemas/Error"
 
     CreateTweetResponseData:
-      required:
-        - "create_tweet"
       properties:
         create_tweet:
           $ref: "#/components/schemas/CreateTweetResponseResult"
@@ -268,16 +267,20 @@ components:
         result:
           $ref: "./../schemas/tweet.yaml#/components/schemas/Tweet"
 
+    # ---DeleteTweet---
+
     DeleteTweetResponse:
       required:
         - "data"
       properties:
         data:
           $ref: "#/components/schemas/DeleteTweetResponseData"
+        errors:
+          type: array
+          items:
+            $ref: "./../response/error.yaml#/components/schemas/Error"
 
     DeleteTweetResponseData:
-      required:
-        - "delete_tweet"
       properties:
         delete_retweet:
           $ref: "#/components/schemas/DeleteTweetResponseResult"
@@ -289,30 +292,38 @@ components:
         tweet_results:
           type: object
 
+    # ---Bookmark---
+
     CreateBookmarkResponse:
       required:
         - "data"
       properties:
         data:
           $ref: "#/components/schemas/CreateBookmarkResponseData"
+        errors:
+          type: array
+          items:
+            $ref: "./../response/error.yaml#/components/schemas/Error"
 
     CreateBookmarkResponseData:
-      required:
-        - "tweet_bookmark_put"
       properties:
         tweet_bookmark_put:
           type: string
 
+    # ---DeleteBookmark---
+
     DeleteBookmarkResponse:
       required:
         - "data"
       properties:
         data:
           $ref: "#/components/schemas/DeleteBookmarkResponseData"
+        errors:
+          type: array
+          items:
+            $ref: "./../response/error.yaml#/components/schemas/Error"
 
     DeleteBookmarkResponseData:
-      required:
-        - "tweet_bookmark_delete"
       properties:
         tweet_bookmark_delete:
           type: string

src/openapi/paths/profile.yaml

@@ -14,9 +14,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/ProfileResponse"
-                  - $ref: "#/components/schemas/ProfileResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
 
 components:
   schemas:
@@ -26,10 +24,12 @@ components:
       properties:
         data:
           $ref: "#/components/schemas/ProfileResponseData"
+        errors:
+          type: array
+          items:
+            $ref: "./../response/error.yaml#/components/schemas/Error"
 
     ProfileResponseData:
-      required:
-        - "user_result_by_screen_name"
       properties:
         user_result_by_screen_name:
           $ref: "#/components/schemas/UserResultByScreenName"

src/openapi/paths/timeline.yaml

@@ -14,9 +14,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/TimelineResponse"
-                  - $ref: "#/components/schemas/TimelineResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "tweet"
 
@@ -30,9 +28,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/TimelineResponse"
-                  - $ref: "#/components/schemas/TimelineResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "tweet"
 
@@ -46,9 +42,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/ListLatestTweetsTimelineResponse"
-                  - $ref: "#/components/schemas/ListLatestTweetsTimelineResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "tweet"
 
@@ -62,9 +56,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/SearchTimelineResponse"
-                  - $ref: "#/components/schemas/SearchTimelineResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "tweet"
 
@@ -76,10 +68,12 @@ components:
       properties:
         data:
           $ref: "#/components/schemas/HomeTimelineResponseData"
+        errors:
+          type: array
+          items:
+            $ref: "./../response/error.yaml#/components/schemas/Error"
 
     HomeTimelineResponseData:
-      required:
-        - "home"
       properties:
         home:
           $ref: "#/components/schemas/HomeTimelineHome"
@@ -97,10 +91,12 @@ components:
       properties:
         data:
           $ref: "#/components/schemas/ListTweetsTimelineData"
+        errors:
+          type: array
+          items:
+            $ref: "./../response/error.yaml#/components/schemas/Error"
 
     ListTweetsTimelineData:
-      required:
-        - "list"
       properties:
         list:
           $ref: "#/components/schemas/ListTweetsTimelineList"
@@ -123,10 +119,12 @@ components:
       properties:
         data:
           $ref: "#/components/schemas/SearchTimelineData"
+        errors:
+          type: array
+          items:
+            $ref: "./../response/error.yaml#/components/schemas/Error"
 
     SearchTimelineData:
-      required:
-        - "search_by_raw_query"
       properties:
         search_by_raw_query:
           $ref: "#/components/schemas/SearchByRawQuery"

src/openapi/paths/tweet.yaml

@@ -14,9 +14,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/TweetDetailResponse"
-                  - $ref: "#/components/schemas/TweetDetailResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "tweet"
 
@@ -30,9 +28,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/TweetResultByRestIdResponse"
-                  - $ref: "#/components/schemas/TweetResultByRestIdResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       # tags:
       #   - "tweet"
 
@@ -46,9 +42,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/TweetFavoritersResponse"
-                  - $ref: "#/components/schemas/TweetFavoritersResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "user-list"
 
@@ -62,9 +56,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/TweetRetweetersResponse"
-                  - $ref: "#/components/schemas/TweetRetweetersResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "user-list"
 
@@ -76,10 +68,12 @@ components:
       properties:
         data:
           $ref: "#/components/schemas/TweetDetailResponseData"
+        errors:
+          type: array
+          items:
+            $ref: "./../response/error.yaml#/components/schemas/Error"
 
     TweetDetailResponseData:
-      required:
-        - "threaded_conversation_with_injections_v2"
       properties:
         threaded_conversation_with_injections_v2:
           $ref: "./../schemas/timeline.yaml#/components/schemas/Timeline"
@@ -90,10 +84,12 @@ components:
       properties:
         data:
           $ref: "#/components/schemas/TweetResultByRestIdData"
+        errors:
+          type: array
+          items:
+            $ref: "./../response/error.yaml#/components/schemas/Error"
 
     TweetResultByRestIdData:
-      required:
-        - "tweetResult"
       properties:
         tweetResult:
           $ref: "./../schemas/content.yaml#/components/schemas/ItemResult"
@@ -104,10 +100,12 @@ components:
       properties:
         data:
           $ref: "#/components/schemas/TweetFavoritersResponseData"
+        errors:
+          type: array
+          items:
+            $ref: "./../response/error.yaml#/components/schemas/Error"
 
     TweetFavoritersResponseData:
-      required:
-        - "favoriters_timeline"
       properties:
         favoriters_timeline:
           $ref: "./../schemas/timeline.yaml#/components/schemas/TimelineV2"
@@ -118,10 +116,12 @@ components:
       properties:
         data:
           $ref: "#/components/schemas/TweetRetweetersResponseData"
+        errors:
+          type: array
+          items:
+            $ref: "./../response/error.yaml#/components/schemas/Error"
 
     TweetRetweetersResponseData:
-      required:
-        - "retweeters_timeline"
       properties:
         retweeters_timeline:
           $ref: "./../schemas/timeline.yaml#/components/schemas/TimelineV2"

src/openapi/paths/user.yaml

@@ -14,9 +14,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/UserResponse"
-                  - $ref: "#/components/schemas/UserResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "user"
 
@@ -30,9 +28,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/UserResponse"
-                  - $ref: "#/components/schemas/UserResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "user"
 
@@ -46,9 +42,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/UsersResponse"
-                  - $ref: "#/components/schemas/UsersResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "users"
 
@@ -60,6 +54,10 @@ components:
       properties:
         data:
           $ref: "#/components/schemas/UserResponseData"
+        errors:
+          type: array
+          items:
+            $ref: "./../response/error.yaml#/components/schemas/Error"
 
     UserResponseData:
       properties:
@@ -72,10 +70,12 @@ components:
       properties:
         data:
           $ref: "#/components/schemas/UsersResponseData"
+        errors:
+          type: array
+          items:
+            $ref: "./../response/error.yaml#/components/schemas/Error"
 
     UsersResponseData:
-      required:
-        - "users"
       properties:
         users:
           type: array

src/openapi/paths/usertweets.yaml

@@ -14,9 +14,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/UserTweetsResponse"
-                  - $ref: "#/components/schemas/UserTweetsResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "tweet"
 
@@ -30,9 +28,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/UserTweetsResponse"
-                  - $ref: "#/components/schemas/UserTweetsResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "tweet"
 
@@ -46,9 +42,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/UserHighlightsTweetsResponse"
-                  - $ref: "#/components/schemas/UserHighlightsTweetsResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "tweet"
 
@@ -62,9 +56,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/UserTweetsResponse"
-                  - $ref: "#/components/schemas/UserTweetsResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "tweet"
 
@@ -78,9 +70,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: "#/components/schemas/UserTweetsResponse"
-                  - $ref: "#/components/schemas/UserTweetsResponse"
-                  - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
         - "tweet"
 
@@ -92,10 +82,12 @@ components:
       properties:
         data:
           $ref: "#/components/schemas/UserTweetsData"
+        errors:
+          type: array
+          items:
+            $ref: "./../response/error.yaml#/components/schemas/Error"
 
     UserTweetsData:
-      required:
-        - "user"
       properties:
         user:
           $ref: "#/components/schemas/UserTweetsUser"
@@ -123,10 +115,12 @@ components:
       properties:
         data:
           $ref: "#/components/schemas/UserHighlightsTweetsData"
+        errors:
+          type: array
+          items:
+            $ref: "./../response/error.yaml#/components/schemas/Error"
 
     UserHighlightsTweetsData:
-      required:
-        - "user"
       properties:
         user:
           $ref: "#/components/schemas/UserHighlightsTweetsUser"

src/openapi/response/error.yaml

@@ -6,25 +6,6 @@ info:
 paths: {}
 components:
   schemas:
-    Errors:
-      type: object
-      required:
-        - errors
-      properties:
-        errors:
-          type: array
-          items:
-            $ref: "#/components/schemas/Error"
-        data:
-          $ref: "#/components/schemas/ErrorsData"
-
-    ErrorsData:
-      type: object
-      properties:
-        user:
-          type: string # always null
-          pattern: "dummy"
-
     Error:
       type: object
       required:

src/openapi/schemas/tweet.yaml

@@ -1316,10 +1316,6 @@ components:
           enum: [Available, Unavailable]
 
     SensitiveMediaWarning:
-      required:
-        - "adult_content"
-        - "graphic_violence"
-        - "other"
       properties:
         adult_content:
           type: boolean

test/python/openapi-generator-config.yaml

@@ -1,4 +1,4 @@
-inputSpec: dist/compatible_discriminator/openapi-3.0.yaml
+inputSpec: dist/compatible/openapi-3.0.yaml
 outputDir: python_generated
 
 useOneOfDiscriminatorLookup: true

test/python/test_serialize.py

@@ -238,7 +238,7 @@ if __name__ == "__main__":
             data = json.load(f)
 
         try:
-            _ = pt.Errors.from_dict(data)
+            _ = pt.TweetDetailResponse.from_dict(data)
         except Exception as e:
             error_dump(e)
     access_token = "AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA"

tools/build_config.py

@@ -3,7 +3,6 @@ from hooks import (
     AddParametersOnContent,
     AddParametersOnParameters,
     AddPathQueryIdOnParameters,
-    RemoveErrorHandle,
     SetResponsesHeader,
 )
 
@@ -12,11 +11,7 @@ class Config:
     OUTPUT_DIR = "dist/{0}"
     INPUT_DIR = "src/openapi"
 
-    def hooks_generator(
+    def hooks_generator(self, queryParameterJson=True):
-        self,
-        queryParameterJson=True,
-        removeLegacyDiscriminatorBehavior=False,
-    ):
         # https://stackoverflow.com/questions/34820064/defining-an-api-with-swagger-get-call-that-uses-json-in-parameters/45223964
         if queryParameterJson:
             # ["parameters"][0]["content"]["application/json"]["schema"]
@@ -33,11 +28,6 @@ class Config:
                 ignoreKeys=["queryId"],
             )
 
-        # https://github.com/OpenAPITools/openapi-generator/issues/15373
-        additionalHooks = []
-        if removeLegacyDiscriminatorBehavior:
-            additionalHooks.append(RemoveErrorHandle())
-
         return {
             "openapi": [],
             "schemas": [],
@@ -47,7 +37,6 @@ class Config:
                     SetResponsesHeader(),
                     AddPathQueryIdOnParameters(split=-1),
                     getParamHook,
-                    *additionalHooks,
                 ]
                 for key in ["default", "user", "users", "user-list", "tweet"]
             }
@@ -60,7 +49,6 @@ class Config:
                         schemaType=None,
                         contentType="application/json",
                     ),
-                    *additionalHooks,
                 ]
                 for key in ["post"]
             }
@@ -91,8 +79,4 @@ class Config:
             "compatible": self.hooks_generator(
                 queryParameterJson=False,
             ),
-            "compatible_discriminator": self.hooks_generator(
-                queryParameterJson=False,
-                removeLegacyDiscriminatorBehavior=True,
-            ),
         }

tools/hooks.py

@@ -125,11 +125,11 @@ class RequestHookBase(HookBase):
 # SchemasHookBase extends
 
 
-class RemoveDiscriminator(SchemasHookBase):
+# class RemoveDiscriminator(SchemasHookBase):
-    def hook(self, value: dict):
+#     def hook(self, value: dict):
-        if value.get("discriminator") is not None:
+#         if value.get("discriminator") is not None:
-            del value["discriminator"]
+#             del value["discriminator"]
-        return value
+#         return value
 
 
 class SchemasCheck(SchemasHookBase):
@@ -218,11 +218,11 @@ class AddPathQueryIdOnParameters(RequestHookBase):
         return path, value
 
 
-class RemoveErrorHandle(RequestHookBase):
+# class RemoveErrorHandle(RequestHookBase):
-    def hook(self, path: str, value: dict):
+#     def hook(self, path: str, value: dict):
-        content = value["responses"]["200"]["content"]["application/json"]
+#         content = value["responses"]["200"]["content"]["application/json"]
-        content["schema"] = content["schema"]["oneOf"][0]
+#         content["schema"] = content["schema"]["oneOf"][0]
-        return path, value
+#         return path, value
 
 
 # OnParameters