From b2aeb037fbbe7cf6b3efffe023214b27933167b0 Mon Sep 17 00:00:00 2001 From: DIYgod Date: Wed, 29 Nov 2023 22:55:11 +0800 Subject: [PATCH] feat: compatible with old twitter caches --- lib/v2/twitter/web-api/twitter-api.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/v2/twitter/web-api/twitter-api.js b/lib/v2/twitter/web-api/twitter-api.js index 673bbb208f..e86396b67a 100644 --- a/lib/v2/twitter/web-api/twitter-api.js +++ b/lib/v2/twitter/web-api/twitter-api.js @@ -205,8 +205,14 @@ const userByAuto = (id) => { return userByScreenName(id); }; const getUserData = (cache, id) => cache.tryGet(`twitter-userdata-${id}`, () => userByAuto(id)); -const getUserID = async (cache, id) => (await getUserData(cache, id)).data.user_result.result.rest_id; -const getUser = async (cache, id) => (await getUserData(cache, id)).data.user_result.result.legacy; +const getUserID = async (cache, id) => { + const userData = await getUserData(cache, id); + return (userData.data?.user || userData.data?.user_result)?.result?.rest_id; +}; +const getUser = async (cache, id) => { + const userData = await getUserData(cache, id); + return (userData.data?.user || userData.data?.user_result)?.result?.legacy; +}; const cacheTryGet = async (cache, _id, params, func) => { const id = await getUserID(cache, _id);