Merge branch 'fix/1.5.1' into released

DimensionDev · Jul 25, 2019 · 73e96d2 · 73e96d2
2 parents a0ad6a2 + ad8d9f7
commit 73e96d2
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/src/components/DataSource/PeopleRef.ts b/src/components/DataSource/PeopleRef.ts
@@ -7,14 +7,17 @@ import { PersonIdentifier, GroupIdentifier } from '../../database/type'
 import { useValueRef } from '../../utils/hooks/useValueRef'
 
 const ref = new ValueRef<Person[]>([])
-Services.People.queryPeople('facebook.com').then(p => (ref.value = p))
+function hasFingerprint(x: Person) {
+    return !!x.fingerprint
+}
+Services.People.queryPeople('facebook.com').then(p => (ref.value = p.filter(hasFingerprint)))
 MessageCenter.on('newPerson', person => {
     person.groups.forEach(group => Object.setPrototypeOf(group, GroupIdentifier.prototype))
     person.previousIdentifiers &&
         person.previousIdentifiers.forEach(id => Object.setPrototypeOf(id, PersonIdentifier.prototype))
     Object.setPrototypeOf(person.identifier, PersonIdentifier.prototype)
     const old = ref.value.filter(x => !x.identifier.equals(person.identifier))
-    ref.value = [...old, person]
+    ref.value = [...old, person].filter(hasFingerprint)
 })
 export function usePeople() {
     return useValueRef(ref)

diff --git a/src/components/InjectedComponents/PostComments.tsx b/src/components/InjectedComponents/PostComments.tsx
@@ -30,7 +30,10 @@ interface Props {
 export function PostComment({ comment, postContent, postIV, needZip }: Props) {
     return (
         <AsyncComponent
-            promise={() => Services.Crypto.decryptComment(postIV, postContent, comment)}
+            promise={() => {
+                if (!postIV || !postContent) return Promise.resolve('')
+                return Services.Crypto.decryptComment(postIV, postContent, comment)
+            }}
             dependencies={[postIV, postContent, comment]}
             awaitingComponent={null}
             completeComponent={result =>

diff --git a/src/extension/content-script/injections/MyUsername.ts b/src/extension/content-script/injections/MyUsername.ts
@@ -90,7 +90,7 @@ export function getPersonIdentifierAtFacebook(links: link[] | link, allowCollect
     }
     return PersonIdentifier.unknown
 }
-function getUserID(x: string) {
+export function getUserID(x: string) {
     if (!x) return null
     const relative = !x.startsWith('https://') && !x.startsWith('http://')
     const url = relative ? new URL(x, location.host) : new URL(x)
@@ -101,5 +101,5 @@ function getUserID(x: string) {
         const search = new URLSearchParams(url.search)
         return search.get('id')
     }
-    return url.pathname.replace(/^\//, '')
+    return url.pathname.replace(/^\//, '').replace(/\/$/, '')
 }
diff --git a/src/extension/content-script/injections/Posts.tsx b/src/extension/content-script/injections/Posts.tsx
@@ -109,7 +109,7 @@ new MutationObserverWatcher(posts)
                         selectElementContents(_root.querySelector('[contenteditable]')!)
                         dispatchCustomEvents('paste', encryptedComment)
                         await sleep(200)
-                        if (_root.innerText.match(encryptedComment)) console.log('Okay')
+                        if (_root.innerText.match(encryptedComment)) 'Okay'
                         else prompt('Please paste it into the comment box!', encryptedComment)
                     }}
                 />

diff --git a/src/extension/content-script/injections/Posts/PostInspector.tsx b/src/extension/content-script/injections/Posts/PostInspector.tsx
@@ -28,6 +28,7 @@ export function PostInspector(props: PostInspectorProps) {
         encryptedPost: deconstructPayload(post),
         provePost: post.match(/🔒(.+)🔒/)!,
     }
+    if (type.provePost) Services.People.uploadProvePostUrl(new PostIdentifier(postBy, postId))
     useAsync(() => {
         if (!whoAmI.equals(postBy)) return Promise.resolve([])
         if (!type.encryptedPost) return Promise.resolve([])
@@ -63,7 +64,6 @@ export function PostInspector(props: PostInspectorProps) {
             </>
         )
     } else if (type.provePost) {
-        Services.People.uploadProvePostUrl(new PostIdentifier(postBy, postId))
         return <AddToKeyStore postBy={postBy} provePost={post} />
     }
     return null

diff --git a/src/extension/content-script/injections/ProfilePage.tsx b/src/extension/content-script/injections/ProfilePage.tsx
@@ -1,18 +1,17 @@
 import Services from '../../service'
 import { PersonIdentifier } from '../../../database/type'
 import { LiveSelector, MutationObserverWatcher } from '@holoflows/kit/es'
+import { getUserID } from './MyUsername'
 
 //#region Find key from bio
 {
     const bio = new LiveSelector().querySelector<HTMLDivElement>('#profile_timeline_intro_card')
     function tryFindBioKey(text: string) {
         const a = document.querySelector<HTMLAnchorElement>('#fb-timeline-cover-name a')
         if (!text || !a) return
-        const id = a.href.match(/profile\.php\?id=(.+)/)
-        const name = a.href.match(/^https:..\.facebook.com\/(.+)/)
-        if (!id && !name) return
-        const username = id ? id[1] : name![1]
-        Services.Crypto.verifyOthersProve(text, new PersonIdentifier('facebook.com', username))
+        const id = getUserID(a.href)
+        if (!id) return
+        Services.Crypto.verifyOthersProve(text, new PersonIdentifier('facebook.com', id))
     }
     new MutationObserverWatcher(bio)
         .enableSingleMode()