emusks 2.3.8 → 2.3.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emusks",
-  "version": "2.3.8",
+  "version": "2.3.10",
   "description": "Reverse-engineered Twitter API client. Log in and interact with the unofficial X API using any client identity - web, Android, iOS, or TweetDeck",
   "keywords": [
     "client",

package/src/flow-jetfuel.js

@@ -146,10 +146,10 @@ function extractUserId(cookies) {
   return null;
 }
 
-async function resolve(value, onRequest, type) {
+async function resolve(value, onRequest, type, context) {
   if (value != null && value !== "") return value;
   if (onRequest) {
-    const v = await onRequest(type);
+    const v = await onRequest(type, context);
     if (v != null && v !== "") return v;
   }
   throw new Error(
@@ -267,7 +267,8 @@ export default async function flowLoginJetfuel(opts) {
     if (passwordSwitch) {
       const knowledgeCheck = response.forms.find((form) => form.url === "/onboarding/web/actions/finish_knowledge_check");
       if (knowledgeCheck && onRequest) {
-        const alternate = await onRequest("alternate_identifier");
+        const kc = knowledgeCheck.fields;
+        const alternate = await onRequest("alternate_identifier", { challengeType: kc.challenge_type ?? null, accountFound: kc.account_found ?? null, accountFoundType: kc.account_found_type ?? null });
         if (alternate != null && alternate !== "") {
           response = await post("finish_knowledge_check", { ...knowledgeCheck.fields, challenge_response: alternate });
           strings = response.strings;
@@ -300,7 +301,7 @@ export default async function flowLoginJetfuel(opts) {
           if (challenge === "email") alternate = email || (identifier.includes("@") ? identifier : null);
           if (challenge === "phone") alternate = phone;
         }
-        fields[field] = await resolve(alternate, onRequest, type);
+        fields[field] = await resolve(alternate, onRequest, type, { challengeType: fields.challenge_type ?? null, accountFound: fields.account_found ?? null, accountFoundType: fields.account_found_type ?? null });
       }
       response = await post(action, fields);
       strings = response.strings;

package/src/helpers/account.js

@@ -52,7 +52,8 @@ export async function viewer() {
     fieldToggles: { withAuxiliaryUserLabels: false },
   });
   const user = res?.data?.viewer?.user_results?.result;
-  return user ? parseUser(user) : res;
+  if (!user) throw new Error("couldn't get viewer, response: " + JSON.stringify(res));
+  return parseUser(user);
 }
 
 export async function sessions() {

package/src/helpers/tweets.js

@@ -241,7 +241,8 @@ export async function get(tweetId) {
     },
   });
   const tweet = res?.data?.tweetResult?.result;
-  return tweet ? parseTweet(tweet) : res;
+  if (!tweet) throw new Error("couldn't get tweet, response: " + JSON.stringify(res));
+  return parseTweet(tweet);
 }
 
 export async function getMany(tweetIds) {

package/src/helpers/users.js

@@ -7,7 +7,8 @@ export async function get(userId) {
     fieldToggles: { withAuxiliaryUserLabels: false },
   });
   const user = res?.data?.user?.result;
-  return user ? parseUser(user) : res;
+  if (!user) throw new Error("couldn't get user, response: " + JSON.stringify(res));
+  return parseUser(user);
 }
 
 export async function getByUsername(username) {
@@ -16,7 +17,8 @@ export async function getByUsername(username) {
     fieldToggles: { withAuxiliaryUserLabels: false },
   });
   const user = res?.data?.user?.result;
-  return user ? parseUser(user) : res;
+  if (!user) throw new Error("couldn't get user, response: " + JSON.stringify(res));
+  return parseUser(user);
 }
 
 export async function getMany(userIds) {

package/src/parsers/tweet.js

@@ -64,6 +64,10 @@ export default function parseTweet(tweet) {
       ? parseTweet(get(tweet, "quoted_status_result.result"))
       : null,
 
+    retweeting: legacy.retweeted_status_result?.result
+      ? parseTweet(legacy.retweeted_status_result.result)
+      : null,
+
     edit_control: data.edit_control || {},
     card: data.card || null,
     unmention_data: data.unmention_data || {},

package/src/parsers/user.js

@@ -27,15 +27,19 @@ export default function parseUser(user) {
       legacy.screen_name ||
       data.screen_name ||
       data.username,
-    description: legacy.description || data.description,
+    description:
+      get(data, "profile_bio.description") ??
+      legacy.description ??
+      data.description,
     banner:
+      get(data, "banner.image_url") ||
       legacy.profile_banner_url ||
       legacy.profile_background_image_url ||
       legacy.profile_background_image_url_https ||
       data.profile_banner_url ||
       data.profile_background_image_url ||
       data.profile_background_image_url_https,
-    url: legacy.url || data.url,
+    url: get(data, "website.url") || legacy.url || data.url,
     location: locationObj.location || legacy.location || data.location || null,
     protected: get(
       data,
@@ -61,21 +65,36 @@ export default function parseUser(user) {
 
     stats: {
       followers: {
-        count: legacy.followers_count || data.followers_count,
+        count:
+          get(data, "relationship_counts.followers") ??
+          legacy.followers_count ??
+          data.followers_count,
         fast_followers:
           legacy.fast_followers_count || data.fast_followers_count || 0,
         normal_followers:
           legacy.normal_followers_count || data.normal_followers_count,
       },
-      following: legacy.friends_count || data.friends_count,
+      following:
+        get(data, "relationship_counts.following") ??
+        legacy.friends_count ??
+        data.friends_count,
       subscriptions_count:
         data.creator_subscriptions_count ||
         legacy.creator_subscriptions_count ||
         0,
-      likes: legacy.favourites_count || data.favourites_count,
+      likes:
+        get(data, "action_counts.favorites_count") ??
+        legacy.favourites_count ??
+        data.favourites_count,
       listed: legacy.listed_count || data.listed_count,
-      media: legacy.media_count || data.media_count,
-      posts: legacy.statuses_count || data.statuses_count,
+      media:
+        get(data, "tweet_counts.media_tweets") ??
+        legacy.media_count ??
+        data.media_count,
+      posts:
+        get(data, "tweet_counts.tweets") ??
+        legacy.statuses_count ??
+        data.statuses_count,
     },
     verification: {
       verified: get(verification, "verified", legacy.verified || data.verified),
@@ -87,22 +106,31 @@ export default function parseUser(user) {
         false,
     },
     pinned_tweets:
-      legacy.pinned_tweet_ids_str || data.pinned_tweet_ids_str || [],
-    birthdate: data.birthdate || {},
+      get(data, "pinned_items.tweet_ids_str") ||
+      legacy.pinned_tweet_ids_str ||
+      data.pinned_tweet_ids_str ||
+      [],
+    birthdate:
+      get(data, "legacy_extended_profile.birthdate") || data.birthdate || {},
     misc: {
       default_profile: legacy.default_profile || data.default_profile,
       default_profile_image:
         legacy.default_profile_image || data.default_profile_image || false,
-      entities: legacy.entities || data.entities,
+      entities: get(data, "profile_bio.entities") || legacy.entities || data.entities,
       has_custom_timelines:
         legacy.has_custom_timelines || data.has_custom_timelines,
       is_translator: legacy.is_translator || data.is_translator || false,
-      translator_type: legacy.translator_type || data.translator_type,
+      translator_type:
+        get(data, "profile_translation.translator_type") ||
+        legacy.translator_type ||
+        data.translator_type,
       is_profile_translatable: data.is_profile_translatable,
       needs_phone_verification: data.needs_phone_verification,
       possibly_sensitive: legacy.possibly_sensitive || data.possibly_sensitive,
       profile_interstitial_type:
-        legacy.profile_interstitial_type || data.profile_interstitial_type,
+        get(data, "profile_metadata.profile_interstitial_type") ??
+        legacy.profile_interstitial_type ??
+        data.profile_interstitial_type,
       want_retweets: legacy.want_retweets || data.want_retweets,
       withheld_in_countries:
         legacy.withheld_in_countries || data.withheld_in_countries || [],
@@ -115,16 +143,25 @@ export default function parseUser(user) {
       ),
       blocked_by: get(
         data,
-        "relationship_perspectives.followed_by",
+        "relationship_perspectives.blocked_by",
         data.blocked_by
       ),
-      blocking: data.blocking,
+      blocking: get(
+        data,
+        "relationship_perspectives.blocking",
+        data.blocking
+      ),
+      followed_by: get(
+        data,
+        "relationship_perspectives.followed_by",
+        data.followed_by
+      ),
       following: get(
         data,
         "relationship_perspectives.following",
         data.following
       ),
-      muting: data.muting,
+      muting: get(data, "relationship_perspectives.muting", data.muting),
       has_graduated_access: data.has_graduated_access,
       geo_enabled: data.geo_enabled,