twitter-openapi-typescript 0.0.31 → 0.0.33

package/src/utils/api.ts

@@ -29,6 +29,8 @@ export const instructionToEntry = (item: i.InstructionUnion[]): i.TimelineAddEnt
   return item.flatMap((e) => {
     if (e.type == i.InstructionType.TimelineAddEntries) {
       return (e as i.TimelineAddEntries).entries;
+    } else if (e.type == i.InstructionType.TimelineAddToModule) {
+      return [];
     } else if (e.type == i.InstructionType.TimelineReplaceEntry) {
       return [(e as i.TimelineReplaceEntry).entry];
     }
@@ -36,6 +38,23 @@ export const instructionToEntry = (item: i.InstructionUnion[]): i.TimelineAddEnt
   });
 };
 
+export const instructionConverter = (item: i.InstructionUnion[]): TweetApiUtilsData[] => {
+  return item
+    .flatMap((e) => {
+      if (e.type == i.InstructionType.TimelineAddEntries) {
+        return [];
+      } else if (e.type == i.InstructionType.TimelineAddToModule) {
+        const item = (e as i.TimelineAddToModule).moduleItems ?? [];
+        return moduleConverter(item);
+      } else if (e.type == i.InstructionType.TimelineReplaceEntry) {
+        return [];
+      }
+      return [];
+    })
+    .filter((e): e is NonNullable<typeof e> => e != undefined)
+    .flat();
+};
+
 export const tweetEntriesConverter = (item: i.TimelineAddEntry[]): TweetApiUtilsData[] => {
   return item
     .map((e) => {
@@ -51,29 +70,7 @@ export const tweetEntriesConverter = (item: i.TimelineAddEntry[]): TweetApiUtils
         ];
       } 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 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),
-            }),
-          ];
-        }
+        return moduleConverter(item);
       }
     })
     .filter((e): e is NonNullable<typeof e> => e != undefined)
@@ -81,6 +78,33 @@ export const tweetEntriesConverter = (item: i.TimelineAddEntry[]): TweetApiUtils
     .flat();
 };
 
+export const moduleConverter = (item: i.ModuleItem[]): TweetApiUtilsData[] => {
+  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 [];
+
+  if (timelineList[0].tweetDisplayType == i.TimelineTweetTweetDisplayTypeEnum.MediaGrid) {
+    return timelineList
+      .map((e) =>
+        buildTweetApiUtils({
+          result: e.tweetResults,
+          promotedMetadata: e.promotedMetadata,
+        }),
+      )
+      .filter((e): e is NonNullable<typeof e> => e != undefined);
+  } 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);
+  }
+};
+
 type buildTweetApiUtilsArgs = {
   result: i.ItemResult;
   promotedMetadata?: any;

package/test/init.ts

@@ -1,11 +1,8 @@
 import { TwitterOpenApi } from '@/api';
-import * as dotenv from 'dotenv';
+import { promises as fs } from 'fs';
 import * as log4js from 'log4js';
 
-dotenv.config();
 
-const authToken = process.env.AUTH_TOKEN as string;
-const CsrfToken = process.env.CSRF_TOKEN as string;
 
 export const logger = log4js
   .configure({
@@ -25,12 +22,19 @@ export const logger = log4js
   })
   .getLogger('Test');
 
+export type Cookie = {
+  name: string;
+  domain: string;
+  value: string;
+};
+
 export const getClient = async () => {
   const api = new TwitterOpenApi();
-  const client = await api.getClientFromCookies({
-    ct0: CsrfToken,
-    auth_token: authToken,
-  });
+  const data = await fs.readFile('cookies.json', 'utf-8');
+  const parsed = JSON.parse(data)
+  const cookies = parsed as Cookie[]
+  const json = Object.fromEntries(cookies.filter((e) => e.domain === '.twitter.com').map((e) => [e.name, e.value]));
+  const client = await api.getClientFromCookies(json);
   return client;
 };
 export const getGuestClient = async () => {

package/a.ts

@@ -1,8 +0,0 @@
-import { TwitterOpenApi } from "@/api";
-
-(async () => {
-    const api = new TwitterOpenApi();
-    const client = await api.getGuestClient();
-    const res = await client.getDefaultApi().getTweetResultByRestId({ tweetId: "1771078537694601545" });
-    console.log(res.data);
-})()