Flexible routing
Another massive refactor to change the way routing works. Now any column can route anywhere. Also things are generally just much better and more modular via the new struct split borrowing technique. I didn't even try to split this into smaller commits for my sanity. Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
@@ -1,8 +1,6 @@
|
||||
use crate::column::Columns;
|
||||
use crate::error::Error;
|
||||
use crate::note::NoteRef;
|
||||
use crate::notecache::{CachedNote, NoteCache};
|
||||
use crate::thread::Threads;
|
||||
use crate::unknowns::UnknownIds;
|
||||
use crate::Result;
|
||||
use crate::{filter, filter::FilterState};
|
||||
@@ -18,9 +16,11 @@ use std::rc::Rc;
|
||||
|
||||
use tracing::{debug, error};
|
||||
|
||||
mod kind;
|
||||
pub mod kind;
|
||||
pub mod route;
|
||||
|
||||
pub use kind::{PubkeySource, TimelineKind};
|
||||
pub use route::TimelineRoute;
|
||||
|
||||
#[derive(Debug, Hash, Copy, Clone, Eq, PartialEq)]
|
||||
pub struct TimelineId(u32);
|
||||
@@ -37,147 +37,6 @@ impl fmt::Display for TimelineId {
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Copy, Clone)]
|
||||
pub enum TimelineSource<'a> {
|
||||
Column(TimelineId),
|
||||
Thread(&'a [u8; 32]),
|
||||
}
|
||||
|
||||
impl<'a> TimelineSource<'a> {
|
||||
pub fn column(id: TimelineId) -> Self {
|
||||
TimelineSource::Column(id)
|
||||
}
|
||||
|
||||
pub fn view<'b>(
|
||||
self,
|
||||
ndb: &Ndb,
|
||||
columns: &'b mut Columns,
|
||||
threads: &'b mut Threads,
|
||||
txn: &Transaction,
|
||||
filter: ViewFilter,
|
||||
) -> &'b mut TimelineTab {
|
||||
match self {
|
||||
TimelineSource::Column(tid) => columns
|
||||
.find_timeline_mut(tid)
|
||||
.expect("timeline")
|
||||
.view_mut(filter),
|
||||
|
||||
TimelineSource::Thread(root_id) => {
|
||||
// TODO: replace all this with the raw entry api eventually
|
||||
|
||||
let thread = if threads.root_id_to_thread.contains_key(root_id) {
|
||||
threads.thread_expected_mut(root_id)
|
||||
} else {
|
||||
threads.thread_mut(ndb, txn, root_id).get_ptr()
|
||||
};
|
||||
|
||||
&mut thread.view
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn sub(
|
||||
self,
|
||||
ndb: &Ndb,
|
||||
columns: &Columns,
|
||||
txn: &Transaction,
|
||||
threads: &mut Threads,
|
||||
) -> Option<Subscription> {
|
||||
match self {
|
||||
TimelineSource::Column(tid) => columns.find_timeline(tid).expect("thread").subscription,
|
||||
TimelineSource::Thread(root_id) => {
|
||||
// TODO: replace all this with the raw entry api eventually
|
||||
|
||||
let thread = if threads.root_id_to_thread.contains_key(root_id) {
|
||||
threads.thread_expected_mut(root_id)
|
||||
} else {
|
||||
threads.thread_mut(ndb, txn, root_id).get_ptr()
|
||||
};
|
||||
|
||||
thread.subscription()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Check local subscriptions for new notes and insert them into
|
||||
/// timelines (threads, columns)
|
||||
pub fn poll_notes_into_view(
|
||||
&self,
|
||||
txn: &Transaction,
|
||||
ndb: &Ndb,
|
||||
columns: &mut Columns,
|
||||
threads: &mut Threads,
|
||||
unknown_ids: &mut UnknownIds,
|
||||
note_cache: &mut NoteCache,
|
||||
) -> Result<()> {
|
||||
let sub = if let Some(sub) = self.sub(ndb, columns, txn, threads) {
|
||||
sub
|
||||
} else {
|
||||
return Err(Error::no_active_sub());
|
||||
};
|
||||
|
||||
let new_note_ids = ndb.poll_for_notes(sub, 100);
|
||||
if new_note_ids.is_empty() {
|
||||
return Ok(());
|
||||
} else {
|
||||
debug!("{} new notes! {:?}", new_note_ids.len(), new_note_ids);
|
||||
}
|
||||
|
||||
let mut new_refs: Vec<(Note, NoteRef)> = Vec::with_capacity(new_note_ids.len());
|
||||
|
||||
for key in new_note_ids {
|
||||
let note = if let Ok(note) = ndb.get_note_by_key(txn, key) {
|
||||
note
|
||||
} else {
|
||||
error!("hit race condition in poll_notes_into_view: https://github.com/damus-io/nostrdb/issues/35 note {:?} was not added to timeline", key);
|
||||
continue;
|
||||
};
|
||||
|
||||
UnknownIds::update_from_note(txn, ndb, unknown_ids, note_cache, ¬e);
|
||||
|
||||
let created_at = note.created_at();
|
||||
new_refs.push((note, NoteRef { key, created_at }));
|
||||
}
|
||||
|
||||
// We're assuming reverse-chronological here (timelines). This
|
||||
// flag ensures we trigger the items_inserted_at_start
|
||||
// optimization in VirtualList. We need this flag because we can
|
||||
// insert notes into chronological order sometimes, and this
|
||||
// optimization doesn't make sense in those situations.
|
||||
let reversed = false;
|
||||
|
||||
// ViewFilter::NotesAndReplies
|
||||
{
|
||||
let refs: Vec<NoteRef> = new_refs.iter().map(|(_note, nr)| *nr).collect();
|
||||
|
||||
let reversed = false;
|
||||
self.view(ndb, columns, threads, txn, ViewFilter::NotesAndReplies)
|
||||
.insert(&refs, reversed);
|
||||
}
|
||||
|
||||
//
|
||||
// handle the filtered case (ViewFilter::Notes, no replies)
|
||||
//
|
||||
// TODO(jb55): this is mostly just copied from above, let's just use a loop
|
||||
// I initially tried this but ran into borrow checker issues
|
||||
{
|
||||
let mut filtered_refs = Vec::with_capacity(new_refs.len());
|
||||
for (note, nr) in &new_refs {
|
||||
let cached_note = note_cache.cached_note_or_insert(nr.key, note);
|
||||
|
||||
if ViewFilter::filter_notes(cached_note, note) {
|
||||
filtered_refs.push(*nr);
|
||||
}
|
||||
}
|
||||
|
||||
self.view(ndb, columns, threads, txn, ViewFilter::Notes)
|
||||
.insert(&filtered_refs, reversed);
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Copy, Clone, Eq, PartialEq, Debug, Default)]
|
||||
pub enum ViewFilter {
|
||||
Notes,
|
||||
@@ -379,6 +238,80 @@ impl Timeline {
|
||||
pub fn view_mut(&mut self, view: ViewFilter) -> &mut TimelineTab {
|
||||
&mut self.views[view.index()]
|
||||
}
|
||||
|
||||
pub fn poll_notes_into_view(
|
||||
timeline_idx: usize,
|
||||
timelines: &mut [Timeline],
|
||||
ndb: &Ndb,
|
||||
txn: &Transaction,
|
||||
unknown_ids: &mut UnknownIds,
|
||||
note_cache: &mut NoteCache,
|
||||
) -> Result<()> {
|
||||
let timeline = &mut timelines[timeline_idx];
|
||||
let sub = timeline.subscription.ok_or(Error::no_active_sub())?;
|
||||
|
||||
let new_note_ids = ndb.poll_for_notes(sub, 500);
|
||||
if new_note_ids.is_empty() {
|
||||
return Ok(());
|
||||
} else {
|
||||
debug!("{} new notes! {:?}", new_note_ids.len(), new_note_ids);
|
||||
}
|
||||
|
||||
let mut new_refs: Vec<(Note, NoteRef)> = Vec::with_capacity(new_note_ids.len());
|
||||
|
||||
for key in new_note_ids {
|
||||
let note = if let Ok(note) = ndb.get_note_by_key(txn, key) {
|
||||
note
|
||||
} else {
|
||||
error!("hit race condition in poll_notes_into_view: https://github.com/damus-io/nostrdb/issues/35 note {:?} was not added to timeline", key);
|
||||
continue;
|
||||
};
|
||||
|
||||
UnknownIds::update_from_note(txn, ndb, unknown_ids, note_cache, ¬e);
|
||||
|
||||
let created_at = note.created_at();
|
||||
new_refs.push((note, NoteRef { key, created_at }));
|
||||
}
|
||||
|
||||
// We're assuming reverse-chronological here (timelines). This
|
||||
// flag ensures we trigger the items_inserted_at_start
|
||||
// optimization in VirtualList. We need this flag because we can
|
||||
// insert notes into chronological order sometimes, and this
|
||||
// optimization doesn't make sense in those situations.
|
||||
let reversed = false;
|
||||
|
||||
// ViewFilter::NotesAndReplies
|
||||
{
|
||||
let refs: Vec<NoteRef> = new_refs.iter().map(|(_note, nr)| *nr).collect();
|
||||
|
||||
let reversed = false;
|
||||
timeline
|
||||
.view_mut(ViewFilter::NotesAndReplies)
|
||||
.insert(&refs, reversed);
|
||||
}
|
||||
|
||||
//
|
||||
// handle the filtered case (ViewFilter::Notes, no replies)
|
||||
//
|
||||
// TODO(jb55): this is mostly just copied from above, let's just use a loop
|
||||
// I initially tried this but ran into borrow checker issues
|
||||
{
|
||||
let mut filtered_refs = Vec::with_capacity(new_refs.len());
|
||||
for (note, nr) in &new_refs {
|
||||
let cached_note = note_cache.cached_note_or_insert(nr.key, note);
|
||||
|
||||
if ViewFilter::filter_notes(cached_note, note) {
|
||||
filtered_refs.push(*nr);
|
||||
}
|
||||
}
|
||||
|
||||
timeline
|
||||
.view_mut(ViewFilter::Notes)
|
||||
.insert(&filtered_refs, reversed);
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
pub enum MergeKind {
|
||||
|
||||
113
src/timeline/route.rs
Normal file
113
src/timeline/route.rs
Normal file
@@ -0,0 +1,113 @@
|
||||
use crate::{
|
||||
account_manager::AccountManager,
|
||||
column::Columns,
|
||||
draft::Drafts,
|
||||
imgcache::ImageCache,
|
||||
notecache::NoteCache,
|
||||
thread::Threads,
|
||||
timeline::TimelineId,
|
||||
ui::{self, note::post::PostResponse},
|
||||
};
|
||||
|
||||
use enostr::{NoteId, RelayPool};
|
||||
use nostrdb::{Ndb, Transaction};
|
||||
|
||||
#[derive(Debug, Eq, PartialEq, Clone, Copy)]
|
||||
pub enum TimelineRoute {
|
||||
Timeline(TimelineId),
|
||||
Thread(NoteId),
|
||||
Reply(NoteId),
|
||||
}
|
||||
|
||||
pub enum TimelineRouteResponse {
|
||||
Post(PostResponse),
|
||||
}
|
||||
|
||||
impl TimelineRouteResponse {
|
||||
pub fn post(post: PostResponse) -> Self {
|
||||
TimelineRouteResponse::Post(post)
|
||||
}
|
||||
}
|
||||
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub fn render_timeline_route(
|
||||
ndb: &Ndb,
|
||||
columns: &mut Columns,
|
||||
pool: &mut RelayPool,
|
||||
drafts: &mut Drafts,
|
||||
img_cache: &mut ImageCache,
|
||||
note_cache: &mut NoteCache,
|
||||
threads: &mut Threads,
|
||||
accounts: &mut AccountManager,
|
||||
route: TimelineRoute,
|
||||
col: usize,
|
||||
show_postbox: bool,
|
||||
textmode: bool,
|
||||
ui: &mut egui::Ui,
|
||||
) -> Option<TimelineRouteResponse> {
|
||||
match route {
|
||||
TimelineRoute::Timeline(timeline_id) => {
|
||||
if show_postbox {
|
||||
if let Some(kp) = accounts.selected_or_first_nsec() {
|
||||
ui::timeline::postbox_view(ndb, kp, pool, drafts, img_cache, ui);
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(bar_action) =
|
||||
ui::TimelineView::new(timeline_id, columns, ndb, note_cache, img_cache, textmode)
|
||||
.ui(ui)
|
||||
{
|
||||
let txn = Transaction::new(ndb).expect("txn");
|
||||
let router = columns.columns_mut()[col].router_mut();
|
||||
|
||||
bar_action.execute_and_process_result(ndb, router, threads, note_cache, pool, &txn);
|
||||
}
|
||||
|
||||
None
|
||||
}
|
||||
|
||||
TimelineRoute::Thread(id) => {
|
||||
if let Some(bar_action) =
|
||||
ui::ThreadView::new(threads, ndb, note_cache, img_cache, id.bytes(), textmode)
|
||||
.id_source(egui::Id::new(("threadscroll", col)))
|
||||
.ui(ui)
|
||||
{
|
||||
let txn = Transaction::new(ndb).expect("txn");
|
||||
let router = columns.columns_mut()[col].router_mut();
|
||||
bar_action.execute_and_process_result(ndb, router, threads, note_cache, pool, &txn);
|
||||
}
|
||||
|
||||
None
|
||||
}
|
||||
|
||||
TimelineRoute::Reply(id) => {
|
||||
let txn = if let Ok(txn) = Transaction::new(ndb) {
|
||||
txn
|
||||
} else {
|
||||
ui.label("Reply to unknown note");
|
||||
return None;
|
||||
};
|
||||
|
||||
let note = if let Ok(note) = ndb.get_note_by_id(&txn, id.bytes()) {
|
||||
note
|
||||
} else {
|
||||
ui.label("Reply to unknown note");
|
||||
return None;
|
||||
};
|
||||
|
||||
let id = egui::Id::new(("post", col, note.key().unwrap()));
|
||||
|
||||
if let Some(poster) = accounts.selected_or_first_nsec() {
|
||||
let response = egui::ScrollArea::vertical().show(ui, |ui| {
|
||||
ui::PostReplyView::new(ndb, poster, pool, drafts, note_cache, img_cache, ¬e)
|
||||
.id_source(id)
|
||||
.show(ui)
|
||||
});
|
||||
|
||||
Some(TimelineRouteResponse::post(response.inner))
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user