[Release] Hotfix 2.26.8 => 2.26.9 (patch) (#11784)

guanbinrui · swkatmask · web-flow · commit b0e8fc61d9d8 · 2024-09-14T10:54:08.000+08:00
* chore: bump version to 2.26.9 * fix(Twitter): reuse query (#11783) * fix(Twitter): update features options * refactor: align query keys * fix: improve query user by user identity (#11787) * refactor(Twitter): get user info via Firefly (#11788) * fix(Twitter): disable refetchOnWindowFocus * fix: increase stale time * refactor(Twitter): get user info via Firefly * fix: prettier --------- Co-authored-by: swkatmask <swkatmask@users.noreply.github.com> * fix(Twitter): skip empty screen name (#11789) --------- Co-authored-by: Wukong Sun <swkatmask@gmail.com> Co-authored-by: swkatmask <swkatmask@users.noreply.github.com>
diff --git a/cspell.json b/cspell.json
@@ -265,6 +265,7 @@
         "ronin",
         "roninchain",
         "rpid",
+        "rweb",
         "sablier",
         "savm",
         "sbch",
@@ -302,6 +303,7 @@
         "thegraph",
         "timelock",
         "timelocked",
+        "tipjar",
         "titlebar",
         "tlos",
         "tokenid",
@@ -326,6 +328,7 @@
         "unstoppabledomains",
         "unstyled",
         "urlcat",
+        "userinfo",
         "usermenu",
         "vcent",
         "venomswap",
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "yarn": ">=999.0.0",
     "npm": ">=999.0.0"
   },
-  "version": "2.26.8",
+  "version": "2.26.9",
   "private": true,
   "license": "AGPL-3.0-or-later",
   "scripts": {
diff --git a/packages/mask/content-script/components/InjectedComponents/ProfileCard/AvatarDecoration.tsx b/packages/mask/content-script/components/InjectedComponents/ProfileCard/AvatarDecoration.tsx
@@ -1,4 +1,4 @@
-import { Twitter } from '@masknet/web3-providers'
+import { FireflyTwitter, Twitter } from '@masknet/web3-providers'
 import { NFTBadgeTimeline } from '@masknet/plugin-avatar'
 import { useQuery } from '@tanstack/react-query'
 
@@ -9,12 +9,13 @@ interface Props {
 }
 export function AvatarDecoration({ userId, className, size }: Props) {
     const { data: user } = useQuery({
-        queryKey: ['twitter', 'profile', 'check-nft-avatar', userId],
-        staleTime: 60_000,
+        queryKey: ['twitter', 'profile', userId],
         retry: 0,
+        staleTime: 3600_000,
+        refetchOnWindowFocus: false,
         queryFn: () => {
             if (!userId) return null
-            return Twitter.getUserByScreenName(userId, true)
+            return FireflyTwitter.getUserInfo(userId)
         },
     })
 
@@ -24,7 +25,7 @@ export function AvatarDecoration({ userId, className, size }: Props) {
         <NFTBadgeTimeline
             classes={{ root: className }}
             userId={userId}
-            avatarId={Twitter.getAvatarId(user.avatarURL)}
+            avatarId={Twitter.getAvatarId(user.legacy.profile_image_url_https)}
             height={size}
             width={size}
         />
diff --git a/packages/mask/content-script/site-adaptors/twitter.com/collecting/identity.ts b/packages/mask/content-script/site-adaptors/twitter.com/collecting/identity.ts
@@ -5,7 +5,7 @@ import { delay } from '@masknet/kit'
 import { ProfileIdentifier } from '@masknet/shared-base'
 import { queryClient } from '@masknet/shared-base-ui'
 import type { SiteAdaptorUI } from '@masknet/types'
-import { Twitter } from '@masknet/web3-providers'
+import { FireflyTwitter } from '@masknet/web3-providers'
 import { creator } from '../../../site-adaptor-infra/index.js'
 import { twitterBase } from '../base.js'
 import {
@@ -98,28 +98,29 @@ function resolveCurrentVisitingIdentityInner(
     ownerRef: SiteAdaptorUI.CollectingCapabilities.IdentityResolveProvider['recognized'],
     cancel: AbortSignal,
 ) {
-    const update = async (twitterId: string) => {
+    const update = async (screenName: string) => {
         const user = await queryClient.fetchQuery({
             retry: 0,
-            staleTime: 60_000,
-            queryKey: ['twitter', 'profile', twitterId],
-            queryFn: () => Twitter.getUserByScreenName(twitterId),
+            staleTime: 3600_000,
+            queryKey: ['twitter', 'profile', screenName],
+            queryFn: () => FireflyTwitter.getUserInfo(screenName),
         })
         if (process.env.NODE_ENV === 'development') {
-            console.assert(user, `Can't get get user by screen name ${twitterId}`)
+            console.assert(user, `Can't get get user by screen name ${screenName}`)
         }
         if (!user) return
 
-        const handle = user.screenName
+        const legacy = user.legacy
+        const handle = legacy.screen_name
         const ownerHandle = ownerRef.value.identifier?.userId
         const isOwner = !!ownerHandle && handle.toLowerCase() === ownerHandle.toLowerCase()
-        const avatar = user.avatarURL
-        const bio = user.bio
-        const homepage = user.homepage
+        const avatar = legacy.profile_image_url_https
+        const bio = legacy.profile_image_url_https
+        const homepage = legacy.entities.url?.urls?.[0]?.expanded_url
 
         ref.value = {
             identifier: ProfileIdentifier.of(twitterBase.networkIdentifier, handle).unwrapOr(undefined),
-            nickname: user.nickname,
+            nickname: legacy.name,
             avatar,
             bio,
             homepage,
diff --git a/packages/mask/content-script/site-adaptors/twitter.com/injection/ProfileCard/index.tsx b/packages/mask/content-script/site-adaptors/twitter.com/injection/ProfileCard/index.tsx
@@ -1,8 +1,7 @@
 import { CrossIsolationMessages, ProfileIdentifier, stopPropagation, type SocialIdentity } from '@masknet/shared-base'
 import { AnchorProvider } from '@masknet/shared-base-ui'
 import { ShadowRootPopper, makeStyles } from '@masknet/theme'
-import { Twitter } from '@masknet/web3-providers'
-import type { TwitterBaseAPI } from '@masknet/web3-providers/types'
+import { FireflyTwitter } from '@masknet/web3-providers'
 import { Fade } from '@mui/material'
 import { useQuery } from '@tanstack/react-query'
 import { useEffect, useMemo, useRef, useState } from 'react'
@@ -48,15 +47,18 @@ function ProfileCardHolder() {
 
     const { data: identity } = useQuery({
         queryKey: ['twitter', 'profile', twitterId],
-        queryFn: () => Twitter.getUserByScreenName(twitterId),
-        select: (user: TwitterBaseAPI.User | null) => {
+        staleTime: 3600_000,
+        refetchOnWindowFocus: false,
+        queryFn: () => FireflyTwitter.getUserInfo(twitterId),
+        select: (user) => {
             if (!user) return null
+            const legacy = user.legacy
             return {
-                identifier: ProfileIdentifier.of(twitterBase.networkIdentifier, user.screenName).unwrapOr(undefined),
-                nickname: user.nickname,
-                avatar: user.avatarURL,
-                bio: user.bio,
-                homepage: user.homepage,
+                identifier: ProfileIdentifier.of(twitterBase.networkIdentifier, legacy.screen_name).unwrapOr(undefined),
+                nickname: legacy.name,
+                avatar: legacy.profile_image_url_https,
+                bio: legacy.description,
+                homepage: legacy.entities.url?.urls?.[0]?.expanded_url,
             } as SocialIdentity
         },
     })
diff --git a/packages/mask/content-script/site-adaptors/twitter.com/utils/user.ts b/packages/mask/content-script/site-adaptors/twitter.com/utils/user.ts
@@ -1,6 +1,7 @@
-import { isNull } from 'lodash-es'
 import { ProfileIdentifier, type SocialIdentity } from '@masknet/shared-base'
-import { Twitter } from '@masknet/web3-providers'
+import { queryClient } from '@masknet/shared-base-ui'
+import { FireflyTwitter } from '@masknet/web3-providers'
+import { isNull } from 'lodash-es'
 import { twitterBase } from '../base.js'
 
 /**
@@ -16,16 +17,22 @@ export function usernameValidator(name: string) {
     return true
 }
 
-export async function getUserIdentity(twitterId: string): Promise<SocialIdentity | undefined> {
-    const user = await Twitter.getUserByScreenName(twitterId)
+export async function getUserIdentity(screenName: string): Promise<SocialIdentity | undefined> {
+    const user = await queryClient.fetchQuery({
+        queryKey: ['twitter', 'profile', screenName],
+        queryFn: () => FireflyTwitter.getUserInfo(screenName),
+        retry: 0,
+        staleTime: 3600_000,
+    })
     if (!user) return
 
+    const legacy = user.legacy
     return {
-        identifier: ProfileIdentifier.of(twitterBase.networkIdentifier, user.screenName).unwrapOr(undefined),
-        nickname: user.nickname,
-        avatar: user.avatarURL,
-        bio: user.bio,
-        homepage: user.homepage,
+        identifier: ProfileIdentifier.of(twitterBase.networkIdentifier, screenName).unwrapOr(undefined),
+        nickname: legacy.name,
+        avatar: legacy.profile_image_url_https,
+        bio: legacy.description,
+        homepage: legacy.entities.url?.urls?.[0]?.expanded_url,
     }
 }
 
diff --git a/packages/plugins/Savings/src/SiteAdaptor/SavingsDialog.tsx b/packages/plugins/Savings/src/SiteAdaptor/SavingsDialog.tsx
@@ -96,7 +96,7 @@ export function SavingsDialog({ open, onClose }: SavingsDialogProps) {
                 return [token[1], aTokens?.find((f) => f[0].toUpperCase() === `a${token[0]}`.toUpperCase())?.[1]]
             })
         },
-        staleTime: 300_000,
+        staleTime: 3600_000,
     })
 
     const { value: detailedAaveTokens = EMPTY_LIST, loading: loadingAAveDetails } = useFungibleTokens(
diff --git a/packages/plugins/Web3Profile/src/SiteAdaptor/components/ProfileCard.tsx b/packages/plugins/Web3Profile/src/SiteAdaptor/components/ProfileCard.tsx
@@ -4,7 +4,7 @@ import { Icons } from '@masknet/icons'
 import { PlatformAvatar, WalletSettingsCard } from '@masknet/shared'
 import { type BindingProof, EMPTY_LIST } from '@masknet/shared-base'
 import { makeStyles } from '@masknet/theme'
-import { Twitter } from '@masknet/web3-providers'
+import { FireflyTwitter } from '@masknet/web3-providers'
 import {
     Card,
     CardContent,
@@ -126,14 +126,17 @@ export const ProfileCard = memo(function ProfileCard({
     const { classes, cx } = useStyles()
     const t = useWeb3ProfileTrans()
     const [expanded, setExpanded] = useState(initialExpanded)
+    const identity = profile.identity
     const { data: user } = useQuery({
-        queryKey: ['twitter', 'profile', profile.identity],
-        queryFn: () => Twitter.getUserByScreenName(profile.identity),
+        queryKey: ['twitter', 'profile', identity],
+        staleTime: 3600_000,
+        refetchOnWindowFocus: false,
+        queryFn: () => FireflyTwitter.getUserInfo(identity),
     })
-    const nickname = user?.nickname || profile.name || profile.identity
+    const nickname = user?.legacy.name || profile.name || profile.identity
     // Identities of Twitter proof get lowered case. Prefer handle from Twitter API.
-    const handle = user?.screenName || profile.identity
-    const avatarUrl = user?.avatarURL || avatar
+    const handle = user?.legacy.screen_name || profile.identity
+    const avatarUrl = user?.legacy.profile_image_url_https || avatar
     const handleSwitch = useCallback(
         (address: string) => {
             onToggle?.(profile.identity, address)
diff --git a/packages/web3-hooks/base/src/useFireflyFarcasterAccounts.ts b/packages/web3-hooks/base/src/useFireflyFarcasterAccounts.ts
@@ -1,20 +1,28 @@
-import { useQuery } from '@tanstack/react-query'
-import { FireflyConfig, Twitter } from '@masknet/web3-providers'
+import { skipToken, useQuery } from '@tanstack/react-query'
+import { FireflyConfig, FireflyTwitter } from '@masknet/web3-providers'
 import { EMPTY_LIST } from '@masknet/shared-base'
 
-export function useFireflyFarcasterAccounts(userId?: string) {
+export function useFireflyFarcasterAccounts(identity?: string) {
+    const { data: user } = useQuery({
+        queryKey: ['twitter', 'profile', identity],
+        staleTime: 3600_000,
+        refetchOnWindowFocus: false,
+        queryFn: identity ? () => FireflyTwitter.getUserInfo(identity) : skipToken,
+    })
+    const id = user?.rest_id
+
     return useQuery({
-        queryKey: ['union-profile', 'by-twitter-id', userId],
+        queryKey: ['union-profile', 'by-twitter-id', id],
         retry: 0,
         staleTime: 60_000,
-        queryFn: async () => {
-            if (!userId) return EMPTY_LIST
-            const user = await Twitter.getUserByScreenName(userId)
-            if (!user?.userId) return
-            const unionProfile = await FireflyConfig.getUnionProfile({
-                twitterId: user?.userId,
-            })
-            return unionProfile.farcasterProfiles ?? EMPTY_LIST
-        },
+        queryFn:
+            id ?
+                async () => {
+                    const unionProfile = await FireflyConfig.getUnionProfile({
+                        twitterId: id,
+                    })
+                    return unionProfile.farcasterProfiles ?? EMPTY_LIST
+                }
+            :   skipToken,
     })
 }
diff --git a/packages/web3-providers/src/Firefly/Config.ts b/packages/web3-providers/src/Firefly/Config.ts
@@ -1,11 +1,11 @@
-import urlcat from 'urlcat'
 import { EMPTY_LIST } from '@masknet/shared-base'
-import { fetchJSON } from '../helpers/fetchJSON.js'
+import urlcat from 'urlcat'
 import type { FireflyConfigAPI } from '../entry-types.js'
+import { fetchJSON } from '../helpers/fetchJSON.js'
+import { FIREFLY_BASE_URL } from './constants.js'
 
 const BASE_URL = 'https://api.dimension.im/v1'
 const TWITTER_HANDLER_VERIFY_URL = 'https://twitter-handler-proxy.r2d2.to'
-const FIREFLY_BASE_URL = 'https://api.firefly.land'
 
 export class FireflyConfig {
     static async getLensByTwitterId(
diff --git a/packages/web3-providers/src/Firefly/RedPacket.ts b/packages/web3-providers/src/Firefly/RedPacket.ts
@@ -9,7 +9,7 @@ import {
 } from '@masknet/shared-base'
 import urlcat from 'urlcat'
 import { fetchJSON } from '../entry-helpers.js'
-import { FireflyRedPacketAPI } from '../entry-types.js'
+import { FireflyRedPacketAPI, type FireflyResponse } from '../entry-types.js'
 
 const siteType = getSiteType()
 const SITE_URL = siteType === EnhanceableSite.Firefly ? location.origin : 'https://firefly.mask.social'
@@ -226,7 +226,7 @@ export class FireflyRedPacket {
         txHash: string,
     ) {
         const url = urlcat(FIREFLY_ROOT_URL, '/v1/redpacket/finishClaiming')
-        return fetchFireflyJSON<FireflyRedPacketAPI.Response<string>>(url, {
+        return fetchFireflyJSON<FireflyResponse<string>>(url, {
             method: 'POST',
             body: JSON.stringify({
                 rpid,
diff --git a/packages/web3-providers/src/Firefly/Twitter.ts b/packages/web3-providers/src/Firefly/Twitter.ts
@@ -0,0 +1,16 @@
+import urlcat from 'urlcat'
+import { FIREFLY_BASE_URL } from './constants.js'
+import { fetchJSON } from '../helpers/fetchJSON.js'
+import { type FireflyTwitterAPI } from '../types/Firefly.js'
+
+export class FireflyTwitter {
+    static async getUserInfo(screenName: string) {
+        if (!screenName) return null
+        const url = urlcat(FIREFLY_BASE_URL, '/v1/twitter/userinfo', {
+            screenName,
+        })
+        const res = await fetchJSON<FireflyTwitterAPI.TwitterUserInfoResponse>(url)
+        if (res.code === 0) return res.data.data.user.result
+        return null
+    }
+}
diff --git a/packages/web3-providers/src/Firefly/constants.ts b/packages/web3-providers/src/Firefly/constants.ts
@@ -0,0 +1 @@
+export const FIREFLY_BASE_URL = 'https://api.firefly.land'
diff --git a/packages/web3-providers/src/Firefly/index.ts b/packages/web3-providers/src/Firefly/index.ts
@@ -1,2 +1,3 @@
 export * from './Config.js'
 export * from './RedPacket.js'
+export * from './Twitter.js'
diff --git a/packages/web3-providers/src/Twitter/apis/getUserByScreenName.ts b/packages/web3-providers/src/Twitter/apis/getUserByScreenName.ts
@@ -19,6 +19,9 @@ const features = {
     hidden_profile_likes_enabled: false,
     hidden_profile_subscriptions_enabled: false,
     subscriptions_verification_info_is_identity_verified_enabled: false,
+    subscriptions_feature_can_gift_premium: false,
+    rweb_tipjar_consumption_enabled: false,
+    responsive_web_twitter_article_notes_tab_enabled: false,
 }
 
 async function createRequest(screenName: string) {
diff --git a/packages/web3-providers/src/Twitter/index.ts b/packages/web3-providers/src/Twitter/index.ts
@@ -54,10 +54,10 @@ export class Twitter {
         return updateProfileImage(screenName, media_id_str)
     }
 
-    static async getUserByScreenName(
-        screenName: string,
-        checkNFTAvatar?: boolean,
-    ): Promise<TwitterBaseAPI.User | null> {
+    /**
+     * @deprecated User FireflyTwitter instead
+     */
+    static async getUserByScreenName(screenName: string): Promise<TwitterBaseAPI.User | null> {
         if (!screenName) return null
         return getUserByScreenName(screenName)
     }
diff --git a/packages/web3-providers/src/entry.ts b/packages/web3-providers/src/entry.ts
@@ -104,7 +104,7 @@ export { Airdrop } from './Airdrop/index.js'
 
 // Firefly
 
-export { FireflyConfig, FireflyRedPacket } from './Firefly/index.js'
+export { FireflyConfig, FireflyRedPacket, FireflyTwitter } from './Firefly/index.js'
 
 // FiatCurrencyRate
 export { FiatCurrencyRate } from './FiatCurrencyRate/index.js'
diff --git a/packages/web3-providers/src/types/Firefly.ts b/packages/web3-providers/src/types/Firefly.ts
