feat(columns): (ctrl | command + click open new column) hashtag, mention, embedded note, profile pic, reply, quote

Author: fernandolguevara

crates/notedeck/src/lib.rs

@@ -67,7 +67,7 @@ pub use muted::{MuteFun, Muted};
 pub use name::NostrName;
 pub use note::{
     BroadcastContext, ContextSelection, NoteAction, NoteContext, NoteContextSelection, NoteRef,
-    RootIdError, RootNoteId, RootNoteIdBuf, ScrollInfo, ZapAction,
+    OpenColumnInfo, RootIdError, RootNoteId, RootNoteIdBuf, ScrollInfo, ZapAction,
 };
 pub use notecache::{CachedNote, NoteCache};
 pub use options::NotedeckOptions;

crates/notedeck/src/note/action.rs

@@ -9,8 +9,29 @@ pub struct ScrollInfo {
     pub offset: Vec2,
 }
 
+#[derive(Debug, PartialEq)]
+pub enum OpenColumnInfo {
+    /// User has clicked the quote reply action
+    Reply(NoteId),
+
+    /// User has clicked the quote repost action
+    Quote(NoteId),
+
+    /// User has clicked a hashtag
+    Hashtag(String),
+
+    /// User has clicked a profile
+    Profile(Pubkey),
+
+    Note {
+        note_id: NoteId,
+    },
+}
+
 #[derive(Debug)]
 pub enum NoteAction {
+    MissingThreadSub,
+
     /// User has clicked the quote reply action
     Reply(NoteId),
 
@@ -24,7 +45,10 @@ pub enum NoteAction {
     Profile(Pubkey),
 
     /// User has clicked a note link
-    Note { note_id: NoteId, preview: bool },
+    Note {
+        note_id: NoteId,
+        preview: bool,
+    },
 
     /// User has selected some context option
     Context(ContextSelection),
@@ -37,6 +61,8 @@ pub enum NoteAction {
 
     /// User scrolled the timeline
     Scroll(ScrollInfo),
+
+    OpenColumn(OpenColumnInfo),
 }
 
 impl NoteAction {

crates/notedeck/src/note/mod.rs

@@ -1,7 +1,7 @@
 mod action;
 mod context;
 
-pub use action::{NoteAction, ScrollInfo, ZapAction, ZapTargetAmount};
+pub use action::{NoteAction, OpenColumnInfo, ScrollInfo, ZapAction, ZapTargetAmount};
 pub use context::{BroadcastContext, ContextSelection, NoteContextSelection};
 
 use crate::Accounts;

crates/notedeck_chrome/src/chrome.rs

@@ -101,6 +101,12 @@ impl ChromePanelAction {
         chrome.switch_to_columns();
 
         if let Some(c) = chrome.get_columns_app().and_then(|columns| {
+            columns
+                .decks_cache
+                .active_columns_mut(ctx.i18n, ctx.accounts)
+                .unwrap()
+                .selected = 0;
+
             columns
                 .decks_cache
                 .selected_column_mut(ctx.i18n, ctx.accounts)
@@ -847,7 +853,13 @@ fn chrome_handle_app_action(
             if let Some(action) = m_action {
                 let col = cols.selected_mut();
 
-                action.process(&mut col.router, &mut col.sheet_router);
+                action.process(
+                    0,
+                    ctx,
+                    &mut columns.threads,
+                    &mut col.router,
+                    &mut col.sheet_router,
+                );
             }
         }
     }
@@ -903,7 +915,13 @@ fn columns_route_to_profile(
     if let Some(action) = m_action {
         let col = cols.selected_mut();
 
-        action.process(&mut col.router, &mut col.sheet_router);
+        action.process(
+            0,
+            ctx,
+            &mut columns.threads,
+            &mut col.router,
+            &mut col.sheet_router,
+        );
     }
 }
 

crates/notedeck_columns/src/actionbar.rs

@@ -30,6 +30,27 @@ pub enum NotesOpenResult {
     Thread(NewThreadNotes),
 }
 
+impl NotesOpenResult {
+    pub fn process(
+        self,
+        threads: &mut Threads,
+        ndb: &Ndb,
+        note_cache: &mut NoteCache,
+        txn: &Transaction,
+        timeline_cache: &mut TimelineCache,
+        unknown_ids: &mut UnknownIds,
+    ) {
+        match self {
+            NotesOpenResult::Timeline(timeline_open_result) => {
+                timeline_open_result.process(ndb, note_cache, txn, timeline_cache, unknown_ids);
+            }
+            NotesOpenResult::Thread(thread_open_result) => {
+                thread_open_result.process(threads, ndb, txn, unknown_ids, note_cache);
+            }
+        }
+    }
+}
+
 pub enum TimelineOpenResult {
     NewNotes(NewNotes),
 }
@@ -63,6 +84,7 @@ fn execute_note_action(
     let can_post = accounts.get_selected_account().key.secret_key.is_some();
 
     match action {
+        NoteAction::MissingThreadSub => router_action = Some(RouterAction::MissingThreadSub),
         NoteAction::Scroll(ref scroll_info) => {
             tracing::trace!("timeline scroll {scroll_info:?}")
         }
@@ -81,6 +103,9 @@ fn execute_note_action(
                 .open(ndb, note_cache, txn, pool, &kind)
                 .map(NotesOpenResult::Timeline);
         }
+        NoteAction::OpenColumn(args) => {
+            router_action = Some(RouterAction::OpenColumn(args));
+        }
         NoteAction::Note { note_id, preview } => 'ex: {
             let Ok(thread_selection) = ThreadSelection::from_note_id(ndb, note_cache, txn, note_id)
             else {
@@ -224,14 +249,7 @@ pub fn execute_and_process_note_action(
     );
 
     if let Some(br) = resp.timeline_res {
-        match br {
-            NotesOpenResult::Timeline(timeline_open_result) => {
-                timeline_open_result.process(ndb, note_cache, txn, timeline_cache, unknown_ids);
-            }
-            NotesOpenResult::Thread(thread_open_result) => {
-                thread_open_result.process(threads, ndb, txn, unknown_ids, note_cache);
-            }
-        }
+        br.process(threads, &ndb, note_cache, txn, timeline_cache, unknown_ids);
     }
 
     resp.router_action