refactor: sns utils (#11345)

DimensionDev · Feb 2, 2024 · b6001e7 · b6001e7
1 parent e647578
commit b6001e7
Show file tree

Hide file tree

Showing 16 changed files with 69 additions and 42 deletions.
diff --git a/packages/app/src/initialization/plugin-host/enable.ts b/packages/app/src/initialization/plugin-host/enable.ts
@@ -47,6 +47,7 @@ __setSiteAdaptorContext__({
     currentNextIDPlatform: undefined,
     currentPersonaIdentifier: UNDEFINED,
     getPostURL: () => null,
+    getProfileURL: () => null,
     share: undefined,
     connectPersona: reject,
     getPostIdFromNewPostToast: undefined,

diff --git a/packages/mask/content-script/site-adaptor-infra/ui.ts b/packages/mask/content-script/site-adaptor-infra/ui.ts
@@ -147,6 +147,7 @@ export async function activateSiteAdaptorUIInner(ui_deferred: SiteAdaptorUI.Defe
         currentNextIDPlatform: ui.configuration.nextIDConfig?.platform,
         currentPersonaIdentifier: createSubscriptionFromValueRef(currentPersonaIdentifier, signal),
         getPostURL: ui.utils.getPostURL || (() => null),
+        getProfileURL: ui.utils.getProfileURL || (() => null),
         share: ui.utils.share,
         getPostIdFromNewPostToast: ui.configuration.nextIDConfig?.getPostIdFromNewPostToast,
         connectPersona,

diff --git a/packages/mask/content-script/site-adaptors/facebook.com/shared.ts b/packages/mask/content-script/site-adaptors/facebook.com/shared.ts
@@ -1,22 +1,34 @@
+import urlcat from 'urlcat'
 import type { SiteAdaptor } from '@masknet/types'
 import { facebookBase } from './base.js'
 import { getPostUrlAtFacebook, isValidFacebookUsername } from './utils/parse-username.js'
-import { type PostIdentifier } from '@masknet/shared-base'
+import { type ProfileIdentifier, type PostIdentifier } from '@masknet/shared-base'
 import { hasPayloadLike } from '../../utils/index.js'
 import { createSiteAdaptorSpecializedPostContext } from '../../site-adaptor-infra/utils/create-post-context.js'
 import { openWindow } from '@masknet/shared-base-ui'
-import { FacebookAdaptor } from '../../../shared/site-adaptors/implementations/facebook.com.js'
 
 function getPostURL(post: PostIdentifier): URL | null {
     return new URL(getPostUrlAtFacebook(post))
 }
+function getProfileURL(profile: ProfileIdentifier): URL | null {
+    return new URL('https://www.facebook.com')
+}
+function getShareURL(text: string): URL | null {
+    return new URL(
+        urlcat('https://www.facebook.com/sharer/sharer.php', {
+            quote: text,
+            u: 'mask.io',
+        }),
+    )
+}
 export const facebookShared: SiteAdaptor.Shared & SiteAdaptor.Base = {
     ...facebookBase,
     utils: {
         isValidUsername: (v) => !!isValidFacebookUsername(v),
         getPostURL,
+        getProfileURL,
         share(message) {
-            openWindow(FacebookAdaptor.getShareLinkURL?.(message))
+            openWindow(getShareURL?.(message))
         },
         createPostContext: createSiteAdaptorSpecializedPostContext(facebookBase.networkIdentifier, {
             hasPayloadLike,

diff --git a/packages/mask/content-script/site-adaptors/instagram.com/shared.ts b/packages/mask/content-script/site-adaptors/instagram.com/shared.ts
@@ -3,9 +3,14 @@ import { createSiteAdaptorSpecializedPostContext } from '../../site-adaptor-infr
 import { hasPayloadLike } from '../../utils/index.js'
 import { instagramBase } from './base.js'
 
+function getProfileURL(): URL | null {
+    return new URL('https://www.instagram.com/')
+}
+
 export const instagramShared: SiteAdaptor.Shared & SiteAdaptor.Base = {
     ...instagramBase,
     utils: {
+        getProfileURL,
         createPostContext: createSiteAdaptorSpecializedPostContext(instagramBase.networkIdentifier, {
             hasPayloadLike,
         }),

diff --git a/packages/mask/content-script/site-adaptors/minds.com/shared.ts b/packages/mask/content-script/site-adaptors/minds.com/shared.ts
@@ -1,22 +1,36 @@
-import { type PostIdentifier } from '@masknet/shared-base'
+import urlcat from 'urlcat'
+import { type ProfileIdentifier, type PostIdentifier } from '@masknet/shared-base'
 import { openWindow } from '@masknet/shared-base-ui'
 import type { SiteAdaptor } from '@masknet/types'
 import { createSiteAdaptorSpecializedPostContext } from '../../site-adaptor-infra/utils/create-post-context.js'
 import { hasPayloadLike } from '../../utils/index.js'
 import { mindsBase } from './base.js'
 import { usernameValidator } from './utils/user.js'
-import { MindsAdaptor } from '../../../shared/site-adaptors/implementations/minds.com.js'
 
 function getPostURL(post: PostIdentifier): URL {
     return new URL(`https://minds.com/newsfeed/${post.postId}`)
 }
+
+function getProfileURL(profile: ProfileIdentifier): URL | null {
+    return new URL('https://www.minds.com')
+}
+
+function getShareURL(text: string): URL | null {
+    return new URL(
+        urlcat('https://www.minds.com/newsfeed/subscriptions', {
+            intentUrl: text,
+        }),
+    )
+}
+
 export const mindsShared: SiteAdaptor.Shared & SiteAdaptor.Base = {
     ...mindsBase,
     utils: {
         isValidUsername: usernameValidator,
         getPostURL,
+        getProfileURL,
         share(message) {
-            openWindow(MindsAdaptor.getShareLinkURL?.(message))
+            openWindow(getShareURL(message))
         },
         createPostContext: createSiteAdaptorSpecializedPostContext(mindsBase.networkIdentifier, {
             hasPayloadLike,

diff --git a/packages/mask/content-script/site-adaptors/mirror.xyz/shared.ts b/packages/mask/content-script/site-adaptors/mirror.xyz/shared.ts
@@ -4,9 +4,18 @@ import { hasPayloadLike } from '../../utils/index.js'
 import { mirrorBase } from './base.js'
 import { getUserIdentity } from './utils/user.js'
 
+function getProfileURL() {
+    return new URL('https://mirror.xyz/dashboard')
+}
+function getShareURL(text: string) {
+    return new URL('https://mirror.xyz')
+}
+
 export const mirrorShared: SiteAdaptor.Shared & SiteAdaptor.Base = {
     ...mirrorBase,
     utils: {
+        getProfileURL,
+        getShareURL,
         createPostContext: createSiteAdaptorSpecializedPostContext(mirrorBase.networkIdentifier, {
             hasPayloadLike,
         }),

diff --git a/packages/mask/content-script/site-adaptors/twitter.com/shared.ts b/packages/mask/content-script/site-adaptors/twitter.com/shared.ts
@@ -1,3 +1,4 @@
+import urlcat from 'urlcat'
 import { type PostIdentifier, ProfileIdentifier } from '@masknet/shared-base'
 import { openWindow } from '@masknet/shared-base-ui'
 import type { SiteAdaptor } from '@masknet/types'
@@ -6,19 +7,26 @@ import { hasPayloadLike } from '../../utils/index.js'
 import { twitterBase } from './base.js'
 import { TwitterDecoder } from '@masknet/encryption'
 import { getUserIdentity, usernameValidator } from './utils/user.js'
-import { TwitterAdaptor } from '../../../shared/site-adaptors/implementations/twitter.com.js'
 
 function getPostURL(post: PostIdentifier): URL | null {
     if (!(post.identifier instanceof ProfileIdentifier)) return null
     return new URL(`https://twitter.com/${post.identifier.userId}/status/${post.postId}`)
 }
+function getProfileURL(profile: ProfileIdentifier): URL | null {
+    return new URL(`https://twitter.com/${profile.userId}`)
+}
+function getShareURL(text: string): URL | null {
+    return new URL(urlcat('https://twitter.com/intent/tweet', { text }))
+}
 export const twitterShared: SiteAdaptor.Shared & SiteAdaptor.Base = {
     ...twitterBase,
     utils: {
         isValidUsername: usernameValidator,
         getPostURL,
+        getProfileURL,
+        getShareURL,
         share(text) {
-            const url = TwitterAdaptor.getShareLinkURL!(text)
+            const url = getShareURL(text)
             const width = 700
             const height = 520
             const openedWindow = openWindow(url, 'share', {
@@ -35,7 +43,7 @@ export const twitterShared: SiteAdaptor.Shared & SiteAdaptor.Base = {
                     scrollbars: true,
                 },
             })
-            if (openedWindow === null) {
+            if (openedWindow === null && url) {
                 location.assign(url)
             }
         },

diff --git a/packages/mask/shared/site-adaptors/implementations/facebook.com.ts b/packages/mask/shared/site-adaptors/implementations/facebook.com.ts
@@ -1,21 +1,13 @@
-import urlcat from 'urlcat'
 import { EnhanceableSite } from '@masknet/shared-base'
 import type { SiteAdaptor } from '../types.js'
 
 const origins = ['https://www.facebook.com/*', 'https://m.facebook.com/*', 'https://facebook.com/*']
+
 export const FacebookAdaptor: SiteAdaptor.Definition = {
     name: 'Facebook',
     networkIdentifier: EnhanceableSite.Facebook,
     declarativePermissions: { origins },
     homepage: 'https://www.facebook.com',
     isSocialNetwork: true,
     sortIndex: 1,
-    getProfilePage: () => new URL('https://www.facebook.com'),
-    getShareLinkURL(message) {
-        const url = urlcat('https://www.facebook.com/sharer/sharer.php', {
-            quote: message,
-            u: 'mask.io',
-        })
-        return new URL(url)
-    },
 }
diff --git a/packages/mask/shared/site-adaptors/implementations/instagram.com.ts b/packages/mask/shared/site-adaptors/implementations/instagram.com.ts
@@ -2,13 +2,12 @@ import { EnhanceableSite } from '@masknet/shared-base'
 import type { SiteAdaptor } from '../types.js'
 
 const origins = ['https://www.instagram.com/*', 'https://m.instagram.com/*', 'https://instagram.com/*']
+
 export const InstagramAdaptor: SiteAdaptor.Definition = {
     name: 'Instagram',
     networkIdentifier: EnhanceableSite.Instagram,
     declarativePermissions: { origins },
     homepage: 'https://www.instagram.com/',
     isSocialNetwork: true,
     sortIndex: 3,
-    getProfilePage: () => new URL('https://www.instagram.com/'),
-    getShareLinkURL: null,
 }
diff --git a/packages/mask/shared/site-adaptors/implementations/minds.com.ts b/packages/mask/shared/site-adaptors/implementations/minds.com.ts
@@ -1,5 +1,4 @@
 import { EnhanceableSite } from '@masknet/shared-base'
-import urlcat from 'urlcat'
 import type { SiteAdaptor } from '../types.js'
 
 const origins = ['https://www.minds.com/*', 'https://minds.com/*', 'https://cdn.minds.com/*']
@@ -10,11 +9,4 @@ export const MindsAdaptor: SiteAdaptor.Definition = {
     homepage: 'https://www.minds.com',
     isSocialNetwork: true,
     sortIndex: 4,
-    getProfilePage: () => new URL('https://www.minds.com'),
-    getShareLinkURL(message) {
-        const url = urlcat('https://www.minds.com/newsfeed/subscriptions', {
-            intentUrl: message,
-        })
-        return new URL(url)
-    },
 }
diff --git a/packages/mask/shared/site-adaptors/implementations/mirror.xyz.ts b/packages/mask/shared/site-adaptors/implementations/mirror.xyz.ts
@@ -9,8 +9,4 @@ export const MirrorAdaptor: SiteAdaptor.Definition = {
     homepage: 'https://mirror.xyz',
     isSocialNetwork: false,
     sortIndex: 2,
-    getProfilePage: () => new URL('https://mirror.xyz/dashboard'),
-    getShareLinkURL(message) {
-        return new URL('https://mirror.xyz')
-    },
 }
diff --git a/packages/mask/shared/site-adaptors/implementations/twitter.com.ts b/packages/mask/shared/site-adaptors/implementations/twitter.com.ts
@@ -1,4 +1,3 @@
-import urlcat from 'urlcat'
 import { EnhanceableSite } from '@masknet/shared-base'
 import type { SiteAdaptor } from '../types.js'
 
@@ -10,9 +9,4 @@ export const TwitterAdaptor: SiteAdaptor.Definition = {
     homepage: 'https://twitter.com',
     isSocialNetwork: true,
     sortIndex: 0,
-    getProfilePage: (userId) => new URL(`https://twitter.com/${userId.userId}`),
-    getShareLinkURL(message) {
-        const url = urlcat('https://twitter.com/intent/tweet', { text: message })
-        return new URL(url)
-    },
 }
diff --git a/packages/mask/shared/site-adaptors/types.d.ts b/packages/mask/shared/site-adaptors/types.d.ts
@@ -12,8 +12,6 @@ export declare namespace SiteAdaptor {
         // Note: if declarativePermissions is no longer sufficient, use "false" to indicate it need a load().
         declarativePermissions: DeclarativePermissions
         homepage: undefined | string
-        getProfilePage: null | ((profile: ProfileIdentifier) => URL | null)
-        getShareLinkURL: null | ((text: string) => URL)
         notReadyForProduction?: boolean
         /** Whether this provider need to connect persona */
         isSocialNetwork?: boolean

diff --git a/packages/plugin-infra/src/site-adaptor/context.ts b/packages/plugin-infra/src/site-adaptor/context.ts
@@ -3,14 +3,15 @@
 
 import type { Subscription } from 'use-subscription'
 import type { IdentityResolved } from '../types.js'
-import type { NextIDPlatform, PersonaIdentifier, PostIdentifier } from '@masknet/shared-base'
+import type { NextIDPlatform, PersonaIdentifier, PostIdentifier, ProfileIdentifier } from '@masknet/shared-base'
 
 export interface __SiteAdaptorContext__ {
     lastRecognizedProfile: Subscription<IdentityResolved | undefined>
     currentVisitingProfile: Subscription<IdentityResolved | undefined>
     currentNextIDPlatform: NextIDPlatform | undefined
     currentPersonaIdentifier: Subscription<PersonaIdentifier | undefined>
     getPostURL: (identifier: PostIdentifier) => URL | null
+    getProfileURL: (identifier: ProfileIdentifier) => URL | null
     share: undefined | ((text: string) => void)
     getUserIdentity: ((useId: string) => Promise<IdentityResolved | undefined>) | undefined
     getPostIdFromNewPostToast: (() => string) | undefined
@@ -23,6 +24,7 @@ export let currentVisitingProfile: __SiteAdaptorContext__['currentVisitingProfil
 export let currentNextIDPlatform: NextIDPlatform | undefined
 export let currentPersonaIdentifier: __SiteAdaptorContext__['currentPersonaIdentifier']
 export let getPostURL: __SiteAdaptorContext__['getPostURL']
+export let getProfileURL: __SiteAdaptorContext__['getProfileURL']
 export let share: __SiteAdaptorContext__['share']
 export let getUserIdentity: __SiteAdaptorContext__['getUserIdentity']
 export let getPostIdFromNewPostToast: __SiteAdaptorContext__['getPostIdFromNewPostToast']
@@ -36,6 +38,7 @@ export function __setSiteAdaptorContext__(value: __SiteAdaptorContext__) {
         currentNextIDPlatform,
         currentPersonaIdentifier,
         getPostURL,
+        getProfileURL,
         share,
         getUserIdentity,
         getPostIdFromNewPostToast,

diff --git a/packages/types/src/SiteAdaptor.ts b/packages/types/src/SiteAdaptor.ts
@@ -1,12 +1,14 @@
 import type { EncryptPayloadNetwork } from '@masknet/encryption'
-import type { EnhanceableSite, PostIdentifier } from '@masknet/shared-base'
+import type { EnhanceableSite, PostIdentifier, ProfileIdentifier } from '@masknet/shared-base'
 import type { IdentityResolved, PostContext, PostContextCreation } from '@masknet/plugin-infra/content-script'
 import type { SiteAdaptorUI } from './SiteAdaptorUI.js'
 
 export declare namespace SiteAdaptor {
     export interface Utils {
         /** @returns post URL from PostIdentifier */
         getPostURL?(post: PostIdentifier): URL | null
+        getProfileURL?(profile: ProfileIdentifier): URL | null
+        getShareURL?(text: string): URL | null
         getUserIdentity?(userId: string): Promise<IdentityResolved | undefined>
         /** Is this username valid in this network */
         isValidUsername?(username: string): boolean

diff --git a/packages/types/src/SiteAdaptorUI.ts b/packages/types/src/SiteAdaptorUI.ts
@@ -163,6 +163,7 @@ export namespace SiteAdaptorUI {
         }
         export interface Redirect {
             profilePage?(profile: ProfileIdentifier): void
+            postPage?(post: PostIdentifier): void
             newsFeed?(): void
         }
         export interface Endpoint {