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

fix(content creators): Fixing bug. Adding TODO items

src/App.js

@@ -14,7 +14,10 @@ import NavMenu from './components/nav-menu'
 import useAppState from './hooks/state'
 import { UninitializedView, InitializedView } from './components/starter-views'
 
-const sigleViewPaths = ['/profile']
+// Paths with custom async loader
+// Single Views, load minimal async services in order to prevent the long-time screen loader.
+const sigleViewPaths = ['/profile', 'user-data']
+
 function App (props) {
   // Load all the app state into a single object that can be passed to child
   // components.

src/components/app-body/nfts-for-sale/index.js

@@ -172,7 +172,7 @@ function NftsForSale (props) {
     } catch (error) {
       setIconsAreLoaded(true)
     }
-  }, [fetchTokenMutableData, appData])
+  }, [fetchTokenMutableData])
 
   //  Check if token data exists in the cache and add it to the tokens object.
   const reviewNftCachedData = useCallback(async (offers) => {

src/components/app-body/nfts-for-sale/info-button.js

@@ -98,17 +98,16 @@ function InfoButton (props) {
             </Row>
 
             {mutableDataCid && (
-              <Row>
+              <Row style={{ paddingTop: '10px' }}>
                 <Col xs={4}><b>User Data</b>:</Col>
                 <Col xs={8}>
-                  <a
-                    href={`/user-data/${props.token.tokenId}`}
+                  <Button
+                    href={`/user-data/${props.token.tokenId}#single-view`}
                     target='_blank'
                     rel='noopener noreferrer'
-                    className='btn btn-link p-0'
                   >
                     View User Data
-                  </a>
+                  </Button>
                 </Col>
               </Row>
             )}

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/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,13 +1,16 @@
 /*
-Component for reading the nostr feeds.
+  Component for reading the nostr feeds.
 */
 
 // Global npm libraries
 import React, { useState, useEffect, useCallback } from 'react'
 import { Container, Nav, Tab, Spinner } from 'react-bootstrap'
+import { RelayPool } from 'nostr'
+
+// Local libraries
 import Feed from './feed'
 import Following from './following'
-import { RelayPool } from 'nostr'
+import config from '../../../../config'
 
 function Feeds (props) {
   const { appData } = props
@@ -28,9 +31,7 @@ function Feeds (props) {
       return currentProfiles
     })
 
-    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: [0], authors: [pubkey] })
     })
@@ -70,9 +71,7 @@ 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)
       pool.on('open', relay => {
         relay.subscribe('REQ', { limit: 10, kinds: [1], '#t': ['slpdex-socialmedia'] })
       })

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

@@ -1,10 +1,12 @@
 /*
-Component for posting nostr information.
+  Component for posting nostr information.
 */
 
 // Global npm libraries
 import React from 'react'
 import { Container } from 'react-bootstrap'
+
+// Local libraries
 import ProfilePost from './profile-post'
 import PublicPost from './public-post'
 

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

@@ -11,6 +11,9 @@ import { Relay } from 'nostr-tools/relay'
 import { hexToBytes } from '@noble/hashes/utils' // already an installed dependency
 import { RelayPool } from 'nostr'
 
