noogle: bugfixes

This commit is contained in:
Believethehype
2024-01-26 11:12:36 +01:00
parent 432b5ca2ec
commit 482a9f8306
5 changed files with 37 additions and 37 deletions

View File

@@ -54,7 +54,8 @@ async function generate_image(message) {
let evt = new EventBuilder(5100, "NIP 90 Image Generation request", tags) let evt = new EventBuilder(5100, "NIP 90 Image Generation request", tags)
let res = await client.sendEventBuilder(evt) 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) //miniToastr.showMessage("Sent Request to DVMs", "Awaiting results", VueNotifications.types.warn)
searching = true searching = true
@@ -66,9 +67,6 @@ async function generate_image(message) {
console.log("Already has event listener") console.log("Already has event listener")
} }
console.log(res)
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
@@ -94,9 +92,9 @@ async function listen() {
let resonsetorequest = false let resonsetorequest = false
for (let tag in event.tags) { for (let tag in event.tags) {
if (event.tags[tag].asVec()[0] === "e") { if (event.tags[tag].asVec()[0] === "e") {
console.log("ETAG: " + event.tags[tag].asVec()[1]) console.log("IMAGE ETAG: " + event.tags[tag].asVec()[1])
console.log("LISTEN TO : " + store.state.requestid) console.log("IMAGE LISTEN TO : " + store.state.requestidImage)
if (event.tags[tag].asVec()[1] === store.state.requestid) { if (event.tags[tag].asVec()[1] === store.state.requestidImage) {
resonsetorequest = true resonsetorequest = true
} }
} }
@@ -315,7 +313,7 @@ defineProps({
<div className="card-body"> <div className="card-body">
<h2 className="card-title">{{ dvm.name }}</h2> <h2 className="card-title">{{ dvm.name }}</h2>
<h3 >{{ dvm.about }}</h3> <h3 class="fa-cut" >{{ dvm.about }}</h3>

View File

@@ -69,11 +69,11 @@ export default {
async sign_in_anon() { async sign_in_anon() {
try { try {
await loadWasmAsync(); await loadWasmAsync();
try { /*try {
initLogger(LogLevel.debug()); initLogger(LogLevel.debug());
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }*/
let keys = Keys.fromSkStr("ece3c0aa759c3e895ecb3c13ab3813c0f98430c6d4bd22160b9c2219efc9cf0e") let keys = Keys.fromSkStr("ece3c0aa759c3e895ecb3c13ab3813c0f98430c6d4bd22160b9c2219efc9cf0e")
this.signer = ClientSigner.keys(keys) //TODO store keys this.signer = ClientSigner.keys(keys) //TODO store keys
@@ -116,11 +116,11 @@ export default {
await loadWasmAsync(); await loadWasmAsync();
try { /* try {
initLogger(LogLevel.debug()); initLogger(LogLevel.debug());
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} } */
let nip07_signer = new Nip07Signer(); let nip07_signer = new Nip07Signer();
try{ try{
@@ -171,12 +171,9 @@ export default {
let signer = ClientSigner.keys(keys) //TODO store keys let signer = ClientSigner.keys(keys) //TODO store keys
let client = new ClientBuilder().signer(signer).build() let client = new ClientBuilder().signer(signer).build()
//await client.addRelay("wss://nos.lol"); for (const relay of store.state.relays){
await client.addRelay("wss://relay.f7z.io") await client.addRelay(relay);
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")
await client.connect(); await client.connect();
let dvmkinds = [] let dvmkinds = []
@@ -204,11 +201,11 @@ export default {
jsonentry.image = jsonentry.picture jsonentry.image = jsonentry.picture
} }
jsonentry.event = entry.asJson() jsonentry.event = entry.asJson()
jsonentry.kind = entry.tags[tag].asVec()[1] jsonentry.kind = entry.tags[tag].asVec()[1]
nip89dvms.push(jsonentry); nip89dvms.push(jsonentry);
} }
catch (error){ catch (error){
console.log(error) //console.log(error)
} }
} }

View File

@@ -70,7 +70,8 @@ async function send_search_request(message) {
let evt = new EventBuilder(5302, "NIP 90 Search request", tags) let evt = new EventBuilder(5302, "NIP 90 Search request", tags)
let res = await client.sendEventBuilder(evt) 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) miniToastr.showMessage("Sent Request to DVMs", "Awaiting results", VueNotifications.types.warn)
if (!store.state.hasEventListener){ if (!store.state.hasEventListener){
listen() listen()
@@ -131,17 +132,17 @@ async function listen() {
} }
const dvmname = getNamefromId(event.author.toHex()) const dvmname = getNamefromId(event.author.toHex())
console.log("Received new event from", relayUrl); console.log("Received new event from", relayUrl);
let resonsetorequest = false let resonsetorequest = false
for (let tag in event.tags) { for (let tag in event.tags) {
if (event.tags[tag].asVec()[0] === "e") {
if (event.tags[tag].asVec()[0] === "e") { //console.log("SEARCH ETAG: " + event.tags[tag].asVec()[1])
console.log("ETAG: " + event.tags[tag].asVec()[1]) // console.log("SEARCH LISTEN TO : " + store.state.requestidSearch)
if (event.tags[tag].asVec()[1] === store.state.requestid) { if (event.tags[tag].asVec()[1] === store.state.requestidSearch) {
resonsetorequest = true resonsetorequest = true
}
}
} }
}
}
if(resonsetorequest){ if(resonsetorequest){
if (event.kind === 7000) { if (event.kind === 7000) {

View File

@@ -12,7 +12,7 @@ import {isVisible} from "bootstrap/js/src/util/index.js";
</div> </div>
<div className="flex-1"> <div className="flex-1">
<router-link class="menu" to="/">Noogle</router-link> <router-link class="menu" to="/">Noogle</router-link>
<router-link class="menu" to="/image">Image Generation</router-link> <router-link class="menu" to="/image">ImageGen</router-link>
<router-link class="menu" to="/about">About</router-link> <router-link class="menu" to="/about">About</router-link>
<router-link class="menu" to="/nip89">DVMs</router-link> <router-link class="menu" to="/nip89">DVMs</router-link>

View File

@@ -8,13 +8,14 @@ const store = createStore({
test: "hello", test: "hello",
client: Client, client: Client,
pubkey: PublicKey, pubkey: PublicKey,
requestid: String, requestidSearch: String,
requestidImage: String,
hasEventListener: false, hasEventListener: false,
imagehasEventListener: false, imagehasEventListener: false,
imagedvmreplies: [], imagedvmreplies: [],
nip89dvms: [], nip89dvms: [],
results: [], 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: { mutations: {
@@ -37,8 +38,11 @@ const store = createStore({
state.nip89dvms.length = 0 state.nip89dvms.length = 0
state.nip89dvms.push.apply(state.nip89dvms, nip89dvms) state.nip89dvms.push.apply(state.nip89dvms, nip89dvms)
}, },
set_current_request_id(state, requestid){ set_current_request_id_search(state, requestid){
state.requestid = requestid state.requestidSearch = requestid
},
set_current_request_id_image(state, requestid){
state.requestidImage = requestid
}, },
set_search_results(state, results){ set_search_results(state, results){
state.results.length = 0 state.results.length = 0