Merge pull request #50 from Permissionless-Software-Foundation/ct-unstable

fix(bch-dex-lib): Updating to v2.2.0

package-lock.json

@@ -15,7 +15,7 @@
         "@fortawesome/react-fontawesome": "0.2.2",
         "@noble/hashes": "^1.8.0",
         "axios": "0.27.2",
-        "bch-dex-lib": "2.0.3",
+        "bch-dex-lib": "2.2.0",
         "bch-message-lib": "2.2.1",
         "bch-nostr": "1.3.4",
         "bch-token-sweep": "2.2.1",
@@ -10043,9 +10043,9 @@
       "license": "MIT"
     },
     "node_modules/bch-dex-lib": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/bch-dex-lib/-/bch-dex-lib-2.0.3.tgz",
-      "integrity": "sha512-aPZIlDcRziZBRKRhEuAv6G/skFjZ28+sE30fkoUY8isUIAe3C0YS7yQMoOmGSA6N46/XuhRbfQi0SRQJfrASpA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/bch-dex-lib/-/bch-dex-lib-2.2.0.tgz",
+      "integrity": "sha512-SORqn4qNmbxfL2SbbapOpbcCB+FtqasR+GT0XRifdkXFjA3aDL0gwMsHjh8IzLZnKtPYSBcfgzKQFxEsXCJNug==",
       "license": "MIT",
       "dependencies": {
         "@chris.troutner/retry-queue": "1.0.10",

package.json

@@ -9,7 +9,7 @@
     "@fortawesome/react-fontawesome": "0.2.2",
     "@noble/hashes": "^1.8.0",
     "axios": "0.27.2",
-    "bch-dex-lib": "2.0.3",
+    "bch-dex-lib": "2.2.0",
     "bch-message-lib": "2.2.1",
     "bch-nostr": "1.3.4",
     "bch-token-sweep": "2.2.1",

src/components/app-body/nostr/content-creators/content-creators-list.js

@@ -1,9 +1,21 @@
+/*
+  This component is used to display the list of content creators.
+
+  TODO:
+  - getFollowList() should aggregate all the followers from all the relays.
+    Currently each relay overwrites the last one.
+
+  - loadProfile() should use multiple relays. It should exit after the first
+    successful retrieval of data from a relay. If the relay fails to give data,
+    it should move on to the next relay.
+*/
+
 import React, { useState, useEffect, useCallback } from 'react'
 import { Container, Spinner, Dropdown } from 'react-bootstrap'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faFilter } from '@fortawesome/free-solid-svg-icons'
-
 import axios from 'axios'
+
 // Local libraries
 import config from '../../../../config'
 import ContentCard from './content-card'
