From 482a9f8306bf62d68aa6b753fe958ac1c3d2eb0e Mon Sep 17 00:00:00 2001 From: Believethehype Date: Fri, 26 Jan 2024 11:12:36 +0100 Subject: [PATCH] noogle: bugfixes --- .../noogle/src/components/ImageGeneration.vue | 14 +++++------ .../gui/vuejs/noogle/src/components/Nip07.vue | 23 ++++++++----------- .../vuejs/noogle/src/components/Search.vue | 23 ++++++++++--------- .../noogle/src/layouts/ThreeColumnLayout.vue | 2 +- tests/gui/vuejs/noogle/src/store.js | 12 ++++++---- 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/tests/gui/vuejs/noogle/src/components/ImageGeneration.vue b/tests/gui/vuejs/noogle/src/components/ImageGeneration.vue index c9d0f38..5be95f0 100644 --- a/tests/gui/vuejs/noogle/src/components/ImageGeneration.vue +++ b/tests/gui/vuejs/noogle/src/components/ImageGeneration.vue @@ -54,7 +54,8 @@ async function generate_image(message) { let evt = new EventBuilder(5100, "NIP 90 Image Generation request", tags) let res = await client.sendEventBuilder(evt) - store.commit('set_current_request_id', res.toHex()) + store.commit('set_current_request_id_image', res.toHex()) + console.log("IMAGE EVENT SENT: " + res.toHex()) //miniToastr.showMessage("Sent Request to DVMs", "Awaiting results", VueNotifications.types.warn) searching = true @@ -66,9 +67,6 @@ async function generate_image(message) { console.log("Already has event listener") } - console.log(res) - - } catch (error) { console.log(error); } @@ -94,9 +92,9 @@ async function listen() { let resonsetorequest = false for (let tag in event.tags) { if (event.tags[tag].asVec()[0] === "e") { - console.log("ETAG: " + event.tags[tag].asVec()[1]) - console.log("LISTEN TO : " + store.state.requestid) - if (event.tags[tag].asVec()[1] === store.state.requestid) { + console.log("IMAGE ETAG: " + event.tags[tag].asVec()[1]) + console.log("IMAGE LISTEN TO : " + store.state.requestidImage) + if (event.tags[tag].asVec()[1] === store.state.requestidImage) { resonsetorequest = true } } @@ -315,7 +313,7 @@ defineProps({

{{ dvm.name }}

-

{{ dvm.about }}

+

{{ dvm.about }}

diff --git a/tests/gui/vuejs/noogle/src/components/Nip07.vue b/tests/gui/vuejs/noogle/src/components/Nip07.vue index ba210c0..0630343 100644 --- a/tests/gui/vuejs/noogle/src/components/Nip07.vue +++ b/tests/gui/vuejs/noogle/src/components/Nip07.vue @@ -69,11 +69,11 @@ export default { async sign_in_anon() { try { await loadWasmAsync(); - try { + /*try { initLogger(LogLevel.debug()); } catch (error) { console.log(error); - } + }*/ let keys = Keys.fromSkStr("ece3c0aa759c3e895ecb3c13ab3813c0f98430c6d4bd22160b9c2219efc9cf0e") this.signer = ClientSigner.keys(keys) //TODO store keys @@ -116,11 +116,11 @@ export default { await loadWasmAsync(); - try { + /* try { initLogger(LogLevel.debug()); } catch (error) { console.log(error); - } + } */ let nip07_signer = new Nip07Signer(); try{ @@ -171,12 +171,9 @@ export default { let signer = ClientSigner.keys(keys) //TODO store keys let client = new ClientBuilder().signer(signer).build() - //await client.addRelay("wss://nos.lol"); - await client.addRelay("wss://relay.f7z.io") - await client.addRelay("wss://pablof7z.nostr1.com") - //await client.addRelay("wss://relay.nostr.net") - await client.addRelay("wss://relay.nostr.band"); - //await client.addRelay("wss://nostr-pub.wellorder.net") + for (const relay of store.state.relays){ + await client.addRelay(relay); + } await client.connect(); let dvmkinds = [] @@ -204,11 +201,11 @@ export default { jsonentry.image = jsonentry.picture } jsonentry.event = entry.asJson() - jsonentry.kind = entry.tags[tag].asVec()[1] - nip89dvms.push(jsonentry); + jsonentry.kind = entry.tags[tag].asVec()[1] + nip89dvms.push(jsonentry); } catch (error){ - console.log(error) + //console.log(error) } } diff --git a/tests/gui/vuejs/noogle/src/components/Search.vue b/tests/gui/vuejs/noogle/src/components/Search.vue index def5fda..7c933e4 100644 --- a/tests/gui/vuejs/noogle/src/components/Search.vue +++ b/tests/gui/vuejs/noogle/src/components/Search.vue @@ -70,7 +70,8 @@ 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()) + store.commit('set_current_request_id_search', res.toHex()) + console.log("SEARCH EVENT SENT: " + res.toHex()) miniToastr.showMessage("Sent Request to DVMs", "Awaiting results", VueNotifications.types.warn) if (!store.state.hasEventListener){ listen() @@ -131,17 +132,17 @@ 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 - } - } - + let resonsetorequest = false + for (let tag in event.tags) { + if (event.tags[tag].asVec()[0] === "e") { + //console.log("SEARCH ETAG: " + event.tags[tag].asVec()[1]) + // console.log("SEARCH LISTEN TO : " + store.state.requestidSearch) + if (event.tags[tag].asVec()[1] === store.state.requestidSearch) { + resonsetorequest = true } + } + + } if(resonsetorequest){ if (event.kind === 7000) { diff --git a/tests/gui/vuejs/noogle/src/layouts/ThreeColumnLayout.vue b/tests/gui/vuejs/noogle/src/layouts/ThreeColumnLayout.vue index b79c000..43d5580 100644 --- a/tests/gui/vuejs/noogle/src/layouts/ThreeColumnLayout.vue +++ b/tests/gui/vuejs/noogle/src/layouts/ThreeColumnLayout.vue @@ -12,7 +12,7 @@ import {isVisible} from "bootstrap/js/src/util/index.js";
Noogle - Image Generation + ImageGen About DVMs diff --git a/tests/gui/vuejs/noogle/src/store.js b/tests/gui/vuejs/noogle/src/store.js index 7b335ac..944c3fc 100644 --- a/tests/gui/vuejs/noogle/src/store.js +++ b/tests/gui/vuejs/noogle/src/store.js @@ -8,13 +8,14 @@ const store = createStore({ test: "hello", client: Client, pubkey: PublicKey, - requestid: String, + requestidSearch: String, + requestidImage: String, hasEventListener: false, imagehasEventListener: false, imagedvmreplies: [], nip89dvms: [], results: [], - relays: ["wss://relay.damus.io", "wss://nos.lol", "wss://relay.f7z.io", "wss://pablof7z.nostr1.com", "wss://relay.nostr.net", "wss://relay.nostr.net", "wss://relay.nostr.band", "wss://nostr-pub.wellorder.net"], + relays: ["wss://relay.damus.io", "wss://nos.lol", "wss://pablof7z.nostr1.com", "wss://relay.nostr.net", "wss://relay.nostr.net", "wss://relay.nostr.band", "wss://nostr-pub.wellorder.net"], } }, mutations: { @@ -37,8 +38,11 @@ const store = createStore({ state.nip89dvms.length = 0 state.nip89dvms.push.apply(state.nip89dvms, nip89dvms) }, - set_current_request_id(state, requestid){ - state.requestid = requestid + set_current_request_id_search(state, requestid){ + state.requestidSearch = requestid + }, + set_current_request_id_image(state, requestid){ + state.requestidImage = requestid }, set_search_results(state, results){ state.results.length = 0