diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fe5879..0e8d330 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ ### Added - Show an avatar in each panel's tab, using the repository owner's profile picture when set and a pixel avatar otherwise +- Add a Tab Bar setting to hide the previous/next tab buttons, hidden by default ### Changed @@ -17,6 +18,7 @@ ### Fixed - Render every avatar at one consistent size, where a surrounding border had shrunk pictures by two pixels and the pixel avatar ignored an explicit size +- Date repositories from their repository state event, so the explore list and open repository views show the latest push instead of the announcement date ### Removed diff --git a/crates/signed_core/src/filters.rs b/crates/signed_core/src/filters.rs index 829a0ab..678cf50 100644 --- a/crates/signed_core/src/filters.rs +++ b/crates/signed_core/src/filters.rs @@ -184,6 +184,11 @@ pub fn all_announcements() -> Filter { Filter::new().kind(Kind::GitRepoAnnouncement) } +/// All repository state events, carrying each repository's refs and last push time. +pub fn all_states() -> Filter { + Filter::new().kind(Kind::RepoState) +} + /// How far back deletion requests are fetched and stored. const DELETIONS_LOOKBACK: Duration = Duration::from_secs(3 * 365 * 86_400); diff --git a/crates/signed_state/src/backend.rs b/crates/signed_state/src/backend.rs index 362c820..1c461b4 100644 --- a/crates/signed_state/src/backend.rs +++ b/crates/signed_state/src/backend.rs @@ -1229,7 +1229,7 @@ impl Backend { self.sync_progress = Some((0, 0)); cx.notify(); - let progress_task: Task> = cx.spawn(async move |this, cx| { + cx.spawn(async move |this, cx| { let mut last_percent: u64 = 0; while rx.changed().await.is_ok() { @@ -1254,23 +1254,18 @@ impl Backend { } } - Ok(()) - }); - progress_task.detach(); + Ok::<(), anyhow::Error>(()) + }) + .detach(); let sync = cx.background_spawn(async move { let opts = SyncOptions::default().progress(tx); sync_bootstrap_only(&client, filter, opts).await }); - let task: Task> = cx.spawn(async move |this, cx| { + cx.spawn(async move |this, cx| { match sync.await { - Ok(summary) => { - log::debug!( - "sync done: {} received, {} sent", - summary.received.len(), - summary.sent.len() - ); + Ok(_) => { this.update(cx, |this, cx| { this.sync_progress = None; cx.emit(BackendEvent::Synced); @@ -1284,9 +1279,10 @@ impl Backend { })?; } } - Ok(()) - }); - task.detach(); + + Ok::<(), anyhow::Error>(()) + }) + .detach(); } /// Emit [`BackendEvent::Published`] for cross-store invalidation. diff --git a/crates/signed_state/src/repo.rs b/crates/signed_state/src/repo.rs index 05c9a86..25cdf78 100644 --- a/crates/signed_state/src/repo.rs +++ b/crates/signed_state/src/repo.rs @@ -205,29 +205,32 @@ impl RepoStore { // Deletions may target any event of this repository. let deletion = update.kind == Kind::EventDeletion || update.kind == Kind::RequestToVanish; + let coordinate = update.coordinate.as_ref() == Some(addr); let author = update.author == addr.public_key; - let kind = update.kind == Kind::GitRepoAnnouncement; - // NIP-22 comments carry no `a` tag. - // Coordinate matching fails for them. - // Any comment may reference this repository's roots. + + let authored = (update.kind == Kind::GitRepoAnnouncement + || update.kind == Kind::RepoState) + && author; + let comment = update.kind == Kind::Comment; - // Status events may omit their `a` tag, NIP-34. - // Any status event may reference a root of this repository. let status = RepoStatus::from_kind(update.kind).is_some(); - deletion || coordinate || (author && kind) || comment || status + deletion || coordinate || authored || comment || status }), BackendEvent::Published(event) => { - let kind = event.kind == Kind::GitRepoAnnouncement; + let announcement = event.kind == Kind::GitRepoAnnouncement; let author = event.pubkey == addr.public_key; let coordinate = event.tags.coordinates().into_iter().any(|c| c == *addr); - // Locally published deletions may target any event of this repository. - // Refresh so they take effect immediately, like relay deletions. + + let state = event.kind == Kind::RepoState + && author + && event.tags.identifier().as_deref() == Some(addr.identifier.as_str()); + let deletion = event.kind == Kind::EventDeletion || event.kind == Kind::RequestToVanish; - coordinate || (kind && author) || deletion + coordinate || (announcement && author) || state || deletion } _ => false, }; @@ -256,8 +259,6 @@ impl RepoStore { /// Announcement, state, activity and deletions targeting it. fn repo_filters(addr: &RepoAddr) -> Vec { let mut filters = vec![ - // Announcement and state share author and identifier. - // They combine into one filter, one fewer negentropy reconciliation per relay. Filter::new() .kinds([Kind::GitRepoAnnouncement, Kind::RepoState]) .author(addr.public_key) @@ -306,9 +307,6 @@ impl RepoStore { } /// Re-query the local database and update all fields. - /// - /// Runs immediately. The backend pump already batches the relay events that - /// trigger a refresh, so no per-store debounce is needed. pub fn refresh(&mut self, cx: &mut Context) { if self.addr.is_none() { return; @@ -345,11 +343,10 @@ impl RepoStore { let deletions = Deletions::from_events(deletion_events); - // Parse and sort off the main thread. - // Only plain data crosses back into the entity. let all_announcements = announcements .into_iter() .filter(|e| !deletions.is_deleted(e)); + let announcement = latest(all_announcements) .as_ref() .and_then(Announcement::from_event); @@ -374,8 +371,6 @@ impl RepoStore { } } - // NIP-22 comments reference their root via an `E` or `e` tag. - // Not the repository's `a` tag, so query them by the root events. let mut seen_comments: HashSet = comments.iter().map(|e| e.id).collect(); let db = client.database(); @@ -393,8 +388,6 @@ impl RepoStore { } } - // Status events may omit their `a` tag. - // Query them by the root events they reference too. let mut seen_statuses: HashSet = statuses.iter().map(|e| e.id).collect(); let db = client.database(); @@ -417,9 +410,6 @@ impl RepoStore { sort_newest_first(&mut pull_requests); sort_oldest_first(&mut comments); - // Resolve every root's status once here. - // Render paths do HashMap lookups instead of per-root status scans. - // Those scans are quadratic, with an allocation per pair. let maintainers = announcement .as_ref() .map(Announcement::effective_maintainers) @@ -477,25 +467,13 @@ impl RepoStore { }; let again = this.update(cx, |this, cx| { - // Compare before moving the freshly queried data in, so a pass - // that found nothing new does not notify observers. The store - // is polled in bursts while a sync is in flight; notifying on - // every identical pass would re-render the repository panel - // several times for no visible change. - // - // The first pass is the exception: it must notify even when it - // found nothing, so views can leave their loading state and show - // the empty result. - // - // Keep the open-time hint until that first pass has confirmed what - // the database holds; afterwards the database is the truth, - // including a deletion. let keep_hint = announcement.is_none() && !this.loaded; - let first_pass = !this.loaded; + let head_changed = state .as_ref() .is_some_and(|(_, head)| this.head.as_deref() != head.as_deref()); + let changed = first_pass || (!keep_hint && this.announcement != announcement) || head_changed @@ -516,6 +494,7 @@ impl RepoStore { .as_ref() .map(|a| a.relays.clone()) .unwrap_or_default(); + this.connect_announced_relays(&relays, cx); if let Some((_, head)) = state { @@ -531,10 +510,6 @@ impl RepoStore { this.open_pr_count = open_pr_count; this.loaded = true; - // Comments and statuses without an `a` tag. - // None are addressed to the repository. - // Fetch them by the root events they reference. - // Use the bootstrap relays and the relays this repository announced. let roots = this .issues .iter() @@ -551,13 +526,13 @@ impl RepoStore { if !new_roots.is_empty() { this.root_fetches.extend(new_roots.iter().copied()); - // Batch the per-root filters. - // One filter per root costs a negentropy reconciliation per relay. + let mut root_filters = filters::comments_for(new_roots.clone()); root_filters.push(filters::statuses_for(new_roots.iter().copied())); let announced: Vec = this.repo_relays.iter().cloned().collect(); let backend = Backend::global(cx); + backend.update(cx, |backend, cx| { backend.subscribe_bootstrap(root_filters.clone(), cx); backend.connect_repo_relays(announced, root_filters, cx); @@ -571,8 +546,6 @@ impl RepoStore { this.refresh.finish() })?; - // Requests that arrived while the refresh was running. - // They are coalesced into one follow-up refresh. if again { this.update(cx, |this, cx| this.refresh(cx))?; } @@ -588,25 +561,16 @@ impl RepoStore { } /// Number of open issues. - /// - /// Issues whose resolved status is [`RepoStatus::Open`]. - /// Issues without status events default to open. pub fn issue_count(&self) -> usize { self.open_issue_count } /// Number of open pull requests. - /// - /// Only root PR events count, PR updates do not. - /// They must resolve to [`RepoStatus::Open`]. pub fn pull_request_count(&self) -> usize { self.open_pr_count } /// Whether `user` is the author or owner of this repository. - /// - /// The author is the public key of the repository address. - /// Only the author may manage pull requests, close, reopen or merge. pub fn is_author(&self, user: &PublicKey) -> bool { self.addr .as_ref() diff --git a/crates/signed_state/src/repos.rs b/crates/signed_state/src/repos.rs index 3c4758f..f13ee91 100644 --- a/crates/signed_state/src/repos.rs +++ b/crates/signed_state/src/repos.rs @@ -1,4 +1,4 @@ -use std::collections::HashMap; +use std::collections::{HashMap, HashSet}; use std::sync::Arc; use std::time::Duration; @@ -47,6 +47,8 @@ pub struct RepoListStore { /// /// Used for the Popular ranking of the explore list. pub counts: Arc>, + /// Own repositories whose state events were fetched from their announced relays. + state_synced_repos: HashSet, refresh: RefreshGate, _subscription: Subscription, } @@ -82,17 +84,16 @@ impl RepoListStore { }), BackendEvent::Published(event) => { let announcement = event.kind == Kind::GitRepoAnnouncement; - - // Locally published deletions are already in the local database. - // Refresh so they take effect immediately, like relay deletions. + let state = event.kind == Kind::RepoState; let deletion = event.kind == Kind::EventDeletion || event.kind == Kind::RequestToVanish; - announcement || deletion + announcement || state || deletion + } + BackendEvent::SignerChanged => { + this.state_synced_repos.clear(); + true } - // Only a completed sync refreshes the list. - // Progress ticks would re-scan the whole database several times - // per sync to reveal entries incrementally. BackendEvent::Synced => true, _ => false, }; @@ -114,6 +115,7 @@ impl RepoListStore { announcements: Arc::new(Vec::new()), last_activity: Arc::new(HashMap::new()), counts: Arc::new(HashMap::new()), + state_synced_repos: HashSet::new(), refresh: RefreshGate::default(), _subscription: subscription, } @@ -133,11 +135,36 @@ impl RepoListStore { backend.update(cx, |backend, cx| { backend.sync_bootstrap(filters::all_announcements(), cx); + backend.sync_bootstrap(filters::all_states(), cx); // Deletion requests, NIP-09/62, must be known before any announcement is shown. backend.sync_bootstrap(filters::deletions(), cx); }); } + /// Fetch the state events of the user's own repositories. + fn sync_own_repo_states(&mut self, cx: &mut Context) { + let backend = Backend::global(cx); + let Some(me) = backend.read(cx).current_user() else { + return; + }; + + let pending: Vec<(RepoAddr, Vec)> = self + .announcements + .iter() + .filter(|announcement| announcement.owner == me && !announcement.relays.is_empty()) + .map(|announcement| (announcement.addr(), announcement.relays.clone())) + .filter(|(addr, _)| !self.state_synced_repos.contains(addr)) + .collect(); + + for (addr, relays) in pending { + self.state_synced_repos.insert(addr.clone()); + + backend.update(cx, |backend, cx| { + backend.connect_repo_relays(relays, vec![filters::state(&addr)], cx); + }); + } + } + /// Re-query the local database. /// /// Runs immediately. The backend pump already batches the relay events that @@ -189,9 +216,6 @@ impl RepoListStore { let mut announcements: Vec = by_repo.into_values().collect(); announcements.sort_by_key(|a| std::cmp::Reverse(a.created_at)); - // Last activity per repository. - // State updates count, and all NIP-34 activity events. - // The activity events are patches, PRs, issues and statuses. let mut last_activity: HashMap = announcements .iter() .map(|a| (a.addr(), a.created_at)) @@ -217,6 +241,7 @@ impl RepoListStore { let activity_filter = Filter::new() .kinds(filters::ACTIVITY_KINDS) .since(Timestamp::now() - ACTIVITY_WINDOW); + for event in client.database().query(activity_filter).await? { if deletions.is_deleted(&event) { continue; @@ -225,8 +250,6 @@ impl RepoListStore { if addr.kind != Kind::GitRepoAnnouncement { continue; } - // Skip events for repos we do not list. - // The map cannot grow beyond the number of announcements. let Some(entry) = last_activity.get_mut(&addr) else { continue; }; @@ -239,13 +262,12 @@ impl RepoListStore { let mut counts: HashMap = HashMap::new(); let count_filter = Filter::new().kinds([Kind::GitIssue, Kind::GitPullRequest, Kind::GitPatch]); + for event in client.database().query(count_filter).await? { if deletions.is_deleted(&event) { continue; } for addr in event.tags.coordinates() { - // Skip events for repos we do not list. - // The map cannot grow beyond the number of announcements. if addr.kind != Kind::GitRepoAnnouncement || !last_activity.contains_key(&addr) { continue; @@ -278,6 +300,7 @@ impl RepoListStore { this.announcements = Arc::new(announcements); this.last_activity = Arc::new(last_activity); this.counts = Arc::new(counts); + this.sync_own_repo_states(cx); cx.notify(); this.refresh.finish()