From 77ff8cef1f7f7f742fba62e0f389889912e72146 Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Tue, 29 Oct 2024 20:19:50 -0400 Subject: [PATCH] db: Fix the db app, and show a message instead of an ugly error when you're not signed in. --- apps/db.json | 3 ++- apps/db/app.js | 17 +++++++++++++++-- core/core.js | 6 +++--- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/apps/db.json b/apps/db.json index f3ed581e..9f05bdb8 100644 --- a/apps/db.json +++ b/apps/db.json @@ -1,4 +1,5 @@ { "type": "tildefriends-app", - "emoji": "💽" + "emoji": "💽", + "previous": "&uQzkIe/Aj8yNhLKe3hEq+5fEJsGwIUx8NVBjJKwoV2U=.sha256" } diff --git a/apps/db/app.js b/apps/db/app.js index 1f65b890..92814e43 100644 --- a/apps/db/app.js +++ b/apps/db/app.js @@ -51,6 +51,19 @@ async function key_list(db) { app.setDocument(doc); } +function load() { + if (core.user?.credentials?.session) { + database_list(); + } else { + app.setDocument(` + + +

Must be signed in to examine databases.

+ +`); + } +} + core.register('message', async function (message) { if (message.event == 'hashChange') { let hash = message.hash.substring(1); @@ -62,9 +75,9 @@ core.register('message', async function (message) { } else if (hash.length) { key_list(await database(hash.split(':').slice(1).join(':'))); } else { - database_list(); + load(); } } }); -database_list(); +load(); diff --git a/core/core.js b/core/core.js index e74ff182..76e69ef1 100644 --- a/core/core.js +++ b/core/core.js @@ -716,12 +716,12 @@ async function getProcessBlob(blobId, key, options) { Object.keys(db).map((x) => [x, db[x].bind(db)]) ); }; - imports.databases = function () { + imports.databases = async function () { return [].concat( - databases.list( + await databases.list( ':shared:' + process.credentials.session.name + ':%' ), - databases.list(process.credentials.session.name + ':%') + await databases.list(process.credentials.session.name + ':%') ); }; }