Merge pull request #52 from Permissionless-Software-Foundation/dh-feeds-todos

feat(nostr): Completed TODOs on feeds page

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,3 +1,15 @@
+/*
+  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'
@@ -19,59 +31,77 @@ function ContentCreators (props) {
 
   const [followList, setFollowList] = useState([])
 
+  // Get the list of profiles followed by the user.
+  // It aggregates all the followers from all the relays.
   const getFollowList = useCallback(async () => {
     const list = await new Promise((resolve, reject) => {
       let list = []
+      let closedRelays = 0
       const { nostrKeyPair } = appData.bchWalletState
 
       const pool = RelayPool(config.nostrRelays)
+      // const pool = RelayPool([config.nostrRelay])
       pool.on('open', relay => {
         relay.subscribe('subid', { limit: 1, kinds: [3], authors: [nostrKeyPair.pubHex] })
       })
 
       pool.on('eose', relay => {
-        console.log('Closing Relay')
         relay.close()
-        /** This ensures to return an empty array if no records are found!
-         *  Applies for new users that don't have a follow list
-        */
-        resolve(list)
+        closedRelays++
+        // Resolve list if all relays are closed
+        if (closedRelays === config.nostrRelays.length) {
+          resolve(list)
+        }
       })
 
       pool.on('event', (relay, subId, ev) => {
-        console.log('Received event:', ev)
-        list = ev.tags
-        resolve(list)
+        // console.log('Received event:', ev)
+        // Merge list received from all relays
+        list = [...list, ...ev.tags]
       })
     })
 
-    console.log('Follow List', list)
+    // console.log('Follow List', list)
     setFollowList(list)
   }, [appData])
 