@@ -23,9 +35,9 @@ function ContentCreators (props) {
     const list = await new Promise((resolve, reject) => {
       let list = []
       const { nostrKeyPair } = appData.bchWalletState
-      const psf = 'wss://nostr-relay.psfoundation.info'
 
-      const pool = RelayPool([psf])
+      const pool = RelayPool(config.nostrRelays)
+      // const pool = RelayPool([config.nostrRelay])
       pool.on('open', relay => {
         relay.subscribe('subid', { limit: 1, kinds: [3], authors: [nostrKeyPair.pubHex] })
       })
@@ -52,9 +64,8 @@ function ContentCreators (props) {
 
   const loadProfile = useCallback(async (pubKey) => {
     return new Promise((resolve) => {
-      const psf = 'wss://nostr-relay.psfoundation.info'
-
-      const pool = RelayPool([psf])
+      // const pool = RelayPool(config.nostrRelays)
+      const pool = RelayPool([config.nostrRelay])
       pool.on('open', relay => {
         relay.subscribe('subid', { limit: 5, kinds: [0], authors: [pubKey] })
       })

src/components/app-body/nostr/feeds/feed-card.js

@@ -25,6 +25,7 @@ function FeedCard (props) {
   const [isLiked, setIsLiked] = useState(false)
   const [likesCount, setLikesCount] = useState(null)
   const [likesFetched, setLikesFetched] = useState(false)
+  const [profilePictureError, setProfilePictureError] = useState(false)
 
   // function to fetch a post likes reaction
   const handleLikes = useCallback(async (post, userPubKey) => {
@@ -76,6 +77,15 @@ function FeedCard (props) {
       console.warn(error)
     }
   }, [])
+
+  const handleProfilePictureError = () => {
+    setProfilePictureError(true)
+  }
+
+  const handleProfilePictureLoad = () => {
+    setProfilePictureError(false)
+  }
+
   // Get npub from pubkey
   useEffect(() => {
     const npub = nip19.npubEncode(post.pubkey)
@@ -170,7 +180,20 @@ function FeedCard (props) {
               background: 'linear-gradient(45deg, #6c757d, #495057)'
             }}
           >
-            <FontAwesomeIcon icon={faUser} size='1x' color='#7c7c7d' />
+            {profile?.picture && !profilePictureError
+              ? (
+                <img
+                  src={profile.picture}
+                  alt='Profile'
+                  className='rounded-circle w-100 h-100'
+                  style={{ objectFit: 'cover' }}
+                  onError={handleProfilePictureError}
+                  onLoad={handleProfilePictureLoad}
+                />
+                )
+              : (
+                <FontAwesomeIcon icon={faUser} size='1x' color='#7c7c7d' />
+                )}
           </div>
           <div className='flex-grow-1'>
             <div className='fw-bold mb-1'>

src/components/app-body/nostr/feeds/following.js

@@ -4,9 +4,10 @@
 // Global npm libraries
 import React, { useEffect, useState } from 'react'
 import { Container, Spinner } from 'react-bootstrap'
-
 import { RelayPool } from 'nostr'
 
+// Local libraries
+import config from '../../../../config'
 import FeedCard from './feed-card'
 
 function Following (props) {
@@ -19,9 +20,8 @@ function Following (props) {
       const followingList = await new Promise((resolve, reject) => {
         let list = []
         const { nostrKeyPair } = appData.bchWalletState
-        const psf = 'wss://nostr-relay.psfoundation.info'
 
-        const pool = RelayPool([psf])
+        const pool = RelayPool(config.nostrRelays)
         pool.on('open', relay => {
           relay.subscribe('subid', { limit: 1, kinds: [3], authors: [nostrKeyPair.pubHex] })
         })

src/components/app-body/nostr/feeds/index.js

@@ -1,5 +1,16 @@
 /*
   Component for reading the nostr feeds.
+
+  TODO:
+  - fetchProfile() should retrieve a profile from multiple relays. If the first relay returns a profile,
+    then that profile can be used and promise resolved. If the first relay returns no profile, the next
+    one should be tried until all relays are exhausted or one returns a profile.
+
+  - useEffect() retrieves the feeds. This should cycle through each relay and posts from each one.
+    Once each relays has been tried, the posts should remove duplicate entries. Finally posts should
+    be sorted by date.
+
+  - Clicking on a profile picture, name, or npub should open the profile for that user in a new tab.
 */
 
 // Global npm libraries
@@ -10,6 +21,7 @@ import { RelayPool } from 'nostr'
 // Local libraries
 import Feed from './feed'
 import Following from './following'
+import config from '../../../../config'
 
 function Feeds (props) {
   const { appData } = props
@@ -21,18 +33,23 @@ function Feeds (props) {
   const [profiles, setProfiles] = useState({})
 
   // function to fetch profile and set it to profiles state
-  const fetchProfile = useCallback((pubkey) => {
+  const fetchProfile = useCallback(async (pubkey) => {
     // no fetch profile again if it exist
+    let hasProfileRequest = false
     setProfiles(currentProfiles => {
       if (currentProfiles[pubkey]) {
+        hasProfileRequest = true
         return currentProfiles
+      } else {
+        const newProfiles = { ...currentProfiles }
+        newProfiles[pubkey] = { loaded: false }
+        return newProfiles
       }
-      return currentProfiles
     })
+    if (hasProfileRequest) return
 
-    const psf = 'wss://nostr-relay.psfoundation.info'
-
-    const pool = RelayPool([psf])
+    // const pool = RelayPool(config.nostrRelays)
+    const pool = RelayPool([config.nostrRelay])
     pool.on('open', relay => {
       relay.subscribe('subid', { limit: 5, kinds: [0], authors: [pubkey] })
     })
@@ -50,6 +67,7 @@ function Feeds (props) {
           return currentProfiles
         })
       } catch (error) {
+        console.warn(error)
         // skip error
       }
     })
@@ -72,9 +90,8 @@ function Feeds (props) {
   // Get global feed posts
   useEffect(() => {
     const start = () => {
-      const psf = 'wss://nostr-relay.psfoundation.info'
-
-      const pool = RelayPool([psf])
+      // const pool = RelayPool(config.nostrRelays)
+      const pool = RelayPool([config.nostrRelay])
       pool.on('open', relay => {
         relay.subscribe('REQ', { limit: 10, kinds: [1], '#t': ['slpdex-socialmedia'] })
       })

src/components/app-body/nostr/nostr-format.js

@@ -26,7 +26,7 @@ const NostrFormat = ({ content }) => {
   }
 
   return (
-    <div dangerouslySetInnerHTML={{ __html: formatContent(content) }} />
+    <div style={{ overflow: 'auto' }} dangerouslySetInnerHTML={{ __html: formatContent(content) }} />
   )
 }
 

src/components/app-body/nostr/profile/profile-read.js

@@ -1,15 +1,23 @@
 /**
- * Component for read nostr information kind 0
+ * Component to read nostr information kind 0 (normal posts)
+ *
+ * TODO:
+ * - Currently feeds are retrieved from only one relay. It should retrieve Kind
+ *   0 posts from all relays. It should then remove any duplicate entries.
  */
+
 // Global npm libraries
 import React, { useEffect, useState } from 'react'
 import { Container, Button } from 'react-bootstrap'
 import CopyOnClick from '../../bch-wallet/copy-on-click.js'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faUser, faGlobe } from '@fortawesome/free-solid-svg-icons'
+import * as nip19 from 'nostr-tools/nip19'
+
+// Local libraries
+import config from '../../../../config'
 import NostrFormat from '../nostr-format'
 import { RelayPool } from 'nostr'
-import * as nip19 from 'nostr-tools/nip19'
 
 function ProfileRead (props) {
   const { npub } = props
@@ -22,9 +30,9 @@ function ProfileRead (props) {
     const start = () => {
       const pubHexData = nip19.decode(npub)
       const pubHex = pubHexData.data
-      const psf = 'wss://nostr-relay.psfoundation.info'
 
-      const pool = RelayPool([psf])
+      // const pool = RelayPool(config.nostrRelays)
+      const pool = new RelayPool([config.nostrRelay])
       pool.on('open', relay => {
         relay.subscribe('subid', { limit: 5, kinds: [0], authors: [pubHex] })
         setLoaded(true)

src/components/app-body/nostr/profile/public-read.js

@@ -6,15 +6,19 @@ import React, { useEffect, useState } from 'react'
 import { Container, Card, Spinner } from 'react-bootstrap'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faUser } from '@fortawesome/free-solid-svg-icons'
-import NostrFormat from '../nostr-format'
 import { RelayPool } from 'nostr'
 import * as nip19 from 'nostr-tools/nip19'
 
+// Local libraries
+import config from '../../../../config'
+import NostrFormat from '../nostr-format'
+
 function PublicRead (props) {
   const { npub } = props
   const { bchWalletState } = props.appData
   const [posts, setPosts] = useState([])
   const [loaded, setLoaded] = useState(false)
+  const [profilePictureError, setProfilePictureError] = useState(false)
 
   useEffect(() => {
     // Get Last post from a author
@@ -22,9 +26,8 @@ function PublicRead (props) {
       const pubHexData = nip19.decode(npub)
       const pubHex = pubHexData.data
       console.log('pubhex', pubHex)
-      const psf = 'wss://nostr-relay.psfoundation.info'
 
-      const pool = RelayPool([psf])
+      const pool = RelayPool(config.nostrRelays)
       pool.on('open', relay => {
         relay.subscribe('subid', { limit: 5, kinds: [1], authors: [pubHex] })
         setLoaded(true)
@@ -47,6 +50,14 @@ function PublicRead (props) {
     }
   }, [bchWalletState, loaded, npub])
 
+  const handleProfilePictureError = () => {
+    setProfilePictureError(true)
+  }
+
+  const handleProfilePictureLoad = () => {
+    setProfilePictureError(false)
+  }
+
   return (
     <Container className='mt-4 mb-5'>
       {/* Nostr Feed Section */}
@@ -74,7 +85,20 @@ function PublicRead (props) {
                       background: 'linear-gradient(45deg, #6c757d, #495057)'
                     }}
                   >
-                    <FontAwesomeIcon icon={faUser} size='1x' color='#7c7c7d' />
+                    {props.profile?.picture && !profilePictureError
+                      ? (
+                        <img
+                          src={props.profile.picture}
+                          alt='Profile'
+                          className='rounded-circle w-100 h-100'
+                          style={{ objectFit: 'cover' }}
+                          onError={handleProfilePictureError}
+                          onLoad={handleProfilePictureLoad}
+                        />
+                        )
+                      : (
+                        <FontAwesomeIcon icon={faUser} size='1x' color='#7c7c7d' />
+                        )}
                   </div>
                   <div className='flex-grow-1'>
                     <div className='fw-bold mb-1'>{props.profile?.name}</div>