fix: use null instead of undefined in worker verify method definition

DimensionDev · Sep 19, 2019 · d22003a · d22003a
1 parent 6320d1c
commit d22003a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/src/extension/options-page/Welcome/index.tsx b/src/extension/options-page/Welcome/index.tsx
@@ -18,6 +18,7 @@ import { Person } from '../../../database'
 import { getCurrentNetworkWorkerService } from '../../background-script/WorkerService'
 import getCurrentNetworkWorker from '../../../social-network/utils/getCurrentNetworkWorker'
 import { BackupJSONFileLatest } from '../../../utils/type-transform/BackupFile'
+import { isNil } from 'lodash-es'
 
 enum WelcomeState {
     // Step 0
@@ -52,10 +53,10 @@ const WelcomeActions = {
             )
     },
     autoVerifyBio(network: PersonIdentifier, provePost: string) {
-        getCurrentNetworkWorkerService(network).autoVerifyBio(network, provePost)
+        getCurrentNetworkWorkerService(network).autoVerifyBio!(network, provePost)
     },
     autoVerifyPost(network: PersonIdentifier, provePost: string) {
-        getCurrentNetworkWorkerService(network).autoVerifyPost(network, provePost)
+        getCurrentNetworkWorkerService(network).autoVerifyPost!(network, provePost)
     },
     manualVerifyBio(user: PersonIdentifier, prove: string) {
         this.autoVerifyBio(user, prove)
@@ -146,9 +147,9 @@ function Welcome(props: Welcome) {
             }
             return (
                 <Welcome1a4v2
-                    hasManual={!!worker.manualVerifyPost}
-                    hasBio={!!worker.autoVerifyBio}
-                    hasPost={!!worker.autoVerifyPost}
+                    hasManual={!isNil(worker.manualVerifyPost)}
+                    hasBio={!isNil(worker.autoVerifyBio)}
+                    hasPost={!isNil(worker.autoVerifyPost)}
                     bioDisabled={whoAmI.identifier.isUnknown}
                     provePost={provePost}
                     requestManualVerify={() => {

diff --git a/src/social-network/defaults/worker.ts b/src/social-network/defaults/worker.ts
@@ -1,8 +1,7 @@
-import { nop } from '../../utils/utils'
 import { cloneDeep } from 'lodash-es'
 
 export const defaultSocialNetworkWorker = cloneDeep({
-    autoVerifyBio: nop,
-    autoVerifyPost: nop,
-    manualVerifyPost: nop,
+    autoVerifyBio: null,
+    autoVerifyPost: null,
+    manualVerifyPost: null,
 })
diff --git a/src/social-network/worker.ts b/src/social-network/worker.ts
@@ -25,19 +25,19 @@ export interface SocialNetworkWorkerDefinition extends SocialNetworkWorkerAndUI
      *
      * If this function is not provided, autoVerifyBio in Welcome will be unavailable
      */
-    autoVerifyBio?(user: PersonIdentifier, provePost: string): void
+    autoVerifyBio?: ((user: PersonIdentifier, provePost: string) => void) | null
     /**
      * This function should open a new page, then automatically input provePost to the post box
      *
      * If this function is not provided, autoVerifyPost in Welcome will be unavailable
      */
-    autoVerifyPost?(user: PersonIdentifier, provePost: string): void
+    autoVerifyPost?: ((user: PersonIdentifier, provePost: string) => void) | null
     /**
      * This function should open a new page, then let user add it by themself
      *
      * If this function is not provided, manualVerifyPost in Welcome will be unavailable
      */
-    manualVerifyPost?(user: PersonIdentifier, provePost: string): void
+    manualVerifyPost?: ((user: PersonIdentifier, provePost: string) => void) | null
 }
 
 export type SocialNetworkWorker = Required<SocialNetworkWorkerDefinition>
@@ -67,6 +67,3 @@ export function defineSocialNetworkWorker(worker: SocialNetworkWorkerDefinition)
     }
     return res
 }
-export function defineSocialNetworkWorkerExtended<T extends SocialNetworkWorker>(worker: T) {
-    defineSocialNetworkWorker(worker)
-}