twitter-openapi-typescript 0.0.10 → 0.0.13

package/dist/src/utils/api.js

@@ -1,11 +1,52 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildHeader = exports.buildCursor = exports.entriesCursor = exports.buildUserResponse = exports.userEntriesConverter = exports.tweetResultsConverter = exports.buildTweetApiUtils = exports.tweetEntriesConverter = exports.instructionToEntry = void 0;
+exports.buildHeader = exports.buildCursor = exports.entriesCursor = exports.userResultConverter = exports.userEntriesConverter = exports.userOrNullConverter = exports.tweetResultsConverter = exports.buildTweetApiUtils = exports.tweetEntriesConverter = exports.instructionToEntry = exports.errorCheck = exports.getKwargs = void 0;
 var i = require("twitter-openapi-typescript-generated");
+var getKwargs = function (flag, additional) {
+    var kwargs = { pathQueryId: flag.queryId };
+    if (flag.variables != null) {
+        kwargs.variables = JSON.stringify(__assign(__assign({}, flag.variables), additional));
+    }
+    if (flag.features != null) {
+        kwargs.features = JSON.stringify(flag.features);
+    }
+    if (flag.fieldToggles != null) {
+        kwargs.fieldToggles = JSON.stringify(flag.fieldToggles);
+    }
+    return kwargs;
+};
+exports.getKwargs = getKwargs;
+var errorCheck = function (data) {
+    var res = data;
+    if (res.data != undefined) {
+        return res;
+    }
+    else if (res.error != undefined) {
+        throw Error(res.errors[0].message);
+    }
+};
+exports.errorCheck = errorCheck;
 var instructionToEntry = function (item) {
-    return item
-        .map(function (e) { return (e.type == i.InstructionType.TimelineAddEntries ? e : null); })
-        .find(function (e) { return e; }).entries;
+    return item.flatMap(function (e) {
+        if (e.type == i.InstructionType.TimelineAddEntries) {
+            return e.entries;
+        }
+        else if (e.type == i.InstructionType.TimelineReplaceEntry) {
+            return [e.entry];
+        }
+        return [];
+    });
 };
 exports.instructionToEntry = instructionToEntry;
 var tweetEntriesConverter = function (item) {
@@ -45,14 +86,19 @@ var buildTweetApiUtils = function (args) {
     var tweet = (0, exports.tweetResultsConverter)(args.result);
     if (tweet == null)
         return undefined;
+    var user = (0, exports.userOrNullConverter)(tweet.core.userResults.result);
+    if (user == null)
+        return undefined;
     var quoted = tweet.quotedStatusResult;
     var retweeted = tweet.legacy.retweetedStatusResult;
+    var reply = (_b = (_a = args.reply) === null || _a === void 0 ? void 0 : _a.map(function (e) { return (0, exports.buildTweetApiUtils)({ result: e.tweetResults, promotedMetadata: e.promotedMetadata }); }).filter(function (e) { return e != null; })) !== null && _b !== void 0 ? _b : [];
     return {
         raw: args.result,
         promotedMetadata: args.promotedMetadata,
         tweet: tweet,
-        user: tweet.core.userResults.result,
-        reply: (_b = (_a = args.reply) === null || _a === void 0 ? void 0 : _a.map(function (e) { return (0, exports.buildTweetApiUtils)({ result: e.tweetResults, promotedMetadata: e.promotedMetadata }); }).filter(function (e) { return e != null; })) !== null && _b !== void 0 ? _b : [],
+        user: user,
+        replies: reply,
+        retweeted: retweeted == undefined ? undefined : (0, exports.buildTweetApiUtils)({ result: retweeted }),
         quoted: quoted == undefined ? undefined : (0, exports.buildTweetApiUtils)({ result: quoted }),
     };
 };
@@ -69,24 +115,39 @@ var tweetResultsConverter = function (tweetResults) {
     throw Error();
 };
 exports.tweetResultsConverter = tweetResultsConverter;
+var userOrNullConverter = function (userResults) {
+    if (userResults.typename == i.TypeName.User) {
+        return userResults;
+    }
+};
+exports.userOrNullConverter = userOrNullConverter;
 var userEntriesConverter = function (item) {
     return item
         .map(function (e) {
         if (e.content.typename == i.TypeName.TimelineTimelineItem) {
             var item_3 = e.content.itemContent;
-            return item_3.itemType == i.ContentItemType.TimelineUser ? item_3 : null;
+            if (item_3.itemType == i.ContentItemType.TimelineUser) {
+                return item_3.userResults;
+            }
         }
     })
         .filter(function (e) { return e != null; });
 };
 exports.userEntriesConverter = userEntriesConverter;
-var buildUserResponse = function (user) {
-    return {
-        raw: user,
-        user: user.userResults.result,
-    };
+var userResultConverter = function (user) {
+    return user
+        .map(function (e) {
+        var user = (0, exports.userOrNullConverter)(e.result);
+        if (user == null)
+            return null;
+        return {
+            raw: e,
+            user: user,
+        };
+    })
+        .filter(function (e) { return e != null; });
 };
-exports.buildUserResponse = buildUserResponse;
+exports.userResultConverter = userResultConverter;
 var entriesCursor = function (item) {
     var cursorList = item
         .map(function (e) {
@@ -106,20 +167,21 @@ var entriesCursor = function (item) {
 exports.entriesCursor = entriesCursor;
 var buildCursor = function (cursorList) {
     return {
-        top: cursorList.find(function (e) { return e.cursorType == i.TimelineTimelineCursorCursorTypeEnum.Top; }),
-        bottom: cursorList.find(function (e) { return e.cursorType == i.TimelineTimelineCursorCursorTypeEnum.Bottom; }),
+        top: cursorList.find(function (e) { return e.cursorType == i.CursorType.Top; }),
+        bottom: cursorList.find(function (e) { return e.cursorType == i.CursorType.Bottom; }),
     };
 };
 exports.buildCursor = buildCursor;
 var buildHeader = function (headers) {
+    var _a, _b, _c;
     return {
         raw: headers,
         connectionHash: headers.get('x-connection-hash'),
         contentTypeOptions: headers.get('x-content-type-options'),
         frameOptions: headers.get('x-frame-options'),
-        rateLimitLimit: Number(headers.get('x-rate-limit-limit')),
-        rateLimitRemaining: Number(headers.get('x-rate-limit-remaining')),
-        rateLimitReset: Number(headers.get('x-rate-limit-reset')),
+        rateLimitLimit: Number((_a = headers.get('x-rate-limit-limit')) !== null && _a !== void 0 ? _a : 0),
+        rateLimitRemaining: Number((_b = headers.get('x-rate-limit-remaining')) !== null && _b !== void 0 ? _b : 0),
+        rateLimitReset: Number((_c = headers.get('x-rate-limit-reset')) !== null && _c !== void 0 ? _c : 0),
         responseTime: Number(headers.get('x-response-time')),
         tfePreserveBody: headers.get('x-tfe-preserve-body') == 'true',
         transactionId: headers.get('x-transaction-id'),

package/dist/src/utils/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/utils/api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/utils/api.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twitter-openapi-typescript",
-  "version": "0.0.10",
+  "version": "0.0.13",
   "description": "Implementation of Twitter internal API in TypeScript",
   "scripts": {
     "test": "jest",
@@ -22,10 +22,10 @@
   "main": "./dist/src/index.js",
   "typings": "./dist/src/index.d.ts",
   "dependencies": {
-    "twitter-openapi-typescript-generated": "^0.0.8"
+    "twitter-openapi-typescript-generated": "^0.0.9"
   },
   "devDependencies": {
-    "@types/jest": "^28.0.0",
+    "@types/jest": "^28.1.8",
     "@types/node": "^20.2.0",
     "@types/node-fetch": "^2.0.0",
     "@typescript-eslint/eslint-plugin": "^5.53.0",

package/src/api.ts

@@ -11,6 +11,7 @@ import {
   V20GetApiUtils,
 } from '@/apis';
 import { DefaultFlag } from '@/models';
+import { UsersApiUtils } from './apis/usersApi';
 
 export type TwitterOpenApiParams = {
   lang?: string;
@@ -27,7 +28,7 @@ export type TwitterOpenApiCookie = {
 };
 
 export class TwitterOpenApi {
-  static hash = '29e05d162f600933fdbf633e992d2d0a249c9413';
+  static hash = '2d477a0fb84d249a30b5af535b467efc25b34923';
   static url = `https://raw.githubusercontent.com/fa0311/twitter-openapi/${this.hash}/src/config/placeholder.json`;
   static twitter = 'https://twitter.com/home';
 
@@ -167,6 +168,10 @@ export class TwitterOpenApiClient {
     return new UserApiUtils(new i.UserApi(this.config), this.flag);
   }
 
+  getUsersApi(): UsersApiUtils {
+    return new UsersApiUtils(new i.UsersApi(this.config), this.flag);
+  }
+
   getUserListApi(): UserListApiUtils {
     return new UserListApiUtils(new i.UserListApi(this.config), this.flag);
   }

package/src/apis/defaultApi.ts

@@ -1,5 +1,5 @@
 import * as i from 'twitter-openapi-typescript-generated';
-import { buildHeader } from '@/utils';
+import { buildHeader, errorCheck, getKwargs } from '@/utils';
 import { RequestParam, DefaultFlag, TwitterApiUtilsResponse } from '@/models';
 
 export type ProfileSpotlightsQueryParam = {
@@ -18,18 +18,10 @@ export class DefaultApiUtils {
 
   async request<T1, T2>(param: RequestParam<T1, T2>): Promise<TwitterApiUtilsResponse<T1>> {
     const apiFn: typeof param.apiFn = param.apiFn.bind(this.api);
-    const fieldTogglesFn = () => {
-      if (this.flag[param.key]['fieldToggles'] == null) return { fieldToggles: '' };
-      return { fieldToggles: JSON.stringify(this.flag[param.key]['fieldToggles']) };
-    };
-    const response = await apiFn({
-      pathQueryId: this.flag[param.key]['queryId'],
-      queryId: this.flag[param.key]['queryId'],
-      variables: JSON.stringify({ ...this.flag[param.key]['variables'], ...param.param }),
-      features: JSON.stringify(this.flag[param.key]['features']),
-      ...fieldTogglesFn(),
-    });
-    const data = param.convertFn(await response.value());
+    const args = getKwargs(this.flag[param.key], param.param);
+    const response = await apiFn(args);
+    const checked = errorCheck(await response.value());
+    const data = param.convertFn(checked);
     return {
       raw: { response: response.raw },
       header: buildHeader(response.raw.headers),

package/src/apis/index.ts

@@ -2,6 +2,7 @@ export { DefaultApiUtils } from './defaultApi';
 export { TweetApiUtils } from './tweetApi';
 export { PostApiUtils } from './postApi';
 export { UserApiUtils } from './userApi';
+export { UsersApiUtils } from './usersApi';
 export { UserListApiUtils } from './userListApi';
 export { V11GetApiUtils } from './v11GetApi';
 export { V11PostApiUtils } from './v11PostApi';

package/src/apis/postApi.ts

@@ -1,7 +1,8 @@
 import * as i from 'twitter-openapi-typescript-generated';
 import { DefaultFlag } from '@/models';
-import { buildHeader } from '@/utils';
+import { buildHeader, errorCheck } from '@/utils';
 import { TwitterApiUtilsResponse } from '@/models';
+import { error } from 'console';
 
 type PostCreateTweetParam = {
   tweetText: string;
@@ -58,10 +59,11 @@ export class PostApiUtils {
         variables: { ...variables, ...args },
       },
     });
+
     return {
       raw: { response: response.raw },
       header: buildHeader(response.raw.headers),
-      data: await response.value(),
+      data: errorCheck(await response.value()),
     };
   }
 
@@ -82,7 +84,7 @@ export class PostApiUtils {
     return {
       raw: { response: response.raw },
       header: buildHeader(response.raw.headers),
-      data: await response.value(),
+      data: errorCheck(await response.value()),
     };
   }
 
@@ -103,7 +105,7 @@ export class PostApiUtils {
     return {
       raw: { response: response.raw },
       header: buildHeader(response.raw.headers),
-      data: await response.value(),
+      data: errorCheck(await response.value()),
     };
   }
   async postDeleteRetweet(param: PostDeleteRetweetParam): Promise<TwitterApiUtilsResponse<i.DeleteRetweetResponse>> {
@@ -123,7 +125,7 @@ export class PostApiUtils {
     return {
       raw: { response: response.raw },
       header: buildHeader(response.raw.headers),
-      data: await response.value(),
+      data: errorCheck(await response.value()),
     };
   }
 
@@ -146,7 +148,7 @@ export class PostApiUtils {
     return {
       raw: { response: response.raw },
       header: buildHeader(response.raw.headers),
-      data: await response.value(),
+      data: errorCheck(await response.value()),
     };
   }
 
@@ -169,7 +171,7 @@ export class PostApiUtils {
     return {
       raw: { response: response.raw },
       header: buildHeader(response.raw.headers),
-      data: await response.value(),
+      data: errorCheck(await response.value()),
     };
   }
 }

package/src/apis/tweetApi.ts

@@ -1,6 +1,12 @@
 import * as i from 'twitter-openapi-typescript-generated';
-import { DefaultFlag, TweetListApiUtilsResponse, ApiUtilsRaw, RequestParam } from '@/models';
-import { buildHeader, entriesCursor, instructionToEntry, tweetEntriesConverter } from '@/utils';
+import {
+  DefaultFlag,
+  RequestParam,
+  TwitterApiUtilsResponse,
+  TweetApiUtilsData,
+  TimelineApiUtilsResponse,
+} from '@/models';
+import { buildHeader, entriesCursor, errorCheck, getKwargs, instructionToEntry, tweetEntriesConverter } from '@/utils';
 
 type GetTweetDetailParam = {
   focalTweetId: string;
@@ -69,6 +75,8 @@ type GetBookmarksParam = {
   extraParam?: { [key: string]: any };
 };
 
+type ResponseType = TwitterApiUtilsResponse<TimelineApiUtilsResponse<TweetApiUtilsData>>;
+
 export class TweetApiUtils {
   api: i.TweetApi;
   flag: DefaultFlag;
@@ -78,36 +86,31 @@ export class TweetApiUtils {
     this.flag = flag;
   }
 
-  async request<T>(param: RequestParam<i.InstructionUnion[], T>): Promise<TweetListApiUtilsResponse> {
+  async request<T>(param: RequestParam<i.InstructionUnion[], T>): Promise<ResponseType> {
     const apiFn: typeof param.apiFn = param.apiFn.bind(this.api);
-    const fieldTogglesFn = () => {
-      if (this.flag[param.key]['fieldToggles'] == null) return { fieldToggles: '' };
-      return { fieldToggles: JSON.stringify(this.flag[param.key]['fieldToggles']) };
-    };
-    const response = await apiFn({
-      pathQueryId: this.flag[param.key]['queryId'],
-      queryId: this.flag[param.key]['queryId'],
-      variables: JSON.stringify({ ...this.flag[param.key]['variables'], ...param.param }),
-      features: JSON.stringify(this.flag[param.key]['features']),
-      ...fieldTogglesFn(),
-    });
-    const instruction = param.convertFn(await response.value());
+    const args = getKwargs(this.flag[param.key], param.param);
+    const response = await apiFn(args);
+    const checked = errorCheck(await response.value());
+    const instruction = param.convertFn(checked);
     const entry = instructionToEntry(instruction);
     const data = tweetEntriesConverter(entry);
-    const raw: ApiUtilsRaw = {
-      response: response.raw,
-      instruction: instruction,
-      entry: entry,
-    };
     return {
-      raw: raw,
+      raw: {
+        response: response.raw,
+      },
       header: buildHeader(response.raw.headers),
-      cursor: entriesCursor(entry),
-      data: data,
+      data: {
+        raw: {
+          instruction,
+          entry,
+        },
+        cursor: entriesCursor(entry),
+        data: data,
+      },
     };
   }
 
-  async getTweetDetail(param: GetTweetDetailParam): Promise<TweetListApiUtilsResponse> {
+  async getTweetDetail(param: GetTweetDetailParam): Promise<ResponseType> {
     const args = {
       focalTweetId: param.focalTweetId,
       ...(param.cursor == null ? {} : { cursor: param.cursor }),
@@ -123,7 +126,7 @@ export class TweetApiUtils {
     });
     return response;
   }
-  async getSearchTimeline(param: GetSearchTimelineParam): Promise<TweetListApiUtilsResponse> {
+  async getSearchTimeline(param: GetSearchTimelineParam): Promise<ResponseType> {
     const args = {
       rawQuery: param.rawQuery,
       ...(param.product == null ? {} : { product: param.product }),
@@ -141,7 +144,7 @@ export class TweetApiUtils {
     return response;
   }
 
-  async getHomeTimeline(param: GetHomeTimelineParam = {}): Promise<TweetListApiUtilsResponse> {
+  async getHomeTimeline(param: GetHomeTimelineParam = {}): Promise<ResponseType> {
     const args = {
       ...(param.count == null ? {} : { count: param.count }),
       ...(param.couser == null ? {} : { couser: param.couser }),
@@ -157,7 +160,7 @@ export class TweetApiUtils {
     return response;
   }
 
-  async getHomeLatestTimeline(param: GetHomeLatestTimelineParam = {}): Promise<TweetListApiUtilsResponse> {
+  async getHomeLatestTimeline(param: GetHomeLatestTimelineParam = {}): Promise<ResponseType> {
     const args = {
       ...(param.count == null ? {} : { count: param.count }),
       ...(param.cursor == null ? {} : { cursor: param.cursor }),
@@ -173,7 +176,7 @@ export class TweetApiUtils {
     return response;
   }
 
-  async getListLatestTweetsTimeline(param: GetListLatestTweetsTimelineParam): Promise<TweetListApiUtilsResponse> {
+  async getListLatestTweetsTimeline(param: GetListLatestTweetsTimelineParam): Promise<ResponseType> {
     const args = {
       listId: param.listId,
       ...(param.count == null ? {} : { count: param.count }),
@@ -190,7 +193,7 @@ export class TweetApiUtils {
     return response;
   }
 
-  async getUserTweets(param: GetUserTweetsParam): Promise<TweetListApiUtilsResponse> {
+  async getUserTweets(param: GetUserTweetsParam): Promise<ResponseType> {
     const args = {
       userId: param.userId,
       ...(param.count == null ? {} : { count: param.count }),
@@ -207,7 +210,7 @@ export class TweetApiUtils {
     return response;
   }
 
-  async getUserTweetsAndReplies(param: GetUserTweetsAndRepliesParam): Promise<TweetListApiUtilsResponse> {
+  async getUserTweetsAndReplies(param: GetUserTweetsAndRepliesParam): Promise<ResponseType> {
     const args = {
       userId: param.userId,
       ...(param.count == null ? {} : { count: param.count }),
@@ -224,7 +227,7 @@ export class TweetApiUtils {
     return response;
   }
 
-  async getUserMedia(param: GetUserMediaParam): Promise<TweetListApiUtilsResponse> {
+  async getUserMedia(param: GetUserMediaParam): Promise<ResponseType> {
     const args = {
       userId: param.userId,
       ...(param.count == null ? {} : { count: param.count }),
@@ -240,7 +243,7 @@ export class TweetApiUtils {
     });
     return response;
   }
-  async getLikes(param: GetLikesParam): Promise<TweetListApiUtilsResponse> {
+  async getLikes(param: GetLikesParam): Promise<ResponseType> {
     const args = {
       userId: param.userId,
       ...(param.count == null ? {} : { count: param.count }),
@@ -256,7 +259,7 @@ export class TweetApiUtils {
     });
     return response;
   }
-  async getBookmarks(param: GetBookmarksParam = {}): Promise<TweetListApiUtilsResponse> {
+  async getBookmarks(param: GetBookmarksParam = {}): Promise<ResponseType> {
     const args = {
       ...(param.count == null ? {} : { count: param.count }),
       ...(param.cursor == null ? {} : { cursor: param.cursor }),

package/src/apis/userApi.ts

@@ -1,6 +1,6 @@
 import * as i from 'twitter-openapi-typescript-generated';
-import { RequestParam, DefaultFlag, UserApiUtilsResponse, UsersApiUtilsResponse } from '@/models';
-import { buildHeader } from '@/utils';
+import { RequestParam, DefaultFlag, UserApiUtilsData, TwitterApiUtilsResponse } from '@/models';
+import { buildHeader, errorCheck, getKwargs, userOrNullConverter } from '@/utils';
 
 type getUserByScreenNameParam = {
   screenName: string;
@@ -12,10 +12,7 @@ type getUserByRestIdParam = {
   extraParam?: { [key: string]: any };
 };
 
-type getUsersByRestIdsParam = {
-  userIds: string[];
-  extraParam?: { [key: string]: any };
-};
+type ResponseType = TwitterApiUtilsResponse<UserApiUtilsData>;
 
 export class UserApiUtils {
   api: i.UserApi;
@@ -26,49 +23,25 @@ export class UserApiUtils {
     this.flag = flag;
   }
 
-  async request<T>(param: RequestParam<i.UserResults, T>): Promise<UserApiUtilsResponse> {
+  async request<T>(param: RequestParam<i.UserResults, T>): Promise<ResponseType> {
     const apiFn: typeof param.apiFn = param.apiFn.bind(this.api);
-    const fieldTogglesFn = () => {
-      if (this.flag[param.key]['fieldToggles'] == null) return { fieldToggles: '' };
-      return { fieldToggles: JSON.stringify(this.flag[param.key]['fieldToggles']) };
-    };
-    const response = await apiFn({
-      pathQueryId: this.flag[param.key]['queryId'],
-      queryId: this.flag[param.key]['queryId'],
-      variables: JSON.stringify({ ...this.flag[param.key]['variables'], ...param.param }),
-      features: JSON.stringify(this.flag[param.key]['features']),
-      ...fieldTogglesFn(),
-    });
-    const user = param.convertFn(await response.value());
-    return {
-      raw: { response: response.raw },
-      header: buildHeader(response.raw.headers),
-      data: user.result,
-    };
-  }
+    const args = getKwargs(this.flag[param.key], param.param);
+    const response = await apiFn(args);
+    const checked = errorCheck(await response.value());
+    const result = param.convertFn(checked);
+    const user = userOrNullConverter(result.result);
 
-  async requests<T>(param: RequestParam<i.UserResults[], T>): Promise<UsersApiUtilsResponse> {
-    const apiFn: typeof param.apiFn = param.apiFn.bind(this.api);
-    const fieldTogglesFn = () => {
-      if (this.flag[param.key]['fieldToggles'] == null) return { fieldToggles: '' };
-      return { fieldToggles: JSON.stringify(this.flag[param.key]['fieldToggles']) };
-    };
-    const response = await apiFn({
-      pathQueryId: this.flag[param.key]['queryId'],
-      queryId: this.flag[param.key]['queryId'],
-      variables: JSON.stringify({ ...this.flag[param.key]['variables'], ...param.param }),
-      features: JSON.stringify(this.flag[param.key]['features']),
-      ...fieldTogglesFn(),
-    });
-    const user = param.convertFn(await response.value()).map((e) => e.result);
     return {
       raw: { response: response.raw },
       header: buildHeader(response.raw.headers),
-      data: user,
+      data: {
+        raw: result,
+        user: user,
+      },
     };
   }
 
-  async getUserByScreenName(param: getUserByScreenNameParam): Promise<UserApiUtilsResponse> {
+  async getUserByScreenName(param: getUserByScreenNameParam): Promise<ResponseType> {
     const args = {
       screen_name: param.screenName,
       ...param.extraParam,
@@ -81,7 +54,7 @@ export class UserApiUtils {
     });
     return response;
   }
-  async getUserByRestId(param: getUserByRestIdParam): Promise<UserApiUtilsResponse> {
+  async getUserByRestId(param: getUserByRestIdParam): Promise<ResponseType> {
     const args = {
       userId: param.userId,
       ...param.extraParam,
@@ -94,18 +67,4 @@ export class UserApiUtils {
     });
     return response;
   }
-
-  async getUsersByRestIds(param: getUsersByRestIdsParam): Promise<UsersApiUtilsResponse> {
-    const args = {
-      userIds: param.userIds,
-      ...param.extraParam,
-    };
-    const response = this.requests({
-      key: 'UsersByRestIds',
-      apiFn: this.api.getUsersByRestIdsRaw,
-      convertFn: (e) => e.data.users,
-      param: args,
-    });
-    return response;
-  }
 }