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

filters: fix hashtag filters

Browse Source 
We might need to move to something a bit more generic that works
for all generic tag filters.
This commit is contained in:
William Casarin
2024-03-22 10:23:41 +01:00
parent 450709afa7
commit 2936012308
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
enostr/src/filter.rs
View File

@@ -15,6 +15,9 @@ pub struct Filter {
#[serde(rename = "#p")] #[serde(rename = "#p")]
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub pubkeys: Option<Vec<Pubkey>>, pub pubkeys: Option<Vec<Pubkey>>,
#[serde(rename = "#t")]
#[serde(skip_serializing_if = "Option::is_none")]
pub hashtags: Option<Vec<String>>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub since: Option<u64>, // unix timestamp seconds pub since: Option<u64>, // unix timestamp seconds
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
@@ -31,6 +34,7 @@ impl Filter {
kinds: None, kinds: None,
events: None, events: None,
pubkeys: None, pubkeys: None,
hashtags: None,
since: None, since: None,
until: None, until: None,
limit: None, limit: None,

5
src/filter.rs
View File

@@ -24,6 +24,11 @@ pub fn convert_enostr_filter(filter: &enostr::Filter) -> nostrdb::Filter {
nfilter.pubkeys(pubkeys.iter().map(|a| *a.bytes()).collect()); nfilter.pubkeys(pubkeys.iter().map(|a| *a.bytes()).collect());
} }
// #t
if let Some(ref hashtags) = filter.hashtags {
nfilter.tags(hashtags.clone(), 't');
}
if let Some(since) = filter.since { if let Some(since) = filter.since {
nfilter.since(since); nfilter.since(since);
} }