+  // Load profile from nostr relays
+  // It uses multiple relays. It will exit after the first successful retrieval
+  // from any relay. If one relay fails, it will move on to the next one.
   const loadProfile = useCallback(async (pubKey) => {
-    return new Promise((resolve) => {
-      const pool = RelayPool(config.nostrRelays)
-      pool.on('open', relay => {
-        relay.subscribe('subid', { limit: 5, kinds: [0], authors: [pubKey] })
-      })
+    // Looking for the profile in each relay sequentially
+    for (let i = 0; i < config.nostrRelays.length; i++) {
+      const profile = await new Promise((resolve) => {
+        const relay = config.nostrRelays[i]
+        // const pool = RelayPool(config.nostrRelays)
+        const pool = RelayPool([relay])
+        pool.on('open', relay => {
+          relay.subscribe('subid', { limit: 5, kinds: [0], authors: [pubKey] })
+        })
 
-      pool.on('eose', relay => {
-        console.log('Closing Relay')
-        relay.close()
-        resolve(false)
-      })
-
-      pool.on('event', (relay, subId, ev) => {
-        try {
-          const profile = JSON.parse(ev.content)
-          // console.log('profile', profile)
-          resolve(profile)
-        } catch (error) {
+        pool.on('eose', relay => {
+          console.log('Closing Relay')
+          relay.close()
           resolve(false)
-        }
+        })
+
+        pool.on('event', (relay, subId, ev) => {
+          try {
+            const profile = JSON.parse(ev.content)
+            // console.log('profile', profile)
+            console.log(`Profile found  for ${pubKey} at ${relay.url}`)
+            resolve(profile)
+          } catch (error) {
+            resolve(false)
+          }
+          relay.close()
+        })
       })
-    })
+      // Stop looking for profile if found
+      if (profile) {
+        return profile
+      }
+    }
   }, [])
 
   useEffect(() => {

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

@@ -1,6 +1,7 @@
 /**
  * Component for displaying nostr posts
  */
+
 // Global npm libraries
 import React, { useCallback, useEffect, useState } from 'react'
 import { Card, Spinner } from 'react-bootstrap'
@@ -8,12 +9,15 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faUser, faHeart as faHeartSolid } from '@fortawesome/free-solid-svg-icons'
 import { faHeart } from '@fortawesome/free-regular-svg-icons'
 import * as nip19 from 'nostr-tools/nip19'
-import NostrFormat from '../nostr-format'
 import { finalizeEvent } from 'nostr-tools/pure'
 import { Relay } from 'nostr-tools/relay'
 import { hexToBytes } from '@noble/hashes/utils' // already an installed dependency
 import { RelayPool } from 'nostr'
 
+// Local libraries
+import CopyOnClick from '../../bch-wallet/copy-on-click.js'
+import NostrFormat from '../nostr-format'
+
 function FeedCard (props) {
   const { post, appData, profiles } = props
   const { nostrKeyPair } = appData.bchWalletState
@@ -21,10 +25,10 @@ function FeedCard (props) {
   const [profile, setProfile] = useState(profiles[post.pubkey])
 
   const [npub, setNpub] = useState('')
-  const [isClicked, setIsClicked] = useState(false)
   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 +80,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)
@@ -94,13 +107,6 @@ function FeedCard (props) {
     }
   }, [profiles, post])
 
-  // copy to clipboard
-  const copyToClipboard = useCallback((value) => {
-    setIsClicked(true)
-    appData.appUtil.copyToClipboard(value)
-    setTimeout(() => setIsClicked(false), 200)
-  }, [appData])
-
   // get short npub
   const getShortNpub = useCallback((npub) => {
     return npub.slice(0, 8) + '...' + npub.slice(-5)
@@ -158,6 +164,11 @@ function FeedCard (props) {
     }
   }
 
+  const goToProfile = () => {
+    const profileUrl = `${window.location.origin}/profile/${npub}#single-view`
+    window.open(profileUrl, '_blank')
+  }
+
   return (
     <Card className='mb-4 bg-light rounded-4 shadow-sm border-0'>
       <Card.Body className='p-3'>
@@ -170,13 +181,27 @@ 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', cursor: 'pointer' }}
+                  onError={handleProfilePictureError}
+                  onLoad={handleProfilePictureLoad}
+                  onClick={goToProfile}
+                />
+                )
+              : (
+                <FontAwesomeIcon icon={faUser} size='1x' color='#7c7c7d' style={{ cursor: 'pointer' }} onClick={goToProfile} />
+                )}
           </div>
           <div className='flex-grow-1'>
             <div className='fw-bold mb-1'>
-              {profile && profile.name && <span>{profile.name}</span>}
+              {profile && profile.name && <span style={{ cursor: 'pointer' }} onClick={goToProfile}>{profile.name}</span>}
               {!profile?.name && (
-                <span>
+                <span style={{ cursor: 'pointer' }} onClick={goToProfile}>
                   {post.pubkey.slice(0, 8) + '...'}
                   {!profile?.loaded && <Spinner animation='border' size='sm' className='ms-2' />}
                 </span>
@@ -188,14 +213,20 @@ function FeedCard (props) {
                   title='Copy to clipboard'
                   style={{
                     cursor: 'pointer',
-                    transform: isClicked ? 'scale(0.95)' : 'scale(1)',
                     transition: 'transform 0.1s ease',
-                    display: 'inline-block'
+                    display: 'inline-block',
+                    marginRight: '5px'
                   }}
-                  onClick={() => copyToClipboard(npub)}
+                  onClick={goToProfile}
+
                 >
                   {getShortNpub(npub)}
                 </span>
+                <CopyOnClick
+                  walletProp='npub'
+                  appData={props.appData}
+                  value={npub}
+                />
               </small>
             )}
           </div>

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

@@ -16,82 +16,121 @@ function Feeds (props) {
   const { appData } = props
   const [activeTab, setActiveTab] = useState(appData.lastFeedTab)
 
-  const { bchWalletState } = appData
   const [posts, setPosts] = useState([])
   const [loaded, setLoaded] = useState(false)
   const [profiles, setProfiles] = useState({})
 
-  // function to fetch profile and set it to profiles state
-  const fetchProfile = useCallback((pubkey) => {
-    // no fetch profile again if it exist
-    setProfiles(currentProfiles => {
-      if (currentProfiles[pubkey]) {
-        return currentProfiles
-      }
-      return currentProfiles
-    })
+  // Load profile from nostr relays
+  // It uses multiple relays. It will exit after the first successful retrieval
+  // from any relay. If one relay fails, it will move on to the next one.
+  const fetchProfile = useCallback(async (pubKey) => {
+    // Looking for the profile in each relay sequentially
+    for (let i = 0; i < config.nostrRelays.length; i++) {
+      const profile = await new Promise((resolve) => {
+        const relay = config.nostrRelays[i]
+        // const pool = RelayPool(config.nostrRelays)
+        const pool = RelayPool([relay])
+        pool.on('open', relay => {
+          relay.subscribe('subid', { limit: 5, kinds: [0], authors: [pubKey] })
+        })
 
-    const pool = RelayPool(config.nostrRelays)
-    pool.on('open', relay => {
-      relay.subscribe('subid', { limit: 5, kinds: [0], authors: [pubkey] })
-    })
+        pool.on('eose', relay => {
+          console.log('Closing Relay')
+          relay.close()
+          resolve(false)
+        })
 
-    pool.on('eose', relay => {
-      relay.close()
-      try {
-      // Mark unknown profiles. From this way we can know which profile was fetched and not found.
-        setProfiles(currentProfiles => {
-          if (!currentProfiles[pubkey]) {
-            const newProfiles = { ...currentProfiles }
-            newProfiles[pubkey] = { loaded: true }
-            return newProfiles
+        pool.on('event', (relay, subId, ev) => {
+          try {
+            const profile = JSON.parse(ev.content)
+            // console.log('profile', profile)
+            console.log(`Profile found  for ${pubKey} at ${relay.url}`)
+            resolve(profile)
+          } catch (error) {
+            resolve(false)
           }
-          return currentProfiles
+          relay.close()
         })
-      } catch (error) {
-        // skip error
+      })
+      // Stop looking for profile if found
+      if (profile) {
+        return profile
       }
-    })
-
-    pool.on('event', (relay, subId, ev) => {
-      try {
-        // update profiles data
-        const profile = JSON.parse(ev.content)
-        setProfiles(currentProfiles => {
-          const newProfiles = { ...currentProfiles }
-          newProfiles[pubkey] = profile
-          return newProfiles
-        })
-      } catch (error) {
-        // skip error
-      }
-    })
+    }
   }, [])
 
-  // Get global feed posts
-  useEffect(() => {
-    const start = () => {
+  // Get array of feeds from relays
+  const fetchFeeds = useCallback(async () => {
+    let feeds = await new Promise((resolve, reject) => {
+      let list = []
+      let closedRelays = 0
+
       const pool = RelayPool(config.nostrRelays)
+      // const pool = RelayPool([config.nostrRelay])
       pool.on('open', relay => {
         relay.subscribe('REQ', { limit: 10, kinds: [1], '#t': ['slpdex-socialmedia'] })
       })
 
       pool.on('eose', relay => {
-        setLoaded(true)
         relay.close()
+        closedRelays++
+        // Resolve list if all relays are closed
+        if (closedRelays === config.nostrRelays.length) {
+          resolve(list)
+        }
       })
 
-      pool.on('event', async (relay, subId, ev) => {
-        setPosts(currentPosts => [...currentPosts, ev])
-        // fetch post profile and set it to profiles state
-        fetchProfile(ev.pubkey)
+      pool.on('event', (relay, subId, ev) => {
+        // console.log('post retrieved from ', relay.url, ev.sig)
+        list = [...list, ev]
       })
+    })
+
+    // Remove duplicated feeds
+    feeds = feeds.filter((val, i, list) => {
+      const existingIndex = list.findIndex(value => value.id === val.id)
+      return existingIndex === i
+    })
+
+    // Sort from newest to oldest
+    feeds.sort((a, b) => b.created_at - a.created_at)
+
+    // console.log('feeds', feeds)
+
+    setPosts(feeds)
+    return feeds
+  }, [])
+
+  // Load data on component mount.
+  useEffect(() => {
+    const loadData = async () => {
+      // Get feeds
+      const feeds = await fetchFeeds()
+      setLoaded(true)
+
+      const loadedProfiles = [] // fetched profiles ( this will be used for prevent load the same profile multiple times.)
+      // Map feeds and get feed owner profile.
+      for (let i = 0; i < feeds.length; i++) {
+        const pubKey = feeds[i].pubkey
+
+        const exist = loadedProfiles.find((val) => { return val === pubKey })
+        if (exist) { continue }
+        // Fech profile.
+        const profile = await fetchProfile(pubKey)
+        loadedProfiles.push(pubKey) // mark as loaded
+
+        // Update profile state
+        setProfiles(currentProfiles => {
+          const newProfiles = { ...currentProfiles }
+          newProfiles[pubKey] = profile
+          return newProfiles
+        })
+      }
     }
-
     if (!loaded) {
-      start()
+      loadData()
     }
-  }, [bchWalletState, loaded, fetchProfile])
+  }, [loaded, fetchFeeds, fetchProfile])
 
   const onChangeTab = (tab) => {
     setActiveTab(tab)

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,6 +1,11 @@
 /**
- * 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'
@@ -26,7 +31,8 @@ function ProfileRead (props) {
       const pubHexData = nip19.decode(npub)
       const pubHex = pubHexData.data
 
-      const pool = RelayPool(config.nostrRelays)
+      // 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

@@ -18,6 +18,7 @@ function PublicRead (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
@@ -49,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 */}
@@ -76,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>