nostr/nostr-rs-relay
1
0
Fork 0
mirror of https://github.com/scsibug/nostr-rs-relay.git synced 2024-11-24 17:49:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: Postgres SQL generation for expiring events

Browse Source
This commit is contained in:
Greg Heartsfield 2023-02-17 21:04:30 -06:00
parent 5638f70d66
commit 9d55731073
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/repo/postgres.rs
View File

@ -550,6 +550,7 @@ fn query_from_filter(f: &ReqFilter) -> Option<QueryBuilder<Postgres>> {
let mut query = QueryBuilder::new("SELECT e.\"content\", e.created_at FROM \"event\" e WHERE "); let mut query = QueryBuilder::new("SELECT e.\"content\", e.created_at FROM \"event\" e WHERE ");
// This tracks whether we need to push a prefix AND before adding another clause
let mut push_and = false; let mut push_and = false;
// Query for "authors", allowing prefix matches // Query for "authors", allowing prefix matches
if let Some(auth_vec) = &f.authors { if let Some(auth_vec) = &f.authors {
@ -747,13 +748,9 @@ fn query_from_filter(f: &ReqFilter) -> Option<QueryBuilder<Postgres>> {
} else { } else {
query.push("e.hidden != 1::bit(1)"); query.push("e.hidden != 1::bit(1)");
} }
// never display expired events // never display expired events
if push_and {
query.push(" AND ");
}
query query
.push("(e.expires_at IS NULL OR e.expires_at > ") .push(" AND (e.expires_at IS NULL OR e.expires_at > ")
.push_bind(Utc.timestamp_opt(utils::unix_time() as i64, 0).unwrap()).push(")"); .push_bind(Utc.timestamp_opt(utils::unix_time() as i64, 0).unwrap()).push(")");
// Apply per-filter limit to this query. // Apply per-filter limit to this query.