Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2e2e01203b | ||
|
|
100f890284 | ||
|
|
0e288fe678 | ||
|
|
bfc804e18c |
Generated
+1
-1
@@ -435,7 +435,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "nostr-rs-relay"
|
name = "nostr-rs-relay"
|
||||||
version = "0.1.5"
|
version = "0.1.6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitcoin_hashes",
|
"bitcoin_hashes",
|
||||||
"env_logger",
|
"env_logger",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "nostr-rs-relay"
|
name = "nostr-rs-relay"
|
||||||
version = "0.1.5"
|
version = "0.1.6"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -229,6 +229,12 @@ fn query_from_sub(sub: &Subscription) -> String {
|
|||||||
let created_clause = format!("created_at > {}", f.since.unwrap());
|
let created_clause = format!("created_at > {}", f.since.unwrap());
|
||||||
filter_components.push(created_clause);
|
filter_components.push(created_clause);
|
||||||
}
|
}
|
||||||
|
// Query for timestamp
|
||||||
|
if f.until.is_some() {
|
||||||
|
let until_clause = format!("created_at < {}", f.until.unwrap());
|
||||||
|
filter_components.push(until_clause);
|
||||||
|
}
|
||||||
|
|
||||||
// combine all clauses, and add to filter_clauses
|
// combine all clauses, and add to filter_clauses
|
||||||
if !filter_components.is_empty() {
|
if !filter_components.is_empty() {
|
||||||
let mut fc = "( ".to_owned();
|
let mut fc = "( ".to_owned();
|
||||||
@@ -246,6 +252,8 @@ fn query_from_sub(sub: &Subscription) -> String {
|
|||||||
query.push_str(" WHERE ");
|
query.push_str(" WHERE ");
|
||||||
query.push_str(&filter_clauses.join(" OR "));
|
query.push_str(&filter_clauses.join(" OR "));
|
||||||
}
|
}
|
||||||
|
// add order clause
|
||||||
|
query.push_str(" ORDER BY created_at ASC");
|
||||||
debug!("query string: {}", query);
|
debug!("query string: {}", query);
|
||||||
query
|
query
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ impl Stream for NostrStream {
|
|||||||
fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
|
fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
|
||||||
/// Convert Message to NostrMessage
|
/// Convert Message to NostrMessage
|
||||||
fn convert(msg: String) -> Result<NostrMessage> {
|
fn convert(msg: String) -> Result<NostrMessage> {
|
||||||
|
debug!("raw msg: {}", msg);
|
||||||
let parsed_res: Result<NostrMessage> = serde_json::from_str(&msg).map_err(|e| e.into());
|
let parsed_res: Result<NostrMessage> = serde_json::from_str(&msg).map_err(|e| e.into());
|
||||||
match parsed_res {
|
match parsed_res {
|
||||||
Ok(m) => Ok(m),
|
Ok(m) => Ok(m),
|
||||||
|
|||||||
@@ -29,6 +29,8 @@ pub struct ReqFilter {
|
|||||||
pub pubkey: Option<String>,
|
pub pubkey: Option<String>,
|
||||||
/// Events published after this time
|
/// Events published after this time
|
||||||
pub since: Option<u64>,
|
pub since: Option<u64>,
|
||||||
|
/// Events published before this time
|
||||||
|
pub until: Option<u64>,
|
||||||
/// List of author public keys
|
/// List of author public keys
|
||||||
pub authors: Option<Vec<String>>,
|
pub authors: Option<Vec<String>>,
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user