lnbits-exts/nostrmarket
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

refactor: naddrs stuff

Browse source
This commit is contained in:
Vlad Stan 2023-07-18 10:25:22 +03:00
parent c366d571ef
commit b9ca9e325a
1 changed files with 28 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

57
static/js/market.js
View file

@ -224,24 +224,10 @@ const market = async () => {
let merchant_pubkey = params.get('merchant_pubkey') let merchant_pubkey = params.get('merchant_pubkey')
let stall_id = params.get('stall_id') let stall_id = params.get('stall_id')
let product_id = params.get('product_id') let product_id = params.get('product_id')
let naddr = params.get('naddr')
if (naddr) { await this.checkMarketplaceNaddr(params.get('naddr'))
try {
let { type, data } = NostrTools.nip19.decode(naddr)
console.log('### naddr 1', type, data)
if (type == 'naddr' && data.kind == '30019') { // just double check
this.config = {
d: data.identifier,
pubkey: data.pubkey,
relays: data.relays
}
}
this.naddr = naddr
} catch (err) {
console.error(err)
}
}
// What component to render on start // What component to render on start
if (stall_id) { if (stall_id) {
@ -279,7 +265,7 @@ const market = async () => {
console.log('### uiConfig storage: ', uiConfig) console.log('### uiConfig storage: ', uiConfig)
// trigger the `watch` logic // trigger the `watch` logic
this.config = { ...this.config, opts: { ...this.config.opts, ...uiConfig } } this.config = { ...this.config, opts: { ...this.config.opts, ...uiConfig } }
console.log('#### restoreFromStorage this.config', this.config) console.log('#### restoreFromStorage this.config', this.config)
this.applyUiConfigs(this.config) this.applyUiConfigs(this.config)
@ -463,10 +449,7 @@ const market = async () => {
this.$q.loading.show() this.$q.loading.show()
const pool = new NostrTools.SimplePool() const pool = new NostrTools.SimplePool()
// If there is an naddr in the URL, get it and parse content
if (this.config) {
await this.checkMarketplaceNaddr(pool)
}
let relays = Array.from(this.relays) let relays = Array.from(this.relays)
@ -492,11 +475,27 @@ const market = async () => {
return return
}, },
async checkMarketplaceNaddr(pool) { async checkMarketplaceNaddr(naddr) {
if (!this.naddr) return console.log('### checkMarketplaceNaddr')
if (!naddr) return
try {
const { type, data } = NostrTools.nip19.decode(naddr)
if (type !== 'naddr' || data.kind !== 30019) return // just double check
this.config = {
d: data.identifier,
pubkey: data.pubkey,
relays: data.relays
}
} catch (err) {
console.error(err)
return
}
try { try {
// add relays to the set // add relays to the set
const pool = new NostrTools.SimplePool()
this.config.relays.forEach(r => this.relays.add(r)) this.config.relays.forEach(r => this.relays.add(r))
const event = await pool.get(this.config.relays, { const event = await pool.get(this.config.relays, {
kinds: [30019], kinds: [30019],
@ -505,10 +504,9 @@ const market = async () => {
'#d': [this.config.d] '#d': [this.config.d]
}) })
if (!event) return if (!event) return
let content = JSON.parse(event.content)
console.log('### event', event) this.config = { ... this.config, opts: JSON.parse(event.content) }
console.log('### naddr content', content)
this.config = { ... this.config, opts: content }
// add merchants // add merchants
const merchantsPubkeys = this.merchants.map(m => m.publicKey) const merchantsPubkeys = this.merchants.map(m => m.publicKey)
const extraMerchants = (this.config.opts?.merchants || []) const extraMerchants = (this.config.opts?.merchants || [])
@ -521,6 +519,7 @@ const market = async () => {
console.warn(error) console.warn(error)
} }
}, },
async poolSubscribe() { async poolSubscribe() {
const authors = Array.from(this.pubkeys).concat(this.merchants.map(m => m.publicKey)) const authors = Array.from(this.pubkeys).concat(this.merchants.map(m => m.publicKey))
console.log('### poolSubscribe.authors', authors) console.log('### poolSubscribe.authors', authors)