twitter-openapi-typescript 0.0.27 → 0.0.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twitter-openapi-typescript",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "description": "Implementation of Twitter internal API in TypeScript",
   "scripts": {
     "test": "jest",
@@ -21,7 +21,7 @@
   "main": "./dist/src/index.js",
   "typings": "./dist/src/index.d.ts",
   "dependencies": {
-    "twitter-openapi-typescript-generated": "^0.0.16"
+    "twitter-openapi-typescript-generated": "^0.0.18"
   },
   "devDependencies": {
     "@types/jest": "*",

package/src/api.ts

@@ -14,7 +14,7 @@ import * as i from 'twitter-openapi-typescript-generated';
 import { UsersApiUtils } from './apis/usersApi';
 
 export class TwitterOpenApi {
-  static hash = '7560ee63488ec9d15f5389e64867f2413701d7dd';
+  static hash = '4f39fa1a95e3b03fcc64ae4c54c3d4389582fd39';
   static url = `https://raw.githubusercontent.com/fa0311/twitter-openapi/${this.hash}/src/config/placeholder.json`;
   static twitter = 'https://twitter.com/home';
 
@@ -44,7 +44,7 @@ export class TwitterOpenApi {
     ...TwitterOpenApi.browser_headers,
   };
 
-  static fetchApi: i.FetchAPI = fetch;
+  static fetchApi: i.FetchAPI = fetch.bind(globalThis);
 
   initOverrides: initOverrides = {};
 

package/src/utils/api.ts

@@ -43,25 +43,42 @@ export const tweetEntriesConverter = (item: i.TimelineAddEntry[]): TweetApiUtils
         const item = (e.content as i.TimelineTimelineItem).itemContent;
         const timeline = item.itemType == i.ContentItemType.TimelineTweet ? (item as i.TimelineTweet) : undefined;
         if (timeline == undefined) return undefined;
-        return buildTweetApiUtils({
-          result: timeline.tweetResults,
-          promotedMetadata: timeline.promotedMetadata,
-        });
+        return [
+          buildTweetApiUtils({
+            result: timeline.tweetResults,
+            promotedMetadata: timeline.promotedMetadata,
+          }),
+        ];
       } else if (e.content.entryType == i.ContentEntryType.TimelineTimelineModule) {
         const item = (e.content as i.TimelineTimelineModule).items ?? [];
         const timelineList = item
           .filter((e) => e.item.itemContent.itemType == i.ContentItemType.TimelineTweet)
           .map((e) => e.item.itemContent as i.TimelineTweet);
         if (timelineList.length == 0) return undefined;
-        const timeline = timelineList[0];
-        return buildTweetApiUtils({
-          result: timeline.tweetResults,
-          promotedMetadata: timeline.promotedMetadata,
-          reply: timelineList.slice(1),
-        });
+
+        const displayType = (e.content as i.TimelineTimelineModule).displayType;
+        if (displayType == i.DisplayType.VerticalGrid) {
+          return timelineList.map((e) =>
+            buildTweetApiUtils({
+              result: e.tweetResults,
+              promotedMetadata: e.promotedMetadata,
+            }),
+          );
+        } else {
+          const timeline = timelineList[0];
+          return [
+            buildTweetApiUtils({
+              result: timeline.tweetResults,
+              promotedMetadata: timeline.promotedMetadata,
+              reply: timelineList.slice(1),
+            }),
+          ];
+        }
       }
     })
-    .filter((e): e is NonNullable<typeof e> => e != undefined);
+    .filter((e): e is NonNullable<typeof e> => e != undefined)
+    .map((e) => e.filter((e): e is NonNullable<typeof e> => e != undefined))
+    .flat();
 };
 
 type buildTweetApiUtilsArgs = {