nostr/notedeck
1
0
Fork 0
mirror of https://github.com/damus-io/notedeck.git synced 2024-09-16 11:53:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

column: extract into_timeline logic into ColumnKind

Browse Source 
I thought I needed this but maybe I don't. Anyways, it's a bit cleaner
this way.

Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin 2024-08-31 08:15:09 -07:00
parent db49cf3c4b
commit 92e9e34e19
2 changed files with 51 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/args.rs
View File

@ -1,8 +1,7 @@
use crate::column::{ColumnKind, ListKind, PubkeySource};
use crate::column::{ColumnKind, PubkeySource};
use crate::timeline::Timeline;
use crate::Error;
use enostr::{Filter, Keypair, Pubkey, SecretKey};
use nostrdb::{Ndb, Transaction};
use nostrdb::Ndb;
use tracing::{error, info};
pub struct Args {
@ -180,50 +179,7 @@ impl ArgColumn {
pub fn into_timeline(self, ndb: &Ndb, user: Option<&[u8; 32]>) -> Timeline {
match self {
ArgColumn::Generic(filters) => Timeline::new(ColumnKind::Generic, Some(filters)),
ArgColumn::Column(ColumnKind::Universe) => {
Timeline::new(ColumnKind::Universe, Some(vec![]))
}
ArgColumn::Column(ColumnKind::Generic) => {
panic!("Not a valid ArgColumn")
}
ArgColumn::Column(ColumnKind::List(ListKind::Contact(ref pk_src))) => {
let pk = match pk_src {
PubkeySource::DeckAuthor => {
if let Some(user_pk) = user {
user_pk
} else {
// No user loaded, so we have to return an unloaded
// contact list columns
return Timeline::new(
ColumnKind::contact_list(PubkeySource::DeckAuthor),
None,
);
}
}
PubkeySource::Explicit(pk) => pk.bytes(),
};
let contact_filter = Filter::new().authors([pk]).kinds([3]).limit(1).build();
let txn = Transaction::new(ndb).expect("txn");
let results = ndb
.query(&txn, vec![contact_filter], 1)
.expect("contact query failed?");
if results.is_empty() {
return Timeline::new(ColumnKind::contact_list(pk_src.to_owned()), None);
}
match Timeline::contact_list(&results[0].note) {
Err(Error::EmptyContactList) => {
Timeline::new(ColumnKind::contact_list(pk_src.to_owned()), None)
}
Err(e) => panic!("Unexpected error: {e}"),
Ok(tl) => tl,
}
}
ArgColumn::Column(ck) => ck.into_timeline(ndb, user),
}
}
}

48
src/column.rs
View File

@ -1,4 +1,6 @@
use crate::{timeline::Timeline, Error};
use enostr::Pubkey;
use nostrdb::{Filter, Ndb, Transaction};
use std::fmt::Display;
#[derive(Clone, Debug)]
@ -42,4 +44,50 @@ impl ColumnKind {
pub fn contact_list(pk: PubkeySource) -> Self {
ColumnKind::List(ListKind::Contact(pk))
}
pub fn into_timeline(self, ndb: &Ndb, default_user: Option<&[u8; 32]>) -> Timeline {
match self {
ColumnKind::Universe => Timeline::new(ColumnKind::Universe, Some(vec![])),
ColumnKind::Generic => {
panic!("you can't convert a ColumnKind::Generic to a Timeline")
}
ColumnKind::List(ListKind::Contact(ref pk_src)) => {
let pk = match pk_src {
PubkeySource::DeckAuthor => {
if let Some(user_pk) = default_user {
user_pk
} else {
// No user loaded, so we have to return an unloaded
// contact list columns
return Timeline::new(
ColumnKind::contact_list(PubkeySource::DeckAuthor),
None,
);
}
}
PubkeySource::Explicit(pk) => pk.bytes(),
};
let contact_filter = Filter::new().authors([pk]).kinds([3]).limit(1).build();
let txn = Transaction::new(ndb).expect("txn");
let results = ndb
.query(&txn, vec![contact_filter], 1)
.expect("contact query failed?");
if results.is_empty() {
return Timeline::new(ColumnKind::contact_list(pk_src.to_owned()), None);
}
match Timeline::contact_list(&results[0].note) {
Err(Error::EmptyContactList) => {
Timeline::new(ColumnKind::contact_list(pk_src.to_owned()), None)
}
Err(e) => panic!("Unexpected error: {e}"),
Ok(tl) => tl,
}
}
}
}
}