From 0fb8a3c522f342e5002fcde39676eb6d8265fe8d Mon Sep 17 00:00:00 2001
From: guanbinrui <guanbinrui@dimension.im>
Date: Thu, 31 Mar 2022 15:52:02 +0800
Subject: [PATCH] fix: twitter nickname selector

---
 .../twitter.com/collecting/identity.ts                    | 4 ++--
 .../social-network-adaptor/twitter.com/utils/selector.ts  | 4 ++--
 .../src/social-network-adaptor/twitter.com/utils/user.ts  | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/mask/src/social-network-adaptor/twitter.com/collecting/identity.ts b/packages/mask/src/social-network-adaptor/twitter.com/collecting/identity.ts
index 77cab412d085..906d2ce076c3 100644
--- a/packages/mask/src/social-network-adaptor/twitter.com/collecting/identity.ts
+++ b/packages/mask/src/social-network-adaptor/twitter.com/collecting/identity.ts
@@ -5,7 +5,7 @@ import { ProfileIdentifier } from '@masknet/shared-base'
 import { creator, SocialNetworkUI as Next } from '../../../social-network'
 import Services from '../../../extension/service'
 import { twitterBase } from '../base'
-import { getAvatar, getBioDescription, getNickname, getTwitterId, getPersonalHomepage } from '../utils/user'
+import { getAvatar, getBio, getNickname, getTwitterId, getPersonalHomepage } from '../utils/user'
 import { delay } from '@dimensiondev/kit'
 
 function resolveLastRecognizedIdentityInner(
@@ -43,7 +43,7 @@ function resolveCurrentVisitingIdentityInner(
     const avatarMetaSelector = searchAvatarMetaSelector()
     const assign = async () => {
         await delay(500)
-        const bio = getBioDescription()
+        const bio = getBio()
         const homepage = getPersonalHomepage()
         const nickname = getNickname()
         const handle = getTwitterId()
diff --git a/packages/mask/src/social-network-adaptor/twitter.com/utils/selector.ts b/packages/mask/src/social-network-adaptor/twitter.com/utils/selector.ts
index 398d94890015..fb567de08e29 100644
--- a/packages/mask/src/social-network-adaptor/twitter.com/utils/selector.ts
+++ b/packages/mask/src/social-network-adaptor/twitter.com/utils/selector.ts
@@ -57,7 +57,7 @@ export const searchNewTweetButtonSelector: () => LiveSelector<E, true> = () => {
 }
 
 export const searchNickNameSelector: () => LiveSelector<E, true> = () =>
-    querySelector<E>('[data-testid="tweet"] a:not([target]) > div > div[dir="auto"] > span > span')
+    querySelector<E>('[data-testid="primaryColumn"] [data-testid="UserName"] div[dir="auto"] > span > span')
 export const searchAvatarSelector = () =>
     querySelector<HTMLImageElement>('[data-testid="primaryColumn"] a[href$="/photo"] img[src*="profile_images"]')
 export const searchNFTAvatarSelector = () =>
@@ -146,7 +146,7 @@ export const twitterMainAvatarSelector: () => LiveSelector<E, true> = () =>
 
 export const newPostButtonSelector = () => querySelector<E>('[data-testid="SideNav_NewTweet_Button"]')
 
-export const bioDescriptionSelector = () => querySelector<HTMLDivElement>('[data-testid="UserDescription"]')
+export const profileBioSelector = () => querySelector<HTMLDivElement>('[data-testid="UserDescription"]')
 
 export const personalHomepageSelector = () => querySelector<HTMLDivElement>('[data-testid="UserUrl"]')
 
diff --git a/packages/mask/src/social-network-adaptor/twitter.com/utils/user.ts b/packages/mask/src/social-network-adaptor/twitter.com/utils/user.ts
index 1fab6ced45c1..d0f6a1f62a6e 100644
--- a/packages/mask/src/social-network-adaptor/twitter.com/utils/user.ts
+++ b/packages/mask/src/social-network-adaptor/twitter.com/utils/user.ts
@@ -1,7 +1,7 @@
 import { isNull } from 'lodash-unified'
 import type { SocialNetwork } from '../../../social-network'
 import {
-    bioDescriptionSelector,
+    profileBioSelector,
     searchAvatarSelector,
     searchNickNameSelector,
     personalHomepageSelector,
@@ -23,7 +23,7 @@ export const usernameValidator: NonNullable<SocialNetwork.Utils['isValidUsername
 }
 
 export const getNickname = () => {
-    const node = searchNickNameSelector().evaluate()?.querySelector<HTMLSpanElement>('span span')
+    const node = searchNickNameSelector().evaluate()
     if (!node) return ''
 
     return collectNodeText(node)
@@ -42,8 +42,8 @@ export const getTwitterId = () => {
     return ''
 }
 
-export const getBioDescription = () => {
-    const node = bioDescriptionSelector().evaluate()
+export const getBio = () => {
+    const node = profileBioSelector().evaluate()
     return node ? collectNodeText(node) : ''
 }