From cee3613a154aa7e8d11afdf454927522206a833a Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Thu, 27 Jun 2024 17:40:05 -0400 Subject: [PATCH] Adds relay url to the query params --- index.html | 26 +++++++++++++++++--------- js/nostr-sheetstr.js | 6 ++---- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/index.html b/index.html index 83a740e..282f4f4 100644 --- a/index.html +++ b/index.html @@ -200,23 +200,30 @@

Your Spreadsheets

const urlParams = new URLSearchParams(window.location.search); const authorParam = urlParams.get('author') const dTag = urlParams.get('id') + let relay = urlParams.get('relay') - console.log("Load page for", author, dTag) + if (!relay) { + relay = "wss://nostr.mom" + urlParams.set("relay", relay); + history.pushState(null, '', window.location.pathname + '?' + urlParams.toString()); + } + + console.log("Load page for", relay, author, dTag) if (dTag) { $("#sheet-name").html(dTag) hideDashboard() if (authorParam) { - loadId(authorParam, dTag) + loadId(relay, authorParam, dTag) } else { - loadId(author, dTag) + loadId(relay, author, dTag) } } else { showDashboard() if (authorParam) { - loadDashboard(authorParam) + loadDashboard(relay, authorParam) } else { - loadDashboard(author) + loadDashboard(relay, author) } } } @@ -231,9 +238,10 @@

Your Spreadsheets

$("#dashboard").show(); } - async function loadDashboard(author) { + async function loadDashboard(relay, author) { $("#sheets").html(""); - fetchAllSpreadsheets(author, (ee) => { + + fetchAllSpreadsheets(relay, author, (ee) => { console.log("Event Received", ee) let currentVersion = expandedEvents.get(ee.address) @@ -433,8 +441,8 @@

Your Spreadsheets

} } - async function loadId(author, dTag) { - fetchSpreadSheet(author, dTag, (ee, data) => { + async function loadId(relay, author, dTag) { + fetchSpreadSheet(relay, author, dTag, (ee, data) => { var { UniverCore, UniverDesign, diff --git a/js/nostr-sheetstr.js b/js/nostr-sheetstr.js index 93ad503..2356b86 100644 --- a/js/nostr-sheetstr.js +++ b/js/nostr-sheetstr.js @@ -468,9 +468,8 @@ async function blankPrivateSheet(dTag) { } } -async function fetchAllSpreadsheets(author, onReady, newUserMetadata) { +async function fetchAllSpreadsheets(relay, author, onReady, newUserMetadata) { tentatives = 0 - let relay = "wss://nostr.mom" addUserMetadataIfItDoesntExist(author) @@ -559,9 +558,8 @@ function hasDataTags(event) { return event.tags.find(tag => tag[0] == "data") != undefined } -async function fetchSpreadSheet(author, dTag, createNewSheet, newUserMetadata) { +async function fetchSpreadSheet(relay, author, dTag, createNewSheet, newUserMetadata, ) { tentatives = 0 - let relay = "wss://nostr.mom" addUserMetadataIfItDoesntExist(author)