remove duplicate filter types

only use nostrdb::Filter

Signed-off-by: William Casarin <jb55@jb55.com>

enostr/src/filter.rs

@@ -1,91 +1 @@
-use crate::{NoteId, Pubkey};
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct Filter {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub ids: Option<Vec<NoteId>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub authors: Option<Vec<Pubkey>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub kinds: Option<Vec<u64>>,
-    #[serde(rename = "#e")]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub events: Option<Vec<NoteId>>,
-    #[serde(rename = "#p")]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    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")]
-    pub since: Option<u64>, // unix timestamp seconds
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub until: Option<u64>, // unix timestamp seconds
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub limit: Option<u16>,
-}
-
-impl Filter {
-    pub fn new() -> Filter {
-        Filter {
-            ids: None,
-            authors: None,
-            kinds: None,
-            events: None,
-            pubkeys: None,
-            hashtags: None,
-            since: None,
-            until: None,
-            limit: None,
-        }
-    }
-
-    pub fn default_limit() -> u16 {
-        250
-    }
-
-    pub fn default_remote_limit() -> u16 {
-        150
-    }
-
-    pub fn ids(mut self, ids: Vec<NoteId>) -> Self {
-        self.ids = Some(ids);
-        self
-    }
-
-    pub fn authors(mut self, authors: Vec<Pubkey>) -> Self {
-        self.authors = Some(authors);
-        self
-    }
-
-    pub fn kinds(mut self, kinds: Vec<u64>) -> Self {
-        self.kinds = Some(kinds);
-        self
-    }
-
-    pub fn events(mut self, events: Vec<NoteId>) -> Self {
-        self.events = Some(events);
-        self
-    }
-
-    pub fn pubkeys(mut self, pubkeys: Vec<Pubkey>) -> Self {
-        self.pubkeys = Some(pubkeys);
-        self
-    }
-
-    pub fn since(mut self, since: u64) -> Self {
-        self.since = Some(since);
-        self
-    }
-
-    pub fn until(mut self, until: u64) -> Self {
-        self.until = Some(until);
-        self
-    }
-
-    pub fn limit(mut self, limit: u16) -> Self {
-        self.limit = Some(limit);
-        self
-    }
-}
+pub type Filter = nostrdb::Filter;