Browse Source

Merge branch 'develop' into release/0.1

develop
dskvr 2 years ago
parent
commit
040fa0b8ad
  1. 3
      relays.yaml
  2. 10
      scripts/relays.js
  3. 4
      src/components/relays/partials/NostrSync.vue
  4. 4
      src/store/user.js

3
relays.yaml

@ -212,4 +212,7 @@ relays:
- wss://relay.nosphr.com
- wss://rsslay.nostr.moe
- wss://relay.nostr.scot
- wss://relay.nostrich.de
- wss://nostr.mouton.dev
- wss://nostr.handyjunky.com
- wss://student.chadpolytechnic.com

10
scripts/relays.js

@ -118,12 +118,14 @@ const sanitizeRelay = function(relay) {
}
const checkRemoteRelays = async function(){
for(let i=0;i<relaysRemote.length;i++) {
const randomlyOrderedRelays = relaysRemote.sort(() => Math.random() - 0.5)
for(let i=0;i<randomlyOrderedRelays.length;i++) {
// //console.log('check for connect', remoteMerged[i])
await checkRelay(relaysRemote[i])
await checkRelay(randomlyOrderedRelays[i])
.catch( () => {
remove.push(relaysRemote[i])
//console.log('removals:', remove.length, relaysRemote[i])
remove.push(randomlyOrderedRelays[i])
//console.log('removals:', remove.length, randomlyOrderedRelays[i])
})
}
}

4
src/components/relays/partials/NostrSync.vue

@ -163,7 +163,9 @@ export default defineComponent({
console.log('valid event?', ok, veryOk)
const pool = new RelayPool( Object.keys(this.store.user.kind3) )
const relaysWrite = Object.keys(this.store.user.kind3).filter( key => this.store.user.kind3[key].write)
const pool = new RelayPool( relaysWrite )
pool.on('open', relay=>{
relay.send(['EVENT', signedEvent])

4
src/store/user.js

@ -63,7 +63,7 @@ export const useUserStore = defineStore('user', {
// reject(err)
})
setTimeout( () => {
ordered.sort( (a, b) => a.created_at - b.created_at )
ordered.sort( (a, b) => b.created_at - a.created_at )
if(!ordered.length)
return
this.kind3Event = ordered[0]
@ -79,7 +79,7 @@ export const useUserStore = defineStore('user', {
if(obj instanceof Object && Object.keys(obj).length)
this.kind3 = obj
else
this.kind3 = Object.assign(this.kind3, await this.retrieveKind3())
this.kind3 = Object.assign(await this.retrieveKind3(), this.kind3)
},
setPublicKey: function(pubKey){ this.pubKey = pubKey },
setProfile: function(stringifiedEvContent){

Loading…
Cancel
Save