Skip to content

Commit

Permalink
refactor: rename SNSAdaptor to SiteAdaptor
Browse files Browse the repository at this point in the history
  • Loading branch information
Jack-Works committed Aug 10, 2023
1 parent 2d3ea89 commit 92c5608
Show file tree
Hide file tree
Showing 76 changed files with 187 additions and 196 deletions.
2 changes: 1 addition & 1 deletion packages/app/src/helpers/createPostInfoContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export function createPostInfoContext(): PostInfo {
nickname: NULL,
avatarURL: NULL,
author: NULL,
snsID: NULL,
postID: NULL,

get rootNode() {
return null
Expand Down
4 changes: 2 additions & 2 deletions packages/app/src/main/page-render.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import '../plugin-host/enable.js'

import { DisableShadowRootContext, ShadowRootIsolation } from '@masknet/theme'
import { createInjectHooksRenderer } from '@masknet/plugin-infra/dom'
import { useActivatedPluginsSNSAdaptor } from '@masknet/plugin-infra/content-script'
import { useActivatedPluginsSiteAdaptor } from '@masknet/plugin-infra/content-script'

const GlobalInjection = createInjectHooksRenderer(
useActivatedPluginsSNSAdaptor.visibility.useAnyMode,
useActivatedPluginsSiteAdaptor.visibility.useAnyMode,
(x) => x.GlobalInjection,
)

Expand Down
4 changes: 2 additions & 2 deletions packages/app/src/main/plugin-render.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import '../plugin-host/enable.js'

import type { TypedMessage } from '@masknet/typed-message'
import { createInjectHooksRenderer } from '@masknet/plugin-infra/dom'
import { useActivatedPluginsSNSAdaptor } from '@masknet/plugin-infra/content-script'
import { useActivatedPluginsSiteAdaptor } from '@masknet/plugin-infra/content-script'
import { DisableShadowRootContext, ShadowRootIsolation } from '@masknet/theme'

const Decrypted = createInjectHooksRenderer(
useActivatedPluginsSNSAdaptor.visibility.useAnyMode,
useActivatedPluginsSiteAdaptor.visibility.useAnyMode,
(x) => x.DecryptedInspector,
)

Expand Down
4 changes: 2 additions & 2 deletions packages/app/src/plugin-host/enable.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import './register.js'

import { Emitter } from '@servie/events'
import { SiteAdaptor, startPluginSNSAdaptor } from '@masknet/plugin-infra/content-script'
import { SiteAdaptor, startPluginSiteAdaptor } from '@masknet/plugin-infra/content-script'
import { BooleanPreference, createI18NBundle, i18NextInstance } from '@masknet/shared-base'
import { setupReactShadowRootEnvironment } from '@masknet/theme'
import { inMemoryStorage, indexedDBStorage } from '../setup/storage.js'
import { createSharedContext } from '../helpers/createSharedContext.js'

startPluginSNSAdaptor(SiteAdaptor.MaskIO, {
startPluginSiteAdaptor(SiteAdaptor.MaskIO, {
minimalMode: {
events: new Emitter(),
isEnabled: () => BooleanPreference.False,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { memo, type PropsWithChildren, useCallback } from 'react'
import { Typography, Link as MaterialLink } from '@mui/material'
import type { RenderFragmentsContextType } from '@masknet/typed-message-react'
import { useActivatedPluginsSNSAdaptor } from '@masknet/plugin-infra/content-script'
import { useActivatedPluginsSiteAdaptor } from '@masknet/plugin-infra/content-script'
import { useChainContext } from '@masknet/web3-hooks-base'
import type { NetworkPluginID } from '@masknet/shared-base'

Expand All @@ -28,7 +28,7 @@ export const Link = memo(function Anchor(props: RenderFragmentsContextType.LinkP

export function useTagEnhancer(kind: 'hash' | 'cash', content: string) {
const { chainId } = useChainContext<NetworkPluginID.PLUGIN_EVM>()
const plugin = useActivatedPluginsSNSAdaptor('any')
const plugin = useActivatedPluginsSiteAdaptor('any')
.filter((x) => x.enhanceTag)
.at(0)

Expand Down
9 changes: 0 additions & 9 deletions packages/mask/src/components/DataSource/usePostInfo.ts

This file was deleted.

4 changes: 2 additions & 2 deletions packages/mask/src/components/InjectedComponents/Avatar.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useMemo } from 'react'
import { createInjectHooksRenderer, useActivatedPluginsSNSAdaptor } from '@masknet/plugin-infra/content-script'
import { createInjectHooksRenderer, useActivatedPluginsSiteAdaptor } from '@masknet/plugin-infra/content-script'
import { useSocialAccountsAll } from '@masknet/web3-hooks-base'
import type { Plugin } from '@masknet/plugin-infra'
import { EMPTY_LIST } from '@masknet/shared-base'
Expand All @@ -23,7 +23,7 @@ export function Avatar(props: AvatarProps) {
const { value: socialAccounts = EMPTY_LIST, loading: loadingSocialAccounts } = useSocialAccountsAll(identity)
const component = useMemo(() => {
const Component = createInjectHooksRenderer(
useActivatedPluginsSNSAdaptor.visibility.useNotMinimalMode,
useActivatedPluginsSiteAdaptor.visibility.useNotMinimalMode,
(plugin) => {
const shouldDisplay =
plugin.AvatarRealm?.Utils?.shouldDisplay?.(identity, socialAccounts, sourceType) ?? true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ import { useI18N } from '../../utils/index.js'
import { EnhanceableSite } from '@masknet/shared-base'

interface StyleProps {
snsId: string
site: EnhanceableSite
}

const useStyles = makeStyles<StyleProps>()((theme, { snsId }) => ({
const useStyles = makeStyles<StyleProps>()((_theme, { site }) => ({
root: {
flex: 1,
fontSize: 13,
background: '#3a3b3c',
width: snsId === EnhanceableSite.Minds ? '96%' : '100%',
width: site === EnhanceableSite.Minds ? '96%' : '100%',
height: 34,
borderRadius: 20,
padding: '2px 1em',
Expand All @@ -37,7 +37,7 @@ export interface CommentBoxProps {
inputProps?: Partial<PropsOf<typeof InputBase>>
}
export function CommentBox(props: CommentBoxProps) {
const { classes } = useStyles({ snsId: activatedSiteAdaptorUI.networkIdentifier })
const { classes } = useStyles({ site: activatedSiteAdaptorUI.networkIdentifier })
const { t } = useI18N()
return (
<Box sx={{ display: 'flex', width: '100%' }}>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createInjectHooksRenderer, useActivatedPluginsSNSAdaptor } from '@masknet/plugin-infra/content-script'
import { createInjectHooksRenderer, useActivatedPluginsSiteAdaptor } from '@masknet/plugin-infra/content-script'
import type { MetadataRenderProps } from '@masknet/typed-message-react'
import { extractTextFromTypedMessage } from '@masknet/typed-message'
import {
Expand All @@ -9,7 +9,7 @@ import {
import { MaskPostExtraPluginWrapperWithPermission } from './PermissionBoundary.js'

const Decrypted = createInjectHooksRenderer(
useActivatedPluginsSNSAdaptor.visibility.useNotMinimalMode,
useActivatedPluginsSiteAdaptor.visibility.useNotMinimalMode,
(x) => x.DecryptedInspector,
MaskPostExtraPluginWrapperWithPermission,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
type Plugin,
PluginI18NFieldRender,
registeredPlugins,
useActivatedPluginsSNSAdaptor,
useActivatedPluginsSiteAdaptor,
usePostInfoDetails,
} from '@masknet/plugin-infra/content-script'
import { MaskPostExtraInfoWrapper } from '@masknet/shared'
Expand All @@ -19,8 +19,8 @@ import Services from '../../extension/service.js'
import { useI18N } from '../../utils/index.js'

function useDisabledPlugins() {
const activated = new Set(useActivatedPluginsSNSAdaptor('any').map((x) => x.ID))
const minimalMode = new Set(useActivatedPluginsSNSAdaptor(true).map((x) => x.ID))
const activated = new Set(useActivatedPluginsSiteAdaptor('any').map((x) => x.ID))
const minimalMode = new Set(useActivatedPluginsSiteAdaptor(true).map((x) => x.ID))
const disabledPlugins = useSubscription(registeredPlugins)
.filter((plugin) => !activated.has(plugin[0]) || minimalMode.has(plugin[0]))
.map((x) => x[1])
Expand Down Expand Up @@ -61,7 +61,7 @@ export function PossiblePluginSuggestionPostInspector() {
}
export function PossiblePluginSuggestionUI(props: { plugins: Plugin.Shared.Definition[] }) {
const { plugins } = props
const _plugins = useActivatedPluginsSNSAdaptor('any')
const _plugins = useActivatedPluginsSiteAdaptor('any')
if (!plugins.length) return null
return (
<>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { useEffect } from 'react'
import { useCustomSnackbar } from '@masknet/theme'
import { Button, Box, Typography } from '@mui/material'
import { createInjectHooksRenderer, useActivatedPluginsSNSAdaptor } from '@masknet/plugin-infra/content-script'
import { createInjectHooksRenderer, useActivatedPluginsSiteAdaptor } from '@masknet/plugin-infra/content-script'
import { MaskMessages } from '@masknet/shared-base'
import { useMatchXS } from '@masknet/shared-base-ui'
import { useAutoPasteFailedDialog } from './AutoPasteFailedDialog.js'
import { useI18N } from '../../utils/index.js'

const GlobalInjection = createInjectHooksRenderer(
useActivatedPluginsSNSAdaptor.visibility.useAnyMode,
useActivatedPluginsSiteAdaptor.visibility.useAnyMode,
(x) => x.GlobalInjection,
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useAsyncRetry } from 'react-use'
import { first } from 'lodash-es'
import { InjectedDialog, usePersonaProofs } from '@masknet/shared'
import {
useActivatedPluginsSNSAdaptor,
useActivatedPluginsSiteAdaptor,
usePluginI18NField,
getSettingsTabContent,
} from '@masknet/plugin-infra/content-script'
Expand Down Expand Up @@ -38,7 +38,7 @@ export function PluginSettingsDialog() {
const translate = usePluginI18NField()

const [open, setOpen] = useState(false)
const activatedPlugins = useActivatedPluginsSNSAdaptor('any')
const activatedPlugins = useActivatedPluginsSiteAdaptor('any')
const displayPlugins = getAvailablePlugins(activatedPlugins, (plugins) => {
return plugins
.flatMap((x) => x.SettingTabs?.map((y) => ({ ...y, pluginID: x.ID })) ?? EMPTY_LIST)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import {
createInjectHooksRenderer,
Plugin,
useActivatedPluginsSNSAdaptor,
useActivatedPluginsSiteAdaptor,
usePostInfoDetails,
} from '@masknet/plugin-infra/content-script'

const ActionsRenderer = createInjectHooksRenderer(
useActivatedPluginsSNSAdaptor.visibility.useNotMinimalMode,
useActivatedPluginsSiteAdaptor.visibility.useNotMinimalMode,
(plugin) => plugin.TipsRealm?.UI?.Content,
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ import { useCurrentIdentity } from '../DataSource/useActivatedUI.js'
import {
usePostInfoDetails,
createInjectHooksRenderer,
useActivatedPluginsSNSAdaptor,
useActivatedPluginsSiteAdaptor,
} from '@masknet/plugin-infra/content-script'
import { PossiblePluginSuggestionPostInspector } from './DisabledPluginSuggestion.js'
import { useSubscription } from 'use-subscription'
import { PersistentStorages } from '../../../shared/index.js'
import { MaskPostExtraPluginWrapperWithPermission } from './PermissionBoundary.js'

const PluginHooksRenderer = createInjectHooksRenderer(
useActivatedPluginsSNSAdaptor.visibility.useNotMinimalMode,
useActivatedPluginsSiteAdaptor.visibility.useNotMinimalMode,
(plugin) => plugin.PostInspector,
MaskPostExtraPluginWrapperWithPermission,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { TabContext } from '@mui/lab'
import { Tab, Typography } from '@mui/material'
import { Icons } from '@masknet/icons'
import {
useActivatedPluginsSNSAdaptor,
useActivatedPluginsSiteAdaptor,
usePluginI18NField,
getProfileCardTabContent,
} from '@masknet/plugin-infra/content-script'
Expand Down Expand Up @@ -134,7 +134,7 @@ export const ProfileCard = memo(({ identity, currentAddress, ...rest }: Props) =
})
}, [retrySocialAddress])

const activatedPlugins = useActivatedPluginsSNSAdaptor('any')
const activatedPlugins = useActivatedPluginsSiteAdaptor('any')
const displayPlugins = getAvailablePlugins(activatedPlugins, (plugins) => {
return plugins
.flatMap((x) => x.ProfileCardTabs?.map((y) => ({ ...y, pluginID: x.ID })) ?? EMPTY_LIST)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useMemo } from 'react'
import { makeStyles } from '@masknet/theme'
import { PluginID } from '@masknet/shared-base'
import { useActivatedPluginsSNSAdaptor, createInjectHooksRenderer } from '@masknet/plugin-infra/content-script'
import { useActivatedPluginsSiteAdaptor, createInjectHooksRenderer } from '@masknet/plugin-infra/content-script'
import { useCurrentVisitingIdentity } from '../DataSource/useActivatedUI.js'

export interface ProfileCoverProps extends withClasses<'root'> {}
Expand All @@ -20,7 +20,7 @@ export function ProfileCover(props: ProfileCoverProps) {

// TODO: Multi-plugin rendering support
const component = useMemo(() => {
const Component = createInjectHooksRenderer(useActivatedPluginsSNSAdaptor.visibility.useAnyMode, (x) => {
const Component = createInjectHooksRenderer(useActivatedPluginsSiteAdaptor.visibility.useAnyMode, (x) => {
const cover = x.ProfileCover?.find((x) => x.ID === `${PluginID.Debugger}_cover`)
return cover?.UI?.Cover
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { TabContext } from '@mui/lab'
import { Link, Button, Stack, Tab, ThemeProvider, Typography } from '@mui/material'
import { Icons } from '@masknet/icons'
import {
useActivatedPluginsSNSAdaptor,
useActivatedPluginsSiteAdaptor,
useIsMinimalMode,
usePluginI18NField,
getProfileTabContent,
Expand Down Expand Up @@ -181,7 +181,7 @@ function Content(props: ProfileTabContentProps) {
})
}, [retrySocialAccounts])

const activatedPlugins = useActivatedPluginsSNSAdaptor('any')
const activatedPlugins = useActivatedPluginsSiteAdaptor('any')
const displayPlugins = getAvailablePlugins(activatedPlugins, (plugins) => {
return plugins
.flatMap((x) => x.ProfileTabs?.map((y) => ({ ...y, pluginID: x.ID })) ?? EMPTY_LIST)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
getSearchResultContentForProfileTab,
getSearchResultTabContent,
getSearchResultTabs,
useActivatedPluginsSNSAdaptor,
useActivatedPluginsSiteAdaptor,
usePluginI18NField,
} from '@masknet/plugin-infra/content-script'
import {
Expand Down Expand Up @@ -62,7 +62,7 @@ export function SearchResultInspector(props: SearchResultInspectorProps) {
const { profileTabType } = props
const keyword_ = useSearchedKeyword()
const keyword = props.keyword || keyword_
const activatedPlugins = useActivatedPluginsSNSAdaptor.visibility.useNotMinimalMode()
const activatedPlugins = useActivatedPluginsSiteAdaptor.visibility.useNotMinimalMode()

const resultList = useAsyncRetry(async () => {
if (!keyword) return
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useCallback } from 'react'
import type { PluginID } from '@masknet/shared-base'
import { ApplicationBoardModal } from '@masknet/shared'
import { useLastRecognizedIdentity } from '../DataSource/useActivatedUI.js'
import { getCurrentSNSNetwork } from '../../site-adaptors/utils.js'
import { getCurrentSite } from '../../site-adaptors/utils.js'
import { activatedSiteAdaptorUI } from '../../site-adaptor-infra/ui.js'
import { usePersonasFromDB } from '../DataSource/usePersonasFromDB.js'
import { usePersonaAgainstSNSConnectStatus } from '../DataSource/usePersonaAgainstSNSConnectStatus.js'
Expand All @@ -11,7 +11,7 @@ import Services from '../../extension/service.js'
export function useOpenApplicationBoardDialog(quickMode?: boolean, focusPluginID?: PluginID) {
const lastRecognized = useLastRecognizedIdentity()
const allPersonas = usePersonasFromDB()
const currentSNSNetwork = getCurrentSNSNetwork(activatedSiteAdaptorUI.networkIdentifier)
const currentSite = getCurrentSite(activatedSiteAdaptorUI.networkIdentifier)
const { value: applicationCurrentStatus, loading: personaAgainstSNSConnectStatusLoading } =
usePersonaAgainstSNSConnectStatus()

Expand All @@ -21,7 +21,7 @@ export function useOpenApplicationBoardDialog(quickMode?: boolean, focusPluginID
allPersonas,
lastRecognized,
openDashboard: Services.Helper.openDashboard,
currentSNSNetwork,
currentSite,
queryOwnedPersonaInformation: Services.Identity.queryOwnedPersonaInformation,
setPluginMinimalModeEnabled: Services.Settings.setPluginMinimalModeEnabled,
getDecentralizedSearchSettings: Services.Settings.getDecentralizedSearchSettings,
Expand All @@ -35,7 +35,7 @@ export function useOpenApplicationBoardDialog(quickMode?: boolean, focusPluginID
allPersonas,
lastRecognized,
applicationCurrentStatus,
currentSNSNetwork,
currentSite,
personaAgainstSNSConnectStatusLoading,
quickMode,
focusPluginID,
Expand Down
12 changes: 4 additions & 8 deletions packages/mask/src/site-adaptor-infra/ui.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import stringify from 'json-stable-stringify'
import { assertNotEnvironment, Environment } from '@dimensiondev/holoflows-kit'
import { delay, waitDocumentReadyState } from '@masknet/kit'
import type { SiteAdaptorUI } from '@masknet/types'
import { type Plugin, startPluginSNSAdaptor, SiteAdaptorContextRef } from '@masknet/plugin-infra/content-script'
import { type Plugin, startPluginSiteAdaptor, SiteAdaptorContextRef } from '@masknet/plugin-infra/content-script'
import { sharedUIComponentOverwrite, sharedUINetworkIdentifier } from '@masknet/shared'
import {
createSubscriptionFromAsync,
Expand All @@ -22,7 +22,7 @@ import { Sentry } from '@masknet/web3-telemetry'
import { ExceptionID, ExceptionType } from '@masknet/web3-telemetry/types'
import { createPartialSharedUIContext, createPluginHost } from '../../shared/plugin-infra/host.js'
import Services from '../extension/service.js'
import { getCurrentIdentifier, getCurrentSNSNetwork } from '../site-adaptors/utils.js'
import { getCurrentIdentifier, getCurrentSite } from '../site-adaptors/utils.js'
import { setupReactShadowRootEnvironment } from '../utils/index.js'
import '../utils/debug/general.js'
import { configureSelectorMissReporter } from '../utils/startWatch.js'
Expand Down Expand Up @@ -187,8 +187,8 @@ export async function activateSiteAdaptorUIInner(ui_deferred: SiteAdaptorUI.Defe
requestHostPermission: Services.Helper.requestHostPermission,
}

startPluginSNSAdaptor(
getCurrentSNSNetwork(ui.networkIdentifier),
startPluginSiteAdaptor(
getCurrentSite(ui.networkIdentifier),
createPluginHost(
signal,
(id, signal): Plugin.SiteAdaptor.SiteAdaptorContext => {
Expand Down Expand Up @@ -227,10 +227,6 @@ export async function activateSiteAdaptorUIInner(ui_deferred: SiteAdaptorUI.Defe
if (document.visibilityState === 'hidden') return
if (newValue.identifier === oldValue.identifier) return
if (!newValue.identifier) return

MaskMessages.events.Native_visibleSNS_currentDetectedProfileUpdated.sendToBackgroundPage(
newValue.identifier,
)
})
if (provider.hasDeprecatedPlaceholderName) {
provider.recognized.addListener((id) => {
Expand Down

0 comments on commit 92c5608

Please sign in to comment.