From ff620a23ed96856a5cb7f14739a047079b312494 Mon Sep 17 00:00:00 2001 From: schmeeve Date: Wed, 23 Sep 2026 21:18:30 -0700 Subject: [PATCH] popup fixes --- browser-extension/background.js | 32 ++++++++++++++++++++++++++++++ browser-extension/manifest.json | 5 +++-- browser-extension/popup.html | 2 +- browser-extension/popup.js | 35 ++++++++++++++++++++++++++++++++- 4 files changed, 70 insertions(+), 4 deletions(-) diff --git a/browser-extension/background.js b/browser-extension/background.js index 19cdb62..7a76082 100644 --- a/browser-extension/background.js +++ b/browser-extension/background.js @@ -22,6 +22,8 @@ browser.runtime.onMessage.addListener((msg, sender) => { return listUsers(); case 'save_note': return saveNote(msg); + case 'upload_attachment': + return uploadAttachment(msg); default: return Promise.reject(new Error('Unknown message kind')); } @@ -69,3 +71,33 @@ async function saveNote(msg) { body: JSON.stringify(body), }); } + +async function uploadAttachment(msg) { + const base = await getServerUrl(); + if (!base) { + throw new Error('Server URL not set — open snotes and click "Capture" → "Apply to Extension", or set it in Options'); + } + const blob = dataUrlToBlob(msg.dataUrl); + const form = new FormData(); + form.append('file', blob, msg.filename || 'page.png'); + if (msg.username) form.append('username', msg.username); + const res = await fetch(base + '/api/attachments', { + method: 'POST', + body: form, + credentials: 'include', + }); + if (!res.ok) { + const err = await res.json().catch(() => ({})); + throw new Error(err.detail || 'HTTP ' + res.status); + } + return res.json(); +} + +function dataUrlToBlob(dataUrl) { + const [meta, b64] = dataUrl.split(','); + const mime = (meta.match(/data:(.*?);/) || [])[1] || 'image/png'; + const bin = atob(b64); + const bytes = new Uint8Array(bin.length); + for (let i = 0; i < bin.length; i++) bytes[i] = bin.charCodeAt(i); + return new Blob([bytes], { type: mime }); +} diff --git a/browser-extension/manifest.json b/browser-extension/manifest.json index 1a4c62c..3d2e814 100644 --- a/browser-extension/manifest.json +++ b/browser-extension/manifest.json @@ -4,10 +4,11 @@ "version": "1.0.2", "description": "Quick-capture a note to snotes from any page, with the selected text and page link ready to use", "permissions": [ - "storage" + "storage", + "activeTab" ], "content_security_policy": { - "extension_pages": "default-src 'self'; script-src 'self'; style-src 'self'; connect-src http://* https://*" + "extension_pages": "default-src 'self'; script-src 'self'; style-src 'self'; connect-src http: https:" }, "host_permissions": [ "http://*/*", diff --git a/browser-extension/popup.html b/browser-extension/popup.html index b0c2b61..380526e 100644 --- a/browser-extension/popup.html +++ b/browser-extension/popup.html @@ -6,7 +6,7 @@
- +
diff --git a/browser-extension/popup.js b/browser-extension/popup.js index 1bf427e..a80b517 100644 --- a/browser-extension/popup.js +++ b/browser-extension/popup.js @@ -25,6 +25,7 @@ try { const r = await browser.runtime.sendMessage({ kind: 'list_users' }); const users = (r && r.users) || []; + const saved = await browser.storage.sync.get('username').then(x => x.username); userEl.innerHTML = ''; for (const u of users) { const opt = document.createElement('option'); @@ -32,6 +33,9 @@ opt.textContent = u.name; userEl.appendChild(opt); } + if (saved && [...userEl.options].some(o => o.value === saved)) { + userEl.value = saved; + } } catch (e) { showStatus('Cannot load users: ' + e.message, false); } @@ -54,7 +58,7 @@ } } - function capturePage() { + async function capturePage() { var title = noteEl.dataset.pageTitle || ''; var url = noteEl.dataset.pageUrl || ''; if (!title && !url) { showStatus('No page to capture', false); return; } @@ -62,6 +66,24 @@ var v = noteEl.value; if (v && !/\n$/.test(v)) v += '\n'; noteEl.value = v + link + '\n'; + + captureBtn.disabled = true; + try { + const dataUrl = await browser.tabs.captureVisibleTab({ format: 'png' }); + const r = await browser.runtime.sendMessage({ + kind: 'upload_attachment', + dataUrl: dataUrl, + filename: 'page.png', + username: userEl.value, + }); + noteEl.value += '![Screenshot](' + r.url + ')\n'; + showStatus('Screenshot attached', true); + } catch (e) { + showStatus('Screenshot failed: ' + e.message, false); + } finally { + captureBtn.disabled = false; + } + noteEl.focus(); scheduleAutosave(); } @@ -99,6 +121,17 @@ noteEl.addEventListener('input', scheduleAutosave); + userEl.addEventListener('change', function () { + browser.storage.sync.set({ username: userEl.value }); + }); + + document.getElementById('logo').addEventListener('click', function () { + browser.storage.sync.get('serverUrl').then(function (r) { + var url = (r.serverUrl || '').replace(/\/+$/, ''); + if (url) browser.tabs.create({ url: url }); + }); + }); + saveBtn.addEventListener('click', function () { if (autosaveTimer) { clearTimeout(autosaveTimer); autosaveTimer = null; } save();