[Release] Hotfix 2.19.1 => 2.19.2 (patch) (#9427)

guanbinrui · UncleBill · web-flow · commit 75a86b0e929c · 2023-04-23T15:57:26.000+08:00
* chore: bump version to 2.19.2 * refactor: mf-4047 migrate lens api to firefly (#9428) * refactor: mf-4047 migrate lens api to firefly * fixup! refactor: mf-4047 migrate lens api to firefly * refactor: code style (#9432) * feat: mf-4061 show lens icon in more places (#9437) * refactor: ab simplehash (#9438) * refactor: remove flag --------- Co-authored-by: UncleBill <billbill290@gmail.com>
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "yarn": ">=999.0.0",
     "npm": ">=999.0.0"
   },
-  "version": "2.19.1",
+  "version": "2.19.2",
   "private": true,
   "license": "AGPL-3.0-or-later",
   "scripts": {
diff --git a/packages/flags/src/flags/index.ts b/packages/flags/src/flags/index.ts
@@ -39,8 +39,6 @@ export const flags = {
     i18nTranslationHotUpdate: true,
     sandboxedPluginRuntime: insiderOnly,
 
-    simplehash_ab_percentage: 50,
-
     /** The earliest version for the sentry to watch events and exceptions. */
     sentry_earliest_version: process.env.VERSION,
     sentry_sample_rate: 0.1,
diff --git a/packages/mask/src/manifest.json b/packages/mask/src/manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "Mask Network",
-    "version": "2.19.1",
+    "version": "2.19.2",
     "manifest_version": 2,
     "permissions": ["storage", "downloads", "webNavigation", "activeTab"],
     "optional_permissions": ["<all_urls>", "notifications", "clipboardRead"],
diff --git a/packages/mask/src/social-network-adaptor/twitter.com/injection/Lens/injectLensOnUserCell.tsx b/packages/mask/src/social-network-adaptor/twitter.com/injection/Lens/injectLensOnUserCell.tsx
@@ -10,7 +10,7 @@ import { attachReactTreeToGlobalContainer } from '../../../../utils/index.js'
 const selector = () => {
     // [href^="/search"] is a hash tag
     return querySelectorAll<HTMLElement>(
-        '[data-testid=sidebarColumn] [data-testid=UserCell] div > a[role=link]:not([tabindex]):not([href^="/search"]) [dir]:last-of-type',
+        '[data-testid=UserCell] div > a[role=link]:not([tabindex]):not([href^="/search"]) [dir]:last-of-type',
     )
 }
 
diff --git a/packages/plugins/EVM/src/state/Hub/hub.ts b/packages/plugins/EVM/src/state/Hub/hub.ts
@@ -1,5 +1,4 @@
-import { EMPTY_LIST, isDeviceOnWhitelist, mixin } from '@masknet/shared-base'
-import { Flags } from '@masknet/flags'
+import { EMPTY_LIST, mixin } from '@masknet/shared-base'
 import { HubStateBaseClient, HubStateFungibleClient, HubStateNonFungibleClient } from '@masknet/web3-state'
 import {
     AlchemyEVM,
@@ -162,8 +161,8 @@ class HubNonFungibleClient extends HubStateNonFungibleClient<ChainId, SchemaType
             options.chainId === ChainId.Mainnet
                 ? [
                       X2Y2,
-                      isDeviceOnWhitelist(Flags.simplehash_ab_percentage) ? NFTScanNonFungibleTokenEVM : SimpleHash,
-                      isDeviceOnWhitelist(Flags.simplehash_ab_percentage) ? SimpleHash : NFTScanNonFungibleTokenEVM,
+                      SimpleHash,
+                      NFTScanNonFungibleTokenEVM,
                       ZerionNonFungibleToken,
                       Rarible,
                       OpenSea,
@@ -176,8 +175,8 @@ class HubNonFungibleClient extends HubStateNonFungibleClient<ChainId, SchemaType
                       R2D2TokenList,
                   ]
                 : [
-                      isDeviceOnWhitelist(Flags.simplehash_ab_percentage) ? NFTScanNonFungibleTokenEVM : SimpleHash,
-                      isDeviceOnWhitelist(Flags.simplehash_ab_percentage) ? SimpleHash : NFTScanNonFungibleTokenEVM,
+                      SimpleHash,
+                      NFTScanNonFungibleTokenEVM,
                       ZerionNonFungibleToken,
                       Rarible,
                       AlchemyEVM,
diff --git a/packages/plugins/Web3Profile/src/SNSAdaptor/components/LensBadge.tsx b/packages/plugins/Web3Profile/src/SNSAdaptor/components/LensBadge.tsx
@@ -1,9 +1,9 @@
 import { memo, type FC, useRef, useEffect } from 'react'
 import { IconButton } from '@mui/material'
 import { makeStyles } from '@masknet/theme'
-import { Plugin } from '@masknet/plugin-infra'
-import { type LensAccount } from '@masknet/web3-providers'
 import { Icons } from '@masknet/icons'
+import { Plugin } from '@masknet/plugin-infra'
+import type { FireflyBaseAPI } from '@masknet/web3-providers/types'
 import { openPopup } from '../emitter.js'
 
 const LensIconSizeMap: Record<Plugin.SNSAdaptor.LensSlot, number> = {
@@ -20,7 +20,7 @@ const useStyles = makeStyles()({
 })
 interface Props {
     slot: Plugin.SNSAdaptor.LensSlot
-    accounts: LensAccount[]
+    accounts: FireflyBaseAPI.LensAccount[]
 }
 
 export const LensBadge: FC<Props> = memo(({ slot, accounts }) => {
diff --git a/packages/plugins/Web3Profile/src/SNSAdaptor/components/LensList.tsx b/packages/plugins/Web3Profile/src/SNSAdaptor/components/LensList.tsx
@@ -1,10 +1,11 @@
-import { memo, type FC } from 'react'
-import { Button, List, ListItem, Typography, type ListProps } from '@mui/material'
-import { makeStyles } from '@masknet/theme'
-import type { LensAccount } from '@masknet/web3-providers'
-import { useI18N } from '../../locales/i18n_generated.js'
 import { Icons } from '@masknet/icons'
+import { Image } from '@masknet/shared'
 import { CrossIsolationMessages } from '@masknet/shared-base'
+import { makeStyles } from '@masknet/theme'
+import type { FireflyBaseAPI } from '@masknet/web3-providers/types'
+import { Button, List, ListItem, Typography, type ListProps } from '@mui/material'
+import { memo, type FC } from 'react'
+import { useI18N } from '../../locales/i18n_generated.js'
 
 const useStyles = makeStyles()((theme) => {
     const isDark = theme.palette.mode === 'dark'
@@ -38,6 +39,9 @@ const useStyles = makeStyles()((theme) => {
                 marginBottom: 0,
             },
         },
+        avatar: {
+            borderRadius: '50%',
+        },
         name: {
             color: theme.palette.maskColor.main,
             fontWeight: 400,
@@ -64,32 +68,40 @@ const useStyles = makeStyles()((theme) => {
     }
 })
 interface Props extends ListProps {
-    accounts: LensAccount[]
+    accounts: FireflyBaseAPI.LensAccount[]
 }
 
 export const LensList: FC<Props> = memo(({ className, accounts, ...rest }) => {
     const { classes, cx } = useStyles()
     const t = useI18N()
     return (
         <List className={cx(classes.list, className)} {...rest}>
-            {accounts.map((account) => (
-                <ListItem className={classes.listItem} key={account.displayName}>
-                    <Icons.Lens size={20} />
-                    <Typography className={classes.name}>{account.displayName || account.handle}</Typography>
-                    <Button
-                        variant="text"
-                        className={classes.followButton}
-                        disableElevation
-                        onClick={() => {
-                            CrossIsolationMessages.events.followLensDialogEvent.sendToLocal({
-                                open: true,
-                                handle: account.handle,
-                            })
-                        }}>
-                        {t.follow()}
-                    </Button>
-                </ListItem>
-            ))}
+            {accounts.map((account) => {
+                const profileUri = account.profileUri.filter(Boolean)
+                const lensIcon = <Icons.Lens size={20} />
+                return (
+                    <ListItem className={classes.listItem} key={account.handle}>
+                        {profileUri.length ? (
+                            <Image size={20} src={profileUri[0]} className={classes.avatar} fallback={lensIcon} />
+                        ) : (
+                            lensIcon
+                        )}
+                        <Typography className={classes.name}>{account.name || account.handle}</Typography>
+                        <Button
+                            variant="text"
+                            className={classes.followButton}
+                            disableElevation
+                            onClick={() => {
+                                CrossIsolationMessages.events.followLensDialogEvent.sendToLocal({
+                                    open: true,
+                                    handle: account.handle,
+                                })
+                            }}>
+                            {t.follow()}
+                        </Button>
+                    </ListItem>
+                )
+            })}
         </List>
     )
 })
diff --git a/packages/plugins/Web3Profile/src/SNSAdaptor/components/LensPopup.tsx b/packages/plugins/Web3Profile/src/SNSAdaptor/components/LensPopup.tsx
@@ -1,11 +1,11 @@
+import { isEqual } from 'lodash-es'
 import { memo, useEffect, useState, useRef } from 'react'
+import { Fade } from '@mui/material'
 import { makeStyles } from '@masknet/theme'
-import type { LensAccount } from '@masknet/web3-providers'
+import type { FireflyBaseAPI } from '@masknet/web3-providers/types'
 import { emitter } from '../emitter.js'
-import { isEqual } from 'lodash-es'
 import { LensList } from './LensList.js'
 import { useControlLensPopup } from '../hooks/Lens/useControlLensPopup.js'
-import { Fade } from '@mui/material'
 
 const useStyles = makeStyles()((theme) => ({
     popup: {
@@ -21,7 +21,7 @@ const useStyles = makeStyles()((theme) => ({
 export const LensPopup = memo(() => {
     const { classes } = useStyles()
     const holderRef = useRef<HTMLDivElement>(null)
-    const [lens, setLens] = useState<LensAccount[]>([])
+    const [lens, setLens] = useState<FireflyBaseAPI.LensAccount[]>([])
     const { style, active } = useControlLensPopup(holderRef)
 
     useEffect(() => {
diff --git a/packages/plugins/Web3Profile/src/SNSAdaptor/emitter.ts b/packages/plugins/Web3Profile/src/SNSAdaptor/emitter.ts
@@ -1,13 +1,13 @@
+import type { FireflyBaseAPI } from '@masknet/web3-providers/types'
 import { Emitter } from '@servie/events'
 import type { BadgeBounding } from './types.js'
-import type { LensAccount } from '@masknet/web3-providers'
 
 export const emitter = new Emitter<{
-    open: [{ badgeBounding: BadgeBounding; lensAccounts: LensAccount[] }]
+    open: [{ badgeBounding: BadgeBounding; lensAccounts: FireflyBaseAPI.LensAccount[] }]
     close: []
 }>()
 
-export function openPopup(badgeBounding: BadgeBounding, lensAccounts: LensAccount[]) {
+export function openPopup(badgeBounding: BadgeBounding, lensAccounts: FireflyBaseAPI.LensAccount[]) {
     emitter.emit('open', { badgeBounding, lensAccounts })
 }
 
diff --git a/packages/plugins/Web3Profile/src/SNSAdaptor/index.tsx b/packages/plugins/Web3Profile/src/SNSAdaptor/index.tsx
@@ -10,7 +10,7 @@ import { context, setupContext, setupStorage } from './context.js'
 import { Web3ProfileDialog } from './components/Web3ProfileDialog.js'
 import { FollowLensDialog } from './components/FollowLensDialog.js'
 import { useAsync } from 'react-use'
-import { NextIDProof } from '@masknet/web3-providers'
+import { Firefly } from '@masknet/web3-providers'
 import { LensBadge } from './components/LensBadge.js'
 import { LensPopup } from './components/LensPopup.js'
 import { ChainContextProvider } from '@masknet/web3-hooks-base'
@@ -113,7 +113,7 @@ const sns: Plugin.SNSAdaptor.Definition = {
             Content({ identity, slot, onStatusUpdate }) {
                 const { value: accounts = EMPTY_LIST } = useAsync(async () => {
                     if (!identity?.userId) return
-                    return NextIDProof.queryAllLens(identity?.userId)
+                    return Firefly.getLensByTwitterId(identity.userId)
                 }, [identity?.userId])
 
                 const hasLens = !accounts.length
diff --git a/packages/web3-providers/src/Firefly/constants.ts b/packages/web3-providers/src/Firefly/constants.ts
@@ -0,0 +1 @@
+export const BASE_URL = 'https://mask-network.firefly.land/v1'
diff --git a/packages/web3-providers/src/Firefly/index.ts b/packages/web3-providers/src/Firefly/index.ts
@@ -0,0 +1,16 @@
+import urlcat from 'urlcat'
+import { BASE_URL } from './constants.js'
+import { fetchJSON } from '../entry-helpers.js'
+import type { FireflyBaseAPI } from '../entry-types.js'
+
+export class FireflyAPI implements FireflyBaseAPI.Provider {
+    async getLensByTwitterId(twitterHandle: string): Promise<FireflyBaseAPI.LensAccount[]> {
+        const result = await fetchJSON<FireflyBaseAPI.LensResult>(
+            urlcat(BASE_URL, '/account/lens', {
+                twitterHandle,
+            }),
+        )
+        if (result.code !== 200) return []
+        return result.data
+    }
+}
diff --git a/packages/web3-providers/src/entry-types.ts b/packages/web3-providers/src/entry-types.ts
@@ -5,6 +5,7 @@ export * from './types/Bundler.js'
 export * from './types/DSearch.js'
 export * from './types/Domain.js'
 export * from './types/Explorer.js'
+export * from './types/Firefly.js'
 export * from './types/FungibleToken.js'
 export * from './types/Funder.js'
 export * from './types/Fuse.js'
diff --git a/packages/web3-providers/src/entry.ts b/packages/web3-providers/src/entry.ts
@@ -67,6 +67,7 @@ import { SmartPayOwnerAPI } from './SmartPay/apis/OwnerAPI.js'
 import { SimpleHashProviderAPI } from './SimpleHash/index.js'
 import { RSS3API } from './RSS3/index.js'
 import { LidoAPI } from './Lido/index.js'
+import { FireflyAPI } from './Firefly/index.js'
 
 export const OpenSea = new OpenSeaAPI()
 export const Lido = new LidoAPI()
@@ -187,4 +188,6 @@ export * from './Storage/index.js'
 
 // RSS3
 export const RSS3 = new RSS3API()
-export * from './helpers/parseJSON.js'
+
+// Firefly
+export const Firefly = new FireflyAPI()
diff --git a/packages/web3-providers/src/types/Firefly.ts b/packages/web3-providers/src/types/Firefly.ts
@@ -0,0 +1,23 @@
+export namespace FireflyBaseAPI {
+    export type Result<T> = {
+        code: number
+        reason: string
+        message: string
+        data: T
+    }
+
+    export interface LensAccount {
+        address: string
+        name: string
+        handle: string
+        bio: string
+        url: string
+        profileUri: string[]
+    }
+
+    export type LensResult = Result<LensAccount[]>
+
+    export interface Provider {
+        getLensByTwitterId(twitterHandle: string): Promise<LensAccount[]>
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "Mask Network",`
`3`		`- "version": "2.19.1",`
	`3`	`+ "version": "2.19.2",`
`4`	`4`	`"manifest_version": 2,`
`5`	`5`	`"permissions": ["storage", "downloads", "webNavigation", "activeTab"],`
`6`	`6`	`"optional_permissions": ["<all_urls>", "notifications", "clipboardRead"],`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import { attachReactTreeToGlobalContainer } from '../../../../utils/index.js'`
`10`	`10`	`const selector = () => {`
`11`	`11`	`// [href^="/search"] is a hash tag`
`12`	`12`	`return querySelectorAll<HTMLElement>(`
`13`		`- '[data-testid=sidebarColumn] [data-testid=UserCell] div > a[role=link]:not([tabindex]):not([href^="/search"]) [dir]:last-of-type',`
	`13`	`+ '[data-testid=UserCell] div > a[role=link]:not([tabindex]):not([href^="/search"]) [dir]:last-of-type',`
`14`	`14`	`)`
`15`	`15`	`}`
`16`	`16`