tyiu/notedeck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'github/pr/87{0,1,2}'

Browse Source 
Merge a few bug fixes and lint issues

Fernando López Guevara (1):
      fix: skip blurring for user's own images

William Casarin (3):
      clippy: fix large enum.

kernelkind (1):
      bugfix: txn failed
This commit is contained in:
William Casarin
2025-06-02 10:34:27 -07:00
parent d9b1de9d2c 1c3b172e21 91c9cfc34f f3f5026719
commit 81a9ddbebc
5 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crates/notedeck_columns/src/ui/add_column.rs
View File

@@ -637,6 +637,7 @@ pub fn render_add_column_routes(
crate::timeline::setup_new_timeline(
&mut timeline,
ctx.ndb,
&txn,
&mut app.subscriptions,
ctx.pool,
ctx.note_cache,
@@ -669,15 +670,15 @@ pub fn render_add_column_routes(
// source to be, so let;s create a timeline from that and
// add it to our list of timelines
AlgoOption::LastPerPubkey(Decision::Decided(list_kind)) => {
let maybe_timeline = {
let txn = Transaction::new(ctx.ndb).unwrap();
TimelineKind::last_per_pubkey(list_kind).into_timeline(&txn, ctx.ndb)
};
let txn = Transaction::new(ctx.ndb).unwrap();
let maybe_timeline =
TimelineKind::last_per_pubkey(list_kind).into_timeline(&txn, ctx.ndb);
if let Some(mut timeline) = maybe_timeline {
crate::timeline::setup_new_timeline(
&mut timeline,
ctx.ndb,
&txn,
&mut app.subscriptions,
ctx.pool,
ctx.note_cache,

3
crates/notedeck_columns/src/ui/timeline.rs
View File

@@ -410,7 +410,8 @@ impl<'a, 'd> TimelineTabView<'a, 'd> {
let zapping_acc = self
.cur_acc
.as_ref()
.filter(|_| self.note_context.current_account_has_wallet);
.filter(|_| self.note_context.current_account_has_wallet)
.or(self.cur_acc.as_ref());
notedeck_ui::padding(8.0, ui, |ui| {
let resp = NoteView::new(