highperfocused/nostrdvm
1
0
Fork 0
mirror of https://github.com/believethehype/nostrdvm.git synced 2025-09-29 23:14:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Believethehype
2024-01-26 17:19:45 +01:00
parent 2d04e5a778
commit 83c449d97e
4 changed files with 140 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
ui/noogle/src/components/ImageGeneration.vue
View File

@@ -32,7 +32,9 @@ let listener = false
const sleep = (ms) => {
return new Promise(resolve => setTimeout(resolve, ms))
}
async function generate_image(message) { async function generate_image(message) {
try { try {
@@ -90,22 +92,21 @@ 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) { sleep(500).then(async () => {
if (event.tags[tag].asVec()[0] === "e") { for (let tag in event.tags) {
console.log("IMAGE ETAG: " + event.tags[tag].asVec()[1]) if (event.tags[tag].asVec()[0] === "e") {
console.log("IMAGE LISTEN TO : " + store.state.requestidImage) console.log("IMAGE ETAG: " + event.tags[tag].asVec()[1])
if (event.tags[tag].asVec()[1] === store.state.requestidImage) { console.log("IMAGE LISTEN TO : " + store.state.requestidImage)
resonsetorequest = true if (event.tags[tag].asVec()[1] === store.state.requestidImage) {
resonsetorequest = true
}
}
} }
} if (resonsetorequest === true) {
}
if (resonsetorequest === true) {
if (event.kind === 7000) {
if (event.kind === 7000) {
try { try {
@@ -167,19 +168,17 @@ async function listen() {
} }
} else if (event.kind === 6100) {
let entries = []
console.log("6100:", event.content);
//miniToastr.showMessage("DVM: " + dvmname, "Received Results", VueNotifications.types.success)
dvms.find(i => i.id === event.author.toHex()).result = event.content
dvms.find(i => i.id === event.author.toHex()).status = "finished"
store.commit('set_imagedvm_results', dvms)
} }
}
})
else if(event.kind === 6100) {
let entries = []
console.log("6100:", event.content);
//miniToastr.showMessage("DVM: " + dvmname, "Received Results", VueNotifications.types.success)
dvms.find(i => i.id === event.author.toHex()).result = event.content
dvms.find(i => i.id === event.author.toHex()).status = "finished"
store.commit('set_imagedvm_results', dvms)
}
}
}, },
// Handle relay message // Handle relay message
handleMsg: async (relayUrl, message) => { handleMsg: async (relayUrl, message) => {

4
ui/noogle/src/components/Nip07.vue
View File

@@ -132,8 +132,8 @@ export default {
this.signer = ClientSigner.keys(Keys.generate()) this.signer = ClientSigner.keys(Keys.generate())
} }
let zapper = ClientZapper.webln() //let zapper = ClientZapper.webln()
let client = new ClientBuilder().signer(this.signer).zapper(zapper).build(); let client = new ClientBuilder().signer(this.signer).build();
for (const relay of store.state.relays){ for (const relay of store.state.relays){
await client.addRelay(relay); await client.addRelay(relay);

218
ui/noogle/src/components/Search.vue
View File

@@ -9,7 +9,7 @@ import {
EventBuilder, EventBuilder,
Tag, Tag,
EventId, EventId,
Nip19Event Nip19Event, Alphabet
} from "@rust-nostr/nostr-sdk"; } from "@rust-nostr/nostr-sdk";
import store from '../store'; import store from '../store';
import miniToastr from "mini-toastr"; import miniToastr from "mini-toastr";
@@ -73,7 +73,9 @@ 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)
let requestid = res.toHex() let requestid = res.toHex()
console.log("STORE: " +store.state.requestidSearch)
store.commit('set_current_request_id_search', requestid) store.commit('set_current_request_id_search', requestid)
console.log("STORE AFTER: " + store.state.requestidSearch)
//miniToastr.showMessage("Sent Request to DVMs", "Awaiting results", VueNotifications.types.warn) //miniToastr.showMessage("Sent Request to DVMs", "Awaiting results", VueNotifications.types.warn)
@@ -127,6 +129,7 @@ async function listen() {
listener = true listener = true
let client = store.state.client let client = store.state.client
let pubkey = store.state.pubkey let pubkey = store.state.pubkey
let originale = [store.state.requestidSearch]
const filter = new Filter().kinds([7000, 6302]).pubkey(pubkey).since(Timestamp.now()); const filter = new Filter().kinds([7000, 6302]).pubkey(pubkey).since(Timestamp.now());
await client.subscribe([filter]); await client.subscribe([filter]);
@@ -137,23 +140,27 @@ async function listen() {
if (store.state.hasEventListener === false){ if (store.state.hasEventListener === false){
return true return true
} }
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) {
if (event.tags[tag].asVec()[0] === "e") { sleep(500).then(async () => {
console.log("SEARCH ETAG: " + event.tags[tag].asVec()[1])
console.log("SEARCH LISTEN TO : " + store.state.requestidSearch) for (let tag in event.tags) {
//if (event.tags[tag].asVec()[1] === store.state.requestidSearch) { if (event.tags[tag].asVec()[0] === "e") {
resonsetorequest = true 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(resonsetorequest){
if (event.kind === 7000) { if (event.kind === 7000) {
try { try {
console.log("7000: ", event.content); console.log("7000: ", event.content);
console.log("DVM: " + event.author.toHex()) console.log("DVM: " + event.author.toHex())
searching = false searching = false
@@ -195,7 +202,6 @@ async function listen() {
jsonentry.name = el.name jsonentry.name = el.name
jsonentry.about = event.content jsonentry.about = event.content
jsonentry.image = el.image jsonentry.image = el.image
console.log(jsonentry) console.log(jsonentry)
} }
@@ -204,9 +210,8 @@ async function listen() {
dvms.push(jsonentry) dvms.push(jsonentry)
} }
dvms.find(i => i.id === jsonentry.id).status = status dvms.find(i => i.id === jsonentry.id).status = status
if(status === "error"){ if (status === "error") {
const index = dvms.indexOf((dvms.find(i => i.id === event.author.toHex()))); const index = dvms.indexOf((dvms.find(i => i.id === event.author.toHex())));
if (index > -1) { if (index > -1) {
dvms.splice(index, 1); dvms.splice(index, 1);
@@ -214,80 +219,77 @@ async function listen() {
} }
store.commit('set_active_search_dvms', dvms) store.commit('set_active_search_dvms', dvms)
console.log(store.state.activesearchdvms)
} catch (error) { } catch (error) {
console.log("Error: ", error); console.log("Error: ", error);
} }
} }
else if (event.kind === 6302) {
let entries = []
console.log("6302:", event.content);
//miniToastr.showMessage("DVM: " + dvmname, "Received Results", VueNotifications.types.success)
let event_etags = JSON.parse(event.content)
if (event_etags.length > 0) {
for (let etag of event_etags) {
const eventid = EventId.fromHex(etag[1])
entries.push(eventid)
}
const events = await getEvents(entries)
let authors = []
for (const evt of events) {
authors.push(evt.author)
}
if (authors.length > 0) {
let profiles = await get_user_infos(authors)
for (const evt of events) {
let p = profiles.find(record => record.author === evt.author.toHex())
let bech32id = evt.id.toBech32()
let nip19 = new Nip19Event(event.id, event.author, store.state.relays)
let nip19bech32 = nip19.toBech32()
let picture = p === undefined ? "../assets/nostr-purple.svg" : p["profile"]["picture"]
let name = p === undefined ? bech32id : p["profile"]["name"]
let highlighterurl = "https://highlighter.com/a/" + bech32id
let njumpurl = "https://njump.me/" + bech32id
let nostrudelurl = "https://nostrudel.ninja/#/n/" + bech32id
let uri = "nostr:" + bech32id // nip19.toNostrUri()
if (items.find(e => e.id.toHex() === evt.id.toHex()) === undefined) {
items.push({
id: evt.id,
content: evt.content,
author: name,
authorurl: "https://njump.me/" + evt.author.toBech32(),
links: {
"uri": uri,
"highlighter": highlighterurl,
"njump": njumpurl,
"nostrudel": nostrudelurl
},
avatar: picture,
indicator: {"time": evt.createdAt.toHumanDatetime()}
})
}
/* try {
console.log("7000: ", event.content);
console.log("DVM: " + event.author.toHex())
miniToastr.showMessage("DVM: " + dvmname, event.content, VueNotifications.types.info)
} catch (error) {
console.log("Error: ", error);
} */
else if(event.kind === 6302) {
let entries = []
console.log("6302:", event.content);
//miniToastr.showMessage("DVM: " + dvmname, "Received Results", VueNotifications.types.success)
let event_etags = JSON.parse(event.content)
for (let etag of event_etags){
const eventid = EventId.fromHex(etag[1])
entries.push(eventid)
}
const events = await getEvents(entries)
let authors = []
for (const evt of events){
authors.push(evt.author)
}
let profiles = await get_user_infos(authors)
for (const evt of events){
let p = profiles.find( record => record.author === evt.author.toHex())
let bech32id = evt.id.toBech32()
let nip19 = new Nip19Event(event.id, event.author, store.state.relays)
let nip19bech32 = nip19.toBech32()
let picture = p === undefined ? "../assets/nostr-purple.svg" : p["profile"]["picture"]
let name = p === undefined ? bech32id : p["profile"]["name"]
let highlighterurl = "https://highlighter.com/a/" + bech32id
let njumpurl = "https://njump.me/" + bech32id
let nostrudelurl = "https://nostrudel.ninja/#/n/" + bech32id
let uri = "nostr:" + bech32id // nip19.toNostrUri()
if (items.find(e => e.id.toHex() === evt.id.toHex()) === undefined) {
items.push({id:evt.id, content: evt.content, author: name, authorurl: "https://njump.me/" + evt.author.toBech32(), links: {"uri": uri, "highlighter": highlighterurl, "njump": njumpurl, "nostrudel": nostrudelurl} , avatar: picture, indicator: {"time": evt.createdAt.toHumanDatetime()}})
} }
}
}
const index = dvms.indexOf((dvms.find(i => i.id === event.author.toHex())));
if (index > -1) {
dvms.splice(index, 1);
}
store.commit('set_active_search_dvms', dvms)
console.log("Events from" + event.author.toHex())
store.commit('set_search_results', items)
} }
const index = dvms.indexOf((dvms.find(i => i.id === event.author.toHex())));
if (index > -1) {
dvms.splice(index, 1);
}
store.commit('set_active_search_dvms', dvms)
console.log("Events from" + event.author.toHex())
console.log(items)
store.commit('set_search_results', items)
}
} }
})
}, },
// Handle relay message // Handle relay message
handleMsg: async (relayUrl, message) => { handleMsg: async (relayUrl, message) => {
@@ -326,49 +328,41 @@ defineProps({
<template> <template>
<div class="greetings">
<div class="greetings"> <img alt="Nostr logo" class="logo" src="../assets/nostr-purple.svg" />
<img alt="Nostr logo" class="logo" src="../assets/nostr-purple.svg" /> <br>
<br> <h1 class="text-7xl font-black tracking-wide">Noogle</h1>
<h1 class="text-7xl font-black tracking-wide">Noogle</h1> <h2 class="text-base-200-content text-center tracking-wide text-2xl font-thin">
<h2 class="text-base-200-content text-center tracking-wide text-2xl font-thin"> Search the Nostr with Data Vending Machines</h2>
Search the Nostr with Data Vending Machines</h2> <h3>
<h3> <br>
<br> <input class="c-Input" autofocus placeholder="Search..." v-model="message" @keyup.enter="send_search_request(message)" @keydown.enter="nextInput">
<input class="c-Input" autofocus placeholder="Search..." v-model="message" @keyup.enter="send_search_request(message)" @keydown.enter="nextInput"> <button class="v-Button" @click="send_search_request(message)">Search the Nostr</button>
<button class="v-Button" @click="send_search_request(message)">Search the Nostr</button> </h3>
</h3> </div>
</div> <div class="max-w-5xl relative space-y-3">
<div class="max-w-5xl relative space-y-3"> <div class="grid grid-cols-1 gap-6">
<div class="grid grid-cols-1 gap-6">
<div className="card w-30 h-60 bg-base-100 shadow-xl" v-for="dvm in store.state.activesearchdvms" <div className="card w-30 h-60 bg-base-100 shadow-xl" v-for="dvm in store.state.activesearchdvms"
:key="dvm.name"> :key="dvm.name">
<div className="card-body"> <div className="card-body">
<div class="grid grid-cols-2 gap-6"> <div class="grid grid-cols-2 gap-6">
<div className="col-end-1">
<h2 className="card-title">{{ dvm.name }}</h2>
<figure v-if="dvm.image!=''" className="w-40"><img className="h-30" :src="dvm.image" alt="DVM Picture" /></figure>
</div>
<div className="col-end-2 w-auto">
<p > {{ dvm.about }}</p>
<div><br>
<span className="loading loading-dots loading-lg" ></span>
</div>
<div className="col-end-1">
<h2 className="card-title">{{ dvm.name }}</h2>
<figure v-if="dvm.image!==''" className="w-40"><img className="h-30" :src="dvm.image" alt="DVM Picture" /></figure>
</div>
<div className="col-end-2 w-auto">
<p>{{ dvm.about }}</p>
<div><br>
<span className="loading loading-dots loading-lg" ></span>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
<br>
</div> </div>
</div> </div>
</div>
</template> </template>

8
ui/noogle/src/store.js
View File

@@ -16,7 +16,13 @@ const store = createStore({
nip89dvms: [], nip89dvms: [],
activesearchdvms: [], activesearchdvms: [],
results: [], results: [],
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"], relays: [
//"wss://relay.damus.io",
"wss://nos.lol",
"wss://pablof7z.nostr1.com",
"wss://relay.nostr.net",
"wss://relay.nostr.band",
"wss://nostr-pub.wellorder.net"],
} }
}, },
mutations: { mutations: {