diff --git a/tests/gui/vuejs/noogle/src/components/ImageGeneration.vue b/tests/gui/vuejs/noogle/src/components/ImageGeneration.vue index c4d6083..5341ab3 100644 --- a/tests/gui/vuejs/noogle/src/components/ImageGeneration.vue +++ b/tests/gui/vuejs/noogle/src/components/ImageGeneration.vue @@ -32,7 +32,9 @@ let listener = false + async function generate_image(message) { + try { if (message === undefined){ message = "A purple Ostrich" @@ -52,7 +54,9 @@ async function generate_image(message) { let evt = new EventBuilder(5100, "NIP 90 Image Generation request", tags) let res = await client.sendEventBuilder(evt) - miniToastr.showMessage("Sent Request to DVMs", "Awaiting results", VueNotifications.types.warn) + store.commit('set_current_request_id', res.toHex()) + + //miniToastr.showMessage("Sent Request to DVMs", "Awaiting results", VueNotifications.types.warn) searching = true if (!store.state.imagehasEventListener){ listen() @@ -72,6 +76,7 @@ async function generate_image(message) { async function listen() { listener = true + let client = store.state.client let pubkey = store.state.pubkey @@ -86,55 +91,86 @@ async function listen() { } //const dvmname = getNamefromId(event.author.toHex()) console.log("Received new event from", relayUrl); - if (event.kind === 7000) { - try { + let resonsetorequest = false + + + + if (event.kind === 7000) { + + for (let tag in event.tags) { + + if (event.tags[tag].asVec()[0] === "e") { + console.log("ETAG: " + event.tags[tag].asVec()[1]) + if (event.tags[tag].asVec()[1] === store.state.requestid) { + resonsetorequest = true + } + } + + } + if (resonsetorequest === true) { + + + try { console.log("7000: ", event.content); console.log("DVM: " + event.author.toHex()) searching = false //miniToastr.showMessage("DVM: " + dvmname, event.content, VueNotifications.types.info) - let status = "unknown" - let jsonentry = {id: event.author.toHex(), kind: "", status: status, result: "", name: event.author.toBech32(), about: "", image: "", amount: 0, bolt11: ""} + let status = "unknown" + let jsonentry = { + id: event.author.toHex(), + kind: "", + status: status, + result: "", + name: event.author.toBech32(), + about: "", + image: "", + amount: 0, + bolt11: "" + } - for (const tag in event.tags){ - if (event.tags[tag].asVec()[0] === "status"){ - status = event.tags[tag].asVec()[1] - } + for (const tag in event.tags) { + if (event.tags[tag].asVec()[0] === "status") { + status = event.tags[tag].asVec()[1] + } - if (event.tags[tag].asVec()[0] === "amount"){ - jsonentry.amount = event.tags[tag].asVec()[1] - if (event.tags[tag].asVec().length > 2){ - jsonentry.bolt11 = event.tags[tag].asVec()[2] - } - // TODO else request invoice - } - } + if (event.tags[tag].asVec()[0] === "amount") { + jsonentry.amount = event.tags[tag].asVec()[1] + if (event.tags[tag].asVec().length > 2) { + jsonentry.bolt11 = event.tags[tag].asVec()[2] + } + // TODO else request invoice + } + } - //let dvm = store.state.nip89dvms.find(x => JSON.parse(x.event).pubkey === event.author.toHex()) - for (const el of store.state.nip89dvms) { - if (JSON.parse(el.event).pubkey === event.author.toHex().toString()) { - jsonentry.name = el.name - jsonentry.about = el.about - jsonentry.image = el.image + //let dvm = store.state.nip89dvms.find(x => JSON.parse(x.event).pubkey === event.author.toHex()) + for (const el of store.state.nip89dvms) { + if (JSON.parse(el.event).pubkey === event.author.toHex().toString()) { + jsonentry.name = el.name + jsonentry.about = el.about + jsonentry.image = el.image console.log(jsonentry) + } } - } - if (dvms.filter(i => i.id === jsonentry.id ).length === 0){ + if (dvms.filter(i => i.id === jsonentry.id).length === 0) { dvms.push(jsonentry) + } + + + dvms.find(i => i.id === jsonentry.id).status = status + + store.commit('set_imagedvm_results', dvms) + + + } catch (error) { + console.log("Error: ", error); } - dvms.find(i => i.id === jsonentry.id).status = status - - store.commit('set_imagedvm_results', dvms) - - - - } catch (error) { - console.log("Error: ", error); } + } else if(event.kind === 6100) { let entries = [] @@ -183,7 +219,7 @@ function nextInput(e) { try { webln = await requestProvider(); } catch (err) { - await this.copyinvoice(invoice) + await copyinvoice(invoice) } if (webln) { diff --git a/tests/gui/vuejs/noogle/src/components/Nip07.vue b/tests/gui/vuejs/noogle/src/components/Nip07.vue index f4bdb58..f346da4 100644 --- a/tests/gui/vuejs/noogle/src/components/Nip07.vue +++ b/tests/gui/vuejs/noogle/src/components/Nip07.vue @@ -193,7 +193,6 @@ export default { for (const entry of evts){ for (const tag in entry.tags){ if (entry.tags[tag].asVec()[0] === "k") - console.log(entry.id.toHex()) if(entry.tags[tag].asVec()[1] >= 5000 && entry.tags[tag].asVec()[1] <= 5999 && deadnip89s.filter(i => i.id === entry.id.toHex() ).length === 0) { // blocklist.indexOf(entry.id.toHex()) < 0){ console.log(entry.tags[tag].asVec()[1]) diff --git a/tests/gui/vuejs/noogle/src/components/Search.vue b/tests/gui/vuejs/noogle/src/components/Search.vue index 1eb985a..def5fda 100644 --- a/tests/gui/vuejs/noogle/src/components/Search.vue +++ b/tests/gui/vuejs/noogle/src/components/Search.vue @@ -70,6 +70,7 @@ async function send_search_request(message) { let evt = new EventBuilder(5302, "NIP 90 Search request", tags) let res = await client.sendEventBuilder(evt) + store.commit('set_current_request_id', res.toHex()) miniToastr.showMessage("Sent Request to DVMs", "Awaiting results", VueNotifications.types.warn) if (!store.state.hasEventListener){ listen() @@ -130,6 +131,19 @@ async function listen() { } const dvmname = getNamefromId(event.author.toHex()) console.log("Received new event from", relayUrl); + let resonsetorequest = false + for (let tag in event.tags) { + + if (event.tags[tag].asVec()[0] === "e") { + console.log("ETAG: " + event.tags[tag].asVec()[1]) + if (event.tags[tag].asVec()[1] === store.state.requestid) { + resonsetorequest = true + } + } + + } + if(resonsetorequest){ + if (event.kind === 7000) { try { console.log("7000: ", event.content); @@ -179,6 +193,7 @@ async function listen() { console.log(items) store.commit('set_search_results', items) } + } }, // Handle relay message handleMsg: async (relayUrl, message) => { diff --git a/tests/gui/vuejs/noogle/src/router/index.js b/tests/gui/vuejs/noogle/src/router/index.js index c89b002..8a5d465 100644 --- a/tests/gui/vuejs/noogle/src/router/index.js +++ b/tests/gui/vuejs/noogle/src/router/index.js @@ -4,7 +4,7 @@ import { createWebHistory, createRouter } from "vue-router"; const routes = [ { path: "/", component: () => import("@/components/Home.vue") }, - { path: "/about", component: () => import("@/components/modaltest.vue") }, + { path: "/about", component: () => import("@/components/AboutPage.vue") }, { path: "/donate", component: () => import("@/components/Donate.vue") }, { path: "/nip89", component: () => import("@/components/Nip89view.vue") }, { path: "/image", component: () => import("@/components/Image.vue") }, diff --git a/tests/gui/vuejs/noogle/src/store.js b/tests/gui/vuejs/noogle/src/store.js index 593d705..7b335ac 100644 --- a/tests/gui/vuejs/noogle/src/store.js +++ b/tests/gui/vuejs/noogle/src/store.js @@ -8,6 +8,7 @@ const store = createStore({ test: "hello", client: Client, pubkey: PublicKey, + requestid: String, hasEventListener: false, imagehasEventListener: false, imagedvmreplies: [], @@ -36,6 +37,9 @@ const store = createStore({ state.nip89dvms.length = 0 state.nip89dvms.push.apply(state.nip89dvms, nip89dvms) }, + set_current_request_id(state, requestid){ + state.requestid = requestid + }, set_search_results(state, results){ state.results.length = 0 state.results.push.apply(state.results, results) @@ -43,10 +47,6 @@ const store = createStore({ set_imagedvm_results(state, results){ state.imagedvmreplies.length = 0 state.imagedvmreplies.push.apply(state.imagedvmreplies, results) - //state.results = [] - - //[].push.apply(state.results, results) - } }