Skip to content

fix: twitter nickname selector #6006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guanbinrui merged 1 commit into from
Mar 31, 2022
Merged

fix: twitter nickname selector #6006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/mask/src/social-network-adaptor/twitter.com/collecting/identity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions packages/mask/src/social-network-adaptor/twitter.com/utils/selector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = () =>
Expand Down Expand Up @@ -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"]')

Expand Down
8 changes: 4 additions & 4 deletions packages/mask/src/social-network-adaptor/twitter.com/utils/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { isNull } from 'lodash-unified'
import type { SocialNetwork } from '../../../social-network'
import {
bioDescriptionSelector,
profileBioSelector,
searchAvatarSelector,
searchNickNameSelector,
personalHomepageSelector,
Expand All @@ -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)
Expand All @@ -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) : ''
}

Expand Down