+// Local libraries
+import config from '../../../../config'
+
 function ProfilePost (props) {
   const { bchWalletState } = props.appData
   const [accordionKey, setAccordionKey] = useState(null)
@@ -90,7 +93,7 @@ function ProfilePost (props) {
       const privateKeyBin = hexToBytes(nostrKeyPair.privHex)
 
       // Relay list
-      const psf = 'wss://nostr-relay.psfoundation.info'
+      // const psf = 'wss://nostr-relay.psfoundation.info'
 
       const formDataString = JSON.stringify(formData)
 
@@ -107,16 +110,24 @@ function ProfilePost (props) {
       const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
       console.log('signedEvent: ', signedEvent)
 
-      // Connect to a relay.
-      const relay = await Relay.connect(psf)
-      console.log(`connected to ${relay.url}`)
+      // Publish the post to each relay.
+      config.nostrRelays.map(async (relayUrl) => {
+        try {
+          // Connect to a relay.
+          const relay = await Relay.connect(relayUrl)
+          console.log(`connected to ${relay.url}`)
 
-      // Publish the message to the relay.
-      const result = await relay.publish(signedEvent)
-      console.log('result: ', result)
+          // Publish the message to the relay.
+          const result = await relay.publish(signedEvent)
+          console.log('result: ', result)
+
+          // Close the connection to the relay.
+          relay.close()
+        } catch (err) {
+          console.warn(`Skipping publishing to ${relayUrl} due to error: ${err}`)
+        }
+      })
 
-      // Close the connection to the relay.
-      relay.close()
       setSuccessMsg('Post successfully published!')
       setOnFetch(false)
     } catch (error) {

src/components/app-body/nostr/nostr-post/public-post.js

@@ -1,5 +1,5 @@
 /*
-Component for posting nostr information on kind 1.
+  Component for posting nostr information on kind 1.
 */
 
 // Global npm libraries
@@ -10,8 +10,11 @@ import { finalizeEvent } from 'nostr-tools/pure'
 import { Relay } from 'nostr-tools/relay'
 import { hexToBytes } from '@noble/hashes/utils' // already an installed dependency
 
+// Local libraries
+import config from '../../../../config'
+
 function PublicPost (props) {
-  const [accordionKey, setAccordionKey] = useState(null)
+  const [accordionKey, setAccordionKey] = useState('0')
   const [onFetch, setOnFetch] = useState(false)
   const { bchWalletState } = props.appData
   const [formData, setFormData] = useState({
@@ -44,9 +47,6 @@ function PublicPost (props) {
       // Convert private key to binary
       const privateKeyBin = hexToBytes(nostrKeyPair.privHex)
 
-      // Relay list
-      const psf = 'wss://nostr-relay.psfoundation.info'
-
       // BCH address of the user.
       const bchAddr = bchWalletState.address
 
@@ -63,16 +63,24 @@ function PublicPost (props) {
       const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
       console.log('signedEvent: ', signedEvent)
 
-      // Connect to a relay.
-      const relay = await Relay.connect(psf)
-      console.log(`connected to ${relay.url}`)
+      // Publish the post to each relay.
+      config.nostrRelays.map(async (relayUrl) => {
+        try {
+          // Connect to a relay.
+          const relay = await Relay.connect(relayUrl)
+          console.log(`connected to ${relay.url}`)
 
-      // Publish the message to the relay.
-      const result = await relay.publish(signedEvent)
-      console.log('result: ', result)
+          // Publish the message to the relay.
+          const result = await relay.publish(signedEvent)
+          console.log('result: ', result)
+
+          // Close the connection to the relay.
+          relay.close()
+        } catch (err) {
+          console.warn(`Skipping publishing to ${relayUrl} due to error: ${err}`)
+        }
+      })
 
-      // Close the connection to the relay.
-      relay.close()
       resetForm()
       setSuccessMsg('Post successfully published!')
       setOnFetch(false)

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

@@ -7,9 +7,12 @@ 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 +25,8 @@ 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)
       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,10 +6,13 @@ 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
@@ -22,9 +25,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)

src/config/index.js

@@ -18,7 +18,12 @@ const config = {
   // dexServer: 'http://localhost:5700',
 
   nostrTopic: 'bch-dex-test-topic-02',
-  nostrRelay: 'wss://nostr-relay.psfoundation.info'
+  nostrRelay: 'wss://nostr-relay.psfoundation.info',
+  nostrRelays: [
+    'wss://nostr-relay.psfoundation.info',
+    'wss://nos.lol',
+    'wss://relay.damus.io'
+  ]
 
 }