diff --git a/crates/tauri-app/src/lib.rs b/crates/tauri-app/src/lib.rs index 26a3828..a805ee4 100644 --- a/crates/tauri-app/src/lib.rs +++ b/crates/tauri-app/src/lib.rs @@ -58,6 +58,10 @@ struct PostDto { reaction_counts: Vec, /// Number of comments on this post comment_count: u64, + /// If the post is authored by one of our held posting identities, the + /// persona's display_name. None for posts authored by peers (or if the + /// local persona has no display name). + as_persona: Option, } #[derive(Serialize)] @@ -208,7 +212,18 @@ async fn post_to_dto( decrypted: Option<&str>, node: &Node, ) -> PostDto { - let is_me = &post.author == &node.node_id; + // "is_me" now means: authored by ANY posting identity we hold, not just the + // network key. Covers the multi-persona case from 0.6.4+. + let (is_me, as_persona) = { + let s = node.storage.get().await; + match s.get_posting_identity(&post.author) { + Ok(Some(pi)) => { + let name = if pi.display_name.is_empty() { None } else { Some(pi.display_name) }; + (true, name) + } + _ => (false, None), + } + }; let author_name = match node.resolve_display_name(&post.author).await { Ok((name, _, _)) if !name.is_empty() => Some(name), _ => None, @@ -280,6 +295,7 @@ async fn post_to_dto( recipients, reaction_counts, comment_count, + as_persona, } } @@ -409,6 +425,7 @@ async fn create_post( visibility: Option, circle_name: Option, recipient_hex: Option, + posting_id_hex: Option, ) -> Result { let node = get_node(&state).await; let intent = match visibility.as_deref() { @@ -424,10 +441,13 @@ async fn create_post( } _ => VisibilityIntent::Public, }; - let (id, post, vis) = node - .create_post_with_visibility(content, intent, vec![]) - .await - .map_err(|e| e.to_string())?; + let (id, post, vis) = match posting_id_hex { + Some(pid_hex) => { + let pid = itsgoin_core::parse_node_id_hex(&pid_hex).map_err(|e| e.to_string())?; + node.create_post_as(&pid, content, intent, vec![]).await + } + None => node.create_post_with_visibility(content, intent, vec![]).await, + }.map_err(|e| e.to_string())?; let decrypted = decrypt_just_created(&node, &post, &vis).await; Ok(post_to_dto(&id, &post, &vis, decrypted.as_deref(), &node).await) } @@ -440,6 +460,7 @@ async fn create_post_with_files( circle_name: Option, recipient_hex: Option, files: Vec<(String, String)>, + posting_id_hex: Option, ) -> Result { let node = get_node(&state).await; let intent = match visibility.as_deref() { @@ -467,10 +488,13 @@ async fn create_post_with_files( }) .collect::, String>>()?; - let (id, post, vis) = node - .create_post_with_visibility(content, intent, attachment_data) - .await - .map_err(|e| e.to_string())?; + let (id, post, vis) = match posting_id_hex { + Some(pid_hex) => { + let pid = itsgoin_core::parse_node_id_hex(&pid_hex).map_err(|e| e.to_string())?; + node.create_post_as(&pid, content, intent, attachment_data).await + } + None => node.create_post_with_visibility(content, intent, attachment_data).await, + }.map_err(|e| e.to_string())?; let decrypted = decrypt_just_created(&node, &post, &vis).await; Ok(post_to_dto(&id, &post, &vis, decrypted.as_deref(), &node).await) } @@ -819,20 +843,32 @@ async fn post_to_dto_batch( let post_ids: Vec = posts.iter().map(|(id, _, _, _)| *id).collect(); // Batch queries — 3 queries total instead of 4 × N - let (reaction_map, comment_map, intent_map) = { + let (reaction_map, comment_map, intent_map, posting_identities) = { let storage = node.storage.get().await; let reactions = storage.get_reaction_counts_batch(&post_ids, &node.node_id).unwrap_or_default(); let comments = storage.get_comment_counts_batch(&post_ids).unwrap_or_default(); let intents = storage.get_post_intents_batch(&post_ids).unwrap_or_default(); - (reactions, comments, intents) + let identities = storage.list_posting_identities().unwrap_or_default(); + (reactions, comments, intents, identities) }; + // Map posting-id -> display-name so we can tag author=persona posts. + let persona_names: HashMap> = posting_identities + .into_iter() + .map(|pi| { + let name = if pi.display_name.is_empty() { None } else { Some(pi.display_name) }; + (pi.node_id, name) + }) + .collect(); // Batch resolve display names let mut name_cache: HashMap> = HashMap::new(); let mut dtos = Vec::with_capacity(posts.len()); for (id, post, vis, decrypted) in posts { - let is_me = post.author == node.node_id; + let (is_me, as_persona) = match persona_names.get(&post.author) { + Some(name) => (true, name.clone()), + None => (false, None), + }; let author_name = if let Some(cached) = name_cache.get(&post.author) { cached.clone() @@ -897,6 +933,7 @@ async fn post_to_dto_batch( recipients, reaction_counts, comment_count, + as_persona: as_persona.clone(), }); } dtos diff --git a/frontend/app.js b/frontend/app.js index 697e6f8..373b00a 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -473,7 +473,10 @@ function renderPost(post, index) { const authorShort = post.author.substring(0, 12); const authorName = post.authorName || authorShort; const authorClass = post.isMe ? 'author-me' : ''; - const meTag = post.isMe ? ' (you)' : ''; + const personaTag = post.asPersona + ? ` as ${escapeHtml(post.asPersona)}` + : ''; + const meTag = post.isMe ? ` (you)${personaTag}` : ''; const timeStr = relativeTime(post.timestampMs); const icon = generateIdenticon(post.author, 22); const delay = Math.min(index * 0.04, 0.6); @@ -551,7 +554,8 @@ function renderPost(post, index) { `; - return `
+ const recipientsData = (post.recipients || []).join(','); + return `
${icon}${authorLink}${visBadge} ${timeStr} @@ -780,6 +784,7 @@ async function loadFeed(force) { setupFeedScrollObserver(); } setupFeedMediaObserver(); + applyFeedPersonaFilter(); } // Pre-fetch next page immediately @@ -833,6 +838,7 @@ async function appendFeedPage() { } feedList.appendChild(fragment); + applyFeedPersonaFilter(); setupFeedScrollObserver(); // Media observer auto-picks up new posts @@ -2572,6 +2578,14 @@ async function doPost() { return; } } + // If a non-default persona is picked in compose, route through create_post_as + const personaSel = $('#persona-select'); + if (personaSel && !personaSel.classList.contains('hidden') && personaSel.value) { + const defaultEntry = personasCache.find(p => p.isDefault); + if (!defaultEntry || personaSel.value !== defaultEntry.nodeId) { + params.postingIdHex = personaSel.value; + } + } let result; if (selectedFiles.length > 0) { @@ -3028,7 +3042,7 @@ document.querySelectorAll('.tab').forEach(tab => { loadMessages(true); loadDmRecipientOptions(); clearNotifications('msg-'); } - if (target === 'settings') { loadIdentities(); loadRedundancy(); loadPublicVisible(); loadCacheSizeSetting(); } + if (target === 'settings') { loadIdentities(); loadPersonas(); loadRedundancy(); loadPublicVisible(); loadCacheSizeSetting(); } }); }); }); @@ -3525,6 +3539,173 @@ $('#import-identity-btn').addEventListener('click', () => { overlay.addEventListener('click', (e) => { if (e.target === overlay) overlay.remove(); }); }); +// --- Posting identities (personas) --- +// Cached list so the compose-box picker and settings list stay in sync. +let personasCache = []; +// 'all' (show everything) or a posting-id hex (filter to that persona). +let feedPersonaFilter = 'all'; + +async function loadPersonas() { + try { + personasCache = await invoke('list_posting_identities') || []; + } catch (e) { + personasCache = []; + console.error('list_posting_identities:', e); + } + renderPersonasList(); + renderComposePersonaPicker(); + renderFeedPersonaFilter(); +} + +function renderFeedPersonaFilter() { + const row = $('#persona-filter-row'); + if (!row) return; + if (personasCache.length < 2) { + row.classList.add('hidden'); + row.innerHTML = ''; + return; + } + row.classList.remove('hidden'); + const pills = [{ id: 'all', label: 'All' }].concat( + personasCache.map(p => ({ + id: p.nodeId, + label: p.displayName || p.nodeId.substring(0, 8), + })) + ); + row.innerHTML = pills.map(p => { + const active = feedPersonaFilter === p.id; + const bg = active ? '#7fdbca' : '#2a2a3e'; + const fg = active ? '#0a0a1f' : '#aaa'; + return ``; + }).join(''); + row.querySelectorAll('.persona-pill').forEach(btn => { + btn.addEventListener('click', () => { + feedPersonaFilter = btn.dataset.id; + renderFeedPersonaFilter(); + applyFeedPersonaFilter(); + }); + }); +} + +// Hide/show rendered post elements according to feedPersonaFilter. +function applyFeedPersonaFilter() { + const list = $('#feed-list'); + if (!list) return; + const selected = feedPersonaFilter; + list.querySelectorAll('.post[data-author]').forEach(el => { + if (selected === 'all') { el.style.display = ''; return; } + const author = el.dataset.author || ''; + const recipients = (el.dataset.recipients || '').split(',').filter(Boolean); + const matches = author === selected || recipients.includes(selected); + el.style.display = matches ? '' : 'none'; + }); +} + +function renderPersonasList() { + const list = $('#personas-list'); + if (!list) return; + if (personasCache.length === 0) { + list.innerHTML = '

No posting personas yet.

'; + return; + } + list.innerHTML = personasCache.map(p => { + const label = p.displayName || '(unnamed)'; + const defaultTag = p.isDefault ? ' (default)' : ''; + const setDefaultBtn = p.isDefault + ? '' + : ``; + const deleteBtn = p.isDefault + ? '' + : ``; + return `
+
+
${escapeHtml(label)}${defaultTag}
+
${p.nodeId.substring(0, 16)}...
+
+
${setDefaultBtn}${deleteBtn}
+
`; + }).join(''); + + list.querySelectorAll('.set-default-persona-btn').forEach(btn => { + btn.addEventListener('click', async () => { + btn.disabled = true; + try { + await invoke('set_default_posting_identity', { nodeIdHex: btn.dataset.id }); + toast('Default persona updated (takes effect next restart)'); + loadPersonas(); + } catch (e) { toast('Error: ' + e); btn.disabled = false; } + }); + }); + list.querySelectorAll('.delete-persona-btn').forEach(btn => { + btn.addEventListener('click', async () => { + if (!confirm('Delete this persona? All keys for it will be lost. Past posts under it remain on the network.')) return; + try { + await invoke('delete_posting_identity', { nodeIdHex: btn.dataset.id }); + toast('Persona deleted'); + loadPersonas(); + } catch (e) { toast('Error: ' + e); } + }); + }); +} + +function renderComposePersonaPicker() { + const sel = $('#persona-select'); + if (!sel) return; + // Only show when there are 2+ personas; otherwise pointless. + if (personasCache.length < 2) { + sel.classList.add('hidden'); + sel.innerHTML = ''; + return; + } + sel.classList.remove('hidden'); + const prior = sel.value; + const options = personasCache.map(p => { + const label = p.displayName || p.nodeId.substring(0, 8); + const tag = p.isDefault ? ' (default)' : ''; + return ``; + }).join(''); + sel.innerHTML = options; + // Default to the stored default; preserve user selection across reloads. + const defaultEntry = personasCache.find(p => p.isDefault); + const defaultValue = defaultEntry ? defaultEntry.nodeId : personasCache[0].nodeId; + sel.value = (prior && personasCache.some(p => p.nodeId === prior)) ? prior : defaultValue; +} + +$('#create-persona-btn').addEventListener('click', () => { + const overlay = document.createElement('div'); + overlay.className = 'image-lightbox'; + overlay.style.cursor = 'default'; + overlay.innerHTML = ` +
+

New Persona

+

Peers will see this persona as a distinct author. No one can tell which personas belong to the same device.

+ +
+ + +
+
`; + document.body.appendChild(overlay); + const nameInput = overlay.querySelector('#new-persona-name'); + nameInput.focus(); + overlay.querySelector('#new-persona-create').addEventListener('click', async () => { + const name = nameInput.value.trim(); + if (!name) { toast('Enter a name'); return; } + try { + await invoke('create_posting_identity', { displayName: name }); + toast(`Persona created: ${name}`); + overlay.remove(); + loadPersonas(); + } catch (e) { toast('Error: ' + e); } + }); + overlay.querySelector('#new-persona-cancel').addEventListener('click', () => overlay.remove()); + overlay.addEventListener('click', (e) => { if (e.target === overlay) overlay.remove(); }); + nameInput.addEventListener('keydown', (e) => { + if (e.key === 'Enter') overlay.querySelector('#new-persona-create').click(); + }); +}); + // Export wizard $('#export-btn').addEventListener('click', () => { const overlay = document.createElement('div'); @@ -3846,6 +4027,9 @@ async function init() { await new Promise(r => setTimeout(r, 300)); } } + // Load personas up front so the compose-box picker is ready before + // the user opens the Feed tab. + loadPersonas().catch(() => {}); const info = await loadNodeInfo(); // Show first-run chooser only if no profile AND only one identity (auto-created) let isFirstRun = false; diff --git a/frontend/index.html b/frontend/index.html index c8bef81..18f6a66 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -60,6 +60,7 @@
+
@@ -86,6 +87,7 @@
Ctrl+Enter to post
+